TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


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

1321 files changed, 15883 insertions, 15524 deletions

diff --git a/kfilereplace/commandengine.cpp b/kfilereplace/commandengine.cpp
index ffb1919d..aaf40f38 100644
--- a/kfilereplace/commandengine.cpp
+++ b/kfilereplace/commandengine.cpp
@@ -34,10 +34,10 @@ TQString CommandEngine::datetime(const TQString& opt, const TQString& arg)
 {
   Q_UNUSED(arg);
   if(opt == "iso")
-    return TQDateTime::currentDateTime(Qt::LocalTime).toString(Qt::ISODate);
+    return TQDateTime::tqcurrentDateTime(Qt::LocalTime).toString(Qt::ISODate);
   if(opt == "local")
-    return TQDateTime::currentDateTime(Qt::LocalTime).toString(Qt::LocalDate);
-  return TQString::null;
+    return TQDateTime::tqcurrentDateTime(Qt::LocalTime).toString(Qt::LocalDate);
+  return TQString();
 }
 
 TQString CommandEngine::user(const TQString& opt, const TQString& arg)
@@ -56,7 +56,7 @@ TQString CommandEngine::user(const TQString& opt, const TQString& arg)
     return u.homeDir();
   if(opt == "shell")
     return u.shell();
-  return TQString::null;
+  return TQString();
 }
 
 TQString CommandEngine::loadfile(const TQString& opt, const TQString& arg)
@@ -64,7 +64,7 @@ TQString CommandEngine::loadfile(const TQString& opt, const TQString& arg)
   Q_UNUSED(arg);
 
   TQFile f(opt);
-  if(!f.open(IO_ReadOnly)) return TQString::null;
+  if(!f.open(IO_ReadOnly)) return TQString();
 
   TQTextStream t(&f);
 
@@ -89,11 +89,11 @@ TQString CommandEngine::mathexp(const TQString& opt, const TQString& arg)
   Q_UNUSED(arg);
 
   TQString tempOpt = opt;
-  tempOpt.replace("ln","l");
-  tempOpt.replace("sin","s");
-  tempOpt.replace("cos","c");
-  tempOpt.replace("arctan","a");
-  tempOpt.replace("exp","e");
+  tempOpt.tqreplace("ln","l");
+  tempOpt.tqreplace("sin","s");
+  tempOpt.tqreplace("cos","c");
+  tempOpt.tqreplace("arctan","a");
+  tempOpt.tqreplace("exp","e");
   
   TQString program = "var=("+tempOpt+");print var";
   TQString script = "echo '"+program+"' | bc -l;";
@@ -111,7 +111,7 @@ TQString CommandEngine::mathexp(const TQString& opt, const TQString& arg)
   //Through slotGetScriptOutput, m_processOutput contains the result of the KProcess call
    if(!proc->start(KProcess::Block, KProcess::All))
      {
-       return TQString::null;
+       return TQString();
      }
    else
      {
@@ -121,7 +121,7 @@ TQString CommandEngine::mathexp(const TQString& opt, const TQString& arg)
      delete proc;
 
    TQString tempbuf = m_processOutput;
-   m_processOutput = TQString::null;
+   m_processOutput = TQString();
 
    return tempbuf;
 
@@ -156,7 +156,7 @@ TQString CommandEngine::variableValue(const TQString &variable)
 
   s.remove("[$").remove("$]").remove(" ");
 
-  if(s.contains(":") == 0)
+  if(s.tqcontains(":") == 0)
     return variable;
   else
     {
diff --git a/kfilereplace/commandengine.h b/kfilereplace/commandengine.h
index 0b3c2106..feb1d803 100644
--- a/kfilereplace/commandengine.h
+++ b/kfilereplace/commandengine.h
@@ -26,9 +26,10 @@ class TQString;
 //KDE
 class KProcess;
 
-class CommandEngine : public QObject
+class CommandEngine : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
   private:
     TQString m_processOutput;
   public:
diff --git a/kfilereplace/configurationclasses.cpp b/kfilereplace/configurationclasses.cpp
index f0c6bcc4..8d0ff303 100644
--- a/kfilereplace/configurationclasses.cpp
+++ b/kfilereplace/configurationclasses.cpp
@@ -104,12 +104,12 @@ ResultViewEntry::ResultViewEntry(TQString nkey, TQString ndata, bool regexp, boo
 
 int ResultViewEntry::lineNumber(const TQString& line) const
 {
-  return line.mid(0,m_pos).contains('\n')+1;
+  return line.mid(0,m_pos).tqcontains('\n')+1;
 }
 
 int ResultViewEntry::columnNumber(const TQString& line) const
 {
-  return(m_pos - line.findRev('\n',m_pos));
+  return(m_pos - line.tqfindRev('\n',m_pos));
 }
 
 void ResultViewEntry::incOccurrences()
@@ -132,7 +132,7 @@ int ResultViewEntry::pos(const TQString& line)
   if(m_regexp)
     m_pos = m_rxKey.search(line,m_pos);
   else
-    m_pos = line.find(m_key, m_pos, m_caseSensitive);
+    m_pos = line.tqfind(m_key, m_pos, m_caseSensitive);
 
   return m_pos;
 }
@@ -164,8 +164,8 @@ TQString ResultViewEntry::capturedText(const TQString& line)
 TQString ResultViewEntry::message(const TQString& capturedText, int x, int y) const
 {
   TQString data = m_data;
-  //return i18n(" captured text \"%1\" replaced with \"%2\" at line: %3, column: %4 ").arg(capturedText).arg(data).arg(TQString::number(x,10)).arg(TQString::number(y,10));
-  return i18n(" Line:%3,Col:%4 - \"%1\" -> \"%2\"").arg(capturedText).arg(data).arg(TQString::number(x,10)).arg(TQString::number(y,10));
+  //return i18n(" captured text \"%1\" replaced with \"%2\" at line: %3, column: %4 ").tqarg(capturedText).tqarg(data).tqarg(TQString::number(x,10)).tqarg(TQString::number(y,10));
+  return i18n(" Line:%3,Col:%4 - \"%1\" -> \"%2\"").tqarg(capturedText).tqarg(data).tqarg(TQString::number(x,10)).tqarg(TQString::number(y,10));
 }
 
 int ResultViewEntry::keyLength() const
diff --git a/kfilereplace/configurationclasses.h b/kfilereplace/configurationclasses.h
index 0d36261b..e5fc77d4 100644
--- a/kfilereplace/configurationclasses.h
+++ b/kfilereplace/configurationclasses.h
@@ -52,7 +52,7 @@ const TQString rcSearchMode = "Search only mode";
 const TQString rcBackupExtension = "Backup file extension";
 const TQString rcIgnoreFiles = "Ignore files if there is no match";
 const TQString rcNotifyOnErrors = "NotifyOnErrors";
-const TQString rcAskConfirmReplace = "Ask confirmation on replace";
+const TQString rcAskConfirmReplace = "Ask confirmation on tqreplace";
 const TQString rcDontAskAgain = "Dont ask again";
 // Default configuration options
 const TQString EncodingOption = "utf8";
diff --git a/kfilereplace/kaddstringdlg.cpp b/kfilereplace/kaddstringdlg.cpp
index 18f8895d..87750a9b 100644
--- a/kfilereplace/kaddstringdlg.cpp
+++ b/kfilereplace/kaddstringdlg.cpp
@@ -2,7 +2,7 @@
                           KAddStringDlg.cpp  -  description
                              -------------------
     begin                : Sat Oct 16 1999
-    copyright            : (C) 1999 by François Dupoux
+    copyright            : (C) 1999 by Fran�ois Dupoux
                            (C) 2004 Emiliano Gulmini <emi_barbarossa@yahoo.it>
     email                : dupoux@dupoux.com
  ***************************************************************************/
@@ -37,7 +37,7 @@
 
 using namespace whatthisNameSpace;
 
-KAddStringDlg::KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *parent, const char *name) : KAddStringDlgS(parent,name,true)
+KAddStringDlg::KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *tqparent, const char *name) : KAddStringDlgS(tqparent,name,true)
 {
   m_option = info;
   m_wantEdit = wantEdit;
@@ -58,8 +58,8 @@ KAddStringDlg::KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *parent, c
 //PRIVATE
 void KAddStringDlg::initGUI()
 {
-  m_pbAdd->setIconSet(SmallIconSet(TQString::fromLatin1("forward")));
-  m_pbDel->setIconSet(SmallIconSet(TQString::fromLatin1("back")));
+  m_pbAdd->setIconSet(SmallIconSet(TQString::tqfromLatin1("forward")));
+  m_pbDel->setIconSet(SmallIconSet(TQString::tqfromLatin1("back")));
 
   m_stack->addWidget(m_stringView);
   m_stack->addWidget(m_stringView_2);
@@ -136,7 +136,7 @@ void KAddStringDlg::saveViewContentIntoMap()
   while(i != 0)
     {
       if(m_option->m_searchingOnlyMode)
-        m_currentMap[i->text(0)] = TQString::null;
+        m_currentMap[i->text(0)] = TQString();
       else
         m_currentMap[i->text(0)] = i->text(1);
       i = i->nextSibling();
@@ -214,7 +214,7 @@ void KAddStringDlg::slotAddStringToView()
           TQListViewItem* lvi = new TQListViewItem(m_sv);
           lvi->setMultiLinesEnabled(true);
           lvi->setText(0,text);
-          m_currentMap[text] = TQString::null;
+          m_currentMap[text] = TQString();
           m_edSearch->clear();
         }
     }
@@ -266,7 +266,7 @@ void KAddStringDlg::slotDeleteStringFromView()
 
 void KAddStringDlg::slotHelp()
 {
-  kapp->invokeHelp(TQString::null, "kfilereplace");
+  kapp->invokeHelp(TQString(), "kfilereplace");
 }
 
 #include "kaddstringdlg.moc"
diff --git a/kfilereplace/kaddstringdlg.h b/kfilereplace/kaddstringdlg.h
index 23c446f4..6193cbae 100644
--- a/kfilereplace/kaddstringdlg.h
+++ b/kfilereplace/kaddstringdlg.h
@@ -28,6 +28,7 @@
 class KAddStringDlg : public KAddStringDlgS
 {
   Q_OBJECT
+  TQ_OBJECT
   private:
     RCOptions* m_option;
     TQListView* m_sv;
@@ -35,7 +36,7 @@ class KAddStringDlg : public KAddStringDlgS
     bool m_wantEdit;
 
   public: //Constructors
-    KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *parent=0, const char *name=0);
+    KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *tqparent=0, const char *name=0);
 
   private slots:
     void slotOK();
@@ -63,7 +64,7 @@ class KAddStringDlg : public KAddStringDlgS
      */
     void raiseView();
     /**
-     * Verifies whether 'lv' contains 's'
+     * Verifies whether 'lv' tqcontains 's'
      */
     bool columnContains(TQListView* lv,const TQString& s, int column);
     void saveViewContentIntoMap();
diff --git a/kfilereplace/kaddstringdlgs.ui b/kfilereplace/kaddstringdlgs.ui
index 6685e92f..3cbf7c4f 100644
--- a/kfilereplace/kaddstringdlgs.ui
+++ b/kfilereplace/kaddstringdlgs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>KAddStringDlgS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>KAddStringDlgS</cstring>
     </property>
@@ -22,15 +22,15 @@
         <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>layout14</cstring>
+                <cstring>tqlayout14</cstring>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QButtonGroup">
+                <widget class="TQButtonGroup">
                     <property name="name">
                         <cstring>bgChoose</cstring>
                     </property>
@@ -44,7 +44,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QRadioButton" row="1" column="0">
+                        <widget class="TQRadioButton" row="1" column="0">
                             <property name="name">
                                 <cstring>m_rbSearchReplace</cstring>
                             </property>
@@ -55,7 +55,7 @@
                                 <string></string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="0" column="0">
+                        <widget class="TQRadioButton" row="0" column="0">
                             <property name="name">
                                 <cstring>m_rbSearchOnly</cstring>
                             </property>
@@ -68,7 +68,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>frame4</cstring>
                     </property>
@@ -82,23 +82,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>layout11</cstring>
+                                <cstring>tqlayout11</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <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="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>m_tlSearch</cstring>
                                             </property>
@@ -106,7 +106,7 @@
                                                 <string>Search for:</string>
                                             </property>
                                         </widget>
-                                        <widget class="QTextEdit">
+                                        <widget class="TQTextEdit">
                                             <property name="name">
                                                 <cstring>m_edSearch</cstring>
                                             </property>
@@ -116,15 +116,15 @@
                                         </widget>
                                     </vbox>
                                 </widget>
-                                <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>m_tlReplace</cstring>
                                             </property>
@@ -135,7 +135,7 @@
                                                 <string>Replace with:</string>
                                             </property>
                                         </widget>
-                                        <widget class="QTextEdit">
+                                        <widget class="TQTextEdit">
                                             <property name="name">
                                                 <cstring>m_edReplace</cstring>
                                             </property>
@@ -153,9 +153,9 @@
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QLayoutWidget" row="0" column="1">
+                        <widget class="TQLayoutWidget" row="0" column="1">
                             <property name="name">
-                                <cstring>layout16</cstring>
+                                <cstring>tqlayout16</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -171,26 +171,26 @@
                                     <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="QLayoutWidget">
+                                <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout15</cstring>
+                                        <cstring>tqlayout15</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
-                                        <widget class="QPushButton">
+                                        <widget class="TQPushButton">
                                             <property name="name">
                                                 <cstring>m_pbDel</cstring>
                                             </property>
-                                            <property name="maximumSize">
+                                            <property name="tqmaximumSize">
                                                 <size>
                                                     <width>30</width>
                                                     <height>32767</height>
@@ -200,11 +200,11 @@
                                                 <string></string>
                                             </property>
                                         </widget>
-                                        <widget class="QPushButton">
+                                        <widget class="TQPushButton">
                                             <property name="name">
                                                 <cstring>m_pbAdd</cstring>
                                             </property>
-                                            <property name="maximumSize">
+                                            <property name="tqmaximumSize">
                                                 <size>
                                                     <width>30</width>
                                                     <height>32767</height>
@@ -229,7 +229,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>90</height>
@@ -238,7 +238,7 @@
                                 </spacer>
                             </vbox>
                         </widget>
-                        <widget class="QWidgetStack" row="0" column="2">
+                        <widget class="TQWidgetStack" row="0" column="2">
                             <property name="name">
                                 <cstring>m_stack</cstring>
                             </property>
@@ -250,7 +250,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <widget class="QWidget">
+                            <widget class="TQWidget">
                                 <property name="name">
                                     <cstring>WStackPage</cstring>
                                 </property>
@@ -264,7 +264,7 @@
                                     <property name="margin">
                                         <number>0</number>
                                     </property>
-                                    <widget class="QListView" row="0" column="0">
+                                    <widget class="TQListView" row="0" column="0">
                                         <column>
                                             <property name="text">
                                                 <string>Search For</string>
@@ -291,7 +291,7 @@
                                     </widget>
                                 </grid>
                             </widget>
-                            <widget class="QWidget">
+                            <widget class="TQWidget">
                                 <property name="name">
                                     <cstring>WStackPage</cstring>
                                 </property>
@@ -305,7 +305,7 @@
                                     <property name="margin">
                                         <number>0</number>
                                     </property>
-                                    <widget class="QListView" row="0" column="0">
+                                    <widget class="TQListView" row="0" column="0">
                                         <column>
                                             <property name="text">
                                                 <string>Search For</string>
@@ -346,15 +346,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="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>m_pbHelp</cstring>
                             </property>
@@ -375,22 +375,22 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>90</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <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="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>m_pbOK</cstring>
                                     </property>
@@ -398,7 +398,7 @@
                                         <string>&amp;OK</string>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>m_pbCancel</cstring>
                                     </property>
@@ -422,5 +422,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kfilereplace/kfilereplace.cpp b/kfilereplace/kfilereplace.cpp
index 48b26f83..35428a7b 100644
--- a/kfilereplace/kfilereplace.cpp
+++ b/kfilereplace/kfilereplace.cpp
@@ -30,15 +30,15 @@ KFileReplace::KFileReplace()
     KLibFactory *factory = KLibLoader::self()->factory("libkfilereplacepart");
     if (factory)
     {
-        m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this,
+        m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this),
                 "kfilereplace_part", "KParts::ReadOnlyPart" ));
 
         if (m_part)
         {
             setCentralWidget(m_part->widget());
-            KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
-            KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection());
-            KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection());
+            KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+            KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection());
+            KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
             setStandardToolBarMenuEnabled(true);
             createGUI(m_part);
             removeDuplicatedActions();
diff --git a/kfilereplace/kfilereplace.h b/kfilereplace/kfilereplace.h
index 2d65d0ed..7d6d5fd4 100644
--- a/kfilereplace/kfilereplace.h
+++ b/kfilereplace/kfilereplace.h
@@ -26,6 +26,7 @@ Shell application for the KFileReplace part.
 class KFileReplace : public KParts::MainWindow
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
     KFileReplace();
     ~KFileReplace();
diff --git a/kfilereplace/kfilereplacelib.cpp b/kfilereplace/kfilereplacelib.cpp
index 6e0d8323..b9073dea 100644
--- a/kfilereplace/kfilereplacelib.cpp
+++ b/kfilereplace/kfilereplacelib.cpp
@@ -102,19 +102,19 @@ TQString KFileReplaceLib::formatFileSize(double size)
   if(size >= kilo && size < mega)
     {
       double d = size / kilo;
-      stringSize = i18n("%1 KB").arg(TQString::number(d,'f',2));
+      stringSize = i18n("%1 KB").tqarg(TQString::number(d,'f',2));
     }
   else
   if(size >= mega && size < giga)
     {
       double d = size / mega;
-      stringSize = i18n("%1 MB").arg(TQString::number(d,'f',2));
+      stringSize = i18n("%1 MB").tqarg(TQString::number(d,'f',2));
     }
   else
   if(size >= giga)
     {
       double d = size / giga;
-      stringSize =  i18n("%1 GB").arg(TQString::number(d,'f',2));
+      stringSize =  i18n("%1 GB").tqarg(TQString::number(d,'f',2));
     }
   return stringSize;
 }
@@ -137,7 +137,7 @@ void KFileReplaceLib::convertOldToNewKFRFormat(const TQString& fileName, KListVi
 
  if(!f || (err != 1) || (pgm != "KFileReplace"))
  {
-   KMessageBox::error(0, i18n("<qt>Cannot open the file <b>%1</b> and load the string list. This file seems not to be a valid old kfr file or it is broken.</qt>").arg(fileName));
+   KMessageBox::error(0, i18n("<qt>Cannot open the file <b>%1</b> and load the string list. This file seems not to be a valid old kfr file or it is broken.</qt>").tqarg(fileName));
    return ;
  }
 
@@ -324,7 +324,7 @@ void KFileReplaceLib::setIconForFileEntry(TQListViewItem* item, TQString path)
   extensionMap["kmdr"] = "widget_doc";
   extensionMap["kwd"] = "kword_kwd";
   extensionMap["log"] = "log";
-  extensionMap["moc"] = "source_moc";
+  extensionMap["tqmoc"] = "source_tqmoc";
   extensionMap["mp3"] = "sound";
   extensionMap["o"] = "source_o";
   extensionMap["pdf"] = "pdf";
diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp
index 3955e643..25f6c7ca 100644
--- a/kfilereplace/kfilereplacepart.cpp
+++ b/kfilereplace/kfilereplacepart.cpp
@@ -60,11 +60,11 @@ typedef KParts::GenericFactory<KFileReplacePart> FileReplaceFactory;
 
 K_EXPORT_COMPONENT_FACTORY( libkfilereplacepart, FileReplaceFactory )
 
-KFileReplacePart::KFileReplacePart(TQWidget* parentWidget, const char* , TQObject* parent, const char* name, const TQStringList & ) : KParts::ReadOnlyPart(parent,name)
+KFileReplacePart::KFileReplacePart(TQWidget* tqparentWidget, const char* , TQObject* tqparent, const char* name, const TQStringList & ) : KParts::ReadOnlyPart(tqparent,name)
 {
   setInstance(FileReplaceFactory::instance());
   KGlobal::locale()->insertCatalogue("kfilereplace");	
-  m_parentWidget = parentWidget;
+  m_parentWidget = tqparentWidget;
   m_config = new KConfig("kfilereplacerc");
   m_aboutDlg = 0;
   m_stop = false;
@@ -114,7 +114,7 @@ void KFileReplacePart::slotSearchingOperation()
   rv->setSorting(-1);
 
   // show wait cursor
-  TQApplication::setOverrideCursor( Qt::waitCursor );
+  TQApplication::setOverrideCursor( TQt::waitCursor );
 
   freezeActions();
 
@@ -161,7 +161,7 @@ void KFileReplacePart::slotSearchingOperation()
 
 void KFileReplacePart::slotReplacingOperation()
 {
-  if (KMessageBox::warningContinueCancel(m_w, i18n("<qt>You have selected <b>%1</b> as the encoding of the files.<br>Selecting the correct encoding is very important as if you have files that have some other encoding than the selected one, after a replace you may damage those files.<br><br>In case you do not know the encoding of your files, select <i>utf8</i> and <b>enable</b> the creation of backup files. This setting will autodetect <i>utf8</i> and <i>utf16</i> files, but the changed files will be converted to <i>utf8</i>.</qt>").arg(m_option->m_encoding), i18n("File Encoding Warning"), KStdGuiItem::cont(), "ShowEncodingWarning") == KMessageBox::Cancel)
+  if (KMessageBox::warningContinueCancel(m_w, i18n("<qt>You have selected <b>%1</b> as the encoding of the files.<br>Selecting the correct encoding is very important as if you have files that have some other encoding than the selected one, after a replace you may damage those files.<br><br>In case you do not know the encoding of your files, select <i>utf8</i> and <b>enable</b> the creation of backup files. This setting will autodetect <i>utf8</i> and <i>utf16</i> files, but the changed files will be converted to <i>utf8</i>.</qt>").tqarg(m_option->m_encoding), i18n("File Encoding Warning"), KStdGuiItem::cont(), "ShowEncodingWarning") == KMessageBox::Cancel)
     return;
   if(!checkBeforeOperation())
     return;
@@ -179,7 +179,7 @@ void KFileReplacePart::slotReplacingOperation()
       rv->setColumnText(4,i18n("Replaced strings"));
     }
   // show wait cursor
-  TQApplication::setOverrideCursor( Qt::waitCursor );
+  TQApplication::setOverrideCursor( TQt::waitCursor );
 
   freezeActions();
 
@@ -248,7 +248,7 @@ void KFileReplacePart::slotCreateReport()
       return ;
     }
   // Select the file where results will be saved
-  TQString documentName = KFileDialog::getSaveFileName(TQString::null, "*.xml|XML " + i18n("Files") + " (*.xml)", m_w, i18n("Save Report"));
+  TQString documentName = KFileDialog::getSaveFileName(TQString(), "*.xml|XML " + i18n("Files") + " (*.xml)", m_w, i18n("Save Report"));
   if (documentName.isEmpty())
     return ;
 
@@ -258,7 +258,7 @@ void KFileReplacePart::slotCreateReport()
   TQFileInfo fileInfo(documentName);
   if(fileInfo.exists())
     {
-      KMessageBox::error(m_w, i18n("<qt>A folder or a file named <b>%1</b> already exists.</qt>").arg(documentName));
+      KMessageBox::error(m_w, i18n("<qt>A folder or a file named <b>%1</b> already exists.</qt>").tqarg(documentName));
       return ;
     }
 
@@ -266,7 +266,7 @@ void KFileReplacePart::slotCreateReport()
 
   if(!directoryName.mkdir(documentName, true))
     {
-      KMessageBox::error(m_w, i18n("<qt>Cannot create the <b>%1</b> folder.</qt>").arg(documentName));
+      KMessageBox::error(m_w, i18n("<qt>Cannot create the <b>%1</b> folder.</qt>").tqarg(documentName));
       return ;
     }
 
@@ -345,7 +345,7 @@ void KFileReplacePart::slotStringsLoad()
 {
   // Selects the file to load from
   TQString menu = "*.kfr|" + i18n("KFileReplace strings") + " (*.kfr)\n*|"+i18n("All Files") + " (*)";
-  TQString fileName = KFileDialog::getOpenFileName(TQString::null, menu, m_w, i18n("Load Strings From File"));
+  TQString fileName = KFileDialog::getOpenFileName(TQString(), menu, m_w, i18n("Load Strings From File"));
 
   if(!fileName.isEmpty())
     loadRulesFile(fileName);
@@ -443,7 +443,7 @@ void KFileReplacePart::showAboutApplication()
 
 void KFileReplacePart::appHelpActivated()
 {
-  kapp->invokeHelp(TQString::null, "kfilereplace");
+  kapp->invokeHelp(TQString(), "kfilereplace");
 }
 
 void KFileReplacePart::reportBug()
@@ -464,7 +464,7 @@ void KFileReplacePart::resetActions()
   actionCollection()->action("new_project")->setEnabled(true);
   actionCollection()->action("search")->setEnabled(hasItems && searchOnlyMode);
   actionCollection()->action("file_simulate")->setEnabled(hasItems && !searchOnlyMode);
-  actionCollection()->action("replace")->setEnabled(hasItems && !searchOnlyMode);
+  actionCollection()->action("tqreplace")->setEnabled(hasItems && !searchOnlyMode);
   actionCollection()->action("save_results")->setEnabled(hasItems);
   actionCollection()->action("stop")->setEnabled(false);
 
@@ -567,48 +567,48 @@ void KFileReplacePart::initGUI()
         }
     }
   // File
-  (void)new KAction(i18n("Customize Search/Replace Session..."), "projectopen", 0, this, TQT_SLOT(slotSetNewParameters()), actionCollection(), "new_project");
-  (void)new KAction(i18n("&Search"), "filesearch", 0, this, TQT_SLOT(slotSearchingOperation()), actionCollection(), "search");
-  (void)new KAction(i18n("S&imulate"), "filesimulate", 0, this, TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate");
-  (void)new KAction(i18n("&Replace"),  "filereplace", 0, this, TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace");
-  (void)new KAction(i18n("Sto&p"), "stop", 0, this, TQT_SLOT(slotStop()), actionCollection(), "stop");
-  (void)new KAction(i18n("Cre&ate Report File..."), "filesaveas", 0, this, TQT_SLOT(slotCreateReport()), actionCollection(), "save_results");
+  (void)new KAction(i18n("Customize Search/Replace Session..."), "projectopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetNewParameters()), actionCollection(), "new_project");
+  (void)new KAction(i18n("&Search"), "filesearch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearchingOperation()), actionCollection(), "search");
+  (void)new KAction(i18n("S&imulate"), "filesimulate", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate");
+  (void)new KAction(i18n("&Replace"),  "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "tqreplace");
+  (void)new KAction(i18n("Sto&p"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop");
+  (void)new KAction(i18n("Cre&ate Report File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "save_results");
 
   // Strings
-  (void)new KAction(i18n("&Add String..."), "editadd", 0, this, TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add");
+  (void)new KAction(i18n("&Add String..."), "editadd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add");
 
-  (void)new KAction(i18n("&Delete String"), "editremove", 0, this, TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del");
-  (void)new KAction(i18n("&Empty Strings List"), "editdelete", 0, this, TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty");
-  (void)new KAction(i18n("Edit Selected String..."), "edit", 0, this, TQT_SLOT(slotStringsEdit()), actionCollection(), "strings_edit");
-  (void)new KAction(i18n("&Save Strings List to File..."), "filesaveas", 0, this, TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save");
-  (void)new KAction(i18n("&Load Strings List From File..."), "unsortedList", 0, this, TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load");
-  (void)new KRecentFilesAction(i18n("&Load Recent Strings Files"), "fileopen", 0, this, TQT_SLOT(slotOpenRecentStringFile(const KURL&)), actionCollection(),"strings_load_recent");
-  (void)new KAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, this, TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert");
-  (void)new KAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, this, TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all");
+  (void)new KAction(i18n("&Delete String"), "editremove", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del");
+  (void)new KAction(i18n("&Empty Strings List"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty");
+  (void)new KAction(i18n("Edit Selected String..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEdit()), actionCollection(), "strings_edit");
+  (void)new KAction(i18n("&Save Strings List to File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save");
+  (void)new KAction(i18n("&Load Strings List From File..."), "unsortedList", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load");
+  (void)new KRecentFilesAction(i18n("&Load Recent Strings Files"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenRecentStringFile(const KURL&)), actionCollection(),"strings_load_recent");
+  (void)new KAction(i18n("&Invert Current String (search <--> tqreplace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert");
+  (void)new KAction(i18n("&Invert All Strings (search <--> tqreplace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all");
 
   // Options
-  (void)new KToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, this, TQT_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive");
-  (void)new KToggleAction(i18n("Create &Backup Files"), "backup_option", 0, this, TQT_SLOT(slotOptionBackup()), actionCollection(), "options_backup");
-  (void)new KToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, this, TQT_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case");
-  (void)new KToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, this, TQT_SLOT(slotOptionVariables()), actionCollection(), "options_var");
-  (void)new KToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, this, TQT_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions");
-  (void)new KAction(i18n("Configure &KFileReplace..."), "configure", 0, this, TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_kfilereplace");
+  (void)new KToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive");
+  (void)new KToggleAction(i18n("Create &Backup Files"), "backup_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionBackup()), actionCollection(), "options_backup");
+  (void)new KToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case");
+  (void)new KToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionVariables()), actionCollection(), "options_var");
+  (void)new KToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions");
+  (void)new KAction(i18n("Configure &KFileReplace..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_kfilereplace");
 
   // Results
-  (void)new KAction(i18n("&Properties"), "informations", 0, m_view, TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos");
-  (void)new KAction(i18n("&Open"), "filenew", 0, m_view, TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile");
+  (void)new KAction(i18n("&Properties"), "informations", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos");
+  (void)new KAction(i18n("&Open"), "filenew", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile");
 
   if(quantaFound)
     {
-      (void)new KAction(i18n("&Edit in Quanta"), "quanta", 0, m_view, TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile");
+      (void)new KAction(i18n("&Edit in Quanta"), "quanta", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile");
     }
-  (void)new KAction(i18n("Open Parent &Folder"), "fileopen", 0, m_view, TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir");
-  (void)new KAction(i18n("&Delete"), "editdelete", 0, m_view, TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete");
-  (void)new KAction(i18n("E&xpand Tree"), 0, m_view, TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand");
-  (void)new KAction(i18n("&Reduce Tree"), 0, m_view, TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce");
-  (void)new KAction(i18n("&About KFileReplace"), "kfilereplace", 0, this, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_kfilereplace");
-  (void)new KAction(i18n("KFileReplace &Handbook"), "help", 0, this, TQT_SLOT(appHelpActivated()), actionCollection(), "help_kfilereplace");
-  (void)new KAction(i18n("&Report Bug"), 0, 0, this, TQT_SLOT(reportBug()), actionCollection(), "report_bug");
+  (void)new KAction(i18n("Open Parent &Folder"), "fileopen", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir");
+  (void)new KAction(i18n("&Delete"), "editdelete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete");
+  (void)new KAction(i18n("E&xpand Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand");
+  (void)new KAction(i18n("&Reduce Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce");
+  (void)new KAction(i18n("&About KFileReplace"), "kfilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_kfilereplace");
+  (void)new KAction(i18n("KFileReplace &Handbook"), "help", 0, TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection(), "help_kfilereplace");
+  (void)new KAction(i18n("&Report Bug"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(reportBug()), actionCollection(), "report_bug");
 
 }
 
@@ -630,7 +630,7 @@ void KFileReplacePart::freezeActions()
   actionCollection()->action("stop")->setEnabled(true);
 
   actionCollection()->action("file_simulate")->setEnabled(false);
-  actionCollection()->action("replace")->setEnabled(false);
+  actionCollection()->action("tqreplace")->setEnabled(false);
   actionCollection()->action("search")->setEnabled(false);
   actionCollection()->action("strings_add")->setEnabled(false);
   actionCollection()->action("strings_del")->setEnabled(false);
@@ -1022,7 +1022,7 @@ void KFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQStri
   TQFile currentFile(oldPathString);
   if(!currentFile.open(IO_ReadOnly))
     {
-      KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for reading.</qt>").arg(oldFileName),TQString::null, rcNotifyOnErrors);
+      KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for reading.</qt>").tqarg(oldFileName),TQString(), rcNotifyOnErrors);
       return ;
     }
   TQTextStream currentStream(&currentFile);
@@ -1061,7 +1061,7 @@ void KFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQStri
           TQFile newFile(oldPathString);
           if(!newFile.open(IO_WriteOnly))
             {
-              KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").arg(oldFileName),TQString::null, rcNotifyOnErrors);
+              KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").tqarg(oldFileName),TQString(), rcNotifyOnErrors);
               return ;
             }
           TQTextStream newStream(&newFile);
@@ -1097,8 +1097,8 @@ void KFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQStri
          }
 
        item->setText(4,TQString::number(occurrence,10));
-       item->setText(5,TQString("%1[%2]").arg(oldFileInfo.owner()).arg(oldFileInfo.ownerId()));
-       item->setText(6,TQString("%1[%2]").arg(oldFileInfo.group()).arg(oldFileInfo.groupId()));
+       item->setText(5,TQString("%1[%2]").tqarg(oldFileInfo.owner()).tqarg(oldFileInfo.ownerId()));
+       item->setText(6,TQString("%1[%2]").tqarg(oldFileInfo.group()).tqarg(oldFileInfo.groupId()));
      }
 }
 
@@ -1110,7 +1110,7 @@ void KFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const TQS
 
   if (!oldFile.open(IO_ReadOnly))
     {
-      KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for reading.</qt>").arg(oldFile.name()),TQString::null, rcNotifyOnErrors);
+      KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for reading.</qt>").tqarg(oldFile.name()),TQString(), rcNotifyOnErrors);
       return ;
     }
 
@@ -1139,7 +1139,7 @@ void KFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const TQS
 	  TQFile newFile(oldPathString);
           if(!newFile.open(IO_WriteOnly))
             {
-              KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").arg(newFile.name()),TQString::null, rcNotifyOnErrors);
+              KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").tqarg(newFile.name()),TQString(), rcNotifyOnErrors);
               return ;
             }
           TQTextStream newStream( &newFile );
@@ -1171,8 +1171,8 @@ void KFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const TQS
         item->setText(3,"-");
 
       item->setText(4,TQString::number(occurrence,10));
-      item->setText(5,TQString("%1[%2]").arg(oldFileInfo.owner()).arg(oldFileInfo.ownerId()));
-      item->setText(6,TQString("%1[%2]").arg(oldFileInfo.group()).arg(oldFileInfo.groupId()));
+      item->setText(5,TQString("%1[%2]").tqarg(oldFileInfo.owner()).tqarg(oldFileInfo.ownerId()));
+      item->setText(6,TQString("%1[%2]").tqarg(oldFileInfo.group()).tqarg(oldFileInfo.groupId()));
     }
 }
 
@@ -1196,7 +1196,7 @@ void KFileReplacePart::replacingLoop(TQString& line, KListViewItem** item, bool&
 	  if(askConfirmReplace)
 	    {
 	      int answer = KMessageBox::questionYesNo(0,
-		                                      i18n("<qt>Do you want to replace the string <b>%1</b> with the string <b>%2</b>?</qt>").arg(it.key()).arg(it.data()),
+		                                      i18n("<qt>Do you want to replace the string <b>%1</b> with the string <b>%2</b>?</qt>").tqarg(it.key()).tqarg(it.data()),
                                                       i18n("Confirm Replace"),
 						      i18n("Replace"),
 						      i18n("Do Not Replace"),
@@ -1332,7 +1332,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
 
   if(!file.open(IO_ReadOnly))
     {
-      KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for reading.</qt>").arg(fileName), TQString::null, rcNotifyOnErrors);
+      KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for reading.</qt>").tqarg(fileName), TQString(), rcNotifyOnErrors);
       return ;
     }
   // Creates a stream with the file
@@ -1381,15 +1381,15 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
           int pos;
 
           if(m_option->m_regularExpressions)
-            pos = line.find(rxKey);
+            pos = line.tqfind(rxKey);
           else
-            pos = line.find(strKey, 0 ,m_option->m_caseSensitive);
+            pos = line.tqfind(strKey, 0 ,m_option->m_caseSensitive);
 
           if(pos != -1)
             {
               atLeastOneStringFound = true;
-              int lineNumber = line.mid(0,pos).contains('\n')+1;
-              int columnNumber = pos - line.findRev('\n',pos);
+              int lineNumber = line.mid(0,pos).tqcontains('\n')+1;
+              int columnNumber = pos - line.tqfindRev('\n',pos);
 
               if (!item)
                 item = new KListViewItem(rv);
@@ -1403,7 +1403,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
               else
                 capturedText = line.mid(pos,strKey.length());
 
-	      msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10));
+	      msg = i18n(" Line:%2, Col:%3 - \"%1\"").tqarg(capturedText).tqarg(TQString::number(lineNumber,10)).tqarg(TQString::number(columnNumber,10));
               tempItem->setMultiLinesEnabled(true);
               tempItem->setText(0,msg);
               occurrence = 1;
@@ -1418,7 +1418,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
           if(m_option->m_regularExpressions)
             pos = rxKey.search(line,pos);
           else
-            pos = line.find(strKey, pos ,m_option->m_caseSensitive);
+            pos = line.tqfind(strKey, pos ,m_option->m_caseSensitive);
 
           while(pos != -1)
             {
@@ -1429,8 +1429,8 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
               atLeastOneStringFound = true;
               TQString msg,
                       capturedText;
-              int lineNumber = line.mid(0,pos).contains('\n')+1;
-              int columnNumber = pos - line.findRev('\n',pos);
+              int lineNumber = line.mid(0,pos).tqcontains('\n')+1;
+              int columnNumber = pos - line.tqfindRev('\n',pos);
 
               if(m_option->m_regularExpressions)
                 {
@@ -1440,10 +1440,10 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
               else
                 {
                   capturedText = line.mid(pos,strKey.length());
-                  pos = line.find(strKey,pos+strKey.length());
+                  pos = line.tqfind(strKey,pos+strKey.length());
                 }
 
-              msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10));
+              msg = i18n(" Line:%2, Col:%3 - \"%1\"").tqarg(capturedText).tqarg(TQString::number(lineNumber,10)).tqarg(TQString::number(columnNumber,10));
 
               if(!item)
                  item = new KListViewItem(rv);
@@ -1475,8 +1475,8 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
        item->setText(1,currentDir);
        item->setText(2,KFileReplaceLib::formatFileSize(fileInfo.size()));
        item->setText(3,TQString::number(occurrence,10));
-       item->setText(4,TQString("%1[%2]").arg(fileInfo.owner()).arg(fileInfo.ownerId()));
-       item->setText(5,TQString("%1[%2]").arg(fileInfo.group()).arg(fileInfo.groupId()));
+       item->setText(4,TQString("%1[%2]").tqarg(fileInfo.owner()).tqarg(fileInfo.ownerId()));
+       item->setText(5,TQString("%1[%2]").tqarg(fileInfo.group()).tqarg(fileInfo.groupId()));
      }
 }
 
@@ -1509,7 +1509,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName)
 
   if(!file.open(IO_ReadOnly))
     {
-      KMessageBox::error(m_w, i18n("<qt>Cannot open the file <b>%1</b> and load the string list.</qt>").arg(fileName));
+      KMessageBox::error(m_w, i18n("<qt>Cannot open the file <b>%1</b> and load the string list.</qt>").tqarg(fileName));
       return ;
     }
 
@@ -1517,7 +1517,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName)
     {
       file.close();
 
-      KMessageBox::information(m_w, i18n("<qt>File <b>%1</b> seems not to be written in new kfr format. Remember that the old kfr format will be soon abandoned. You can convert your old rules files by simply saving them with kfilereplace.</qt>").arg(fileName),i18n("Warning"));
+      KMessageBox::information(m_w, i18n("<qt>File <b>%1</b> seems not to be written in new kfr format. Remember that the old kfr format will be soon abandoned. You can convert your old rules files by simply saving them with kfilereplace.</qt>").tqarg(fileName),i18n("Warning"));
 
       KFileReplaceLib::convertOldToNewKFRFormat(fileName, sv);
 
@@ -1537,7 +1537,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName)
 
   if(searchAttribute.isNull() || searchAttribute.isEmpty())
     {
-      int answer = KMessageBox::warningYesNo(m_w, i18n("<qt>The format of kfr files has been changed; attempting to load <b>%1</b>. Please see the KFilereplace manual for details. Do you want to load a search-and-replace list of strings?</qt>").arg(fileName),i18n("Warning"),i18n("Load"),i18n("Do Not Load"));
+      int answer = KMessageBox::warningYesNo(m_w, i18n("<qt>The format of kfr files has been changed; attempting to load <b>%1</b>. Please see the KFilereplace manual for details. Do you want to load a search-and-replace list of strings?</qt>").tqarg(fileName),i18n("Warning"),i18n("Load"),i18n("Do Not Load"));
 
       if(answer == KMessageBox::Yes)
         searchAttribute = "false";
@@ -1569,7 +1569,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName)
 
   // Adds file to "load strings form file" menu
   TQStringList fileList = m_option->m_recentStringFileList;
-  if(!fileList.contains(fileName))
+  if(!fileList.tqcontains(fileName))
     {
       fileList.append(fileName);
       ((KRecentFilesAction* ) actionCollection()->action("strings_load_recent"))->setItems(fileList);
@@ -1623,10 +1623,10 @@ bool KFileReplacePart::checkBeforeOperation()
   loadViewContent();
   KListView* sv = m_view->getStringsView();
 
-  // Checks if there are strings to replace (not need in search operation)
+  // Checks if there are strings to tqreplace (not need in search operation)
   if (sv->childCount() == 0)
     {
-      KMessageBox::error(m_w, i18n("There are no strings to search and replace."));
+      KMessageBox::error(m_w, i18n("There are no strings to search and tqreplace."));
       return false;
     }
 
@@ -1639,7 +1639,7 @@ bool KFileReplacePart::checkBeforeOperation()
 
   if(!dir.exists())
     {
-      KMessageBox::error(m_w, i18n("<qt>The main folder of the project <b>%1</b> does not exist.</qt>").arg(directory));
+      KMessageBox::error(m_w, i18n("<qt>The main folder of the project <b>%1</b> does not exist.</qt>").tqarg(directory));
       return false;
     }
 
@@ -1647,7 +1647,7 @@ bool KFileReplacePart::checkBeforeOperation()
   if(!(dirInfo.isReadable() && dirInfo.isExecutable())
        || (!m_option->m_searchingOnlyMode && !m_option->m_simulation && !(dirInfo.isWritable())))
     {
-      KMessageBox::error(m_w, i18n("<qt>Access denied in the main folder of the project:<br><b>%1</b></qt>").arg(directory));
+      KMessageBox::error(m_w, i18n("<qt>Access denied in the main folder of the project:<br><b>%1</b></qt>").tqarg(directory));
       return false;
     }
 
diff --git a/kfilereplace/kfilereplacepart.h b/kfilereplace/kfilereplacepart.h
index a5044ff9..757a02d2 100644
--- a/kfilereplace/kfilereplacepart.h
+++ b/kfilereplace/kfilereplacepart.h
@@ -32,6 +32,7 @@ class KFileReplaceView;
 class KFileReplacePart: public KParts::ReadOnlyPart
 {
   Q_OBJECT
+  TQ_OBJECT
 
   private: //MEMBERS
     KFileReplaceView* m_view;
@@ -46,9 +47,9 @@ class KFileReplacePart: public KParts::ReadOnlyPart
     int m_optionMask;
 
   public://Constructors
-    KFileReplacePart(TQWidget *parentWidget,
+    KFileReplacePart(TQWidget *tqparentWidget,
                      const char *widgetName,
-                     TQObject *parent,
+                     TQObject *tqparent,
                      const char *name,
                      const TQStringList &args);
     ~KFileReplacePart();
diff --git a/kfilereplace/kfilereplaceview.cpp b/kfilereplace/kfilereplaceview.cpp
index fc0d08aa..f68e0c8f 100644
--- a/kfilereplace/kfilereplaceview.cpp
+++ b/kfilereplace/kfilereplaceview.cpp
@@ -15,7 +15,7 @@
  *                                                                           *
  *****************************************************************************/
 
-// Qt
+// TQt
 #include <tqwhatsthis.h>
 #include <tqmap.h>
 #include <tqfileinfo.h>
@@ -43,7 +43,7 @@
 
 using namespace whatthisNameSpace;
 
-KFileReplaceView::KFileReplaceView(RCOptions* info, TQWidget *parent,const char *name):KFileReplaceViewWdg(parent,name)
+KFileReplaceView::KFileReplaceView(RCOptions* info, TQWidget *tqparent,const char *name):KFileReplaceViewWdg(tqparent,name)
 {
   m_option = info;
 
@@ -65,8 +65,8 @@ TQString KFileReplaceView::currentPath()
   if(! m_lviCurrent) lvi = m_rv->currentItem();
   else lvi = (TQListViewItem*) m_lviCurrent;
 
-  while (lvi->parent())
-    lvi = lvi->parent();
+  while (lvi->tqparent())
+    lvi = lvi->tqparent();
 
   return TQString(lvi->text(1)+"/"+lvi->text(0));
 }
@@ -117,7 +117,7 @@ void KFileReplaceView::stringsInvert(bool invertAll)
       // Cannot invert the string when search string is empty
     if (replaceText.isEmpty())
     {
-      KMessageBox::error(0, i18n("<qt>Cannot invert string <b>%1</b>, because the search string would be empty.</qt>").arg(searchText));
+      KMessageBox::error(0, i18n("<qt>Cannot invert string <b>%1</b>, because the search string would be empty.</qt>").tqarg(searchText));
       return;
     }
 
@@ -175,7 +175,7 @@ void KFileReplaceView::slotMouseButtonClicked (int button, TQListViewItem *lvi,
     return;
 
   // RIGHT BUTTON
-  if (button == TQMouseEvent::RightButton)
+  if (button == Qt::RightButton)
     {
       m_lviCurrent = static_cast<KListViewItem*>(lvi);
       m_menuResult->popup(pos);
@@ -256,8 +256,8 @@ void KFileReplaceView::slotResultEdit()
 
               if(!success)
                 {
-                  TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").arg(path);
-                  KMessageBox::error(parentWidget(), message);
+                  TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").tqarg(path);
+                  KMessageBox::error(tqparentWidget(), message);
                 }
             }
             if (lviChild == lvi)
@@ -278,8 +278,8 @@ void KFileReplaceView::slotResultDelete()
   if (!currItem.isEmpty())
     {
       TQFile fi;
-      int answer = KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete %1?").arg(currItem),
-                                                      TQString::null,KStdGuiItem::del());
+      int answer = KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete %1?").tqarg(currItem),
+                                                      TQString(),KStdGuiItem::del());
 
       if(answer == KMessageBox::Continue)
         {
@@ -338,7 +338,7 @@ void KFileReplaceView::slotQuickStringsAdd(const TQString& quickSearch, const TQ
     KeyValueMap map;
     if(quickReplace.isEmpty())
     {
-      map[quickSearch] = TQString::null;
+      map[quickSearch] = TQString();
       m_option->m_searchingOnlyMode = true;
     }
     else
@@ -417,13 +417,13 @@ void KFileReplaceView::slotStringsSave()
     body += TQString("\n\t<replacement>"
 	"\n\t\t<oldstring><![CDATA[%1]]></oldstring>"
 	"\n\t\t<newstring><![CDATA[%2]]></newstring>"
-	"\n\t</replacement>").arg(lvi->text(0)).arg(lvi->text(1));
+	"\n\t</replacement>").tqarg(lvi->text(0)).tqarg(lvi->text(1));
     lvi = lvi->nextSibling();
   }
 
    // Selects the file where strings will be saved
   TQString menu = "*.kfr|" + i18n("KFileReplace Strings") + " (*.kfr)\n*|" + i18n("All Files") + " (*)";
-  TQString fileName = KFileDialog::getSaveFileName(TQString::null, menu, 0, i18n("Save Strings to File"));
+  TQString fileName = KFileDialog::getSaveFileName(TQString(), menu, 0, i18n("Save Strings to File"));
   if (fileName.isEmpty())
     return;
 
@@ -434,7 +434,7 @@ void KFileReplaceView::slotStringsSave()
   TQFile file( fileName );
   if(!file.open( IO_WriteOnly ))
   {
-    KMessageBox::error(0, i18n("File %1 cannot be saved.").arg(fileName));
+    KMessageBox::error(0, i18n("File %1 cannot be saved.").tqarg(fileName));
     return ;
   }
   TQTextStream oTStream( &file );
@@ -498,7 +498,7 @@ void KFileReplaceView::initGUI()
 
 
 
-  m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("fileopen")),
+  m_menuResult->insertItem(SmallIconSet(TQString::tqfromLatin1("fileopen")),
                            i18n("&Open"),
                            this,
                            TQT_SLOT(slotResultOpen()));
@@ -517,16 +517,16 @@ void KFileReplaceView::initGUI()
                                TQT_SLOT(slotResultEdit()));
     }
 
-  m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("up")),
+  m_menuResult->insertItem(SmallIconSet(TQString::tqfromLatin1("up")),
                            i18n("Open Parent &Folder"),
                            this,
                            TQT_SLOT(slotResultDirOpen()));
-  m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("editdelete")),
+  m_menuResult->insertItem(SmallIconSet(TQString::tqfromLatin1("editdelete")),
                            i18n("&Delete"),
                            this,
                            TQT_SLOT(slotResultDelete()));
   m_menuResult->insertSeparator();
-  m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("info")),
+  m_menuResult->insertItem(SmallIconSet(TQString::tqfromLatin1("info")),
                            i18n("&Properties"),
                            this,
                            TQT_SLOT(slotResultProperties()));
@@ -562,7 +562,7 @@ coord KFileReplaceView::extractWordCoordinates(TQListViewItem* lvi)
   c.column = 0;
   TQString s = lvi->text(0);
   //qWarning("WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW=%s",s.latin1());
- /* if(lvi->parent()) s = lvi->text(0);
+ /* if(lvi->tqparent()) s = lvi->text(0);
   else return c;*/
 
   TQString temp;
@@ -591,7 +591,7 @@ coord KFileReplaceView::extractWordCoordinates(TQListViewItem* lvi)
 	break;
     }
   c.line = temp.toInt();
-  temp = TQString::null;
+  temp = TQString();
 
   while(true)
     {
@@ -640,7 +640,7 @@ void KFileReplaceView::setMap()
   while(i != 0)
   {
     if(m_option->m_searchingOnlyMode)
-      map[i->text(0)] = TQString::null;
+      map[i->text(0)] = TQString();
     else
       map[i->text(0)] = i->text(1);
     i = i->nextSibling();
diff --git a/kfilereplace/kfilereplaceview.h b/kfilereplace/kfilereplaceview.h
index 1c6af2d9..4e94081e 100644
--- a/kfilereplace/kfilereplaceview.h
+++ b/kfilereplace/kfilereplaceview.h
@@ -25,7 +25,7 @@
 //QT
 #include <tqlcdnumber.h>
 #include <tqwidgetstack.h>
-class QPixMap;
+class TQPixMap;
 
 //KDE
 class KPopupMenu;
@@ -52,11 +52,12 @@ class coord
 
 
 /**
- * The view of KFilereplace.
+ * The view of KFiletqreplace.
  */
 class KFileReplaceView : public KFileReplaceViewWdg
 {
   Q_OBJECT
+  TQ_OBJECT
   private:
     KPopupMenu* m_menuResult;
     RCOptions* m_option;
@@ -65,7 +66,7 @@ class KFileReplaceView : public KFileReplaceViewWdg
              * m_sv;
 
   public://Constructors
-    KFileReplaceView(RCOptions* info, TQWidget *parent,const char *name);
+    KFileReplaceView(RCOptions* info, TQWidget *tqparent,const char *name);
 
   public:
     TQString currentPath();
diff --git a/kfilereplace/kfilereplaceviewwdg.ui b/kfilereplace/kfilereplaceviewwdg.ui
index 17be7441..65452482 100644
--- a/kfilereplace/kfilereplaceviewwdg.ui
+++ b/kfilereplace/kfilereplaceviewwdg.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>KFileReplaceViewWdg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KFileReplaceViewWdg</cstring>
     </property>
@@ -19,14 +19,14 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QSplitter" row="0" column="0">
+        <widget class="TQSplitter" row="0" column="0">
             <property name="name">
                 <cstring>splitter3</cstring>
             </property>
             <property name="orientation">
                 <enum>Vertical</enum>
             </property>
-            <widget class="QWidgetStack">
+            <widget class="TQWidgetStack">
                 <property name="name">
                     <cstring>m_stackResults</cstring>
                 </property>
@@ -38,7 +38,7 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>WStackPage</cstring>
                     </property>
@@ -161,7 +161,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>WStackPage</cstring>
                     </property>
@@ -274,7 +274,7 @@
                     </grid>
                 </widget>
             </widget>
-            <widget class="QWidgetStack">
+            <widget class="TQWidgetStack">
                 <property name="name">
                     <cstring>m_stackStrings</cstring>
                 </property>
@@ -286,7 +286,7 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>WStackPage</cstring>
                     </property>
@@ -341,7 +341,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>WStackPage</cstring>
                     </property>
@@ -387,17 +387,17 @@
                 </widget>
             </widget>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -407,7 +407,7 @@
                             <property name="name">
                                 <cstring>m_ledGo</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -434,7 +434,7 @@
                             <property name="name">
                                 <cstring>m_ledWait</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -461,7 +461,7 @@
                             <property name="name">
                                 <cstring>m_ledStop</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -490,22 +490,22 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>354</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <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>m_tlFilesNumber</cstring>
                             </property>
@@ -513,7 +513,7 @@
                                 <string>Scanned files:</string>
                             </property>
                         </widget>
-                        <widget class="QLCDNumber">
+                        <widget class="TQLCDNumber">
                             <property name="name">
                                 <cstring>m_lcdFilesNumber</cstring>
                             </property>
@@ -542,7 +542,7 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>klistview.h</includehint>
diff --git a/kfilereplace/knewprojectdlg.cpp b/kfilereplace/knewprojectdlg.cpp
index b23c1eec..14221357 100644
--- a/kfilereplace/knewprojectdlg.cpp
+++ b/kfilereplace/knewprojectdlg.cpp
@@ -51,7 +51,7 @@
 using namespace whatthisNameSpace;
 
 
-KNewProjectDlg::KNewProjectDlg(RCOptions* info, TQWidget *parent, const char *name) : KNewProjectDlgS(parent, name)
+KNewProjectDlg::KNewProjectDlg(RCOptions* info, TQWidget *tqparent, const char *name) : KNewProjectDlgS(tqparent, name)
 {
   m_searchNowFlag = "";
   m_option = info;
@@ -94,7 +94,7 @@ void KNewProjectDlg::saveRCOptions()
 
 void KNewProjectDlg::slotDir()
 {
-  TQString directoryString = KFileDialog::getExistingDirectory(TQString::null, this, i18n("Project Directory"));
+  TQString directoryString = KFileDialog::getExistingDirectory(TQString(), this, i18n("Project Directory"));
   if(!directoryString.isEmpty())
     m_cbLocation->setEditText(directoryString);
 }
@@ -493,7 +493,7 @@ void KNewProjectDlg::setDatas(const TQString& directoryString, const TQString& f
     m_cbFilter->setEditText(filterString);
 }
 
-bool KNewProjectDlg::contains(TQListView* lv,const TQString& s, int column)
+bool KNewProjectDlg::tqcontains(TQListView* lv,const TQString& s, int column)
 {
   TQListViewItem* i = lv->firstChild();
   while (i != 0)
diff --git a/kfilereplace/knewprojectdlg.h b/kfilereplace/knewprojectdlg.h
index ac537eac..7459bacf 100644
--- a/kfilereplace/knewprojectdlg.h
+++ b/kfilereplace/knewprojectdlg.h
@@ -2,7 +2,7 @@
                           knewprojectdlg.h  -  description
                              -------------------
     begin                : Tue Dec 28 1999
-    copyright            : (C) 1999 by François Dupoux
+    copyright            : (C) 1999 by Fran�ois Dupoux
                            (C) 2004 Emiliano Gulmini <emi_barbarossa@yahoo.it>
     email                : dupoux@dupoux.com
  ***************************************************************************/
@@ -29,13 +29,14 @@ class KConfig;
 class KNewProjectDlg : public KNewProjectDlgS
 {
   Q_OBJECT
+  TQ_OBJECT
 
   private:
     TQString m_searchNowFlag;
     RCOptions* m_option;
 
   public:
-    KNewProjectDlg(RCOptions* info, TQWidget *parent=0, const char *name=0);
+    KNewProjectDlg(RCOptions* info, TQWidget *tqparent=0, const char *name=0);
     ~KNewProjectDlg();
 
   public:
@@ -55,7 +56,7 @@ class KNewProjectDlg : public KNewProjectDlgS
     void slotEnableChbUser(bool b);
     void slotEnableChbGroup(bool b);
     void slotEnableChbBackup(bool b);
-    void slotHelp(){ kapp->invokeHelp(TQString::null, "kfilereplace"); }
+    void slotHelp(){ kapp->invokeHelp(TQString(), "kfilereplace"); }
 
   private:
     void initGUI();
@@ -76,7 +77,7 @@ class KNewProjectDlg : public KNewProjectDlgS
     void saveFiltersList();
     void saveBackupExtensionOptions();
 
-    bool contains(TQListView* lv,const TQString& s, int column);
+    bool tqcontains(TQListView* lv,const TQString& s, int column);
     void setDatas(const TQString& directoryString, const TQString& filterString);
     void whatsThis();
 };
diff --git a/kfilereplace/knewprojectdlgs.ui b/kfilereplace/knewprojectdlgs.ui
index 238a003f..a037ae02 100644
--- a/kfilereplace/knewprojectdlgs.ui
+++ b/kfilereplace/knewprojectdlgs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KNewProjectDlgS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>KNewProjectDlgS</cstring>
     </property>
@@ -25,9 +25,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>layout28</cstring>
+                <cstring>tqlayout28</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -48,13 +48,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>70</width>
                             <height>32767</height>
@@ -74,14 +74,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>m_pbSearchNow</cstring>
                     </property>
@@ -95,7 +95,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>m_pbSearchLater</cstring>
                     </property>
@@ -118,7 +118,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>70</width>
                             <height>32767</height>
@@ -130,11 +130,11 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>tabWidget2</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -145,7 +145,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>groupBox5</cstring>
                         </property>
@@ -156,7 +156,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>m_tlFilter</cstring>
                                 </property>
@@ -167,7 +167,7 @@
                                     <cstring>cbFilter</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>m_tlLocation</cstring>
                                 </property>
@@ -212,7 +212,7 @@
                                     <string>Insert a search path here. You can use the search path button.</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="0" column="2">
+                            <widget class="TQPushButton" row="0" column="2">
                                 <property name="name">
                                     <cstring>m_pbLocation</cstring>
                                 </property>
@@ -254,7 +254,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3">
+                            <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>m_chbIncludeSubfolders</cstring>
                                 </property>
@@ -267,7 +267,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>groupBox6</cstring>
                         </property>
@@ -278,17 +278,17 @@
                             <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>m_leSearch</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="1" column="1">
+                            <widget class="TQLineEdit" row="1" column="1">
                                 <property name="name">
                                     <cstring>m_leReplace</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>m_tlSearch</cstring>
                                 </property>
@@ -296,7 +296,7 @@
                                     <string>Search:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>m_tlReplace</cstring>
                                 </property>
@@ -306,7 +306,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="2" column="0">
+                    <widget class="TQGroupBox" row="2" column="0">
                         <property name="name">
                             <cstring>groupBox4</cstring>
                         </property>
@@ -317,7 +317,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3">
+                            <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>m_chbRegularExpressions</cstring>
                                 </property>
@@ -328,7 +328,7 @@
                                     <string>Enable &amp;regular expressions</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>m_chbBackup</cstring>
                                 </property>
@@ -336,7 +336,7 @@
                                     <string>Do &amp;backup copy instead of overwrite</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3">
+                            <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>m_chbCaseSensitive</cstring>
                                 </property>
@@ -344,7 +344,7 @@
                                     <string>&amp;Case sensitive</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>m_chbEnableVariables</cstring>
                                 </property>
@@ -352,7 +352,7 @@
                                     <string>Enable co&amp;mmands in the replace string</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="5" column="0">
+                            <widget class="TQLabel" row="5" column="0">
                                 <property name="name">
                                     <cstring>m_tlBackup</cstring>
                                 </property>
@@ -360,7 +360,7 @@
                                     <string>Backup copy suffix:</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="5" column="1" rowspan="1" colspan="2">
+                            <widget class="TQLineEdit" row="5" column="1" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>m_leBackup</cstring>
                                 </property>
@@ -381,7 +381,7 @@
                                     </sizepolicy>
                                 </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>
@@ -393,7 +393,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -404,7 +404,7 @@
                     <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>gbOwnership</cstring>
                         </property>
@@ -415,7 +415,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>m_chbOwnerUser</cstring>
                                 </property>
@@ -531,7 +531,7 @@
                                     <bool>false</bool>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="0">
+                            <widget class="TQCheckBox" row="1" column="0">
                                 <property name="name">
                                     <cstring>m_chbOwnerGroup</cstring>
                                 </property>
@@ -557,7 +557,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>gbAccessDate</cstring>
                         </property>
@@ -568,23 +568,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>layout8</cstring>
+                                    <cstring>tqlayout8</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout18</cstring>
+                                            <cstring>tqlayout18</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
                                                 <cstring>unnamed</cstring>
                                             </property>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>m_tlDateValid</cstring>
                                                 </property>
@@ -592,7 +592,7 @@
                                                     <string>Dates valid for:</string>
                                                 </property>
                                             </widget>
-                                            <widget class="QCheckBox">
+                                            <widget class="TQCheckBox">
                                                 <property name="name">
                                                     <cstring>m_chbDateMin</cstring>
                                                 </property>
@@ -600,7 +600,7 @@
                                                     <string>Accessed after:</string>
                                                 </property>
                                             </widget>
-                                            <widget class="QCheckBox">
+                                            <widget class="TQCheckBox">
                                                 <property name="name">
                                                     <cstring>m_chbDateMax</cstring>
                                                 </property>
@@ -610,9 +610,9 @@
                                             </widget>
                                         </vbox>
                                     </widget>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout19</cstring>
+                                            <cstring>tqlayout19</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -642,7 +642,7 @@
                                                     <bool>false</bool>
                                                 </property>
                                             </widget>
-                                            <widget class="QDateEdit">
+                                            <widget class="TQDateEdit">
                                                 <property name="name">
                                                     <cstring>m_dedDateMin</cstring>
                                                 </property>
@@ -674,7 +674,7 @@
                                                     </date>
                                                 </property>
                                             </widget>
-                                            <widget class="QDateEdit">
+                                            <widget class="TQDateEdit">
                                                 <property name="name">
                                                     <cstring>m_dedDateMax</cstring>
                                                 </property>
@@ -718,7 +718,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>190</width>
                                                 <height>16</height>
@@ -729,7 +729,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>gbSize</cstring>
                         </property>
@@ -740,23 +740,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>layout32</cstring>
+                                    <cstring>tqlayout32</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout31</cstring>
+                                            <cstring>tqlayout31</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
                                                 <cstring>unnamed</cstring>
                                             </property>
-                                            <widget class="QCheckBox">
+                                            <widget class="TQCheckBox">
                                                 <property name="name">
                                                     <cstring>m_chbSizeMin</cstring>
                                                 </property>
@@ -764,7 +764,7 @@
                                                     <string>Minimum si&amp;ze:</string>
                                                 </property>
                                             </widget>
-                                            <widget class="QCheckBox">
+                                            <widget class="TQCheckBox">
                                                 <property name="name">
                                                     <cstring>m_chbSizeMax</cstring>
                                                 </property>
@@ -774,15 +774,15 @@
                                             </widget>
                                         </vbox>
                                     </widget>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout30</cstring>
+                                            <cstring>tqlayout30</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
                                                 <cstring>unnamed</cstring>
                                             </property>
-                                            <widget class="QSpinBox">
+                                            <widget class="TQSpinBox">
                                                 <property name="name">
                                                     <cstring>m_spbSizeMin</cstring>
                                                 </property>
@@ -793,7 +793,7 @@
                                                     <number>0</number>
                                                 </property>
                                             </widget>
-                                            <widget class="QSpinBox">
+                                            <widget class="TQSpinBox">
                                                 <property name="name">
                                                     <cstring>m_spbSizeMax</cstring>
                                                 </property>
@@ -806,15 +806,15 @@
                                             </widget>
                                         </vbox>
                                     </widget>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout31</cstring>
+                                            <cstring>tqlayout31</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
                                                 <cstring>unnamed</cstring>
                                             </property>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>m_tlSizeMin</cstring>
                                                 </property>
@@ -822,7 +822,7 @@
                                                     <string>KB</string>
                                                 </property>
                                             </widget>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>m_tlSizeMax</cstring>
                                                 </property>
@@ -842,7 +842,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>330</width>
                                                 <height>16</height>
@@ -894,5 +894,5 @@
     <tabstop>m_dedDateMin</tabstop>
     <tabstop>m_dedDateMax</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kfilereplace/koptionsdlg.cpp b/kfilereplace/koptionsdlg.cpp
index fc0dc899..84492238 100644
--- a/kfilereplace/koptionsdlg.cpp
+++ b/kfilereplace/koptionsdlg.cpp
@@ -41,7 +41,7 @@
 using namespace whatthisNameSpace;
 
 
-KOptionsDlg::KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name) : KOptionsDlgS(parent,name,true)
+KOptionsDlg::KOptionsDlg(RCOptions* info, TQWidget *tqparent, const char *name) : KOptionsDlgS(tqparent,name,true)
 {
   m_config = new KConfig("kfilereplacerc");
   m_option = info;
@@ -220,7 +220,7 @@ void KOptionsDlg::saveRCOptions()
 
 void KOptionsDlg::whatsThis()
 {
-  // Create help QWhatsThis
+  // Create help TQWhatsThis
   TQWhatsThis::add(m_chbCaseSensitive, chbCaseSensitiveWhatthis);
   TQWhatsThis::add(m_chbRecursive, chbRecursiveWhatthis);
   TQWhatsThis::add(m_chbHaltOnFirstOccurrence, chbHaltOnFirstOccurrenceWhatthis);
diff --git a/kfilereplace/koptionsdlg.h b/kfilereplace/koptionsdlg.h
index 973393d6..4faec9f0 100644
--- a/kfilereplace/koptionsdlg.h
+++ b/kfilereplace/koptionsdlg.h
@@ -2,7 +2,7 @@
                           koptionsdlg.h  -  description
                              -------------------
     begin                : Tue Dec 28 1999
-    copyright            : (C) 1999 by François Dupoux
+    copyright            : (C) 1999 by Fran�ois Dupoux
                            (C) 2004 Emiliano Gulmini <emi_barbarossa@yahoo.it>
     email                : dupoux@dupoux.com
  ***************************************************************************/
@@ -27,14 +27,15 @@ class KConfig;
 #include "koptionsdlgs.h"
 
 /**
-  *@author François Dupoux
+  *@author Fran�ois Dupoux
   */
 
 class KOptionsDlg : public KOptionsDlgS
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name);
+    KOptionsDlg(RCOptions* info, TQWidget *tqparent, const char *name);
     ~KOptionsDlg();
 
   private:
@@ -47,7 +48,7 @@ class KOptionsDlg : public KOptionsDlgS
     void slotChbBackup(bool b);
     void slotChbConfirmStrings(bool b);
     void slotChbShowConfirmDialog(bool b);
-    void slotHelp(){ kapp->invokeHelp(TQString::null, "kfilereplace"); }
+    void slotHelp(){ kapp->invokeHelp(TQString(), "kfilereplace"); }
 
   private:
     void initGUI();
diff --git a/kfilereplace/koptionsdlgs.ui b/kfilereplace/koptionsdlgs.ui
index 88f0d8f8..0347b879 100644
--- a/kfilereplace/koptionsdlgs.ui
+++ b/kfilereplace/koptionsdlgs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KOptionsDlgS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>KOptionsDlgS</cstring>
     </property>
@@ -22,11 +22,11 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="5">
+        <widget class="TQTabWidget" row="0" column="0" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>tabWidget2</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="QGroupBox" row="0" column="0">
+                    <widget class="TQGroupBox" row="0" column="0">
                         <property name="name">
                             <cstring>groupBox7</cstring>
                         </property>
@@ -48,7 +48,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <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>m_chbVariables</cstring>
                                 </property>
@@ -59,7 +59,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="7" column="0">
+                            <widget class="TQLabel" row="7" column="0">
                                 <property name="name">
                                     <cstring>m_tlBackup</cstring>
                                 </property>
@@ -67,7 +67,7 @@
                                     <string>Backup copy suffix:</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="7" column="1" rowspan="1" colspan="2">
+                            <widget class="TQLineEdit" row="7" column="1" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>m_leBackup</cstring>
                                 </property>
@@ -75,7 +75,7 @@
                                     <string></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>m_chbNotifyOnErrors</cstring>
                                 </property>
@@ -83,7 +83,7 @@
                                     <string>Notif&amp;y on errors</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3">
+                            <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>m_chbCaseSensitive</cstring>
                                 </property>
@@ -94,7 +94,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3">
+                            <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>m_chbRecursive</cstring>
                                 </property>
@@ -105,7 +105,7 @@
                                     <string></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>m_chbRegularExpressions</cstring>
                                 </property>
@@ -116,7 +116,7 @@
                                     <string>Enable regular e&amp;xpressions</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>m_chbBackup</cstring>
                                 </property>
@@ -124,7 +124,7 @@
                                     <string>Do &amp;backup copy</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>
@@ -149,7 +149,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Tab3</cstring>
                 </property>
@@ -160,7 +160,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>gbxConfirm</cstring>
                         </property>
@@ -171,7 +171,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox" row="5" column="0">
+                            <widget class="TQCheckBox" row="5" column="0">
                                 <property name="name">
                                     <cstring>m_chbIgnoreHidden</cstring>
                                 </property>
@@ -179,7 +179,7 @@
                                     <string>Ignore hidden files and folders</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="4" column="0">
+                            <widget class="TQCheckBox" row="4" column="0">
                                 <property name="name">
                                     <cstring>m_chbFollowSymLinks</cstring>
                                 </property>
@@ -187,7 +187,7 @@
                                     <string>Follow s&amp;ymbolic links</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="3" column="0">
+                            <widget class="TQCheckBox" row="3" column="0">
                                 <property name="name">
                                     <cstring>m_chbHaltOnFirstOccurrence</cstring>
                                 </property>
@@ -195,7 +195,7 @@
                                     <string>When searching, stop on first string found (faster but no details)</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="0">
+                            <widget class="TQCheckBox" row="2" column="0">
                                 <property name="name">
                                     <cstring>m_chbIgnoreFiles</cstring>
                                 </property>
@@ -206,9 +206,9 @@
                                     <string>Do not show file if no strings are found or replaced</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">
@@ -224,14 +224,14 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>20</height>
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>m_chbShowConfirmDialog</cstring>
                                         </property>
@@ -244,7 +244,7 @@
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="0">
+                            <widget class="TQCheckBox" row="0" column="0">
                                 <property name="name">
                                     <cstring>m_chbConfirmStrings</cstring>
                                 </property>
@@ -260,7 +260,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QPushButton" row="1" column="0">
+        <widget class="TQPushButton" row="1" column="0">
             <property name="name">
                 <cstring>m_pbHelp</cstring>
             </property>
@@ -281,14 +281,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>202</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="1" column="2">
+        <widget class="TQPushButton" row="1" column="2">
             <property name="name">
                 <cstring>m_pbDefault</cstring>
             </property>
@@ -296,7 +296,7 @@
                 <string>&amp;Default Values</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="3">
+        <widget class="TQPushButton" row="1" column="3">
             <property name="name">
                 <cstring>m_pbOK</cstring>
             </property>
@@ -304,7 +304,7 @@
                 <string>&amp;OK</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="4">
+        <widget class="TQPushButton" row="1" column="4">
             <property name="name">
                 <cstring>m_pbCancel</cstring>
             </property>
@@ -343,5 +343,5 @@
     <tabstop>m_chbFollowSymLinks</tabstop>
     <tabstop>m_chbIgnoreHidden</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kfilereplace/report.cpp b/kfilereplace/report.cpp
index 6d485eba..5497b045 100644
--- a/kfilereplace/report.cpp
+++ b/kfilereplace/report.cpp
@@ -38,13 +38,13 @@ void Report::createReportFile()
   TQFile report(xmlFileName);
   if (!report.open( IO_WriteOnly ))
     {
-      KMessageBox::error(0, i18n("<qt>Cannot open the file <b>%1</b>.</qt>").arg(xmlFileName));
+      KMessageBox::error(0, i18n("<qt>Cannot open the file <b>%1</b>.</qt>").tqarg(xmlFileName));
       return ;
     }
 
   // b) Write the header of the XML file
 
-  TQDateTime datetime = TQDateTime::currentDateTime(Qt::LocalTime);
+  TQDateTime datetime = TQDateTime::tqcurrentDateTime(Qt::LocalTime);
   TQString dateString = datetime.toString(Qt::LocalDate);
   KUser user;
   TQString columnTextFour,
@@ -60,7 +60,7 @@ void Report::createReportFile()
       columnReplaceWith = i18n("-");
     }
 
-  TQString css =  cssFileName.mid(cssFileName.findRev("/")+1,cssFileName.length()-(cssFileName.findRev("/")+1));
+  TQString css =  cssFileName.mid(cssFileName.tqfindRev("/")+1,cssFileName.length()-(cssFileName.tqfindRev("/")+1));
   TQTextStream oTStream( &report );
   oTStream << "<?xml version=\"1.0\"?>\n"
               "<?xml-stylesheet href=\""+css+"\" type=\"text/css\"?>"
@@ -191,7 +191,7 @@ void Report::createStyleSheet()
   TQFile styleSheet(cssFileName);
   if (!styleSheet.open( IO_WriteOnly ))
     {
-      KMessageBox::error(0, i18n("<qt>Cannot open the file <b>%1</b>.</qt>").arg(cssFileName));
+      KMessageBox::error(0, i18n("<qt>Cannot open the file <b>%1</b>.</qt>").tqarg(cssFileName));
       return ;
     }
 
diff --git a/kfilereplace/whatthis.h b/kfilereplace/whatthis.h
index 09f6ac80..01c1e1f4 100644
--- a/kfilereplace/whatthis.h
+++ b/kfilereplace/whatthis.h
@@ -31,7 +31,7 @@ namespace whatthisNameSpace
   const TQString lvStringsWhatthis = i18n("Shows a list of strings to search for (and if you specified it, a list of strings to replace with). Use the \"add strings\" dialog to edit your string list or double click on a string.");
 
   //KNewProjectDlg messages
-  const TQString cbLocationWhatthis = i18n("Base folder for operations of search/replace. Insert path string here by hand or use the search button.");
+  const TQString cbLocationWhatthis = i18n("Base folder for operations of search/tqreplace. Insert path string here by hand or use the search button.");
 
   const TQString cbFilterWhatthis = i18n("Shell-like wildcards. Example: \"*.html;*.txt;*.xml\".");
 
diff --git a/kimagemapeditor/arealistview.cpp b/kimagemapeditor/arealistview.cpp
index 203a741f..a92eb567 100644
--- a/kimagemapeditor/arealistview.cpp
+++ b/kimagemapeditor/arealistview.cpp
@@ -31,8 +31,8 @@
 #include "arealistview.h"
 
 
-AreaListView::AreaListView(TQWidget *parent, const char *name)
-  : TQVBox(parent, name)
+AreaListView::AreaListView(TQWidget *tqparent, const char *name)
+  : TQVBox(tqparent, name)
 {
   listView = new KListView(this);
   listView->addColumn(i18n("Areas"));
diff --git a/kimagemapeditor/arealistview.h b/kimagemapeditor/arealistview.h
index 6e09aaef..8b640828 100644
--- a/kimagemapeditor/arealistview.h
+++ b/kimagemapeditor/arealistview.h
@@ -30,12 +30,13 @@ class Area;
  * It shows all Areas of the current map.
  * Jan Schaefer
  **/
-class AreaListView : public QVBox
+class AreaListView : public TQVBox
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  AreaListView(TQWidget *parent, const char *name);
+  AreaListView(TQWidget *tqparent, const char *name);
   ~AreaListView();
   
   KListView* listView;
diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp
index 60b6fe9f..152f5300 100644
--- a/kimagemapeditor/drawzone.cpp
+++ b/kimagemapeditor/drawzone.cpp
@@ -37,8 +37,8 @@
 
 #include "kimecommon.h"
 
-DrawZone::DrawZone(TQWidget *parent,KImageMapEditor* _imageMapEditor)
-	: TQScrollView(parent)
+DrawZone::DrawZone(TQWidget *tqparent,KImageMapEditor* _imageMapEditor)
+	: TQScrollView(tqparent)
 {
 	imageMapEditor=_imageMapEditor;
 //	setPicture(TQImage());
@@ -175,7 +175,7 @@ void DrawZone::setZoom(double z)
 	pix.convertFromImage(image);
 	// if the picture has transparent areas,
 	// fill them with Gimp like background
-	if (pix.mask()) {
+	if (pix.tqmask()) {
   	TQPixmap backPix(32,32);
   	TQPainter p2(&backPix);
   	p2.fillRect(0,0,32,32,TQColor(156,149,156));
@@ -189,7 +189,7 @@ void DrawZone::setZoom(double z)
 	p.flush();
 	resizeContents(visibleWidth()>imageRect.width() ? visibleWidth() : imageRect.width(),
 								 visibleHeight()>imageRect.height() ? visibleHeight() : imageRect.height());
-	repaintContents(0,0,contentsWidth(),contentsHeight(),true);
+	tqrepaintContents(0,0,contentsWidth(),contentsHeight(),true);
 }
 
 TQPoint DrawZone::translateFromZoom(const TQPoint & p) const {
@@ -238,7 +238,7 @@ void DrawZone::contentsMousePressEvent(TQMouseEvent* e)
 	drawStart=e->pos();
 	// Check if it's on picture if not
 	// move it to the picture's border
-	if (!imageRect.contains(drawStart)) {
+	if (!imageRect.tqcontains(drawStart)) {
 		if (drawStart.x()>imageRect.right())
 			drawStart.setX(imageRect.right());
 		if (drawStart.x()<imageRect.left())
@@ -262,7 +262,7 @@ void DrawZone::contentsMousePressEvent(TQMouseEvent* e)
 	}
 
 	if ( currentAction==None ) {
-		if (e->button()==RightButton)
+		if (e->button()==Qt::RightButton)
 		{
 			if ( (currentArea=imageMapEditor->onArea(drawStart)) )
 			{
@@ -278,7 +278,7 @@ void DrawZone::contentsMousePressEvent(TQMouseEvent* e)
 
 		}
 		else
-		if (e->button()==MidButton) {
+		if (e->button()==Qt::MidButton) {
 			contentsMouseDoubleClickEvent(e);
 		}
 		else  // LeftClick on selectionpoint
@@ -379,7 +379,7 @@ void DrawZone::contentsMousePressEvent(TQMouseEvent* e)
 		r=oldArea->selectionRect();
 	if (currentArea) {
 		r= r | currentArea->selectionRect();
-		repaintContents(translateToZoom(r),false);
+		tqrepaintContents(translateToZoom(r),false);
 	}
 
 
@@ -393,7 +393,7 @@ void DrawZone::contentsMouseReleaseEvent(TQMouseEvent *e) {
 
 	// Check if it's on picture if not
 	// move it to the picture's border
-	if (!imageRect.contains(drawEnd)) {
+	if (!imageRect.tqcontains(drawEnd)) {
 		if (drawEnd.x()>imageRect.right())
 			drawEnd.setX(imageRect.right());
 		if (drawEnd.x()<imageRect.left())
@@ -419,8 +419,8 @@ void DrawZone::contentsMouseReleaseEvent(TQMouseEvent *e) {
 		// and clicked on the first PolygonPoint or
 		// the right Button was pressed the Polygon is finished
   	if ((currentArea->selectionPoints()->count()>2)
-  		&& (currentArea->selectionPoints()->first()->contains(drawEnd)
-  		 || (e->button()==RightButton)))
+  		&& (currentArea->selectionPoints()->first()->tqcontains(drawEnd)
+  		 || (e->button()==Qt::RightButton)))
   	{
 			currentArea->setFinished(true);
   		currentAction=None;
@@ -501,7 +501,7 @@ void DrawZone::contentsMouseReleaseEvent(TQMouseEvent *e) {
 
     imageMapEditor->updateActionAccess();
   	imageMapEditor->updateSelection();
-    repaintContents(imageRect,false);
+    tqrepaintContents(imageRect,false);
   } else {
   	currentAction=None;
   }
@@ -509,11 +509,11 @@ void DrawZone::contentsMouseReleaseEvent(TQMouseEvent *e) {
 	if (currentArea)
 	{
 	  currentArea->setMoving(false);
-		repaintArea(*currentArea);
+		tqrepaintArea(*currentArea);
 	}
 	delete oldArea;
 	oldArea=0L;
-//	repaintContents(0,0,contentsWidth(),contentsHeight(),false);
+//	tqrepaintContents(0,0,contentsWidth(),contentsHeight(),false);
   imageMapEditor->slotUpdateSelectionCoords();
 }
 
@@ -528,7 +528,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
 
 		// If outside the image
 		// set it to the border
-		if (!imageRect.contains(drawCurrent)) {
+		if (!imageRect.tqcontains(drawCurrent)) {
   		if (drawCurrent.x()>imageRect.right())
   			drawCurrent.setX(imageRect.right());
   		if (drawCurrent.x()<imageRect.left())
@@ -545,12 +545,12 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
 		drawCurrent=translateFromZoom(drawCurrent);
 
 		if (currentAction==DrawRectangle) {
-			// To avoid flicker, only repaint the minimum rect
+			// To avoid flicker, only tqrepaint the minimum rect
 			TQRect oldRect=translateToZoom(currentArea->rect());
 			currentArea->setRect(TQRect(drawStart,drawCurrent).normalize());
 			TQRect newRect=translateToZoom(currentArea->selectionRect());
 			TQRect r=oldRect | newRect;
-			repaintContents(r,false);
+			tqrepaintContents(r,false);
 			imageMapEditor->slotUpdateSelectionCoords( currentArea->rect() );
 		} else
 		if (currentAction==DrawCircle) {
@@ -576,7 +576,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
 			currentArea->setRect(TQRect(drawStart,endPoint).normalize());
 			TQRect newRect=translateToZoom(currentArea->rect());
 			TQRect r=oldRect | newRect;
-			repaintContents(r,false);
+			tqrepaintContents(r,false);
 			imageMapEditor->slotUpdateSelectionCoords( currentArea->rect() );
 		} else
 		if ( currentAction==DrawPolygon ) {
@@ -584,14 +584,14 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
 			currentArea->moveSelectionPoint(currentSelectionPoint,drawCurrent);
 			TQRect newRect=translateToZoom(currentArea->rect());
 			TQRect r=oldRect | newRect;
-			repaintContents(r,false);
+			tqrepaintContents(r,false);
 		} else
 		if ( currentAction==DrawFreehand) {
 			TQRect oldRect=translateToZoom(currentArea->rect());
 		  currentArea->insertCoord(currentArea->countSelectionPoints(), drawCurrent);
 			TQRect newRect=translateToZoom(currentArea->rect());
 			TQRect r=oldRect | newRect;
-			repaintContents(r,false);
+			tqrepaintContents(r,false);
 		} else
 		if ( currentAction==MoveArea ) {
 			TQRect oldRect=translateToZoom(currentArea->selectionRect());
@@ -599,7 +599,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
 			TQRect newRect=translateToZoom(currentArea->selectionRect());
 			TQRect r=oldRect | newRect;
 			currentArea->setMoving(true);
-			repaintContents(r,false);
+			tqrepaintContents(r,false);
 			drawStart=drawCurrent;
 			imageMapEditor->slotUpdateSelectionCoords();
 		} else
@@ -608,7 +608,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
 			currentArea->moveSelectionPoint(currentSelectionPoint,drawCurrent);
 			TQRect newRect=translateToZoom(currentArea->selectionRect());
 			TQRect r=oldRect | newRect;
-			repaintContents(r,false);
+			tqrepaintContents(r,false);
 			imageMapEditor->slotUpdateSelectionCoords();
 		} else
 	  if (currentAction==DoSelect) {
@@ -629,27 +629,27 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
       			imageMapEditor->deselectWithoutUpdate( it.current() );
 			}
 */
-      // We don't have to repaint the hole selection rectangle
-      // only the borders have to be repainted.
+      // We don't have to tqrepaint the hole selection rectangle
+      // only the borders have to be tqrepainted.
       // So we have to create 4 rectangles for every rectangle
-      // which represent the borders and then repaint them.
+      // which represent the borders and then tqrepaint them.
 
       TQRect lb,rb,tb,bb;
       createBorderRectangles(translateToZoom(r),lb,rb,tb,bb);
-      repaintContents(lb,false);
-      repaintContents(rb,false);
-      repaintContents(tb,false);
-      repaintContents(bb,false);
+      tqrepaintContents(lb,false);
+      tqrepaintContents(rb,false);
+      tqrepaintContents(tb,false);
+      tqrepaintContents(bb,false);
 
       createBorderRectangles(translateToZoom(oldSelectionRect),lb,rb,tb,bb);
-      repaintContents(lb,false);
-      repaintContents(rb,false);
-      repaintContents(tb,false);
-      repaintContents(bb,false);
+      tqrepaintContents(lb,false);
+      tqrepaintContents(rb,false);
+      tqrepaintContents(tb,false);
+      tqrepaintContents(bb,false);
 
-//    	repaintContents(oldSelectionRect | r,false);
+//    	tqrepaintContents(oldSelectionRect | r,false);
     	oldSelectionRect = r;
-//    	repaintContents(translateToZoom(r),false);
+//    	tqrepaintContents(translateToZoom(r),false);
 //+			imageMapEditor->updateSelection();
 
 
@@ -658,7 +658,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
 //			TQRect r2(drawStart.x(),drawStart.y(),drawOld.x()-drawStart.x(),drawOld.y()-drawStart.y());
 //			r2 = r2.normalize();
 //			r = translateToZoom(r | r2);
-//			repaintContents(r,false);
+//			tqrepaintContents(r,false);
   	} else
 		if ( currentAction==None )
 		{
@@ -782,17 +782,17 @@ void DrawZone::cancelDrawing()
     TQRect r = translateToZoom(currentArea->selectionRect());
     delete currentArea;
     currentArea = 0L;
-    repaintContents(r,false);
+    tqrepaintContents(r,false);
     imageMapEditor->slotUpdateSelectionCoords();
   }
 }
 
-void DrawZone::repaintArea(const Area & a) {
-	repaintContents(translateToZoom(a.selectionRect()),false);
+void DrawZone::tqrepaintArea(const Area & a) {
+	tqrepaintContents(translateToZoom(a.selectionRect()),false);
 }
 
-void DrawZone::repaintRect(const TQRect & r) {
-	repaintContents(translateToZoom(r),false);
+void DrawZone::tqrepaintRect(const TQRect & r) {
+	tqrepaintContents(translateToZoom(r),false);
 }
 
 void DrawZone::drawContents(TQPainter* p,int clipx,int clipy,int clipw,int cliph)
@@ -848,7 +848,7 @@ void DrawZone::drawContents(TQPainter* p,int clipx,int clipy,int clipw,int cliph
 	if (currentAction == DoSelect )
   {
 		TQPen pen = TQPen(TQColor("white"),1);
-		p2.setRasterOp(Qt::XorROP);
+		p2.setRasterOp(TQt::XorROP);
 		pen.setStyle(Qt::DotLine);
 		p2.setPen(pen);
 
diff --git a/kimagemapeditor/drawzone.h b/kimagemapeditor/drawzone.h
index 58887288..f1b1d410 100644
--- a/kimagemapeditor/drawzone.h
+++ b/kimagemapeditor/drawzone.h
@@ -38,12 +38,12 @@ class Area;
 class DrawZone : public TQScrollView  {
 public:
 
-  DrawZone(TQWidget *parent,KImageMapEditor* _imageMapEditor);
+  DrawZone(TQWidget *tqparent,KImageMapEditor* _imageMapEditor);
   ~DrawZone();
 
   TQImage picture() const;
-  void repaintArea(const Area & a);
-  void repaintRect(const TQRect & r);
+  void tqrepaintArea(const Area & a);
+  void tqrepaintRect(const TQRect & r);
   void cancelDrawing();
 
   void setPicture(const TQImage &_image);
@@ -97,7 +97,7 @@ private:
   KImageMapEditor *imageMapEditor;
   // Only the rect of the zoomed image, perhaps redundant
   TQRect imageRect;
-  // Only for repaint issues
+  // Only for tqrepaint issues
   Area *oldArea;
 
   TQRect oldSelectionRect;
diff --git a/kimagemapeditor/imagemap.cpp b/kimagemapeditor/imagemap.cpp
index 4489508d..070b54fa 100644
--- a/kimagemapeditor/imagemap.cpp
+++ b/kimagemapeditor/imagemap.cpp
@@ -28,8 +28,8 @@ int round(double d) {
 		return ((int) d)+1;
 }
 
-ImageMap::ImageMap(TQWidget *parent,KImageMapEditor* _imageMapEditor)
-	: TQScrollView(parent)
+ImageMap::ImageMap(TQWidget *tqparent,KImageMapEditor* _imageMapEditor)
+	: TQScrollView(tqparent)
 {
 	imageMapEditor=_imageMapEditor;
 //	setPicture(TQImage());
@@ -63,7 +63,7 @@ void ImageMap::setZoom(double z) {
 	pix.convertFromImage(image);
 	// if the picture has transparent areas,
 	// fill them with Gimp like background
-	if (pix.mask()) {
+	if (pix.tqmask()) {
   	TQPixmap backPix(32,32);
   	TQPainter p2(&backPix);
   	p2.fillRect(0,0,32,32,TQColor(156,149,156));
@@ -77,7 +77,7 @@ void ImageMap::setZoom(double z) {
 	p.flush();
 	resizeContents(visibleWidth()>imageRect.width() ? visibleWidth() : imageRect.width(),
 								 visibleHeight()>imageRect.height() ? visibleHeight() : imageRect.height());
-	repaintContents(0,0,contentsWidth(),contentsHeight(),true);
+	tqrepaintContents(0,0,contentsWidth(),contentsHeight(),true);
 }
 
 TQPoint ImageMap::translateFromZoom(const TQPoint & p) const {
@@ -107,7 +107,7 @@ void ImageMap::contentsMousePressEvent(TQMouseEvent* e) {
 	drawStart=e->pos();
 	// Check if it's on picture if not
 	// move it to the picture's border
-	if (!imageRect.contains(drawStart)) {
+	if (!imageRect.tqcontains(drawStart)) {
 		if (drawStart.x()>imageRect.right())
 			drawStart.setX(imageRect.right());
 		if (drawStart.x()<imageRect.left())
@@ -172,7 +172,7 @@ void ImageMap::contentsMousePressEvent(TQMouseEvent* e) {
 		r=oldArea->selectionRect();		
 	if (currentArea) {
 		r= r | currentArea->selectionRect();
-		repaintContents(translateToZoom(r),false);
+		tqrepaintContents(translateToZoom(r),false);
 	}
 	
 }
@@ -182,7 +182,7 @@ void ImageMap::contentsMouseReleaseEvent(TQMouseEvent *e) {
 	
 	// Check if it's on picture if not
 	// move it to the picture's border
-	if (!imageRect.contains(drawEnd)) {
+	if (!imageRect.tqcontains(drawEnd)) {
 		if (drawEnd.x()>imageRect.right())
 			drawEnd.setX(imageRect.right());
 		if (drawEnd.x()<imageRect.left())
@@ -207,7 +207,7 @@ void ImageMap::contentsMouseReleaseEvent(TQMouseEvent *e) {
 		// and clicked on the first PolygonPoint or
 		// the right Button was pressed the Polygon is finished
   	if ((currentArea->selectionPoints()->count()>2)
-  		&& (currentArea->selectionPoints()->first()->contains(drawEnd)
+  		&& (currentArea->selectionPoints()->first()->tqcontains(drawEnd)
   		 || (e->button()==RightButton)))
   	{
 			currentArea->setFinished(true);
@@ -233,8 +233,8 @@ void ImageMap::contentsMouseReleaseEvent(TQMouseEvent *e) {
 	imageMapEditor->slotUpdateSelectionCoords();
 
 	if (currentArea)
-		repaintArea(*currentArea);
-//	repaintContents(0,0,contentsWidth(),contentsHeight(),false);
+		tqrepaintArea(*currentArea);
+//	tqrepaintContents(0,0,contentsWidth(),contentsHeight(),false);
 }
 
 
@@ -243,7 +243,7 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) {
 		
 		// If outside the image
 		// set it to the border
-		if (!imageRect.contains(drawCurrent)) {
+		if (!imageRect.tqcontains(drawCurrent)) {
   		if (drawCurrent.x()>imageRect.right())
   			drawCurrent.setX(imageRect.right());
   		if (drawCurrent.x()<imageRect.left())
@@ -259,12 +259,12 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) {
 		drawCurrent=translateFromZoom(drawCurrent);
 		
 		if (currentAction==DrawRectangle) {
-			// To avoid flicker, only repaint the minimum rect
+			// To avoid flicker, only tqrepaint the minimum rect
 			TQRect oldRect=translateToZoom(currentArea->rect());
 			currentArea->setRect(TQRect(drawStart,drawCurrent).normalize());
 			TQRect newRect=translateToZoom(currentArea->rect());
 			TQRect r=oldRect | newRect;
-			repaintContents(r,false);
+			tqrepaintContents(r,false);
 			imageMapEditor->slotUpdateSelectionCoords(currentArea->rect());
 		} else
 		if (currentAction==DrawCircle) {
@@ -272,7 +272,7 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) {
 			currentArea->setRect(TQRect(drawStart,drawCurrent).normalize());
 			TQRect newRect=translateToZoom(currentArea->rect());
 			TQRect r=oldRect | newRect;
-			repaintContents(r,false);
+			tqrepaintContents(r,false);
 			imageMapEditor->slotUpdateSelectionCoords(currentArea->rect());
 		} else
 		if ( currentAction==DrawPolygon ) {
@@ -280,7 +280,7 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) {
 			currentArea->moveSelectionPoint(currentSelectionPoint,drawCurrent);
 			TQRect newRect=translateToZoom(currentArea->rect());
 			TQRect r=oldRect | newRect;
-			repaintContents(r,false);
+			tqrepaintContents(r,false);
 			imageMapEditor->slotUpdateSelectionCoords(currentArea->rect());
 		} else
 		if ( currentAction==MoveArea ) {
@@ -288,7 +288,7 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) {
 			currentArea->moveBy((drawCurrent-drawStart).x(),(drawCurrent-drawStart).y());
 			TQRect newRect=translateToZoom(currentArea->selectionRect());
 			TQRect r=oldRect | newRect;
-			repaintContents(r,false);
+			tqrepaintContents(r,false);
 			drawStart=drawCurrent;
 			imageMapEditor->slotUpdateSelectionCoords();
 		} else
@@ -297,7 +297,7 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) {
 			currentArea->moveSelectionPoint(currentSelectionPoint,drawCurrent);
 			TQRect newRect=translateToZoom(currentArea->selectionRect());
 			TQRect r=oldRect | newRect;
-			repaintContents(r,false);
+			tqrepaintContents(r,false);
 			imageMapEditor->slotUpdateSelectionCoords();
 		}
 		imageMapEditor->slotChangeStatusCoords(drawCurrent.x(),drawCurrent.y());
@@ -321,8 +321,8 @@ void ImageMap::resizeEvent(TQResizeEvent* e) {
 	
 }
 
-void ImageMap::repaintArea(const Area & a) {
-	repaintContents(translateToZoom(a.selectionRect()),false);
+void ImageMap::tqrepaintArea(const Area & a) {
+	tqrepaintContents(translateToZoom(a.selectionRect()),false);
 }
 
 void ImageMap::drawContents(TQPainter* p,int clipx,int clipy,int clipw,int cliph) {
diff --git a/kimagemapeditor/imagemap.h b/kimagemapeditor/imagemap.h
index fe14c9d4..5f24560e 100644
--- a/kimagemapeditor/imagemap.h
+++ b/kimagemapeditor/imagemap.h
@@ -51,11 +51,11 @@ private:
 	KImageMapEditor *imageMapEditor;
 	double _zoom;
 public:
-	ImageMap(TQWidget *parent,KImageMapEditor* _imageMapEditor);
+	ImageMap(TQWidget *tqparent,KImageMapEditor* _imageMapEditor);
 	~ImageMap();
 	void setZoom(double z);
 	void setPicture(const TQImage &_image);
-	void repaintArea(const Area & a);
+	void tqrepaintArea(const Area & a);
 	TQImage picture() const;
 	TQPoint translateFromZoom(const TQPoint & p) const;
 	TQPoint translateToZoom(const TQPoint & p) const;
diff --git a/kimagemapeditor/imageslistview.cpp b/kimagemapeditor/imageslistview.cpp
index 7db15e1e..b7d50b26 100644
--- a/kimagemapeditor/imageslistview.cpp
+++ b/kimagemapeditor/imageslistview.cpp
@@ -26,8 +26,8 @@
 // locale 
 #include "imageslistview.h"
 
-ImagesListViewItem::ImagesListViewItem(ImagesListView* parent, ImageTag* tag) 
-  : TQListViewItem(parent) 
+ImagesListViewItem::ImagesListViewItem(ImagesListView* tqparent, ImageTag* tag) 
+  : TQListViewItem(tqparent) 
 {
     _imageTag = tag;
     update();
@@ -37,10 +37,10 @@ ImagesListViewItem::ImagesListViewItem(ImagesListView* parent, ImageTag* tag)
 void ImagesListViewItem::update() {
     TQString src="";
     TQString usemap="";
-    if (_imageTag->find("src"))
-      src=*_imageTag->find("src");
-    if (_imageTag->find("usemap"))
-      usemap=*_imageTag->find("usemap");
+    if (_imageTag->tqfind("src"))
+      src=*_imageTag->tqfind("src");
+    if (_imageTag->tqfind("usemap"))
+      usemap=*_imageTag->tqfind("usemap");
 
     setText(0,src);
     setText(1,usemap); 
@@ -51,8 +51,8 @@ ImageTag* ImagesListViewItem::imageTag() {
 }
 
 
-ImagesListView::ImagesListView(TQWidget *parent, const char *name)
-  : KListView(parent, name)
+ImagesListView::ImagesListView(TQWidget *tqparent, const char *name)
+  : KListView(tqparent, name)
 {
   addColumn(i18n("Images"));
   addColumn(i18n("Usemap"));
diff --git a/kimagemapeditor/imageslistview.h b/kimagemapeditor/imageslistview.h
index ede6a87b..5155bfc4 100644
--- a/kimagemapeditor/imageslistview.h
+++ b/kimagemapeditor/imageslistview.h
@@ -25,7 +25,7 @@
 
 class ImagesListView;
 
-class ImagesListViewItem : public QListViewItem
+class ImagesListViewItem : public TQListViewItem
 {
   public:
     ImagesListViewItem(ImagesListView*, ImageTag*);
@@ -47,9 +47,10 @@ class ImagesListViewItem : public QListViewItem
 class ImagesListView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  ImagesListView(TQWidget *parent, const char *name);
+  ImagesListView(TQWidget *tqparent, const char *name);
   virtual ~ImagesListView();
   
   /**
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index 6a71f3a6..ba5183e0 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -84,9 +84,9 @@
 typedef KParts::GenericFactory<KImageMapEditor> KimeFactory;
 K_EXPORT_COMPONENT_FACTORY( libkimagemapeditor , KimeFactory )
 
-KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *,
-            TQObject *parent, const char *name, const TQStringList & )
-  : KParts::ReadWritePart(parent,name)
+KImageMapEditor::KImageMapEditor(TQWidget *tqparentWidget, const char *,
+            TQObject *tqparent, const char *name, const TQStringList & )
+  : KParts::ReadWritePart(tqparent,name)
 {
   setInstance( KimeFactory::instance() );
 
@@ -94,14 +94,14 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *,
 
   // Test if the MainWindow can handle DockWindows, if so create DockWidgets
   // instead of a Splitter
-  mainDock = dynamic_cast<KDockMainWindow*>(parent) ;
+  mainDock = dynamic_cast<KDockMainWindow*>(tqparent) ;
   TQSplitter * splitter = 0L;
   tabWidget = 0L;
 
   if (mainDock) {
 //    kdDebug() << "KImageMapEditor: We got a KDockMainWindow !" << endl;
 
-    KDockWidget* parentDock = mainDock->getMainDockWidget();
+    KDockWidget* tqparentDock = mainDock->getMainDockWidget();
     areaDock = mainDock->createDockWidget( "Areas", 0L, 0L, i18n("Areas"), i18n("Areas"));
     mapsDock = mainDock->createDockWidget( "Maps", 0L, 0L, i18n("Maps"), i18n("Maps"));
     imagesDock = mainDock->createDockWidget( "Images", 0L, 0L, i18n("Images"), i18n("Images"));
@@ -114,7 +114,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *,
     mapsDock->setWidget(mapsListView);
     imagesDock->setWidget(imagesListView);
 
-    areaDock->manualDock( (KDockWidget*) parentDock, KDockWidget::DockLeft, 30);
+    areaDock->manualDock( (KDockWidget*) tqparentDock, KDockWidget::DockLeft, 30);
     mapsDock->manualDock( (KDockWidget*) areaDock, KDockWidget::DockCenter);
     imagesDock->manualDock( (KDockWidget*) mapsDock, KDockWidget::DockCenter);
 
@@ -125,7 +125,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *,
     areaDock = 0L;
     mapsDock = 0L;
     imagesDock = 0L;
-    splitter = new TQSplitter(parentWidget);
+    splitter = new TQSplitter(tqparentWidget);
     tabWidget = new TQTabWidget(splitter);
     areaListView = new AreaListView(tabWidget,"AreaListView");
     mapsListView = new MapsListView(tabWidget, "MapsListView");
@@ -174,7 +174,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *,
     splitter->setResizeMode(tabWidget,TQSplitter::KeepSize);
     setWidget(splitter);
   } else {
-    drawZone = new DrawZone(parentWidget,this);
+    drawZone = new DrawZone(tqparentWidget,this);
     setWidget(drawZone);
   }
 
@@ -225,14 +225,14 @@ KImageMapEditor::~KImageMapEditor() {
 
 MapTag::MapTag() {
   modified = false;
-  name = TQString::null;
+  name = TQString();
 }
 
 void KImageMapEditor::init()
 {
   _htmlContent.clear();
-  _imageUrl = TQString::null;
-  m_url = TQString::null;
+  _imageUrl = TQString();
+  m_url = TQString();
   HtmlElement* el = new HtmlElement("<html>\n");
   _htmlContent.append(el);
   el = new HtmlElement("<head>\n");
@@ -333,7 +333,7 @@ void KImageMapEditor::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);
 }
 
@@ -396,7 +396,7 @@ void KImageMapEditor::slotConfigChanged()
   }
 
   updateAllAreas();
-  drawZone->viewport()->repaint();
+  drawZone->viewport()->tqrepaint();
 }
 
 void KImageMapEditor::openLastURL(KConfig* config) {
@@ -414,7 +414,7 @@ void KImageMapEditor::openLastURL(KConfig* config) {
     if ( openHTMLFile(lastURL, lastMap, lastImage) )
         m_url = lastURL;
     else
-        m_url = TQString::null;
+        m_url = TQString();
   }
 }
 
@@ -425,7 +425,7 @@ void KImageMapEditor::saveLastURL(KConfig* config) {
 //  kdDebug() << "writing entry lastopenurl : " << url().path() << endl;
 //  kdDebug() << "writing entry lastactivemap : " << mapName() << endl;
 //  kdDebug() << "writing entry lastactiveimage : " << _imageUrl.path() << endl;
-  //KMessageBox::information(0L, TQString("Group: %1 Saving ... %2").arg(config->group()).arg(url().path()));
+  //KMessageBox::information(0L, TQString("Group: %1 Saving ... %2").tqarg(config->group()).tqarg(url().path()));
 }
 
 void KImageMapEditor::setupActions()
@@ -736,7 +736,7 @@ void KImageMapEditor::showPopupMenu(const TQPoint & pos, const TQString & name)
   TQPopupMenu* pop = static_cast<TQPopupMenu *>(factory()->container(name, this));
 
   if (!pop) {
-      kdWarning() << TQString("KImageMapEditorPart: Missing XML definition for %1\n").arg(name) << endl;
+      kdWarning() << TQString("KImageMapEditorPart: Missing XML definition for %1\n").tqarg(name) << endl;
       return;
   }
 
@@ -794,8 +794,8 @@ void KImageMapEditor::updateStatusBar()
 
 void KImageMapEditor::slotChangeStatusCoords(int x,int y)
 {
-//	statusBar()->changeItem(TQString(" Cursor : x: %1 ,y: %2 ").arg(x).arg(y),STATUS_CURSOR);
-  cursorStatusText = i18n(" Cursor: x: %1, y: %2 ").arg(x).arg(y);
+//	statusBar()->changeItem(TQString(" Cursor : x: %1 ,y: %2 ").tqarg(x).tqarg(y),STATUS_CURSOR);
+  cursorStatusText = i18n(" Cursor: x: %1, y: %2 ").tqarg(x).tqarg(y);
   updateStatusBar();
 }
 
@@ -803,7 +803,7 @@ void KImageMapEditor::slotUpdateSelectionCoords() {
   if (selected()->count()>0) {
     TQRect r=selected()->rect();
 //		statusBar()->changeItem(
-    selectionStatusText = i18n(" Selection: x: %1, y: %2, w: %3, h: %4 ").arg(r.left()).arg(r.top()).arg(r.width()).arg(r.height());
+    selectionStatusText = i18n(" Selection: x: %1, y: %2, w: %3, h: %4 ").tqarg(r.left()).tqarg(r.top()).tqarg(r.width()).tqarg(r.height());
 
 //		  ,STATUS_SELECTION);
     kapp->processEvents();
@@ -816,7 +816,7 @@ void KImageMapEditor::slotUpdateSelectionCoords() {
 
 void KImageMapEditor::slotUpdateSelectionCoords( const TQRect & r )
 {
-  selectionStatusText = i18n(" Selection: x: %1, y: %2, w: %3, h: %4 ").arg(r.left()).arg(r.top()).arg(r.width()).arg(r.height());
+  selectionStatusText = i18n(" Selection: x: %1, y: %2, w: %3, h: %4 ").tqarg(r.left()).tqarg(r.top()).tqarg(r.width()).tqarg(r.height());
   updateStatusBar();
   kapp->processEvents();
 }
@@ -844,7 +844,7 @@ TQImage KImageMapEditor::getBackgroundImage() {
 
 
 //  TQString filename = TQString("dropimage_")+KGlobal::locale()->language()+".png";
-//  TQString path = TQString::null; //KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/"+filename ) + "kimagemapeditor/"+filename;
+//  TQString path = TQString(); //KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/"+filename ) + "kimagemapeditor/"+filename;
 //  kdDebug() << "getBackgroundPic : loaded image : " << path << endl;
 
 //  if ( ! TQFileInfo(path).exists() ) {
@@ -863,7 +863,7 @@ TQImage KImageMapEditor::getBackgroundImage() {
     font.setBold(true);
     p.setFont( font );
     
-    p.setRasterOp(Qt::CopyROP);
+    p.setRasterOp(TQt::CopyROP);
     p.setPen(TQPen(TQColor(112,114,112),1));
 
     // The translated string must be divided into
@@ -990,7 +990,7 @@ void KImageMapEditor::deleteArea( Area * area )
 {
   if (!area) return;
 
-  // only for repaint reasons
+  // only for tqrepaint reasons
   TQRect redrawRect = area->selectionRect();
 
   // Perhaps we've got a selection of areas
@@ -1015,7 +1015,7 @@ void KImageMapEditor::deleteArea( Area * area )
     area->deleteListViewItem();
   }
 
-  drawZone->repaintRect(redrawRect);
+  drawZone->tqrepaintRect(redrawRect);
 
 
   // Only to disable cut and copy actions
@@ -1037,7 +1037,7 @@ void KImageMapEditor::deleteSelected() {
   }
 
 
-  drawZone->repaintArea( *currentSelected );
+  drawZone->tqrepaintArea( *currentSelected );
   // Only to disable cut and copy actions
   if (areas->count()==0)
     deselectAll();
@@ -1055,7 +1055,7 @@ void KImageMapEditor::deleteAllAreas()
     a=areas->first(); // because the current is deleted
   }
 
-  drawZone->viewport()->repaint();
+  drawZone->viewport()->tqrepaint();
 
 }
 
@@ -1065,7 +1065,7 @@ void KImageMapEditor::updateAllAreas()
   for (Area* a=areas->first();a!=0L;a=areas->next()) {
     a->listViewItem()->setPixmap(1,makeListViewPix(*a));
   }
-  drawZone->viewport()->repaint();
+  drawZone->viewport()->tqrepaint();
 }
 
 void KImageMapEditor::updateSelection() const {
@@ -1083,7 +1083,7 @@ void KImageMapEditor::select(Area* a)
   currentSelected->add(a);
   updateActionAccess();
   slotUpdateSelectionCoords();
-//	drawZone->repaintArea( *a);
+//	drawZone->tqrepaintArea( *a);
 
 }
 
@@ -1100,13 +1100,13 @@ void KImageMapEditor::slotSelectionChanged()
 
   for ( ; it.current() != 0L; ++it)
   {
-    if ( it.current()->listViewItem()->isSelected() != (list.containsRef(it.current()) > 0) )
+    if ( it.current()->listViewItem()->isSelected() != (list.tqcontainsRef(it.current()) > 0) )
     {
       it.current()->listViewItem()->isSelected()
         ? select( it.current() )
         :	deselect( it.current() );
 
-      drawZone->repaintArea( *it.current());
+      drawZone->tqrepaintArea( *it.current());
     }
   }
 
@@ -1122,7 +1122,7 @@ void KImageMapEditor::select( TQListViewItem* item)
     if (it.current()->listViewItem() == item )
     {
       select( it.current() );
-      drawZone->repaintArea( *it.current());
+      drawZone->tqrepaintArea( *it.current());
     }
   }
 
@@ -1162,7 +1162,7 @@ void KImageMapEditor::slotAreaChanged(Area *area)
     area->listViewItem()->setPixmap(1,makeListViewPix(*area));
   }
 
-  drawZone->repaintArea(*area);
+  drawZone->tqrepaintArea(*area);
 
 }
 
@@ -1170,7 +1170,7 @@ void KImageMapEditor::deselect(Area* a)
 {
   if (a) {
     currentSelected->remove(a);
-//		drawZone->repaintArea(*a);
+//		drawZone->tqrepaintArea(*a);
     updateActionAccess();
     slotUpdateSelectionCoords();
   }
@@ -1280,7 +1280,7 @@ void KImageMapEditor::updateUpDownBtn()
     return;
   }
   // if the first Area is in the selection can't move up
-  if (list.find( areas->getFirst() ) == -1)
+  if (list.tqfind( areas->getFirst() ) == -1)
   {
     forwardOneAction->setEnabled(true);
     areaListView->upBtn->setEnabled(true);
@@ -1290,10 +1290,10 @@ void KImageMapEditor::updateUpDownBtn()
     areaListView->upBtn->setEnabled(false);
   }
 
-  drawZone->repaintArea(*currentSelected);
+  drawZone->tqrepaintArea(*currentSelected);
 
   // if the last Area is in the selection can't move down
-  if (list.find( areas->getLast() ) == -1)
+  if (list.tqfind( areas->getLast() ) == -1)
   {
     backOneAction->setEnabled(true);
     areaListView->downBtn->setEnabled(true);
@@ -1309,13 +1309,13 @@ void KImageMapEditor::deselectAll()
 {
   TQRect redrawRect= currentSelected->selectionRect();
   currentSelected->reset();
-  drawZone->repaintRect(redrawRect);
+  drawZone->tqrepaintRect(redrawRect);
   updateActionAccess();
 }
 
 Area* KImageMapEditor::onArea(const TQPoint & p) const {
   for (Area* s=areas->first();s!=0L;s=areas->next()) {
-    if (s->contains(p))
+    if (s->tqcontains(p))
       return s;
   }
   return 0L;
@@ -1324,7 +1324,7 @@ Area* KImageMapEditor::onArea(const TQPoint & p) const {
 
 int KImageMapEditor::showTagEditor(Area *a) {
   if (!a) return 0;
-  drawZone->repaintArea(*a);
+  drawZone->tqrepaintArea(*a);
 
   AreaDialog *dialog= new AreaDialog(this,a);
   connect (dialog, TQT_SIGNAL(areaChanged(Area*)), this, TQT_SLOT(slotAreaChanged(Area*)));
@@ -1379,7 +1379,7 @@ TQPixmap KImageMapEditor::makeListViewPix(Area & a)
   TQPixmap pix2((int)(pix.width()*shrinkFactor), (int)(pix.height()*shrinkFactor));
 
   // Give all pixels a defined color
-  pix2.fill(Qt::white);
+  pix2.fill(TQt::white);
 
   TQPainter p(&pix2);
 
@@ -1407,10 +1407,10 @@ void KImageMapEditor::setPicture(const KURL & url) {
          imageUsemapAction->setEnabled(true);
      }
      else
-         kdError() << TQString("The image %1 could not be opened.").arg(url.path()) << endl;
+         kdError() << TQString("The image %1 could not be opened.").tqarg(url.path()) << endl;
   }
   else
-     kdError() << TQString("The image %1 does not exist.").arg(url.path()) << endl;
+     kdError() << TQString("The image %1 does not exist.").tqarg(url.path()) << endl;
 }
 
 void KImageMapEditor::setPicture(const TQImage & pix) {
@@ -1519,7 +1519,7 @@ void KImageMapEditor::mapEditName()
   if (ok) {
     if (input != _mapName) {
         if (mapsListView->nameAlreadyExists(input))
-            KMessageBox::sorry(this->widget(), i18n("The name <em>%1</em> already exists.").arg(input));
+            KMessageBox::sorry(this->widget(), i18n("The name <em>%1</em> already exists.").tqarg(input));
         else {
             setMapName(input);
         }
@@ -1529,7 +1529,7 @@ void KImageMapEditor::mapEditName()
 
 void KImageMapEditor::mapShowHTML()
 {
-  KDialogBase *dialog= new KDialogBase(widget(),TQString::null,true,i18n("HTML Code of Map"),KDialogBase::Ok);
+  KDialogBase *dialog= new KDialogBase(widget(),TQString(),true,i18n("HTML Code of Map"),KDialogBase::Ok);
   TQMultiLineEdit *edit = new TQMultiLineEdit(dialog);
 
   edit->setText(getHtmlCode());
@@ -1568,7 +1568,7 @@ bool KImageMapEditor::openURL(const KURL & url) {
 
 void KImageMapEditor::fileOpen() {
 
-  TQString fileName = KFileDialog::getOpenFileName(TQString::null,
+  TQString fileName = KFileDialog::getOpenFileName(TQString(),
           i18n("*.png *.jpg *.jpeg *.gif *.htm *.html|Web File\n"
           "*.png *.jpg *.jpeg *.gif *.bmp *.xbm *.xpm *.pnm *.mng|Images\n"
           "*.htm *.html|HTML Files\n"
@@ -1622,12 +1622,12 @@ void KImageMapEditor::fileSaveAs() {
   if ( fileInfo.exists() )
   {
   	if (KMessageBox::warningContinueCancel(widget(),
-      i18n("<qt>The file <em>%1</em> already exists.<br>Do you want to overwrite it?</qt>").arg(fileInfo.fileName()),
+      i18n("<qt>The file <em>%1</em> already exists.<br>Do you want to overwrite it?</qt>").tqarg(fileInfo.fileName()),
       i18n("Overwrite File?"), i18n("Overwrite"))==KMessageBox::Cancel)
       return;
 
     if(!fileInfo.isWritable()) {
-      KMessageBox::sorry(widget(), i18n("<qt>You do not have write permission for the file <em>%1</em>.</qt>").arg(fileInfo.fileName()));
+      KMessageBox::sorry(widget(), i18n("<qt>You do not have write permission for the file <em>%1</em>.</qt>").tqarg(fileInfo.fileName()));
       return;
     }
   }
@@ -1646,14 +1646,14 @@ bool KImageMapEditor::openFile()
   if ( !fileInfo.exists() )
   {
       KMessageBox::information(widget(),
-        i18n("<qt>The file <b>%1</b> does not exist.</qt>").arg(fileInfo.fileName()),
+        i18n("<qt>The file <b>%1</b> does not exist.</qt>").tqarg(fileInfo.fileName()),
         i18n("File Does Not Exist"));
       return false;
   }
 
   openHTMLFile(url());
 
-  drawZone->viewport()->repaint();
+  drawZone->viewport()->tqrepaint();
   recentFilesAction->addURL(url());
   setModified(false);
   backupFileCreated = false;
@@ -1675,7 +1675,7 @@ TQDict<TQString> KImageMapEditor::getTagAttributes(TQTextStream & s, TQString &
   TQChar w;
   TQString attr,value;
 
-  readText = TQString::null;
+  readText = TQString();
 
   // get the tagname
   while (!s.atEnd() && w!=" ") {
@@ -1717,8 +1717,8 @@ TQDict<TQString> KImageMapEditor::getTagAttributes(TQTextStream & s, TQString &
   bool valueRead=false; // currently reading a value ?
   TQChar quotation='\0'; // currently reading a value with quotation marks ?
   bool php=false; // currently reading a php script
-  attr=TQString::null;
-  value=TQString::null;
+  attr=TQString();
+  value=TQString();
 
   //get the other attributes
   while (!s.atEnd() && w!=">")
@@ -1802,7 +1802,7 @@ TQDict<TQString> KImageMapEditor::getTagAttributes(TQTextStream & s, TQString &
           quotation='\0';
           valueRead=false;
           dict.insert(attr,new TQString(value));
-          attr = value = TQString::null;
+          attr = value = TQString();
 
         }
       } else
@@ -1810,7 +1810,7 @@ TQDict<TQString> KImageMapEditor::getTagAttributes(TQTextStream & s, TQString &
       if (w==" ") {
         valueRead=false;
         dict.insert(attr,new TQString(value));
-        attr = value = TQString::null;
+        attr = value = TQString();
       }
     } else {
       if (w!=" ") {
@@ -1854,44 +1854,44 @@ bool KImageMapEditor::openHTMLFile(const KURL & url, const TQString & mapName, c
     {
       if (!readMap && !origcode.isEmpty()) {
         _htmlContent.append( new HtmlElement(origcode));
-        origcode = TQString::null;
+        origcode = TQString();
       }
 
       origcode.append("<");
       attr=new TQDict<TQString>(getTagAttributes(s,temp));
       origcode.append(temp);
 
-      if (attr->find("tagname")) {
+      if (attr->tqfind("tagname")) {
 
-        if (attr->find("tagname")->lower()=="img") {
+        if (attr->tqfind("tagname")->lower()=="img") {
           HtmlImgElement *el = new HtmlImgElement(origcode);
           el->imgTag = static_cast<ImageTag*>(attr);
           images->append(el->imgTag);
           _htmlContent.append(el);
 
-          origcode = TQString::null;
+          origcode = TQString();
         } else
-        if (attr->find("tagname")->lower()=="map") {
+        if (attr->tqfind("tagname")->lower()=="map") {
           map = new MapTag();
-          map->name=(*attr->find("name"));
+          map->name=(*attr->tqfind("name"));
           readMap=true;
         } else
-        if (attr->find("tagname")->lower()=="/map") {
+        if (attr->tqfind("tagname")->lower()=="/map") {
           readMap=false;
           maps->append(map);
           HtmlMapElement *el = new HtmlMapElement(origcode);
           el->mapTag = map;
           _htmlContent.append(el);
 
-          origcode = TQString::null;
+          origcode = TQString();
         } else
         if (readMap) {
-          if (attr->find("tagname")->lower()=="area") {
+          if (attr->tqfind("tagname")->lower()=="area") {
              map->prepend(attr);
           }
         } else {
           _htmlContent.append(new HtmlElement(origcode));
-          origcode = TQString::null;
+          origcode = TQString();
         }
 
       }
@@ -1924,7 +1924,7 @@ bool KImageMapEditor::openHTMLFile(const KURL & url, const TQString & mapName, c
     if (images->count() == 1) {
       if (images->first()) {
         ImageTag* imgTag = images->first();
-        TQString *src = imgTag->find("src");
+        TQString *src = imgTag->tqfind("src");
         if (src)
           imageUrl = KURL(url,*src);
       }
@@ -1936,12 +1936,12 @@ bool KImageMapEditor::openHTMLFile(const KURL & url, const TQString & mapName, c
         ImageTag* imageTag;
         for ( imageTag = images->first(); imageTag; imageTag = images->next() )
         {
-            TQString *usemap = imageTag->find("usemap");
+            TQString *usemap = imageTag->tqfind("usemap");
             if (usemap) {
                 // Remove the #
                 TQString usemapName = usemap->right(usemap->length()-1);
                 if (usemapName == map->name) {
-                    TQString *src = imageTag->find("src");
+                    TQString *src = imageTag->tqfind("src");
                     if (src)
                       imageUrl = KURL(url,*src);
                 }
@@ -2005,7 +2005,7 @@ bool KImageMapEditor::openHTMLFile(const KURL & url, const TQString & mapName, c
  */
 HtmlElement* KImageMapEditor::findHtmlElement(const TQString & containingText) {
   for (HtmlElement * el = _htmlContent.first(); el; el = _htmlContent.next() ) {
-    if (el->htmlCode.contains(containingText,false)) {
+    if (el->htmlCode.tqcontains(containingText,false)) {
       return el;
     }
   }
@@ -2027,7 +2027,7 @@ HtmlImgElement* KImageMapEditor::findHtmlImgElement(ImageTag* tag) {
   return 0L;
 }
 
-void KImageMapEditor::addMap(const TQString & name = TQString::null) {
+void KImageMapEditor::addMap(const TQString & name = TQString()) {
   HtmlMapElement* el = new HtmlMapElement("\n<map></map>");
   MapTag* map = new MapTag();
   map->name = name;
@@ -2038,7 +2038,7 @@ void KImageMapEditor::addMap(const TQString & name = TQString::null) {
 
   // if we found one add the new map right after the body tag
   if (bodyTag) {
-     uint index = _htmlContent.find(bodyTag);
+     uint index = _htmlContent.tqfind(bodyTag);
 
      // Add a newline before the map
      _htmlContent.insert(index+1, new HtmlElement("\n"));
@@ -2107,16 +2107,16 @@ void KImageMapEditor::saveAreasToMapTag(MapTag* map) {
   map->clear();
   for (Area* a=areas->first();a!=0L;a=areas->next()) {
     TQDict<TQString> *dict = new TQDict<TQString>(17,false);
-    TQString *shapeStr = 0L;
+    TQString *tqshapeStr = 0L;
 
     switch (a->type()) {
-      case Area::Rectangle : shapeStr = new TQString("rect");break;
-      case Area::Circle : shapeStr = new TQString("circle");break;
-      case Area::Polygon : shapeStr = new TQString("poly");break;
+      case Area::Rectangle : tqshapeStr = new TQString("rect");break;
+      case Area::Circle : tqshapeStr = new TQString("circle");break;
+      case Area::Polygon : tqshapeStr = new TQString("poly");break;
       default : continue;
     }
 
-    dict->insert("shape",shapeStr);
+    dict->insert("tqshape",tqshapeStr);
 
     for (AttributeIterator it = a->firstAttribute();it!=a->lastAttribute();++it)  {
       dict->insert(it.key(),new TQString(it.data()));
@@ -2130,7 +2130,7 @@ void KImageMapEditor::saveAreasToMapTag(MapTag* map) {
 
   if (defaultArea && defaultArea->finished()) {
     TQDict<TQString> *dict = new TQDict<TQString>(17,false);
-    dict->insert("shape",new TQString("default"));
+    dict->insert("tqshape",new TQString("default"));
 
     for (AttributeIterator it = defaultArea->firstAttribute();it!=defaultArea->lastAttribute();++it)  {
       dict->insert(it.key(),new TQString(it.data()));
@@ -2159,49 +2159,49 @@ void KImageMapEditor::setMap(HtmlMapElement* mapElement) {
     _mapName = map->name;
     for (AreaTag *tag=map->first();tag!=0L;tag=map->next())
     {
-        TQString shape="rect";
-        if (tag->find("shape"))
-          shape=*tag->find("shape");
+        TQString tqshape="rect";
+        if (tag->tqfind("tqshape"))
+          tqshape=*tag->tqfind("tqshape");
 
         Area::ShapeType type=Area::Rectangle;
-        if (shape=="circle")
+        if (tqshape=="circle")
           type=Area::Circle;
-        else if (shape=="poly")
+        else if (tqshape=="poly")
           type=Area::Polygon;
-        else if (shape=="default")
+        else if (tqshape=="default")
           type=Area::Default;
 
         Area* a=AreaCreator::create(type);
 
-        if (tag->find("href"))
-          a->setAttribute("href",*tag->find("href"));
+        if (tag->tqfind("href"))
+          a->setAttribute("href",*tag->tqfind("href"));
 
-        if (tag->find("alt"))
-          a->setAttribute("alt",*tag->find("alt"));
+        if (tag->tqfind("alt"))
+          a->setAttribute("alt",*tag->tqfind("alt"));
 
-        if (tag->find("target"))
-          a->setAttribute("target",*tag->find("target"));
+        if (tag->tqfind("target"))
+          a->setAttribute("target",*tag->tqfind("target"));
 
-        if (tag->find("title"))
-          a->setAttribute("title",*tag->find("title"));
+        if (tag->tqfind("title"))
+          a->setAttribute("title",*tag->tqfind("title"));
 
-        if (tag->find("onclick"))
-          a->setAttribute("onclick",*tag->find("onclick"));
+        if (tag->tqfind("onclick"))
+          a->setAttribute("onclick",*tag->tqfind("onclick"));
 
-        if (tag->find("onmousedown"))
-          a->setAttribute("onmousedown",*tag->find("onmousedown"));
+        if (tag->tqfind("onmousedown"))
+          a->setAttribute("onmousedown",*tag->tqfind("onmousedown"));
 
-        if (tag->find("onmouseup"))
-          a->setAttribute("onmouseup",*tag->find("onmouseup"));
+        if (tag->tqfind("onmouseup"))
+          a->setAttribute("onmouseup",*tag->tqfind("onmouseup"));
 
-        if (tag->find("onmouseover"))
-          a->setAttribute("onmouseover",*tag->find("onmouseover"));
+        if (tag->tqfind("onmouseover"))
+          a->setAttribute("onmouseover",*tag->tqfind("onmouseover"));
 
-        if (tag->find("onmousemove"))
-          a->setAttribute("onmousemove",*tag->find("onmousemove"));
+        if (tag->tqfind("onmousemove"))
+          a->setAttribute("onmousemove",*tag->tqfind("onmousemove"));
 
-        if (tag->find("onmouseout"))
-          a->setAttribute("onmouseout",*tag->find("onmouseout"));
+        if (tag->tqfind("onmouseout"))
+          a->setAttribute("onmouseout",*tag->tqfind("onmouseout"));
 
 
 
@@ -2211,8 +2211,8 @@ void KImageMapEditor::setMap(HtmlMapElement* mapElement) {
           continue;
         }
 
-        if (tag->find("coords"))
-          a->setCoords(*tag->find("coords"));
+        if (tag->tqfind("coords"))
+          a->setCoords(*tag->tqfind("coords"));
 
         a->setMoving(false);
         addArea(a);
@@ -2267,7 +2267,7 @@ void KImageMapEditor::saveImageMap(const KURL & url)
 
   if (!TQFileInfo(url.directory()).isWritable()) {
     KMessageBox::error(widget(),
-      i18n("<qt>The file <i>%1</i> could not be saved, because you do not have the required write permissions.</qt>").arg(url.path()));
+      i18n("<qt>The file <i>%1</i> could not be saved, because you do not have the required write permissions.</qt>").tqarg(url.path()));
     return;
   }
 
@@ -2295,7 +2295,7 @@ void KImageMapEditor::saveImageMap(const KURL & url)
       << "<body>\n"
       << "  " << getHTMLImageMap()
       << "\n"
-      << "  <img src=\"" << QExtFileInfo::toRelative(_imageUrl,KURL( url.directory() )).path() << "\""
+      << "  <img src=\"" << TQExtFileInfo::toRelative(_imageUrl,KURL( url.directory() )).path() << "\""
       << " usemap=\"#" << _mapName << "\""
       << " width=\"" << drawZone->picture().width() << "\""
       << " height=\"" << drawZone->picture().height() << "\">\n"
@@ -2375,7 +2375,7 @@ void KImageMapEditor::slotBackOne()
   // move every selected Area one step lower
   for (int i=areas->count()-2; i > -1; i--)
   {
-    if (list.find( areas->at(i) ) > -1 )
+    if (list.tqfind( areas->at(i) ) > -1 )
     {
       a = areas->at(i);
       areas->remove(a);
@@ -2399,7 +2399,7 @@ void KImageMapEditor::slotForwardOne()
   // move every selected Area one step higher
   for (int i=1; i < (int)areas->count(); i++)
   {
-    if (list.find( areas->at(i) ) > -1 )
+    if (list.tqfind( areas->at(i) ) > -1 )
     {
       a = areas->at(i);
       areas->remove(a);
@@ -2556,7 +2556,7 @@ void KImageMapEditor::slotHightlightAreas()
 //  highlightAreasAction->setChecked(b);
   Area::highlightArea = b;
   updateAllAreas();
-  drawZone->viewport()->repaint();
+  drawZone->viewport()->tqrepaint();
 }
 
 void KImageMapEditor::slotShowAltTag()
@@ -2564,7 +2564,7 @@ void KImageMapEditor::slotShowAltTag()
   bool b = showAltAction->isChecked();
 //  showAltAction->setChecked(b);
   Area::showAlt = b;
-  drawZone->viewport()->repaint();
+  drawZone->viewport()->tqrepaint();
 }
 
 void KImageMapEditor::mapNew()
@@ -2583,7 +2583,7 @@ void KImageMapEditor::mapDelete()
 
   int result = KMessageBox::warningContinueCancel(widget(),
     i18n("<qt>Are you sure you want to delete the map <i>%1</i>?"
-         " <br><b>There is no way to undo this.</b></qt>").arg(selectedMap),
+         " <br><b>There is no way to undo this.</b></qt>").tqarg(selectedMap),
     i18n("Delete Map?"),KGuiItem(i18n("&Delete"),"editdelete"));
 
   if (result == KMessageBox::No)
@@ -2631,7 +2631,7 @@ bool KImageMapEditor::queryClose() {
      return true;
 
   switch ( KMessageBox::warningYesNoCancel( widget(),
-   i18n("<qt>The file <i>%1</i> has been modified.<br>Do you want to save it?</qt>").arg(url().fileName()), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard()) ) {
+   i18n("<qt>The file <i>%1</i> has been modified.<br>Do you want to save it?</qt>").tqarg(url().fileName()), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()) ) {
            case KMessageBox::Yes :
              saveFile();
              return true;
@@ -2671,7 +2671,7 @@ void KImageMapEditor::addImage(const KURL & imgUrl) {
     if (imgUrl.isEmpty())
         return;
 
-    TQString relativePath ( QExtFileInfo::toRelative(imgUrl, KURL( url().directory() )).path() );
+    TQString relativePath ( TQExtFileInfo::toRelative(imgUrl, KURL( url().directory() )).path() );
 
     TQString imgHtml = TQString("<img src=\"")+relativePath+TQString("\">");
     ImageTag *imgTag = new ImageTag();
@@ -2683,7 +2683,7 @@ void KImageMapEditor::addImage(const KURL & imgUrl) {
 
     HtmlElement *bodyEl = findHtmlElement("<body");
     if (bodyEl) {
-        int bodyIndex = _htmlContent.find(bodyEl);
+        int bodyIndex = _htmlContent.tqfind(bodyEl);
         _htmlContent.insert(bodyIndex+1, new HtmlElement("\n"));
         _htmlContent.insert(bodyIndex+2, imgEl);
     }
@@ -2727,7 +2727,7 @@ void KImageMapEditor::imageRemove() {
     else {
         ImageTag* selected = imagesListView->selectedImage();
         if (selected) {
-            TQString *url = selected->find("src");
+            TQString *url = selected->tqfind("src");
             if (url) {
                 setPicture(KURL(*url));
             }
@@ -2746,11 +2746,11 @@ void KImageMapEditor::imageUsemap() {
 
   TQString usemap;
 
-  if (imageTag->find("usemap"))
-      usemap=*imageTag->find("usemap");
+  if (imageTag->tqfind("usemap"))
+      usemap=*imageTag->tqfind("usemap");
 
   TQStringList maps = mapsListView->getMaps();
-  int index = maps.findIndex(usemap);
+  int index = maps.tqfindIndex(usemap);
   if (index == -1) {
     maps.prepend("");
     index = 0;
@@ -2759,12 +2759,12 @@ void KImageMapEditor::imageUsemap() {
 #if KDE_IS_VERSION(3, 1, 90)
   TQString input = KInputDialog::getItem(i18n("Enter Usemap"),
 #else
-  TQString input = QInputDialog::getItem(i18n("Enter Usemap"),
+  TQString input = TQInputDialog::getItem(i18n("Enter Usemap"),
 #endif
     i18n("Enter the usemap value:"),
     maps,index,true,&ok,widget());
   if (ok) {
-     imageTag->replace("usemap", new TQString(input));
+     imageTag->tqreplace("usemap", new TQString(input));
      imagesListView->updateImage(imageTag);
      setModified(true);
 
@@ -2772,7 +2772,7 @@ void KImageMapEditor::imageUsemap() {
      HtmlImgElement* imgEl = findHtmlImgElement(imageTag);
 
      imgEl->htmlCode = "<";
-     TQString *tagName = imgEl->imgTag->find("tagname");
+     TQString *tagName = imgEl->imgTag->tqfind("tagname");
      imgEl->htmlCode += TQString(*tagName);
 
      TQDictIterator<TQString> it( *imgEl->imgTag );
diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h
index f6177f9b..d2d6e24c 100644
--- a/kimagemapeditor/kimagemapeditor.h
+++ b/kimagemapeditor/kimagemapeditor.h
@@ -130,11 +130,12 @@ class KDockMainWindow;
 
 class KImageMapEditor : public KParts::ReadWritePart {
     Q_OBJECT
+  TQ_OBJECT
 public :
     enum ToolType { Selection, Rectangle, Circle, Polygon, Freehand, AddPoint, RemovePoint };
 
-    KImageMapEditor(TQWidget *parentWidget, const char *,
-                    TQObject *parent, const char *name, const TQStringList & args = TQStringList());
+    KImageMapEditor(TQWidget *tqparentWidget, const char *,
+                    TQObject *tqparent, const char *name, const TQStringList & args = TQStringList());
     virtual ~KImageMapEditor();
 
     static KAboutData *createAboutData();
@@ -213,7 +214,7 @@ public :
 
 protected:
     void init();
-    bool openHTMLFile(const KURL &, const TQString & mapName = TQString::null, const TQString & imagePath = TQString::null);
+    bool openHTMLFile(const KURL &, const TQString & mapName = TQString(), const TQString & imagePath = TQString());
     void saveImageMap(const KURL &);
 
     /**
@@ -231,7 +232,7 @@ protected:
 
 private:
     // Stores the hole html file in a List
-    // The entries are either a MapTag an ImageTag or a QString
+    // The entries are either a MapTag an ImageTag or a TQString
     HtmlContent _htmlContent;
 
     // the url of the working image;
diff --git a/kimagemapeditor/kimearea.cpp b/kimagemapeditor/kimearea.cpp
index cee54b8a..4a6be5be 100644
--- a/kimagemapeditor/kimearea.cpp
+++ b/kimagemapeditor/kimearea.cpp
@@ -85,7 +85,7 @@ Area::~Area() {
 
 }
 
-bool Area::contains(const TQPoint &) const {
+bool Area::tqcontains(const TQPoint &) const {
   return false;
 }
 
@@ -100,7 +100,7 @@ TQString Area::attribute(const TQString & name) const
 
 void Area::setAttribute(const TQString & name, const TQString & value)
 {
-  _attributes.replace(name.lower(),value);
+  _attributes.tqreplace(name.lower(),value);
   if (value.isEmpty())
      _attributes.remove(name.lower());
 }
@@ -279,9 +279,9 @@ void Area::removeCoord(int pos) {
 
 bool Area::removeSelectionPoint(TQRect * r)
 {
-  if (_selectionPoints->contains(r))
+  if (_selectionPoints->tqcontains(r))
   {
-    removeCoord(_selectionPoints->find(r));
+    removeCoord(_selectionPoints->tqfind(r));
     return true;
   }
 
@@ -319,7 +319,7 @@ void Area::drawHighlighting(TQPainter & p)
 {
 	if (Area::highlightArea && !isMoving() && _highlightedPixmap)
 	{
-  	p.setRasterOp(Qt::CopyROP);
+  	p.setRasterOp(TQt::CopyROP);
   	
   	TQPoint point = TQPoint(rect().x(),rect().y());
     if (point.x()<0)
@@ -336,10 +336,10 @@ void Area::drawAlt(TQPainter & p)
 {
   double x,y;
 
-  double scalex = p.worldMatrix().m11();
-//  double scaley = p.worldMatrix().m12();
+  double scalex = p.tqworldMatrix().m11();
+//  double scaley = p.tqworldMatrix().m12();
 
-  TQWMatrix oldMatrix = p.worldMatrix();
+  TQWMatrix oldMatrix = p.tqworldMatrix();
 
   p.setWorldMatrix(TQWMatrix(1,oldMatrix.m12(), oldMatrix.m21(), 1, oldMatrix.dx(), oldMatrix.dy() ));
 
@@ -356,12 +356,12 @@ void Area::drawAlt(TQPainter & p)
 
   if (highlightArea)
   {
-    p.setRasterOp(Qt::CopyROP);
-    p.setPen(Qt::black);
+    p.setRasterOp(TQt::CopyROP);
+    p.setPen(TQt::black);
   }
   else
   {
-    p.setRasterOp(Qt::XorROP);
+    p.setRasterOp(TQt::XorROP);
   	p.setPen(TQPen(TQColor("white"),1));
 	}
 
@@ -379,10 +379,10 @@ void Area::draw(TQPainter & p)
   {
 		int i=0;
 
-    double scalex = p.worldMatrix().m11();
-//    double scaley = p.worldMatrix().m12();
+    double scalex = p.tqworldMatrix().m11();
+//    double scaley = p.tqworldMatrix().m12();
 
-    TQWMatrix oldMatrix = p.worldMatrix();
+    TQWMatrix oldMatrix = p.tqworldMatrix();
 
     p.setWorldMatrix(TQWMatrix(1,oldMatrix.m12(), oldMatrix.m21(), 1, oldMatrix.dx(), oldMatrix.dy() ));
 
@@ -392,15 +392,15 @@ void Area::draw(TQPainter & p)
 			if (i==currentHighlighted) {
 				TQRect r2(0,0,15,15);
 				r2.moveCenter(r->center()*scalex);
-				p.setRasterOp(Qt::CopyROP);
+				p.setRasterOp(TQt::CopyROP);
 				p.setPen(TQPen(TQColor("lightgreen"),2));
 				p.drawEllipse(r2);
-				p.setRasterOp(Qt::XorROP);
+				p.setRasterOp(TQt::XorROP);
 				p.setPen(TQPen(TQColor("white"),1));
 			}
 
 			// Draw the selection point
-			p.setRasterOp(Qt::XorROP);
+			p.setRasterOp(TQt::XorROP);
 
 			TQRect r3(*r);
       int d = 1;
@@ -415,7 +415,7 @@ void Area::draw(TQPainter & p)
 
 			r3.setSize(r3.size()+TQSize(2,2));
 //+			r3.moveBy(-1,-1);	
-			p.setRasterOp(Qt::CopyROP);
+			p.setRasterOp(TQt::CopyROP);
 			p.setPen(TQPen(TQColor("lightgreen"),1));
 			p.setBrush(TQColor("lightgreen"));
 			p.drawPie(r3,0,5760);
@@ -435,7 +435,7 @@ void Area::draw(TQPainter & p)
   {
      drawAlt(p);
    }
-  p.setRasterOp(Qt::XorROP);
+  p.setRasterOp(TQt::XorROP);
 	
 }
 
@@ -447,7 +447,7 @@ TQRect* Area::onSelectionPoint(const TQPoint & p, double zoom) const
 
     r2.moveCenter(r2.center()*zoom);
 
-    if (r2.contains(p))
+    if (r2.tqcontains(p))
     {
 
 			return r;
@@ -477,12 +477,12 @@ TQPixmap Area::cutOut(const TQImage & image)
 		return dummyPix;
 	}
 
-	// Get the mask from the subclasses
-	TQBitmap mask=getMask();
+	// Get the tqmask from the subclasses
+	TQBitmap tqmask=getMask();
 			
 	// The rectangle which is part of the image
 	TQRect partOfImage=rect();
-	TQRect partOfMask(0,0,mask.width(),mask.height());
+	TQRect partOfMask(0,0,tqmask.width(),tqmask.height());
 	
 	
 	// If the area is outside of the image make the
@@ -507,8 +507,8 @@ TQPixmap Area::cutOut(const TQImage & image)
 		partOfMask.setY(myabs(rect().y()));
 	}
 		
-  TQImage tempImage=mask.convertToImage().copy(partOfMask);
-	mask.convertFromImage(tempImage);
+  TQImage tempImage=tqmask.convertToImage().copy(partOfMask);
+	tqmask.convertFromImage(tempImage);
 
 //  partOfImage = partOfImage.normalize();
 	TQImage cut=image.copy(partOfImage);
@@ -521,23 +521,23 @@ TQPixmap Area::cutOut(const TQImage & image)
 	            << partOfMask.width() << "," << partOfMask.height() << "," << endl;
 
 /*	            	
-	TQBitmap mask2(partOfMask.width(), partOfMask.height());
-	TQPainter p4(&mask2);
-	p4.drawPixmap( TQPoint(0,0) ,mask,partOfMask);
+	TQBitmap tqmask2(partOfMask.width(), partOfMask.height());
+	TQPainter p4(&tqmask2);
+	p4.drawPixmap( TQPoint(0,0) ,tqmask,partOfMask);
 	p4.flush();
 	p4.end();
 */
 	
 	pix.convertFromImage(cut);
 
-	setHighlightedPixmap(cut, mask);
+	setHighlightedPixmap(cut, tqmask);
 		
 	TQPixmap retPix(pix.width(),pix.height());
   TQPainter p3(&retPix);
 	
 	// if transparent image fill the background
 	// with gimp-like rectangles
-	if (pix.mask()) {
+	if (pix.tqmask()) {
   	TQPixmap backPix(32,32);
   	
   	// Gimp like transparent rectangle
@@ -555,7 +555,7 @@ TQPixmap Area::cutOut(const TQImage & image)
 	p3.drawPixmap(TQPoint(0,0),pix);
 	p3.flush();
 	p3.end();
-	retPix.setMask(mask);
+	retPix.setMask(tqmask);
 
 	return retPix;
 }
@@ -566,7 +566,7 @@ TQBitmap Area::getMask() const
 	return b;
 }
 
-void Area::setHighlightedPixmap( TQImage & im, TQBitmap & mask )
+void Area::setHighlightedPixmap( TQImage & im, TQBitmap & tqmask )
 {
   if (!Area::highlightArea)
      return;
@@ -584,9 +584,9 @@ void Area::setHighlightedPixmap( TQImage & im, TQBitmap & mask )
   {
     for (int x=0; x < size.width(); x++)
     {
-      r = qRed(image.pixel(x,y));
-      g = qGreen(image.pixel(x,y));
-      b = qBlue(image.pixel(x,y));
+      r = tqRed(image.pixel(x,y));
+      g = tqGreen(image.pixel(x,y));
+      b = tqBlue(image.pixel(x,y));
       r = (r *123 / 255)+132;
       g = (g *123 / 255)+132;
       b = (b *123 / 255)+132;
@@ -598,7 +598,7 @@ void Area::setHighlightedPixmap( TQImage & im, TQBitmap & mask )
 
   _highlightedPixmap = new TQPixmap();
   _highlightedPixmap->convertFromImage( image );
-  _highlightedPixmap->setMask( mask );
+  _highlightedPixmap->setMask( tqmask );
 
   if (_highlightedPixmap->isNull())
      kdDebug() << "HighlightedPixmap is null" << endl;
@@ -639,15 +639,15 @@ void RectArea::draw(TQPainter & p)
 {
 
   drawHighlighting(p);
-//  p.setRasterOp(Qt::CopyROP);
-//  p.setRasterOp(Qt:: OrROP);
+//  p.setRasterOp(TQt::CopyROP);
+//  p.setRasterOp(TQt:: OrROP);
 //  TQBrush b(TQBrush::SolidPattern);
 //  TQBrush b(TQBrush::Dense4Pattern);
 //  TQBrush b(TQBrush::BDiagPattern);
 //	b.setColor(TQColor(32,32,32));
 //	p.fillRect(rect(), b);
 	
-	p.setRasterOp(Qt::XorROP);
+	p.setRasterOp(TQt::XorROP);
 	p.setPen(TQPen(TQColor("white"),1));
   TQRect r(rect());
   r.setWidth(r.width()+1);
@@ -659,32 +659,32 @@ void RectArea::draw(TQPainter & p)
 
 TQBitmap RectArea::getMask() const
 {
-	TQBitmap mask(rect().width(),rect().height());
+	TQBitmap tqmask(rect().width(),rect().height());
 	
-	mask.fill(Qt::color0);
-	TQPainter p(&mask);
-	p.setBackgroundColor(Qt::color0);
-	p.setPen(Qt::color1);
-	p.setBrush(Qt::color1);
-	mask.fill(Qt::color1);
+	tqmask.fill(TQt::color0);
+	TQPainter p(&tqmask);
+	p.setBackgroundColor(TQt::color0);
+	p.setPen(TQt::color1);
+	p.setBrush(TQt::color1);
+	tqmask.fill(TQt::color1);
 	p.end();
 	
-	return mask;
+	return tqmask;
 }
 
 TQString RectArea::coordsToString() const
 {
 	TQString retStr=TQString("%1,%2,%3,%4")
-					.arg(rect().left())
-					.arg(rect().top())
-					.arg(rect().right())
-					.arg(rect().bottom());
+					.tqarg(rect().left())
+					.tqarg(rect().top())
+					.tqarg(rect().right())
+					.tqarg(rect().bottom());
 
 	return retStr;					
 }
 
-bool RectArea::contains(const TQPoint & p) const{
-	return rect().contains(p);
+bool RectArea::tqcontains(const TQPoint & p) const{
+	return rect().tqcontains(p);
 }
 
 void RectArea::moveSelectionPoint(TQRect* selectionPoint, const TQPoint & p)
@@ -747,7 +747,7 @@ bool RectArea::setCoords(const TQString & s)
 TQString RectArea::getHTMLCode() const {
 	TQString retStr;
 	retStr+="<area ";
-	retStr+="shape=\"rect\" ";
+	retStr+="tqshape=\"rect\" ";
 	
 	retStr+=getHTMLAttributes();
 	
@@ -791,7 +791,7 @@ void CircleArea::draw(TQPainter & p)
   drawHighlighting(p);
 
 /*
-  p.setRasterOp(Qt::CopyROP);
+  p.setRasterOp(TQt::CopyROP);
 	TQBrush bold = p.brush();
 	TQBrush b(TQBrush::Dense5Pattern);
 	b.setColor(TQColor("green"));
@@ -802,7 +802,7 @@ void CircleArea::draw(TQPainter & p)
 	p.drawChord(r,0,5760);
 	p.setBrush(bold);
 */	
-  p.setRasterOp(Qt::XorROP);
+  p.setRasterOp(TQt::XorROP);
   p.setPen(TQPen(TQColor("white"),1));
 
   TQRect r(_rect);
@@ -815,36 +815,36 @@ void CircleArea::draw(TQPainter & p)
 
 TQBitmap CircleArea::getMask() const
 {
-	TQBitmap mask(_rect.width(),_rect.height());
+	TQBitmap tqmask(_rect.width(),_rect.height());
 	
-	mask.fill(Qt::color0);
-	TQPainter p(&mask);
-	p.setBackgroundColor(Qt::color0);
-	p.setPen(Qt::color1);
-	p.setBrush(Qt::color1);
+	tqmask.fill(TQt::color0);
+	TQPainter p(&tqmask);
+	p.setBackgroundColor(TQt::color0);
+	p.setPen(TQt::color1);
+	p.setBrush(TQt::color1);
 	p.drawPie(TQRect(0,0,_rect.width(),_rect.height()),0,5760);
 	p.flush();
 	p.end();
 	
 	
-	return mask;
+	return tqmask;
 
 }
 
 TQString CircleArea::coordsToString() const
 {
 	TQString retStr=TQString("%1,%2,%3")
-					.arg(_rect.center().x())
-					.arg(_rect.center().y())
-					.arg(_rect.width()/2);
+					.tqarg(_rect.center().x())
+					.tqarg(_rect.center().y())
+					.tqarg(_rect.width()/2);
 	
 	return retStr;
 }
 
-bool CircleArea::contains(const TQPoint & p) const
+bool CircleArea::tqcontains(const TQPoint & p) const
 {
 	TQRegion r(_rect,TQRegion::Ellipse);
-	return r.contains(p);
+	return r.tqcontains(p);
 }
 
 void CircleArea::moveSelectionPoint(TQRect* selectionPoint, const TQPoint & p)
@@ -949,7 +949,7 @@ bool CircleArea::setCoords(const TQString & s)
 TQString CircleArea::getHTMLCode() const {
 	TQString retStr;
 	retStr+="<area ";
-	retStr+="shape=\"circle\" ";
+	retStr+="tqshape=\"circle\" ";
 	
 	retStr+=getHTMLAttributes();
 	
@@ -985,16 +985,16 @@ void PolyArea::draw(TQPainter & p)
 {
   drawHighlighting(p);
 	
-	p.setRasterOp(Qt::XorROP);
+	p.setRasterOp(TQt::XorROP);
 	p.setPen(TQPen(TQColor("white"),1));
  	if (_coords->count()==0) return;
 
 
 
  	if (_finished)
-    p.drawPolygon ( *_coords,false,0,_coords->count());
+    p.tqdrawPolygon ( *_coords,false,0,_coords->count());
   else
-    p.drawPolyline ( *_coords,0,_coords->count());
+    p.tqdrawPolyline ( *_coords,0,_coords->count());
 
 /*
  	p.moveTo(_coords->point(0));
@@ -1009,22 +1009,22 @@ void PolyArea::draw(TQPainter & p)
 
 TQBitmap PolyArea::getMask() const
 {
-	TQBitmap mask(_rect.width(),_rect.height());
+	TQBitmap tqmask(_rect.width(),_rect.height());
 	
-	mask.fill(Qt::color0);
-	TQPainter p(&mask);
-	p.setBackgroundColor(Qt::color0);
-	p.setPen(Qt::color1);
-	p.setBrush(Qt::color1);
+	tqmask.fill(TQt::color0);
+	TQPainter p(&tqmask);
+	p.setBackgroundColor(TQt::color0);
+	p.setPen(TQt::color1);
+	p.setBrush(TQt::color1);
  	p.setClipping(true);
  	TQRegion r(*_coords);
  	r.translate(-_rect.left(),-_rect.top());
  	p.setClipRegion(r);
- 	p.fillRect(TQRect(0,0,_rect.width(),_rect.height()),Qt::color1);
+ 	p.fillRect(TQRect(0,0,_rect.width(),_rect.height()),TQt::color1);
  	p.flush();
 	p.end();
 	
-	return mask;
+	return tqmask;
 }
 
 TQString PolyArea::coordsToString() const
@@ -1033,8 +1033,8 @@ TQString PolyArea::coordsToString() const
  	
  	for (uint i=0;i<_coords->count();i++) {
  		retStr.append(TQString("%1,%2,")
- 			.arg(_coords->point(i).x())
- 			.arg(_coords->point(i).y()));
+ 			.tqarg(_coords->point(i).x())
+ 			.tqarg(_coords->point(i).y()));
  	}
  	
  	retStr.remove(retStr.length()-1,1);
@@ -1160,12 +1160,12 @@ int PolyArea::addCoord(const TQPoint & p)
 
 }		
 
-bool PolyArea::contains(const TQPoint & p) const
+bool PolyArea::tqcontains(const TQPoint & p) const
 {
 	// A line can't contain a point
  	if (_coords->count() >2 ) {
  		TQRegion r(*_coords);
- 		return r.contains(p);
+ 		return r.tqcontains(p);
  	}
  	else
  		return false;
@@ -1224,7 +1224,7 @@ bool PolyArea::setCoords(const TQString & s)
 TQString PolyArea::getHTMLCode() const {
 	TQString retStr;
 	retStr+="<area ";
-	retStr+="shape=\"poly\" ";
+	retStr+="tqshape=\"poly\" ";
 
 	retStr+=getHTMLAttributes();
 		
@@ -1283,7 +1283,7 @@ void DefaultArea::draw(TQPainter &)
 TQString DefaultArea::getHTMLCode() const {
 	TQString retStr;
 	retStr+="<area ";
-	retStr+="shape=\"default\" ";
+	retStr+="tqshape=\"default\" ";
 
 	retStr+=getHTMLAttributes();
 		
@@ -1302,7 +1302,7 @@ AreaSelection::AreaSelection()
 {
 	_areas = new AreaList();
 	_name = "Selection";
-	invalidate();
+	tqinvalidate();
 }
 
 AreaSelection::~AreaSelection() {
@@ -1338,7 +1338,7 @@ void AreaSelection::add(Area *a)
 		
 		for (Area* area = list.first(); area != 0L; area = list.next() )
 		{
-			if ( _areas->find( area ) == -1 ) {
+			if ( _areas->tqfind( area ) == -1 ) {
 				_areas->append( area );  // Must come before area->setSelected
 				area->setSelected( true );
 			}
@@ -1346,23 +1346,23 @@ void AreaSelection::add(Area *a)
 	}
 	else
 	{
-		if ( _areas->find( a ) == -1 ) {
+		if ( _areas->tqfind( a ) == -1 ) {
   		_areas->append( a );  // Must come before a->setSelected
   		a->setSelected( true );
   	}
   }
 
-	invalidate();
+	tqinvalidate();
 }
 
 void AreaSelection::remove(Area *a)
 {
-	if (_areas->find(a) == -1)
+	if (_areas->tqfind(a) == -1)
 		return;
 		
 	a->setSelected( false );	
 	_areas->remove( a );
-	invalidate();
+	tqinvalidate();
 }
 
 void AreaSelection::reset()
@@ -1375,17 +1375,17 @@ void AreaSelection::reset()
   }
  	
  	_areas->clear();
-	invalidate();
+	tqinvalidate();
 }
 
-bool AreaSelection::contains(const TQPoint & p) const
+bool AreaSelection::tqcontains(const TQPoint & p) const
 {
 	bool b=false;
   AreaListIterator it=getAreaListIterator();
 
   for ( ; it.current() != 0L; ++it )
   {
-  	if ( it.current()->contains( p ) )
+  	if ( it.current()->tqcontains( p ) )
   	{
   		b=true;
   		break;
@@ -1423,7 +1423,7 @@ void AreaSelection::moveSelectionPoint(TQRect* selectionPoint, const TQPoint & p
 		
 	_areas->getFirst()->moveSelectionPoint(selectionPoint,p);		
 
-	invalidate();
+	tqinvalidate();
 }
 
 
@@ -1436,7 +1436,7 @@ void AreaSelection::moveBy(int dx, int dy)
 
 	Area::moveBy( dx, dy );  	
 
-	invalidate();
+	tqinvalidate();
 }
 
 TQString AreaSelection::typeString() const
@@ -1474,7 +1474,7 @@ void AreaSelection::updateSelectionPoints()
 		it.current()->updateSelectionPoints();
   }
 
- 	invalidate();
+ 	tqinvalidate();
 
 }
 
@@ -1525,7 +1525,7 @@ void AreaSelection::setArea(const Area & copy)
 		setAreaSelection(*selection);
 	else {	
     Area::setArea(copy);
-  	invalidate();
+  	tqinvalidate();
   }
 }
 
@@ -1541,14 +1541,14 @@ void AreaSelection::setAreaSelection(const AreaSelection & copy)
    	it.current()->setArea(*it2.current());
 
   Area::setArea(copy);
-	invalidate();
+	tqinvalidate();
 }
 
 void AreaSelection::setAreaList( const AreaList & areas )
 {
 	delete _areas;
 	_areas = new AreaList(areas);
-	invalidate();
+	tqinvalidate();
 }
 
 void AreaSelection::setRect(const TQRect & r)
@@ -1558,7 +1558,7 @@ void AreaSelection::setRect(const TQRect & r)
 		_areas->getFirst()->setRect(r);
 	}
 
-	invalidate();
+	tqinvalidate();
 	_rect=rect();
 	updateSelectionPoints();
 }
@@ -1586,7 +1586,7 @@ int AreaSelection::addCoord(const TQPoint & p)
 	if ( _areas->count()==1 )
 	{
 		return _areas->getFirst()->addCoord(p);
-		invalidate();
+		tqinvalidate();
 	}
 
   return 0;	
@@ -1597,7 +1597,7 @@ void AreaSelection::insertCoord(int pos, const TQPoint & p)
 	if ( _areas->count()==1 )
 	{
 		_areas->getFirst()->insertCoord(pos, p);
-		invalidate();
+		tqinvalidate();
 	}	
 }
 
@@ -1606,7 +1606,7 @@ void AreaSelection::removeCoord(int pos)
 	if ( _areas->count()==1 )
 	{
 		_areas->getFirst()->removeCoord(pos);
-		invalidate();
+		tqinvalidate();
 	}	
 }
 
@@ -1617,7 +1617,7 @@ bool AreaSelection::removeSelectionPoint(TQRect * r)
 	if ( _areas->count()==1 )
 	{
 		result = _areas->getFirst()->removeSelectionPoint(r);
-		invalidate();
+		tqinvalidate();
 	}	
 	
 	return result;
@@ -1639,7 +1639,7 @@ void AreaSelection::moveCoord(int pos,const TQPoint & p)
 	if ( _areas->count()==1 )
 	{
 		_areas->getFirst()->moveCoord(pos,p);
-		invalidate();
+		tqinvalidate();
 	}	
 }
 
@@ -1648,7 +1648,7 @@ void AreaSelection::highlightSelectionPoint(int i)
 	if ( _areas->count()==1 )
 	{
 		_areas->getFirst()->highlightSelectionPoint(i);
-		invalidate();
+		tqinvalidate();
 	}	
 }
 
@@ -1730,7 +1730,7 @@ bool AreaSelection::isMoving() const
  **/
 bool AreaSelection::allAreasWithin(const TQRect & r) const
 {
-  if ( ! r.contains(rect()) )
+  if ( ! r.tqcontains(rect()) )
   {
     AreaListIterator it=getAreaListIterator();
 
diff --git a/kimagemapeditor/kimearea.h b/kimagemapeditor/kimearea.h
index d23ad18c..5c084a02 100644
--- a/kimagemapeditor/kimearea.h
+++ b/kimagemapeditor/kimearea.h
@@ -73,7 +73,7 @@ public:
 
 	virtual Area* clone() const;	
 	// Default implementation; is specified by subclasses
-	virtual bool contains(const TQPoint &) const;
+	virtual bool tqcontains(const TQPoint &) const;
 	// Default implementation; is specified by subclasses
 	virtual TQString coordsToString() const;
 	virtual void draw(TQPainter &);
@@ -172,7 +172,7 @@ class RectArea : public Area
 		virtual ~RectArea();
 		
 		virtual Area* clone() const;	
-		virtual bool contains(const TQPoint & p) const;
+		virtual bool tqcontains(const TQPoint & p) const;
 		virtual TQString coordsToString() const;
 		virtual void draw(TQPainter & p);
 		virtual void moveSelectionPoint(TQRect* selectionPoint, const TQPoint & p);
@@ -194,7 +194,7 @@ class CircleArea : public Area
 		virtual ~CircleArea();
 
 		virtual Area* clone() const; 	
-		virtual bool contains(const TQPoint & p) const;
+		virtual bool tqcontains(const TQPoint & p) const;
 		virtual TQString coordsToString() const;
 		virtual void draw(TQPainter & p);
 		virtual void moveSelectionPoint(TQRect* selectionPoint, const TQPoint & p);
@@ -217,7 +217,7 @@ class PolyArea :public Area
 		virtual ~PolyArea();
 
 		virtual Area* clone() const;	
-		virtual bool contains(const TQPoint & p) const;
+		virtual bool tqcontains(const TQPoint & p) const;
 		virtual TQString coordsToString() const;
 		virtual void draw(TQPainter & p);
 		virtual void moveSelectionPoint(TQRect* selectionPoint, const TQPoint & p);
@@ -294,7 +294,7 @@ class AreaSelection : public Area {
 		/**
 		 * Overiden Methods of the Area class
 		 */		
-		virtual bool contains(const TQPoint & p) const;
+		virtual bool tqcontains(const TQPoint & p) const;
 
 		/**
 		 *
@@ -367,7 +367,7 @@ class AreaSelection : public Area {
     bool allAreasWithin(const TQRect & r) const;
 
 		// makes the cache invalid
-		void invalidate();		
+		void tqinvalidate();		
 	private :
 		
 		AreaList *_areas;			
@@ -382,7 +382,7 @@ class AreaSelection : public Area {
 };
 
 
-inline void AreaSelection::invalidate() {
+inline void AreaSelection::tqinvalidate() {
 	_selectionCacheValid=false;
 	_rectCacheValid=false;
 }
diff --git a/kimagemapeditor/kimecommands.cpp b/kimagemapeditor/kimecommands.cpp
index 59157f9d..1d2b08ee 100644
--- a/kimagemapeditor/kimecommands.cpp
+++ b/kimagemapeditor/kimecommands.cpp
@@ -30,7 +30,7 @@ KCommand
 #else
 KNamedCommand
 #endif
- (i18n( "Cut %1" ).arg( a.typeString() ))
+ (i18n( "Cut %1" ).tqarg( a.typeString() ))
 {
 	_document=document;
 	_cutAreaSelection=new AreaSelection();
@@ -74,7 +74,7 @@ void CutCommand::unexecute()
 DeleteCommand::DeleteCommand(KImageMapEditor * document, const AreaSelection & a)
 	: CutCommand(document,a)
 {
-	setName(i18n( "Delete %1" ).arg( a.typeString() ));
+	setName(i18n( "Delete %1" ).tqarg( a.typeString() ));
 }
 
 PasteCommand::PasteCommand(KImageMapEditor *document, const AreaSelection & a)
@@ -84,7 +84,7 @@ KCommand
 #else
 KNamedCommand
 #endif
- (i18n( "Paste %1" ).arg( a.typeString() ))
+ (i18n( "Paste %1" ).tqarg( a.typeString() ))
 {
 	_document=document;
 	_pasteAreaSelection=new AreaSelection();
@@ -129,7 +129,7 @@ KCommand
 #else
 KNamedCommand
 #endif
-(i18n( "Move %1" ).arg( a->typeString() ))
+(i18n( "Move %1" ).tqarg( a->typeString() ))
 {
 	_document=document;
 	_areaSelection=new AreaSelection();
@@ -147,7 +147,7 @@ MoveCommand::~MoveCommand () {
 
 void MoveCommand::execute()
 {
-	// only for repainting reasons
+	// only for tqrepainting reasons
 	Area* tempArea = _areaSelection->clone();
 
 	_areaSelection->moveTo( _newPoint.x(), _newPoint.y() );
@@ -155,7 +155,7 @@ void MoveCommand::execute()
   if (!_areaSelection->allAreasWithin(_document->getDrawZone()->getImageRect()))
   	_areaSelection->moveTo( _oldPoint.x(), _oldPoint.y() );
 
-  _document->selected()->invalidate();
+  _document->selected()->tqinvalidate();
 
 
 	_document->slotAreaChanged( tempArea );
@@ -174,7 +174,7 @@ void MoveCommand::unexecute()
 	_areaSelection->moveTo( _oldPoint.x(), _oldPoint.y() );
   _areaSelection->setMoving(false);
 
-  _document->selected()->invalidate();
+  _document->selected()->tqinvalidate();
 
 	_document->slotAreaChanged( tempArea );
 	_document->slotAreaChanged( _areaSelection );
@@ -191,7 +191,7 @@ KCommand
 #else
 KNamedCommand
 #endif
-(i18n( "Resize %1" ).arg( a->typeString() ))
+(i18n( "Resize %1" ).tqarg( a->typeString() ))
 {
 	_areaSelection=new AreaSelection();
 	_areaSelection->setAreaList( a->getAreaList() );
@@ -238,7 +238,7 @@ KCommand
 #else
 KNamedCommand
 #endif
-(i18n( "Add point to %1" ).arg( a->typeString() ))
+(i18n( "Add point to %1" ).tqarg( a->typeString() ))
 {
   if (a->type()!=Area::Polygon)
   {
@@ -269,15 +269,15 @@ void AddPointCommand::execute()
 void AddPointCommand::unexecute()
 {
 //  TQRect *selectionPoint = _areaSelection->onSelectionPoint(_point);
-  Area* repaintArea = _areaSelection->clone();
+  Area* tqrepaintArea = _areaSelection->clone();
 
   _areaSelection->removeCoord(_coordpos);
   _areaSelection->setMoving(false);
 
 	_document->slotAreaChanged( _areaSelection );
-	_document->slotAreaChanged( repaintArea );
+	_document->slotAreaChanged( tqrepaintArea );
 
-  delete repaintArea;
+  delete tqrepaintArea;
 }
 
 RemovePointCommand::RemovePointCommand (KImageMapEditor *document, AreaSelection *a, Area *oldArea)
@@ -287,7 +287,7 @@ KCommand
 #else
 KNamedCommand
 #endif
-(i18n( "Remove point from %1" ).arg( a->typeString() ))
+(i18n( "Remove point from %1" ).tqarg( a->typeString() ))
 {
   if (a->type()!=Area::Polygon)
   {
@@ -340,7 +340,7 @@ KCommand
 #else
 KNamedCommand
 #endif
-(i18n( "Create %1" ).arg( area->typeString() ))
+(i18n( "Create %1" ).tqarg( area->typeString() ))
 {
 	_document=document;
 	_area=area;
diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp
index 0196b0e5..4cb26986 100644
--- a/kimagemapeditor/kimedialogs.cpp
+++ b/kimagemapeditor/kimedialogs.cpp
@@ -47,8 +47,8 @@
 // LOCAL
 #include "kimedialogs.h"
 
-CoordsEdit::CoordsEdit(TQWidget *parent, Area* a)
-  : TQWidget(parent)
+CoordsEdit::CoordsEdit(TQWidget *tqparent, Area* a)
+  : TQWidget(tqparent)
 {
   area=a;
 }
@@ -66,56 +66,56 @@ CoordsEdit::~CoordsEdit()
 {
 }
 
-RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a)
-  : CoordsEdit(parent,a)
+RectCoordsEdit::RectCoordsEdit(TQWidget *tqparent, Area* a)
+  : CoordsEdit(tqparent,a)
 {
-  TQGridLayout *layout= new TQGridLayout(this,5,2,5,5);
+  TQGridLayout *tqlayout= new TQGridLayout(this,5,2,5,5);
 
   topXSpin = new TQSpinBox(this);
   topXSpin->setMaxValue(INT_MAX);
   topXSpin->setMinValue(0);
   topXSpin->setValue(a->rect().left());
-  layout->addWidget(topXSpin,0,1);
+  tqlayout->addWidget(topXSpin,0,1);
   connect( topXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
 
   TQLabel *lbl= new TQLabel(i18n("Top &X:"),this);
   lbl->setBuddy(topXSpin);
-  layout->addWidget(lbl,0,0);
+  tqlayout->addWidget(lbl,0,0);
 
   topYSpin = new TQSpinBox(this);
   topYSpin->setMaxValue(INT_MAX);
   topYSpin->setMinValue(0);
   topYSpin->setValue(a->rect().top());
-  layout->addWidget(topYSpin,1,1);
+  tqlayout->addWidget(topYSpin,1,1);
   connect( topYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
 
   lbl= new TQLabel(i18n("Top &Y:"),this);
   lbl->setBuddy(topYSpin);
-  layout->addWidget(lbl,1,0);
+  tqlayout->addWidget(lbl,1,0);
 
   widthSpin = new TQSpinBox(this);
   widthSpin->setMaxValue(INT_MAX);
   widthSpin->setMinValue(0);
   widthSpin->setValue(a->rect().width());
-  layout->addWidget(widthSpin,2,1);
+  tqlayout->addWidget(widthSpin,2,1);
   connect( widthSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
 
   lbl= new TQLabel(i18n("&Width:"),this);
   lbl->setBuddy(widthSpin);
-  layout->addWidget(lbl,2,0);
+  tqlayout->addWidget(lbl,2,0);
 
   heightSpin = new TQSpinBox(this);
   heightSpin->setMaxValue(INT_MAX);
   heightSpin->setMinValue(0);
   heightSpin->setValue(a->rect().height());
-  layout->addWidget(heightSpin,3,1);
+  tqlayout->addWidget(heightSpin,3,1);
   connect( heightSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
 
   lbl= new TQLabel(i18n("Hei&ght:"),this);
   lbl->setBuddy(heightSpin);
-  layout->addWidget(lbl,3,0);
+  tqlayout->addWidget(lbl,3,0);
 
-  layout->setRowStretch(4,10);
+  tqlayout->setRowStretch(4,10);
 }
 
 void RectCoordsEdit::applyChanges() {
@@ -127,47 +127,47 @@ void RectCoordsEdit::applyChanges() {
   area->setRect(r);
 }
 
-CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a)
-  : CoordsEdit(parent,a)
+CircleCoordsEdit::CircleCoordsEdit(TQWidget *tqparent, Area* a)
+  : CoordsEdit(tqparent,a)
 {
-  TQGridLayout *layout= new TQGridLayout(this,4,2,5,5);
+  TQGridLayout *tqlayout= new TQGridLayout(this,4,2,5,5);
 
   centerXSpin = new TQSpinBox(this);
   centerXSpin->setMaxValue(INT_MAX);
   centerXSpin->setMinValue(0);
   centerXSpin->setValue(a->rect().center().x());
-  layout->addWidget(centerXSpin,0,1);
+  tqlayout->addWidget(centerXSpin,0,1);
   connect( centerXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
 
   TQLabel *lbl= new TQLabel(i18n("Center &X:"),this);
   lbl->setBuddy(centerXSpin);
-  layout->addWidget(lbl,0,0);
+  tqlayout->addWidget(lbl,0,0);
 
   centerYSpin = new TQSpinBox(this);
   centerYSpin->setMaxValue(INT_MAX);
   centerYSpin->setMinValue(0);
   centerYSpin->setValue(a->rect().center().y());
-  layout->addWidget(centerYSpin,1,1);
+  tqlayout->addWidget(centerYSpin,1,1);
   connect( centerYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
 
 
   lbl= new TQLabel(i18n("Center &Y:"),this);
   lbl->setBuddy(centerYSpin);
-  layout->addWidget(lbl,1,0);
+  tqlayout->addWidget(lbl,1,0);
 
   radiusSpin = new TQSpinBox(this);
   radiusSpin->setMaxValue(INT_MAX);
   radiusSpin->setMinValue(0);
   radiusSpin->setValue(a->rect().width()/2);
-  layout->addWidget(radiusSpin,2,1);
+  tqlayout->addWidget(radiusSpin,2,1);
   connect( radiusSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
 
 
   lbl= new TQLabel(i18n("&Radius:"),this);
   lbl->setBuddy(radiusSpin);
-  layout->addWidget(lbl,2,0);
+  tqlayout->addWidget(lbl,2,0);
 
-  layout->setRowStretch(3,10);
+  tqlayout->setRowStretch(3,10);
 
 }
 
@@ -180,11 +180,11 @@ void CircleCoordsEdit::applyChanges() {
   area->setRect(r);
 }
 
-PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a)
-  : CoordsEdit(parent,a)
+PolyCoordsEdit::PolyCoordsEdit(TQWidget *tqparent, Area* a)
+  : CoordsEdit(tqparent,a)
 {
   if (!a) return;
-  TQVBoxLayout *layout= new TQVBoxLayout(this);
+  TQVBoxLayout *tqlayout= new TQVBoxLayout(this);
   int numPoints=a->coords()->count();
   coordsTable= new TQTable(numPoints,2,this);
   coordsTable->horizontalHeader()->setLabel(0,"X");
@@ -205,15 +205,15 @@ PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a)
 //	coordsTable->setMaximumHeight(400);
 //	coordsTable->resizeContents(100,100);
   coordsTable->resize(coordsTable->width(),100);
-  layout->addWidget(coordsTable);
-  layout->setStretchFactor(coordsTable,-1);
+  tqlayout->addWidget(coordsTable);
+  tqlayout->setStretchFactor(coordsTable,-1);
   TQHBox *hbox= new TQHBox(this);
   TQPushButton *addBtn=new TQPushButton(i18n("Add"),hbox);
   connect( addBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddPoint()));
   TQPushButton *removeBtn=new TQPushButton(i18n("Remove"),hbox);
   connect( removeBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotRemovePoint()));
 
-  layout->addWidget(hbox);
+  tqlayout->addWidget(hbox);
   slotHighlightPoint(1);
 }
 
@@ -274,32 +274,32 @@ void PolyCoordsEdit::applyChanges() {
   }
 }
 
-SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *parent, Area* a)
-  : CoordsEdit(parent,a)
+SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *tqparent, Area* a)
+  : CoordsEdit(tqparent,a)
 {
-  TQGridLayout *layout= new TQGridLayout(this,2,2);
+  TQGridLayout *tqlayout= new TQGridLayout(this,2,2);
 
   topXSpin = new TQSpinBox(this);
   topXSpin->setMaxValue(INT_MAX);
   topXSpin->setMinValue(0);
   topXSpin->setValue(a->rect().left());
-  layout->addWidget(topXSpin,0,1);
+  tqlayout->addWidget(topXSpin,0,1);
   connect( topXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
 
   TQLabel *lbl= new TQLabel(i18n("Top &X"),this);
   lbl->setBuddy(topXSpin);
-  layout->addWidget(lbl,0,0);
+  tqlayout->addWidget(lbl,0,0);
 
   topYSpin = new TQSpinBox(this);
   topYSpin->setMaxValue(INT_MAX);
   topYSpin->setMinValue(0);
   topYSpin->setValue(a->rect().top());
-  layout->addWidget(topYSpin,1,1);
+  tqlayout->addWidget(topYSpin,1,1);
   connect( topYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
 
   lbl= new TQLabel(i18n("Top &Y"),this);
   lbl->setBuddy(topYSpin);
-  layout->addWidget(lbl,1,0);
+  tqlayout->addWidget(lbl,1,0);
 }
 
 void SelectionCoordsEdit::applyChanges() {
@@ -308,13 +308,13 @@ void SelectionCoordsEdit::applyChanges() {
 
 
 
-TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *layout, int y, const TQString & value, const TQString & name)
+TQLineEdit* AreaDialog::createLineEdit(TQWidget* tqparent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name)
 {
-  TQLineEdit* edit=new TQLineEdit(value,parent);
-  layout->addWidget(edit,y,2);
-  TQLabel* lbl=new TQLabel(name,parent);
+  TQLineEdit* edit=new TQLineEdit(value,tqparent);
+  tqlayout->addWidget(edit,y,2);
+  TQLabel* lbl=new TQLabel(name,tqparent);
   lbl->setBuddy(edit);
-  layout->addWidget(lbl,y,1);
+  tqlayout->addWidget(lbl,y,1);
 
   return edit;
 }
@@ -322,7 +322,7 @@ TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *layout, i
 TQWidget* AreaDialog::createGeneralPage()
 {
   TQFrame* page = new TQFrame(this);
-  TQGridLayout* layout = new TQGridLayout(page,5,2,5,5);
+  TQGridLayout* tqlayout = new TQGridLayout(page,5,2,5,5);
 
 
   TQHBox *hbox= new TQHBox(page);
@@ -332,25 +332,25 @@ TQWidget* AreaDialog::createGeneralPage()
   connect( btn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChooseHref()));
   hbox->setMinimumHeight(hbox->height());
 
-  layout->addWidget(hbox,0,2);
+  tqlayout->addWidget(hbox,0,2);
   TQLabel *lbl=new TQLabel(i18n( "&HREF:" ),page);
   lbl->setBuddy(hrefEdit);
-  layout->addWidget(lbl,0,1);
+  tqlayout->addWidget(lbl,0,1);
 
-  altEdit = createLineEdit(page,layout,1,area->attribute("alt"),i18n("Alt. &Text:"));
-  targetEdit = createLineEdit(page,layout,2,area->attribute("target"),i18n("Tar&get:"));
-  titleEdit = createLineEdit(page,layout,3,area->attribute("title"),i18n("Tit&le:"));
+  altEdit = createLineEdit(page,tqlayout,1,area->attribute("alt"),i18n("Alt. &Text:"));
+  targetEdit = createLineEdit(page,tqlayout,2,area->attribute("target"),i18n("Tar&get:"));
+  titleEdit = createLineEdit(page,tqlayout,3,area->attribute("title"),i18n("Tit&le:"));
 
   if (area->type()==Area::Default)
   {
     defaultAreaChk = new TQCheckBox(i18n("Enable default map"),page);
     if (area->finished())
       defaultAreaChk->setChecked(true);
-    layout->addWidget(defaultAreaChk,3,2);
+    tqlayout->addWidget(defaultAreaChk,3,2);
   }
 
 
-  layout->setRowStretch(4,10);
+  tqlayout->setRowStretch(4,10);
 
   return page;
 }
@@ -358,11 +358,11 @@ TQWidget* AreaDialog::createGeneralPage()
 TQWidget* AreaDialog::createCoordsPage()
 {
   TQFrame* page = new TQFrame(this);
-  TQVBoxLayout *layout = new TQVBoxLayout(page);
-  layout->setMargin(5);
+  TQVBoxLayout *tqlayout = new TQVBoxLayout(page);
+  tqlayout->setMargin(5);
 
   coordsEdit = createCoordsEdit(page,area);
-  layout->addWidget(coordsEdit);
+  tqlayout->addWidget(coordsEdit);
   connect( coordsEdit, TQT_SIGNAL(update()), this, TQT_SLOT(slotUpdateArea()));
 
   return page;
@@ -371,17 +371,17 @@ TQWidget* AreaDialog::createCoordsPage()
 TQWidget* AreaDialog::createJavascriptPage()
 {
   TQFrame* page = new TQFrame(this);
-  TQGridLayout* layout = new TQGridLayout(page,8,2,5,5);
+  TQGridLayout* tqlayout = new TQGridLayout(page,8,2,5,5);
 
-  onClickEdit = createLineEdit(page,layout,0,area->attribute("onClick"),i18n("OnClick:"));
-  onDblClickEdit = createLineEdit(page,layout,1,area->attribute("onDblClick"),i18n("OnDblClick:"));
-  onMouseDownEdit = createLineEdit(page,layout,2,area->attribute("onMouseDown"),i18n("OnMouseDown:"));
-  onMouseUpEdit = createLineEdit(page,layout,3,area->attribute("onMouseUp"),i18n("OnMouseUp:"));
-  onMouseOverEdit = createLineEdit(page,layout,4,area->attribute("onMouseOver"),i18n("OnMouseOver:"));
-  onMouseMoveEdit = createLineEdit(page,layout,5,area->attribute("onMouseMove"),i18n("OnMouseMove:"));
-  onMouseOutEdit = createLineEdit(page,layout,6,area->attribute("onMouseOut"),i18n("OnMouseOut:"));
+  onClickEdit = createLineEdit(page,tqlayout,0,area->attribute("onClick"),i18n("OnClick:"));
+  onDblClickEdit = createLineEdit(page,tqlayout,1,area->attribute("onDblClick"),i18n("OnDblClick:"));
+  onMouseDownEdit = createLineEdit(page,tqlayout,2,area->attribute("onMouseDown"),i18n("OnMouseDown:"));
+  onMouseUpEdit = createLineEdit(page,tqlayout,3,area->attribute("onMouseUp"),i18n("OnMouseUp:"));
+  onMouseOverEdit = createLineEdit(page,tqlayout,4,area->attribute("onMouseOver"),i18n("OnMouseOver:"));
+  onMouseMoveEdit = createLineEdit(page,tqlayout,5,area->attribute("onMouseMove"),i18n("OnMouseMove:"));
+  onMouseOutEdit = createLineEdit(page,tqlayout,6,area->attribute("onMouseOut"),i18n("OnMouseOut:"));
 
-  layout->setRowStretch(7,10);
+  tqlayout->setRowStretch(7,10);
 
 
   return page;
@@ -408,59 +408,59 @@ TQWidget* AreaDialog::createButtonBar()
 
 }
 
-AreaDialog::AreaDialog(KImageMapEditor* parent,Area * a)
-  : KDialog(parent->widget(),"",true)
-// : KDialogBase(Tabbed,i18n("Area Tag Editor"),Ok|Apply|Cancel,Ok,parent,"")
-//	: KDialogBase(parent,"",true,"Area Tag Editor",Ok|Apply|Cancel,Ok,true)
+AreaDialog::AreaDialog(KImageMapEditor* tqparent,Area * a)
+  : KDialog(tqparent->widget(),"",true)
+// : KDialogBase(Tabbed,i18n("Area Tag Editor"),Ok|Apply|Cancel,Ok,tqparent,"")
+//	: KDialogBase(tqparent,"",true,"Area Tag Editor",Ok|Apply|Cancel,Ok,true)
 {
   if (!a) {
    slotCancel();
    return;  
   }
 
-  _document=parent;
+  _document=tqparent;
 
   setCaption(i18n("Area Tag Editor"));
 
   area=a;
-  TQString shape="Default";
+  TQString tqshape="Default";
   areaCopy= a->clone();
   oldArea= new Area();
   oldArea->setRect( a->rect() );
 
   switch (a->type()) {
-    case Area::Rectangle : shape=i18n("Rectangle");break;
-    case Area::Circle : shape=i18n("Circle");break;
-    case Area::Polygon : shape=i18n("Polygon");break;
-    case Area::Selection : shape=i18n("Selection");break;
+    case Area::Rectangle : tqshape=i18n("Rectangle");break;
+    case Area::Circle : tqshape=i18n("Circle");break;
+    case Area::Polygon : tqshape=i18n("Polygon");break;
+    case Area::Selection : tqshape=i18n("Selection");break;
     default : break;
   }
 
 
   // To get a margin around everything
 
-  TQVBoxLayout *layout = new TQVBoxLayout(this);
+  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
 
-  layout->setMargin(5);
+  tqlayout->setMargin(5);
 
-  TQLabel *lbl = new TQLabel("<b>"+shape+"</b>",this);
-  lbl->setTextFormat(Qt::RichText);
-  layout->addWidget(lbl);
+  TQLabel *lbl = new TQLabel("<b>"+tqshape+"</b>",this);
+  lbl->setTextFormat(TQt::RichText);
+  tqlayout->addWidget(lbl);
 
   TQFrame *line = new TQFrame(this);
   line->setFrameStyle(TQFrame::HLine  | TQFrame::Sunken);
   line->setFixedHeight(10);
-  layout->addWidget(line);
+  tqlayout->addWidget(line);
 
   TQTabWidget *tab = new TQTabWidget(this);
 
-  layout->addWidget(tab);
+  tqlayout->addWidget(tab);
 
   tab->addTab(createGeneralPage(),i18n("&General"));
 
   if (a->type()==Area::Default)
   {
-      shape=i18n("Default");
+      tqshape=i18n("Default");
   }
   else
     tab->addTab(createCoordsPage(),i18n("Coor&dinates"));
@@ -470,9 +470,9 @@ AreaDialog::AreaDialog(KImageMapEditor* parent,Area * a)
   line = new TQFrame(this);
   line->setFrameStyle(TQFrame::HLine  | TQFrame::Sunken);
   line->setFixedHeight(10);
-  layout->addWidget(line);
+  tqlayout->addWidget(line);
 
-  layout->addWidget(createButtonBar());
+  tqlayout->addWidget(createButtonBar());
 
   setMinimumHeight(360);
   setMinimumWidth(327);
@@ -485,28 +485,28 @@ AreaDialog::~AreaDialog() {
   delete oldArea;
 }
 
-CoordsEdit* AreaDialog::createCoordsEdit(TQWidget *parent, Area *a) {
+CoordsEdit* AreaDialog::createCoordsEdit(TQWidget *tqparent, Area *a) {
   if (!a) return 0;
   switch (a->type()) {
     case Area::Rectangle :
-        return new RectCoordsEdit(parent,a);
+        return new RectCoordsEdit(tqparent,a);
       break;
     case Area::Circle :
-        return new CircleCoordsEdit(parent,a);
+        return new CircleCoordsEdit(tqparent,a);
       break;
     case Area::Polygon :
-        return new PolyCoordsEdit(parent,a);
+        return new PolyCoordsEdit(tqparent,a);
       break;
     case Area::Selection :
-        return new SelectionCoordsEdit(parent,a);
+        return new SelectionCoordsEdit(tqparent,a);
       break;
-    case Area::Default : return new CoordsEdit(parent,a); break;
-    default : return new CoordsEdit(parent,a);break;
+    case Area::Default : return new CoordsEdit(tqparent,a); break;
+    default : return new CoordsEdit(tqparent,a);break;
   }
 }
 
 void AreaDialog::slotChooseHref() {
-  KURL url=KFileDialog::getOpenURL(TQString::null, "*|" + i18n( "All Files" ), this, i18n("Choose File"));
+  KURL url=KFileDialog::getOpenURL(TQString(), "*|" + i18n( "All Files" ), this, i18n("Choose File"));
   if (!url.isEmpty()) {
     hrefEdit->setText(url.url());
   }
@@ -570,8 +570,8 @@ void AreaDialog::slotUpdateArea() {
     oldArea->setRect(area->rect());
 }
 
-ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_maps,TQPtrList<ImageTag> *_images,const KURL & _baseUrl)
-  : KDialogBase(parent,"",true,i18n( "Choose Map & Image to Edit" ),Ok,Ok,true)
+ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* tqparent,TQPtrList<MapTag> *_maps,TQPtrList<ImageTag> *_images,const KURL & _baseUrl)
+  : KDialogBase(tqparent,"",true,i18n( "Choose Map & Image to Edit" ),Ok,Ok,true)
 {
   baseUrl=_baseUrl;
   maps=_maps;
@@ -580,17 +580,17 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_
   TQWidget *page=new TQWidget(this);
   setMainWidget(page);
   setCaption(baseUrl.fileName());
-  TQVBoxLayout *layout = new TQVBoxLayout(page,5,5);
+  TQVBoxLayout *tqlayout = new TQVBoxLayout(page,5,5);
 
   TQLabel *lbl= new TQLabel(i18n("Select an image and/or a map that you want to edit"),page);
   lbl->setFont(TQFont("Sans Serif",12, TQFont::Bold));
-  layout->addWidget(lbl);
+  tqlayout->addWidget(lbl);
   TQFrame *line= new TQFrame(page);
   line->setFrameStyle(TQFrame::HLine  | TQFrame::Sunken);
   line->setFixedHeight(10);
-  layout->addWidget(line,0);
+  tqlayout->addWidget(line,0);
 
-  TQGridLayout *gridLayout= new TQGridLayout(layout,2,3,5);
+  TQGridLayout *gridLayout= new TQGridLayout(tqlayout,2,3,5);
   gridLayout->setRowStretch(0,0);
   gridLayout->setRowStretch(1,100);
   lbl=new TQLabel(i18n("&Maps"),page);
@@ -602,7 +602,7 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_
   line= new TQFrame(page);
   line->setFrameStyle(TQFrame::VLine | TQFrame::Sunken);
   line->setFixedWidth(10);
-//	line->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding));
+//	line->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding));
   gridLayout->addWidget(line,1,1);
 
   lbl=new TQLabel(i18n("Image Preview"),page);
@@ -610,7 +610,7 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_
 
   imagePreview= new TQLabel(page);
   imagePreview->setFixedSize(310,210);
-  imagePreview->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding));
+  imagePreview->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding));
   imagePreview->setFrameStyle(TQLabel::Panel | TQLabel::Sunken);
   imagePreview->setIndent(5);
   imagePreview->setBackgroundColor(TQColor("white"));
@@ -619,12 +619,12 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_
 //	lbl= new TQLabel(i18n("&Maps"),page);
 //	lbl->setBuddy(mapListBox);
   gridLayout->addWidget(imagePreview,1,2);
-//	layout->addLayout(gridLayout,1);
+//	tqlayout->addLayout(gridLayout,1);
 
   line= new TQFrame(page);
   line->setFrameStyle(TQFrame::HLine  | TQFrame::Sunken);
   line->setFixedHeight(10);
-  layout->addWidget(line,0);
+  tqlayout->addWidget(line,0);
 
 
   if (maps->isEmpty()) {
@@ -648,29 +648,29 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_
   resize(510,460);
 }
 
-void ImageMapChooseDialog::initImageListTable(TQWidget* parent) {
+void ImageMapChooseDialog::initImageListTable(TQWidget* tqparent) {
 
 
   if (images->isEmpty()) {
-    imageListTable= new TQTable(1,1,parent);
+    imageListTable= new TQTable(1,1,tqparent);
     imageListTable->setText(0,0,i18n("No images found"));
     imageListTable->setEnabled(false);
     imageListTable->horizontalHeader()->hide();
     imageListTable->setTopMargin(0);
     imageListTable->setColumnStretchable(0,true);
   } else {
-    imageListTable= new TQTable(images->count(),2,parent);
+    imageListTable= new TQTable(images->count(),2,tqparent);
     imageListTable->setColumnStretchable(0,true);
   }
 
   imageListTable->verticalHeader()->hide();
   imageListTable->setLeftMargin(0);
 
-  TQLabel *lbl= new TQLabel(i18n("&Images"),parent);
+  TQLabel *lbl= new TQLabel(i18n("&Images"),tqparent);
   lbl->setBuddy(imageListTable);
 
-  parent->layout()->add(lbl);
-  parent->layout()->add(imageListTable);
+  tqparent->tqlayout()->add(lbl);
+  tqparent->tqlayout()->add(imageListTable);
 
   if (images->isEmpty())
     return;
@@ -687,10 +687,10 @@ void ImageMapChooseDialog::initImageListTable(TQWidget* parent) {
   for (ImageTag *tag = images->first(); tag!=0L; tag=images->next()) {
     TQString src="";
     TQString usemap="";
-    if (tag->find("src"))
-      src=*tag->find("src");
-    if (tag->find("usemap"))
-      usemap=*tag->find("usemap");
+    if (tag->tqfind("src"))
+      src=*tag->tqfind("src");
+    if (tag->tqfind("usemap"))
+      usemap=*tag->tqfind("usemap");
 
     imageListTable->setText(row,0,src);
     imageListTable->setText(row,1,usemap);
@@ -711,8 +711,8 @@ void ImageMapChooseDialog::slotImageChanged()
 {
   int i=imageListTable->currentRow();
   TQImage pix;
-  if (images->at(i)->find("src")) {
-    TQString str=*images->at(i)->find("src");
+  if (images->at(i)->tqfind("src")) {
+    TQString str=*images->at(i)->tqfind("src");
     // relative url
     pixUrl=KURL(baseUrl,str);
     pix=TQImage(pixUrl.path());
@@ -731,7 +731,7 @@ void ImageMapChooseDialog::slotImageChanged()
   pix2.convertFromImage(pix);
   imagePreview->setPixmap(pix2);
 
-//	imagePreview->repaint();
+//	imagePreview->tqrepaint();
 }
 
 void ImageMapChooseDialog::selectImageWithUsemap(const TQString & usemap) {
@@ -749,8 +749,8 @@ void ImageMapChooseDialog::slotMapChanged(int i) {
   selectImageWithUsemap(currentMap->name);
 }
 
-PreferencesDialog::PreferencesDialog(TQWidget *parent, KConfig* conf)
-  : KDialogBase(parent,"",true,i18n("Preferences"),Ok|Apply|Cancel,Ok,true)
+PreferencesDialog::PreferencesDialog(TQWidget *tqparent, KConfig* conf)
+  : KDialogBase(tqparent,"",true,i18n("Preferences"),Ok|Apply|Cancel,Ok,true)
 {
   config = conf;
   TQVBox *page=new TQVBox(this);
@@ -836,8 +836,8 @@ void PreferencesDialog::slotApply( void ) {
   emit applyClicked();
 }
 
-HTMLPreviewDialog::HTMLPreviewDialog(TQWidget* parent, KURL url, const TQString & htmlCode)
-  : KDialogBase(parent, "", true, i18n("Preview"), KDialogBase::Ok)
+HTMLPreviewDialog::HTMLPreviewDialog(TQWidget* tqparent, KURL url, const TQString & htmlCode)
+  : KDialogBase(tqparent, "", true, i18n("Preview"), KDialogBase::Ok)
 {
   tempFile = new KTempFile(url.directory(false), ".html");
   tempFile->setAutoDelete(true);
@@ -866,8 +866,8 @@ HTMLPreviewDialog::~HTMLPreviewDialog() {
 void HTMLPreviewDialog::show() {
   KDialogBase::show();
   htmlPart->openURL(KURL( tempFile->name() ));
-//  htmlView->layout();
-//  htmlView->repaint();
+//  htmlView->tqlayout();
+//  htmlView->tqrepaint();
   resize(800,600);
 }
 
diff --git a/kimagemapeditor/kimedialogs.h b/kimagemapeditor/kimedialogs.h
index 7445e584..90b445a2 100644
--- a/kimagemapeditor/kimedialogs.h
+++ b/kimagemapeditor/kimedialogs.h
@@ -2,7 +2,7 @@
                           kimedialogs.h  -  description
                              -------------------
     begin                : Tue Apr 17 2001
-    copyright            : (C) 2001 by Jan Schäfer
+    copyright            : (C) 2001 by Jan Sch�fer
     email                : janschaefer@users.sourceforge.net
  ***************************************************************************/
 
@@ -33,8 +33,9 @@ class TQSpinBox;
 
 class CoordsEdit : public TQWidget {
 Q_OBJECT
+  TQ_OBJECT
 	public :
-		CoordsEdit(TQWidget *parent, Area* a);
+		CoordsEdit(TQWidget *tqparent, Area* a);
 		virtual ~CoordsEdit();
 		virtual void applyChanges();
 	protected:
@@ -47,7 +48,7 @@ Q_OBJECT
 
 class RectCoordsEdit : public CoordsEdit {
 	public:
-		RectCoordsEdit(TQWidget *parent, Area* a);
+		RectCoordsEdit(TQWidget *tqparent, Area* a);
 		virtual void applyChanges();
 	private:
 		TQSpinBox *topXSpin;
@@ -58,7 +59,7 @@ class RectCoordsEdit : public CoordsEdit {
 
 class CircleCoordsEdit : public CoordsEdit {
 	public:
-		CircleCoordsEdit(TQWidget *parent, Area* a);
+		CircleCoordsEdit(TQWidget *tqparent, Area* a);
 		virtual void applyChanges();
 	private:
 		TQSpinBox *centerXSpin;
@@ -69,9 +70,10 @@ class CircleCoordsEdit : public CoordsEdit {
 class TQTable;
 
 class PolyCoordsEdit : public CoordsEdit {
-Q_OBJECT	
+    Q_OBJECT
+    TQ_OBJECT
 	public:
-		PolyCoordsEdit(TQWidget *parent, Area* a);
+		PolyCoordsEdit(TQWidget *tqparent, Area* a);
 		~PolyCoordsEdit();
 		virtual void applyChanges();
 	private:
@@ -84,9 +86,10 @@ Q_OBJECT
 };
 
 class SelectionCoordsEdit : public CoordsEdit {
-Q_OBJECT	
+    Q_OBJECT
+    TQ_OBJECT
 	public:
-		SelectionCoordsEdit(TQWidget *parent, Area* a);
+		SelectionCoordsEdit(TQWidget *tqparent, Area* a);
 		virtual void applyChanges();
 	private:
 		TQSpinBox *topXSpin;
@@ -99,7 +102,8 @@ class TQCheckBox;
 class TQGridLayout;
 
 class AreaDialog : public KDialog {
-Q_OBJECT
+  Q_OBJECT
+  TQ_OBJECT
 	private:
 		Area *area;
 		Area *oldArea; // Only for drawing reasons
@@ -118,13 +122,13 @@ Q_OBJECT
 		TQLineEdit *onMouseOutEdit;
 		
 		CoordsEdit *coordsEdit;
-		CoordsEdit* createCoordsEdit(TQWidget *parent, Area *a);
+		CoordsEdit* createCoordsEdit(TQWidget *tqparent, Area *a);
 		TQCheckBox *defaultAreaChk;
 		KImageMapEditor *_document;
 		
 
 	public:
-		AreaDialog(KImageMapEditor* parent,Area * a);
+		AreaDialog(KImageMapEditor* tqparent,Area * a);
 		~AreaDialog();
 	protected slots:
 		virtual void slotOk();
@@ -133,7 +137,7 @@ Q_OBJECT
 		void slotChooseHref();
 		void slotUpdateArea();
 		
-    TQLineEdit* createLineEdit(TQWidget* parent, TQGridLayout *layout, int y, const TQString & value, const TQString & name);
+    TQLineEdit* createLineEdit(TQWidget* tqparent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name);
 	  TQWidget* createGeneralPage();
 	  TQWidget* createCoordsPage();
 	  TQWidget* createJavascriptPage();
@@ -148,7 +152,8 @@ class TQLabel;
 
 
 class ImageMapChooseDialog : public KDialogBase {
-Q_OBJECT
+  Q_OBJECT
+  TQ_OBJECT
 	private:
 		TQTable *imageListTable;
 		TQLabel *imagePreview;		
@@ -159,7 +164,7 @@ Q_OBJECT
 		KURL baseUrl;
     void initImageListTable(TQWidget*);    
 	public:
-		ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_maps,TQPtrList<ImageTag> *_images, const KURL & _baseUrl);
+		ImageMapChooseDialog(TQWidget* tqparent,TQPtrList<MapTag> *_maps,TQPtrList<ImageTag> *_images, const KURL & _baseUrl);
 		~ImageMapChooseDialog();
 		KURL pixUrl;
 		MapTag* currentMap;
@@ -173,9 +178,10 @@ Q_OBJECT
 class KConfig;
 
 class PreferencesDialog : public KDialogBase {
-Q_OBJECT
+  Q_OBJECT
+  TQ_OBJECT
 	public:
-		PreferencesDialog(TQWidget *parent,KConfig*);
+		PreferencesDialog(TQWidget *tqparent,KConfig*);
 		~PreferencesDialog();
 	protected slots:
 	  virtual void slotDefault( void );
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp
index 071f3299..7d92e8fb 100644
--- a/kimagemapeditor/kimeshell.cpp
+++ b/kimagemapeditor/kimeshell.cpp
@@ -45,7 +45,7 @@ KimeShell::KimeShell(const char *name )
   KDockWidget* mainDock;
   mainDock = createDockWidget( "MainDockWidget", 0L, 0L, "main_dock_widget");
   TQWidget *w = new TQHBox( mainDock );
-//  TQLayout* layout = new TQGridLayout( mainDock );
+//  TQLayout* tqlayout = new TQGridLayout( mainDock );
 
   mainDock->setWidget( w );
   // allow others to dock to the 4 sides
@@ -54,7 +54,7 @@ KimeShell::KimeShell(const char *name )
   mainDock->setEnableDocking(KDockWidget::DockNone);
   setView( mainDock); // central widget in a KDE mainwindow
   setMainDockWidget( mainDock); // master dockwidget
-  m_part = new KImageMapEditor( w, "kimagemapeditor", this, "kimagemapeditor");
+  m_part = new KImageMapEditor( w, "kimagemapeditor", TQT_TQOBJECT(this), "kimagemapeditor");
 
 
 //	setCentralWidget( part->widget() );
@@ -71,7 +71,7 @@ KimeShell::KimeShell(const char *name )
   //setCentralWidget(part->widget());
 
   if (!initialGeometrySet())
-    resize( TQSize(725, 525).expandedTo(minimumSizeHint()));
+    resize( TQSize(725, 525).expandedTo(tqminimumSizeHint()));
 
   connect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)),
            this, TQT_SLOT(slotSetStatusBarText ( const TQString & )));
@@ -109,16 +109,16 @@ bool KimeShell::queryExit()
 
 void KimeShell::setupActions()
 {
-  (void)KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
+  (void)KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
 
 	// File Quit
-	(void)KStdAction::quit(this, TQT_SLOT(close()),actionCollection());
+	(void)KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()),actionCollection());
 
 
-	(void)KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
-  (void)KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-	(void)KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
-  (void)KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
+	(void)KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection());
+  (void)KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
+	(void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+  (void)KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection());
 
 
 }
@@ -155,7 +155,7 @@ void KimeShell::openLastFile()
 
 void KimeShell::fileOpen()
 {
-  KURL url=KFileDialog::getOpenURL(TQString::null,
+  KURL url=KFileDialog::getOpenURL(TQString(),
           "*.png *.jpg *.jpeg *.gif *.htm *.html|" + i18n( "Web Files" ) + "\n"
           "*.png *.jpg *.jpeg *.gif *.bmp *.xbm *.xpm *.pnm *.mng|" + i18n( "Images" ) + "\n"
           "*.htm *.html|" + i18n( "HTML Files" ) + "\n"
diff --git a/kimagemapeditor/kimeshell.h b/kimagemapeditor/kimeshell.h
index 28026524..e361216c 100644
--- a/kimagemapeditor/kimeshell.h
+++ b/kimagemapeditor/kimeshell.h
@@ -25,6 +25,7 @@ class KImageMapEditor;
 class KimeShell : public KParts::DockMainWindow
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   KimeShell( const char *name=0 );
diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp
index d3a9ebe9..d215e157 100644
--- a/kimagemapeditor/mapslistview.cpp
+++ b/kimagemapeditor/mapslistview.cpp
@@ -23,8 +23,8 @@
 #include "mapslistview.h"
 
 
-MapsListView::MapsListView(TQWidget *parent, const char *name)
-: TQVBox(parent, name) {
+MapsListView::MapsListView(TQWidget *tqparent, const char *name)
+: TQVBox(tqparent, name) {
     _listView = new KListView(this);
     _listView->addColumn(i18n("Maps"));
     _listView->setFullWidth(true);
@@ -42,7 +42,7 @@ MapsListView::MapsListView(TQWidget *parent, const char *name)
 MapsListView::~MapsListView() {
 }
 
-void MapsListView::addMap(const TQString & name = TQString::null) {
+void MapsListView::addMap(const TQString & name = TQString()) {
     new TQListViewItem(_listView,name);
     //kdDebug() << "MapsListView::addMap : Added map '" << name << "'" << endl;
 
@@ -56,7 +56,7 @@ void MapsListView::addMaps(TQPtrList<MapTag> * maps) {
 }
 
 void MapsListView::selectMap(const TQString & name) {
-    TQListViewItem* item = _listView->findItem(name,0);
+    TQListViewItem* item = _listView->tqfindItem(name,0);
     if (item) {
        selectMap(item);
     } else
@@ -83,7 +83,7 @@ TQString MapsListView::selectedMap() {
 }
 
 void MapsListView::removeMap(const TQString & name) {
-    TQListViewItem* item = _listView->findItem(name,0);
+    TQListViewItem* item = _listView->tqfindItem(name,0);
     if (item) {
         _listView->takeItem(item);
         _listView->setSelected(_listView->currentItem(),true);
@@ -108,7 +108,7 @@ void MapsListView::slotItemRenamed(TQListViewItem* item) {
 
 void MapsListView::changeMapName(const TQString & oldName, const TQString & newName) {
 //    kdDebug() << "MapsListView::changeMapName : " << oldName << " to " << newName << endl;
-    TQListViewItem* item = _listView->findItem(oldName,0);
+    TQListViewItem* item = _listView->tqfindItem(oldName,0);
     if (item) {
         item->setText(0,newName);
 //        kdDebug() << "MapsListView::changeMapName : successful" << endl;
diff --git a/kimagemapeditor/mapslistview.h b/kimagemapeditor/mapslistview.h
index 467279ae..ca1707af 100644
--- a/kimagemapeditor/mapslistview.h
+++ b/kimagemapeditor/mapslistview.h
@@ -28,11 +28,12 @@ class KListView;
  * 
  * Jan Schaefer
  **/
-class MapsListView : public QVBox
+class MapsListView : public TQVBox
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  MapsListView(TQWidget *parent, const char *name);
+  MapsListView(TQWidget *tqparent, const char *name);
   ~MapsListView();
   
   /**
@@ -41,7 +42,7 @@ public:
   void addMap(const TQString &);
   
   /**
-   * Adds all maps of the given QList to the ListView
+   * Adds all maps of the given TQList to the ListView
    */
   void addMaps(TQPtrList<MapTag> *);
   
diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp
index 4c10d102..19c638cf 100644
--- a/kimagemapeditor/qextfileinfo.cpp
+++ b/kimagemapeditor/qextfileinfo.cpp
@@ -32,10 +32,10 @@
 //app includes
 #include "qextfileinfo.h"
 
-TQString QExtFileInfo::lastErrorMsg = "";
+TQString TQExtFileInfo::lastErrorMsg = "";
 
 /** create a relative short url based in baseURL*/
-KURL QExtFileInfo::toRelative(const KURL& urlToConvert,const KURL& baseURL)
+KURL TQExtFileInfo::toRelative(const KURL& urlToConvert,const KURL& baseURL)
 {
   KURL resultURL = urlToConvert;
   if (urlToConvert.protocol() == baseURL.protocol())
@@ -52,8 +52,8 @@ KURL QExtFileInfo::toRelative(const KURL& urlToConvert,const KURL& baseURL)
       int pos1=0;
       for (;;)
       {
-        pos=path.find("/");
-        pos1=basePath.find("/");
+        pos=path.tqfind("/");
+        pos1=basePath.tqfind("/");
         if ( pos<0 || pos1<0 ) break;
         if ( path.left(pos+1 ) == basePath.left(pos1+1) )
         {
@@ -65,7 +65,7 @@ KURL QExtFileInfo::toRelative(const KURL& urlToConvert,const KURL& baseURL)
       };
 
       if ( basePath == "/" ) basePath="";
-      int level = basePath.contains("/");
+      int level = basePath.tqcontains("/");
       for (int i=0; i<level; i++)
       {
         path="../"+path;
@@ -79,7 +79,7 @@ KURL QExtFileInfo::toRelative(const KURL& urlToConvert,const KURL& baseURL)
   return resultURL;
 }
 /** convert relative filename to absolute */
-KURL QExtFileInfo::toAbsolute(const KURL& urlToConvert,const KURL& baseURL)
+KURL TQExtFileInfo::toAbsolute(const KURL& urlToConvert,const KURL& baseURL)
 {
   KURL resultURL = urlToConvert;
   if (urlToConvert.protocol() == baseURL.protocol() && !urlToConvert.path().startsWith("/"))
@@ -87,11 +87,11 @@ KURL QExtFileInfo::toAbsolute(const KURL& urlToConvert,const KURL& baseURL)
     int pos;
     TQString cutname = urlToConvert.path();
     TQString cutdir = baseURL.path(1);
-    while ( (pos = cutname.find("../")) >=0 )
+    while ( (pos = cutname.tqfind("../")) >=0 )
     {
        cutname.remove( 0, pos+3 );
        cutdir.remove( cutdir.length()-1, 1 );
-       cutdir.remove( cutdir.findRev('/')+1 , 1000);
+       cutdir.remove( cutdir.tqfindRev('/')+1 , 1000);
     }
     resultURL.setPath(TQDir::cleanDirPath(cutdir+cutname));
   }
@@ -105,27 +105,27 @@ KURL QExtFileInfo::toAbsolute(const KURL& urlToConvert,const KURL& baseURL)
   This is needed for empty directory adding/handling. (Andras)
   Currently works only for local directories
 */
-KURL::List QExtFileInfo::allFiles( const KURL& path, const TQString& mask)
+KURL::List TQExtFileInfo::allFiles( const KURL& path, const TQString& tqmask)
 {
-  QExtFileInfo internalFileInfo;
-  return internalFileInfo.allFilesInternal(path, mask);
+  TQExtFileInfo internalFileInfo;
+  return internalFileInfo.allFilesInternal(path, tqmask);
 }
 
-KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& mask)
+KURL::List TQExtFileInfo::allFilesRelative( const KURL& path, const TQString& tqmask)
 {
-  QExtFileInfo internalFileInfo;
-  KURL::List r = internalFileInfo.allFilesInternal( path, mask);
+  TQExtFileInfo internalFileInfo;
+  KURL::List r = internalFileInfo.allFilesInternal( path, tqmask);
 
   KURL::List::Iterator it;
   for ( it = r.begin(); it != r.end(); ++it )
   {
-    *it = QExtFileInfo::toRelative( *it, path );
+    *it = TQExtFileInfo::toRelative( *it, path );
   }
 
   return r;
 }
 
-bool QExtFileInfo::createDir( const KURL& path )
+bool TQExtFileInfo::createDir( const KURL& path )
 {
   int i=0;
   bool result;
@@ -150,7 +150,7 @@ bool QExtFileInfo::createDir( const KURL& path )
  return result;
 }
 
-KURL QExtFileInfo::cdUp(const KURL &url)
+KURL TQExtFileInfo::cdUp(const KURL &url)
 {
   KURL u = url;
   TQString dir = u.path(-1);
@@ -162,17 +162,17 @@ KURL QExtFileInfo::cdUp(const KURL &url)
   return u;
 }
 
-TQString QExtFileInfo::shortName(const TQString &fname)
+TQString TQExtFileInfo::shortName(const TQString &fname)
 {
   return fname.section("/",-1);
 }
 
-KURL QExtFileInfo::path( const KURL &url )
+KURL TQExtFileInfo::path( const KURL &url )
 {
   return KURL( url.directory(false,false) );
 }
 
-KURL QExtFileInfo::home()
+KURL TQExtFileInfo::home()
 {
   KURL url;
   url.setPath(TQDir::currentDirPath()+"/");
@@ -180,7 +180,7 @@ KURL QExtFileInfo::home()
 }
 
 
-bool QExtFileInfo::exists(const KURL& a_url)
+bool TQExtFileInfo::exists(const KURL& a_url)
 {
 // Andras: Don't use it now, as it brings up an extra dialog and need manual
 // intervention when usign fish
@@ -192,21 +192,21 @@ bool QExtFileInfo::exists(const KURL& a_url)
     return TQFile::exists( a_url.path() );
  } else
  {
-  QExtFileInfo internalFileInfo;
+  TQExtFileInfo internalFileInfo;
   return internalFileInfo.internalExists(a_url);
  }
 }
 
 /* Synchronouse copy, like NetAccess::file_copy in KDE 3.2 */
-bool QExtFileInfo::copy( const KURL& src, const KURL& target, int permissions,
+bool TQExtFileInfo::copy( const KURL& src, const KURL& target, int permissions,
  bool overwrite, bool resume, TQWidget* window )
 {
-  QExtFileInfo internalFileInfo;
+  TQExtFileInfo internalFileInfo;
   return internalFileInfo.internalCopy( src, target, permissions, overwrite, resume, window );
 }
 
 /** No descriptions */
-KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& mask)
+KURL::List TQExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& tqmask)
 {
   dirListItems.clear();
   if (internalExists(startURL))
@@ -214,7 +214,7 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString&
     lstFilters.setAutoDelete(true);
     lstFilters.clear();
     // Split on white space
-    TQStringList list = TQStringList::split( ' ', mask );
+    TQStringList list = TQStringList::split( ' ', tqmask );
     for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
        lstFilters.append( new TQRegExp(*it, false, true ) );
 
@@ -240,10 +240,10 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString&
 
 //Some hackery from KIO::NetAccess as they do not do exactly what we want
 /* return true if the url exists*/
-bool QExtFileInfo::internalExists(const KURL& url)
+bool TQExtFileInfo::internalExists(const KURL& url)
 {
   bJobOK = true;
- // kdDebug(24000)<<"QExtFileInfo::internalExists"<<endl;
+ // kdDebug(24000)<<"TQExtFileInfo::internalExists"<<endl;
   KIO::StatJob * job = KIO::stat( url, false);
   job->setDetails(0);
   job->setSide(false); //check the url for writing
@@ -252,13 +252,13 @@ bool QExtFileInfo::internalExists(const KURL& url)
 
   //To avoid lock-ups, start a timer.
   TQTimer::singleShot(10*1000, this,TQT_SLOT(slotTimeout()));
-//  kdDebug(24000)<<"QExtFileInfo::internalExists:before enter_loop"<<endl;
+//  kdDebug(24000)<<"TQExtFileInfo::internalExists:before enter_loop"<<endl;
   enter_loop();
-//  kdDebug(24000)<<"QExtFileInfo::internalExists:after enter_loop"<<endl;
+//  kdDebug(24000)<<"TQExtFileInfo::internalExists:after enter_loop"<<endl;
   return bJobOK;
 }
 
-bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permissions,
+bool TQExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permissions,
                                 bool overwrite, bool resume, TQWidget* window)
 {
   bJobOK = true; // success unless further error occurs
@@ -277,18 +277,18 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss
 void qt_enter_modal( TQWidget *widget );
 void qt_leave_modal( TQWidget *widget );
 
-void QExtFileInfo::enter_loop()
+void TQExtFileInfo::enter_loop()
 {
   TQWidget dummy(0,0,WType_Dialog | WShowModal);
-  dummy.setFocusPolicy( TQWidget::NoFocus );
+  dummy.setFocusPolicy( TQ_NoFocus );
   qt_enter_modal(&dummy);
-//  kdDebug(24000)<<"QExtFileInfo::enter_loop:before qApp->enter_loop()"<<endl;
-  qApp->enter_loop();
-//  kdDebug(24000)<<"QExtFileInfo::enter_loop:after qApp->enter_loop()"<<endl;
+//  kdDebug(24000)<<"TQExtFileInfo::enter_loop:before tqApp->enter_loop()"<<endl;
+  tqApp->enter_loop();
+//  kdDebug(24000)<<"TQExtFileInfo::enter_loop:after tqApp->enter_loop()"<<endl;
   qt_leave_modal(&dummy);
 }
 
-void QExtFileInfo::slotResult( KIO::Job * job )
+void TQExtFileInfo::slotResult( KIO::Job * job )
 {
   bJobOK = !job->error();
   if ( !bJobOK )
@@ -298,14 +298,14 @@ void QExtFileInfo::slotResult( KIO::Job * job )
   }
   if ( job->isA("KIO::StatJob") )
     m_entry = static_cast<KIO::StatJob *>(job)->statResult();
-  qApp->exit_loop();
+  tqApp->exit_loop();
 }
 
-void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList)
+void TQExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList)
 {
   KURL url = static_cast<KIO::ListJob *>(job)->url();
   url.adjustPath(-1);
-  // avoid creating these QStrings again and again
+  // avoid creating these TQStrings again and again
   static const TQString& dot = KGlobal::staticQString(".");
   static const TQString& dotdot = KGlobal::staticQString("..");
 
@@ -339,9 +339,9 @@ void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsLis
 }
 
 /** Timeout occured while waiting for some network function to return. */
-void QExtFileInfo::slotTimeout()
+void TQExtFileInfo::slotTimeout()
 {
   bJobOK = false;
-  qApp->exit_loop();
+  tqApp->exit_loop();
 }
 #include "qextfileinfo.moc"
diff --git a/kimagemapeditor/qextfileinfo.h b/kimagemapeditor/qextfileinfo.h
index 6f2b867c..7842e338 100644
--- a/kimagemapeditor/qextfileinfo.h
+++ b/kimagemapeditor/qextfileinfo.h
@@ -9,8 +9,8 @@
     (at your option) any later version.
 */
 
-#ifndef _QEXTFILEINFO_H_
-#define _QEXTFILEINFO_H_
+#ifndef _TQEXTFILEINFO_H_
+#define _TQEXTFILEINFO_H_
 
 #include <kio/global.h>
 #include <kio/job.h>
@@ -21,20 +21,21 @@
 #include <tqptrlist.h>
 #include <tqregexp.h>
 
-class QExtFileInfo:public QObject
+class TQExtFileInfo:public TQObject
 {
  Q_OBJECT
+  TQ_OBJECT
 public:
-  QExtFileInfo() {};
-  ~QExtFileInfo() {};
+  TQExtFileInfo() {};
+  ~TQExtFileInfo() {};
 
   /** create to ralative short name */
   static KURL toRelative(const KURL& urlToConvert,const KURL& baseURL);
   /** convert relative filename to absolute */
   static KURL toAbsolute(const KURL& urlToConvert,const KURL& baseURL);
   /** recurse function for all files in dir */
-  static KURL::List allFiles( const KURL& path, const TQString &mask);
-  static KURL::List allFilesRelative( const KURL& path, const TQString &mask);
+  static KURL::List allFiles( const KURL& path, const TQString &tqmask);
+  static KURL::List allFilesRelative( const KURL& path, const TQString &tqmask);
   /** create dir if don't exists */
   static bool createDir(const KURL & path );
   static KURL cdUp(const KURL &dir);
@@ -59,7 +60,7 @@ private:
   TQPtrList<TQRegExp> lstFilters;
 
   /** No descriptions */
-  KURL::List allFilesInternal(const KURL& startURL, const TQString& mask);
+  KURL::List allFilesInternal(const KURL& startURL, const TQString& tqmask);
 
 //  friend class I_like_this_class;
 
diff --git a/klinkstatus/FEATURES b/klinkstatus/FEATURES
index 33a328e4..11ed0bf0 100644
--- a/klinkstatus/FEATURES
+++ b/klinkstatus/FEATURES
@@ -14,5 +14,5 @@
 - Tabbed checking (allow multiple sessions at the same time)
 - Filter checked links (good, broken, malformed and undetermined)
 - Configurable number of simultaneous connections (performance tunning)
-- Other configurable options like "check external links", "check parent folders", "timeout"
+- Other configurable options like "check external links", "check tqparent folders", "timeout"
 - Good integration with Quanta+
\ No newline at end of file
diff --git a/klinkstatus/data/styles/results_stylesheet.xsl b/klinkstatus/data/styles/results_stylesheet.xsl
index d0b0c10d..fac79c2f 100644
--- a/klinkstatus/data/styles/results_stylesheet.xsl
+++ b/klinkstatus/data/styles/results_stylesheet.xsl
@@ -30,7 +30,7 @@
                     <thead>
                         <tr>
                             <th>URL</th>
-                            <th>Status</th>
+                            <th>tqStatus</th>
                             <th>Label</th>
                             <th>Referrers</th>
                         </tr>
diff --git a/klinkstatus/src/Makefile.am b/klinkstatus/src/Makefile.am
index 590957a2..06c14b60 100644
--- a/klinkstatus/src/Makefile.am
+++ b/klinkstatus/src/Makefile.am
@@ -17,7 +17,7 @@ bin_PROGRAMS = klinkstatus
 
 # the application source, library search path, and link libraries
 
-klinkstatus_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+klinkstatus_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP
 klinkstatus_LDADD   = $(LIB_KPARTS)
 
 xdg_apps_DATA = klinkstatus.desktop
@@ -34,7 +34,7 @@ kde_module_LTLIBRARIES = libklinkstatuspart.la
 
 # the Part's source, library search path, and link libraries
 
-libklinkstatuspart_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+libklinkstatuspart_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP
 libklinkstatuspart_la_LIBADD = ui/settings/libsettings.la \
 	ui/libui.la engine/libengine.la \
 	parser/libparser.la utils/libutils.la $(LIB_KPARTS) $(LIB_KFILE)
diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp
index f126d977..94506ea3 100644
--- a/klinkstatus/src/actionmanager.cpp
+++ b/klinkstatus/src/actionmanager.cpp
@@ -63,8 +63,8 @@ public:
     SessionWidget* sessionWidget;
 };
 
-ActionManager::ActionManager(TQObject *parent, const char *name)
-        : TQObject(parent, name), d(new ActionManagerPrivate)
+ActionManager::ActionManager(TQObject *tqparent, const char *name)
+        : TQObject(tqparent, name), d(new ActionManagerPrivate)
 {}
 
 ActionManager::~ActionManager()
@@ -90,33 +90,33 @@ void ActionManager::initPart(KLinkStatusPart* part)
     new KAction(i18n("New Link Check"), "filenew",
                 0,
                 d->part, TQT_SLOT(slotNewLinkCheck()),
-                d->actionCollection, "new_link_check");
+                TQT_TQOBJECT(d->actionCollection), "new_link_check");
 
     new KAction(i18n("Open URL..."), "fileopen",
                 0,
                 d->part, TQT_SLOT(slotOpenLink()),
-                d->actionCollection, "open_link");
+                TQT_TQOBJECT(d->actionCollection), "open_link");
 
     action = new KAction(i18n("Close Tab"), "fileclose",
                          0,
                          d->part, TQT_SLOT(slotClose()),
-                         d->actionCollection, "close_tab");
+                         TQT_TQOBJECT(d->actionCollection), "close_tab");
     action->setEnabled(false);
 
     // *************** Settings menu *********************
 
-    (void) new KAction(i18n("Configure KLinkStatus..."), "configure",
-                       0, d->part, TQT_SLOT(slotConfigureKLinkStatus()),
-                       d->actionCollection, "configure_klinkstatus");
+    (void) new KAction(i18n("Configure KLinktqStatus..."), "configure",
+                       0, d->part, TQT_SLOT(slotConfigureKLinktqStatus()),
+                       TQT_TQOBJECT(d->actionCollection), "configure_klinkstatus");
 
     // *************** Help menu *********************
 
-    (void) new KAction(i18n("About KLinkStatus"), "klinkstatus",
+    (void) new KAction(i18n("About KLinktqStatus"), "klinkstatus",
                        0, d->part, TQT_SLOT(slotAbout()),
-                       d->actionCollection, "about_klinkstatus");
+                       TQT_TQOBJECT(d->actionCollection), "about_klinkstatus");
 
     (void) new KAction(i18n("&Report Bug..."), 0, 0, d->part,
-                       TQT_SLOT(slotReportBug()), d->actionCollection, "report_bug");
+                       TQT_SLOT(slotReportBug()), TQT_TQOBJECT(d->actionCollection), "report_bug");
 
     // *************** View menu *********************
 }
@@ -133,8 +133,8 @@ void ActionManager::initTabWidget(TabWidgetSession* tabWidgetSession)
     // *************** File menu *********************
 
     KAction* action = new KAction(i18n("E&xport Results as HTML..."), "filesave", 0,
-                                  d->tabWidgetSession, TQT_SLOT(slotExportAsHTML()),
-                                  d->actionCollection, "file_export_html");
+                                  TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotExportAsHTML()),
+                                  TQT_TQOBJECT(d->actionCollection), "file_export_html");
     action->setEnabled(false);
 
     // *************** View menu *********************
@@ -142,39 +142,39 @@ void ActionManager::initTabWidget(TabWidgetSession* tabWidgetSession)
     //     this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget
     KToggleAction* toggle_action = new KToggleAction(i18n("&Follow last Link checked"),
                                    "make_kdevelop", "Ctrl+f",
-                                   d->tabWidgetSession, TQT_SLOT(slotFollowLastLinkChecked()),
-                                   d->actionCollection, "follow_last_link_checked");
+                                   TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotFollowLastLinkChecked()),
+                                   TQT_TQOBJECT(d->actionCollection), "follow_last_link_checked");
     toggle_action->setChecked(KLSConfig::followLastLinkChecked());
 
     //     this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget
     toggle_action = new KToggleAction(i18n("&Hide Search Panel"), "bottom", "Ctrl+h",
-                                      d->tabWidgetSession, TQT_SLOT(slotHideSearchPanel()),
-                                      d->actionCollection, "hide_search_bar");
+                                      TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotHideSearchPanel()),
+                                      TQT_TQOBJECT(d->actionCollection), "hide_search_bar");
     KGuiItem item(i18n("&Show Search Panel"), "top", "Show Search Panel");
     toggle_action->setCheckedState(item);
     
     new KAction(i18n("&Reset Search Options"), "reload", "F5",
-                d->tabWidgetSession, TQT_SLOT(slotResetSearchOptions()),
-                d->actionCollection, "reset_search_bar");
+                TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotResetSearchOptions()),
+                TQT_TQOBJECT(d->actionCollection), "reset_search_bar");
 
     // *************** Search menu *********************
     
     toggle_action = new KToggleAction(i18n("&Start Search"),
                                       "player_play", "Ctrl+s",
-                                      d->tabWidgetSession, TQT_SLOT(slotStartSearch()),
-                                      d->actionCollection, "start_search");
+                                      TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotStartSearch()),
+                                      TQT_TQOBJECT(d->actionCollection), "start_search");
     toggle_action->setEnabled(false);
     
     toggle_action = new KToggleAction(i18n("&Pause Search"),
                                       "player_pause", "Ctrl+p",
-                                      d->tabWidgetSession, TQT_SLOT(slotPauseSearch()),
-                                      d->actionCollection, "pause_search");    
+                                      TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotPauseSearch()),
+                                      TQT_TQOBJECT(d->actionCollection), "pause_search");    
     toggle_action->setEnabled(false);
     
     action = new KAction(i18n("St&op Search"),
                                   "player_stop", "Ctrl+c",
-                                  d->tabWidgetSession, TQT_SLOT(slotStopSearch()),
-                                  d->actionCollection, "stop_search");
+                                  TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotStopSearch()),
+                                  TQT_TQOBJECT(d->actionCollection), "stop_search");
     action->setEnabled(false);
 }
 
diff --git a/klinkstatus/src/actionmanager.h b/klinkstatus/src/actionmanager.h
index 53fc1003..b2426d8d 100644
--- a/klinkstatus/src/actionmanager.h
+++ b/klinkstatus/src/actionmanager.h
@@ -34,11 +34,12 @@ class TabWidgetSession;
  
     interface for accessing actions, popup menus etc. from widgets.
 */
-class ActionManager : public QObject
+class ActionManager : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ActionManager(TQObject* parent=0, const char* name=0);
+    ActionManager(TQObject* tqparent=0, const char* name=0);
     virtual ~ActionManager();
 
     static ActionManager* getInstance();
diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp
index 8186bda8..32e17329 100644
--- a/klinkstatus/src/engine/linkchecker.cpp
+++ b/klinkstatus/src/engine/linkchecker.cpp
@@ -43,9 +43,9 @@
 
 int LinkChecker::count_ = 0;
 
-LinkChecker::LinkChecker(LinkStatus* linkstatus, int time_out,
-                         TQObject *parent, const char *name)
-        : TQObject(parent, name), search_manager_(0), 
+LinkChecker::LinkChecker(LinktqStatus* linkstatus, int time_out,
+                         TQObject *tqparent, const char *name)
+        : TQObject(tqparent, name), search_manager_(0), 
         linkstatus_(linkstatus), t_job_(0), time_out_(time_out), checker_(0), document_charset_(), 
         redirection_(false), header_checked_(false), finnished_(false), 
         parsing_(false), is_charset_checked_(false), has_defined_charset_(false)
@@ -69,7 +69,7 @@ void LinkChecker::check()
 {
     Q_ASSERT(!finnished_);
 
-    KURL url(linkStatus()->absoluteUrl());
+    KURL url(linktqStatus()->absoluteUrl());
     Q_ASSERT(url.isValid());
 
     if(url.hasRef()) {
@@ -84,8 +84,8 @@ void LinkChecker::check()
 
     t_job_->addMetaData("PropagateHttpHeader", "true"); // to have the http header
 
-    if (linkstatus_->parent()) {
-        t_job_->addMetaData("referrer", linkstatus_->parent()->absoluteUrl().prettyURL());
+    if (linkstatus_->tqparent()) {
+        t_job_->addMetaData("referrer", linkstatus_->tqparent()->absoluteUrl().prettyURL());
     }
 
     if(search_manager_->sendIdentification())
@@ -128,7 +128,7 @@ void LinkChecker::slotTimeOut()
             linkstatus_->setErrorOccurred(true);
             linkstatus_->setChecked(true);
             linkstatus_->setError(i18n("Timeout"));
-            linkstatus_->setStatus(LinkStatus::TIMEOUT);
+            linkstatus_->settqStatus(LinktqStatus::TIMEOUT);
 
             killJob();
             finnish();
@@ -146,9 +146,9 @@ void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type)
 
     Q_ASSERT(t_job_);
 
-    LinkStatus* ls = 0;
+    LinktqStatus* ls = 0;
 /*    if(redirection_)
-        ls = linkStatus()->redirection();
+        ls = linktqStatus()->redirection();
     else*/
         ls = linkstatus_;
     Q_ASSERT(ls);
@@ -168,7 +168,7 @@ void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type)
             if(!url.protocol().startsWith("http"))
             {
                 ls->setStatusText("OK");
-                ls->setStatus(LinkStatus::SUCCESSFULL);
+                ls->settqStatus(LinktqStatus::SUCCESSFULL);
                 
                 killJob();                
                 finnish();
@@ -186,7 +186,7 @@ void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type)
                 {
                     //kdDebug(23100) <<  "mimetype: " << type << endl;
                     ls->setStatusText("OK");
-                    ls->setStatus(LinkStatus::SUCCESSFULL);
+                    ls->settqStatus(LinktqStatus::SUCCESSFULL);
                     
                     killJob();                    
                     finnish();
@@ -206,9 +206,9 @@ void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data)
     
     Q_ASSERT(t_job_);
     
-    LinkStatus* ls = 0;
+    LinktqStatus* ls = 0;
 /*    if(redirection_)
-        ls = linkStatus()->redirection();
+        ls = linktqStatus()->redirection();
     else*/
         ls = linkstatus_;
     Q_ASSERT(ls);
@@ -235,7 +235,7 @@ void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data)
                 if(header_checked_)
                 {
                     killJob();
-                    linkstatus_->setStatus(getHttpStatus());
+                    linkstatus_->settqStatus(getHttptqStatus());
                     linkstatus_->setChecked(true);
                     finnish();
                     return;
@@ -253,7 +253,7 @@ void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data)
                 if(ls->mimeType() != "text/html" && header_checked_)
                 {
                     //kdDebug(23100) <<  "mimetype of " << ls->absoluteUrl().prettyURL() << ": " << ls->mimeType() << endl;
-                    ls->setStatus(getHttpStatus());
+                    ls->settqStatus(getHttptqStatus());
                     killJob();
                     finnish(); // if finnish is called before kill what you get is a segfault, don't know why
                     return;
@@ -262,7 +262,7 @@ void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data)
                 {
                     //kdDebug(23100) <<  "ERROR PAGE" << endl;
                     ls->setIsErrorPage(true);
-                    ls->setStatus(getHttpStatus());
+                    ls->settqStatus(getHttptqStatus());
                     killJob();
                     finnish();
                     return;
@@ -339,9 +339,9 @@ void LinkChecker::slotResult(KIO::Job* /*job*/)
         return;
     }
 
-    LinkStatus* ls = 0;
+    LinktqStatus* ls = 0;
     if(redirection_)
-        ls = linkStatus()->redirection();
+        ls = linktqStatus()->redirection();
     else
         ls = linkstatus_;
     Q_ASSERT(ls);
@@ -366,15 +366,15 @@ void LinkChecker::slotResult(KIO::Job* /*job*/)
         if(job->error() == KIO::ERR_IS_DIRECTORY)
         {
             ls->setStatusText("OK");
-            ls->setStatus(LinkStatus::SUCCESSFULL);
+            ls->settqStatus(LinktqStatus::SUCCESSFULL);
         }
         else
         {
             ls->setErrorOccurred(true);
             if(job->error() == KIO::ERR_SERVER_TIMEOUT)
-                ls->setStatus(LinkStatus::TIMEOUT);
+                ls->settqStatus(LinktqStatus::TIMEOUT);
             else
-                ls->setStatus(LinkStatus::BROKEN);
+                ls->settqStatus(LinktqStatus::BROKEN);
 
             if(job->errorString().isEmpty())
                 kdWarning(23100) << "\n\nError string is empty, error = " << job->error() << "\n\n\n";
@@ -389,7 +389,7 @@ void LinkChecker::slotResult(KIO::Job* /*job*/)
     {
         if(!ls->absoluteUrl().protocol().startsWith("http")) {
             ls->setStatusText("OK");
-            ls->setStatus(LinkStatus::SUCCESSFULL);
+            ls->settqStatus(LinktqStatus::SUCCESSFULL);
            }
         else
         {
@@ -402,7 +402,7 @@ void LinkChecker::slotResult(KIO::Job* /*job*/)
             }
             Q_ASSERT(header_checked_);
             
-            ls->setStatus(getHttpStatus());
+            ls->settqStatus(getHttptqStatus());
         }
 
         if(!doc_html_.isNull() && !doc_html_.isEmpty())
@@ -449,10 +449,10 @@ bool LinkChecker::processRedirection(KURL const& toUrl)
     linkstatus_->setHttpHeader(getHttpHeader(t_job_, false));
     linkstatus_->setIsRedirection(true);
     linkstatus_->setStatusText("redirection");
-    linkstatus_->setStatus(LinkStatus::HTTP_REDIRECTION);
+    linkstatus_->settqStatus(LinktqStatus::HTTP_REDIRECTION);
     linkstatus_->setChecked(true);
     
-    LinkStatus* ls_red = new LinkStatus(*linkstatus_);
+    LinktqStatus* ls_red = new LinktqStatus(*linkstatus_);
     ls_red->setAbsoluteUrl(toUrl);
     ls_red->setRootUrl(linkstatus_->rootUrl());
 
@@ -534,33 +534,33 @@ HttpResponseHeader LinkChecker::getHttpHeader(KIO::Job* /*job*/, bool remember_c
 
 void LinkChecker::checkRef()
 {
-    KURL url(linkStatus()->absoluteUrl());
+    KURL url(linktqStatus()->absoluteUrl());
     Q_ASSERT(url.hasRef());
     
     TQString ref = url.ref();
     if(ref == "" || ref == "top") {
         linkstatus_->setStatusText("OK");
-        linkstatus_->setStatus(LinkStatus::SUCCESSFULL);
+        linkstatus_->settqStatus(LinktqStatus::SUCCESSFULL);
         finnish();
         return;
     }
 
     TQString url_base;
-    LinkStatus const* ls_parent = 0;
+    LinktqStatus const* ls_parent = 0;
     int i_ref = -1;
 
-    if(linkStatus()->originalUrl().startsWith("#"))
-        ls_parent = linkStatus()->parent();
+    if(linktqStatus()->originalUrl().startsWith("#"))
+        ls_parent = linktqStatus()->tqparent();
 
     else
     {
-        i_ref = url.url().find("#");
+        i_ref = url.url().tqfind("#");
         url_base = url.url().left(i_ref);
         //kdDebug(23100) << "url_base: " << url_base << endl;
 
         Q_ASSERT(search_manager_);
 
-        ls_parent = search_manager_->linkStatus(url_base);
+        ls_parent = search_manager_->linktqStatus(url_base);
     }
 
     if(ls_parent)
@@ -603,22 +603,22 @@ void LinkChecker::checkRef(KURL const& url)
         search_manager_->addHtmlPart(url_string, html_part);
     }
 
-    if(hasAnchor(html_part, linkStatus()->absoluteUrl().ref()))
+    if(hasAnchor(html_part, linktqStatus()->absoluteUrl().ref()))
     {
         linkstatus_->setStatusText("OK");
-        linkstatus_->setStatus(LinkStatus::SUCCESSFULL);
+        linkstatus_->settqStatus(LinktqStatus::SUCCESSFULL);
     }
     else
     {
         linkstatus_->setErrorOccurred(true);
         linkstatus_->setError(i18n( "Link destination not found." ));
-        linkstatus_->setStatus(LinkStatus::BROKEN);
+        linkstatus_->settqStatus(LinktqStatus::BROKEN);
     }
 
     finnish();
 }
 
-void LinkChecker::checkRef(LinkStatus const* linkstatus_parent)
+void LinkChecker::checkRef(LinktqStatus const* linkstatus_parent)
 {
     Q_ASSERT(search_manager_);
 
@@ -638,16 +638,16 @@ void LinkChecker::checkRef(LinkStatus const* linkstatus_parent)
         search_manager_->addHtmlPart(url_string, html_part);
     }
 
-    if(hasAnchor(html_part, linkStatus()->absoluteUrl().ref()))
+    if(hasAnchor(html_part, linktqStatus()->absoluteUrl().ref()))
     {
         linkstatus_->setStatusText("OK");
-        linkstatus_->setStatus(LinkStatus::SUCCESSFULL);
+        linkstatus_->settqStatus(LinktqStatus::SUCCESSFULL);
     }
     else
     {
         linkstatus_->setErrorOccurred(true);
         linkstatus_->setError(i18n( "Link destination not found." ));
-        linkstatus_->setStatus(LinkStatus::BROKEN);
+        linkstatus_->settqStatus(LinktqStatus::BROKEN);
     }
 
     finnish();
@@ -684,20 +684,20 @@ void LinkChecker::killJob()
     aux->kill(true); // quietly   
 }
 
-LinkStatus::Status LinkChecker::getHttpStatus() const
+LinktqStatus::tqStatus LinkChecker::getHttptqStatus() const
 {
     TQString status_code = TQString::number(linkstatus_->httpHeader().statusCode());
     
     if(status_code[0] == '2')
-        return LinkStatus::SUCCESSFULL;
+        return LinktqStatus::SUCCESSFULL;
     else if(status_code[0] == '3')
-        return LinkStatus::HTTP_REDIRECTION;
+        return LinktqStatus::HTTP_REDIRECTION;
     else if(status_code[0] == '4')
-        return LinkStatus::HTTP_CLIENT_ERROR;
+        return LinktqStatus::HTTP_CLIENT_ERROR;
     else if(status_code[0] == '5')
-        return LinkStatus::HTTP_SERVER_ERROR;
+        return LinktqStatus::HTTP_SERVER_ERROR;
     else
-        return LinkStatus::UNDETERMINED;
+        return LinktqStatus::UNDETERMINED;
 }
 
 #include "linkchecker.moc"
diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h
index 168776d9..74cf9eb9 100644
--- a/klinkstatus/src/engine/linkchecker.h
+++ b/klinkstatus/src/engine/linkchecker.h
@@ -37,25 +37,26 @@ using namespace std;
 /**
 @author Paulo Moura Guedes
 */
-class LinkChecker : public QObject
+class LinkChecker : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    LinkChecker(LinkStatus* linkstatus, int time_out = 50,
-                TQObject *parent = 0, const char *name = 0);
+    LinkChecker(LinktqStatus* linkstatus, int time_out = 50,
+                TQObject *tqparent = 0, const char *name = 0);
     ~LinkChecker();
 
     //virtual void run();
     void check();
     void setSearchManager(SearchManager* search_manager);
 
-    LinkStatus const* linkStatus() const;
+    LinktqStatus const* linktqStatus() const;
 
     static bool hasAnchor(KHTMLPart* html_part, TQString const& anchor);
 
 signals:
 
-    void transactionFinished(const LinkStatus * linkstatus,
+    void transactionFinished(const LinktqStatus * linkstatus,
                              LinkChecker * checker);
     void jobFinnished(LinkChecker * checker);
 
@@ -75,8 +76,8 @@ protected:
 
 private:
     
-    LinkStatus::Status getHttpStatus() const;
-    void checkRef(LinkStatus const* linkstatus_parent);
+    LinktqStatus::tqStatus getHttptqStatus() const;
+    void checkRef(LinktqStatus const* linkstatus_parent);
     void checkRef(KURL const& url);
     void killJob();    
     /**
@@ -90,7 +91,7 @@ private:
 private:
 
     SearchManager* search_manager_;
-    LinkStatus* const linkstatus_;
+    LinktqStatus* const linkstatus_;
     KIO::TransferJob* t_job_;
     int time_out_;
     LinkChecker* checker_;
@@ -119,7 +120,7 @@ private:
     static int count_; // debug attribute that counts how many links were checked
 };
 
-inline LinkStatus const* LinkChecker::linkStatus() const
+inline LinktqStatus const* LinkChecker::linktqStatus() const
 {
     return linkstatus_;
 }
diff --git a/klinkstatus/src/engine/linkfilter.cpp b/klinkstatus/src/engine/linkfilter.cpp
index 1c7a3844..92dee430 100644
--- a/klinkstatus/src/engine/linkfilter.cpp
+++ b/klinkstatus/src/engine/linkfilter.cpp
@@ -22,7 +22,7 @@
 #include "linkstatus.h"
 
 
-LinkMatcher::LinkMatcher(TQString const& text, ResultView::Status status)
+LinkMatcher::LinkMatcher(TQString const& text, ResultView::tqStatus status)
     : m_text(text), m_status(status)
 {
 }
@@ -31,15 +31,15 @@ LinkMatcher::~LinkMatcher()
 {
 }
 
-bool LinkMatcher::matches(LinkStatus const& link ) const
+bool LinkMatcher::matches(LinktqStatus const& link ) const
 {
 /*    kdDebug() << link.absoluteUrl().url() << endl;
     kdDebug() << link.label() << endl;
-    kdDebug() << link.absoluteUrl().url().contains(m_text) << endl;
-    kdDebug() << link.label().contains(m_text) << endl;
+    kdDebug() << link.absoluteUrl().url().tqcontains(m_text) << endl;
+    kdDebug() << link.label().tqcontains(m_text) << endl;
     */
-    return (link.absoluteUrl().url().contains(m_text, false) || link.label().contains(m_text, false)) &&
-            ResultView::displayableWithStatus(&link, m_status);
+    return (link.absoluteUrl().url().tqcontains(m_text, false) || link.label().tqcontains(m_text, false)) &&
+            ResultView::displayableWithtqStatus(&link, m_status);
 }
 
 
diff --git a/klinkstatus/src/engine/linkfilter.h b/klinkstatus/src/engine/linkfilter.h
index 6d211aa6..908649d2 100644
--- a/klinkstatus/src/engine/linkfilter.h
+++ b/klinkstatus/src/engine/linkfilter.h
@@ -28,22 +28,22 @@
 class LinkMatcher
 {
 public:
-    LinkMatcher(TQString const& text, ResultView::Status status);
+    LinkMatcher(TQString const& text, ResultView::tqStatus status);
     ~LinkMatcher();
 
-    bool matches(LinkStatus const& link) const;
+    bool matches(LinktqStatus const& link) const;
 
     void setText(const TQString& text) { m_text = text; }
     TQString text() const { return m_text; }
 
-    void setStatus(ResultView::Status status) { m_status = status; }
-    ResultView::Status status() const { return m_status; }
+    void settqStatus(ResultView::tqStatus status) { m_status = status; }
+    ResultView::tqStatus status() const { return m_status; }
     
     bool nullFilter() const { return m_text.isEmpty() && m_status == ResultView::none; }
         
 private:
     TQString m_text;
-    ResultView::Status m_status;
+    ResultView::tqStatus m_status;
 };
 
 #endif
diff --git a/klinkstatus/src/engine/linkstatus.cpp b/klinkstatus/src/engine/linkstatus.cpp
index 58841a63..cec4cd52 100644
--- a/klinkstatus/src/engine/linkstatus.cpp
+++ b/klinkstatus/src/engine/linkstatus.cpp
@@ -28,20 +28,20 @@
 #include <tqdom.h>
 
 
-LinkStatus::~LinkStatus()
+LinktqStatus::~LinktqStatus()
 {
     //kdDebug(23100) <<  "|";
 
-    for(uint i = 0; i != children_nodes_.size(); ++i)
+    for(uint i = 0; i != tqchildren_nodes_.size(); ++i)
     {
-        if(children_nodes_[i])
+        if(tqchildren_nodes_[i])
         {
-            delete children_nodes_[i];
-            children_nodes_[i] = 0;
+            delete tqchildren_nodes_[i];
+            tqchildren_nodes_[i] = 0;
         }
     }
 
-    children_nodes_.clear();
+    tqchildren_nodes_.clear();
 
     if(isRedirection())
     {
@@ -53,7 +53,7 @@ LinkStatus::~LinkStatus()
     }
 }
 
-void LinkStatus::reset()
+void LinktqStatus::reset()
 {
     depth_ = -1;
     external_domain_depth_ = -1;
@@ -71,16 +71,16 @@ void LinkStatus::reset()
     http_header_ = HttpResponseHeader();
     error_ = "";
 
-    for(uint i = 0; i != children_nodes_.size(); ++i)
+    for(uint i = 0; i != tqchildren_nodes_.size(); ++i)
     {
-        if(children_nodes_[i])
+        if(tqchildren_nodes_[i])
         {
-            delete children_nodes_[i];
-            children_nodes_[i] = 0;
+            delete tqchildren_nodes_[i];
+            tqchildren_nodes_[i] = 0;
         }
     }
 
-    children_nodes_.clear();
+    tqchildren_nodes_.clear();
 
     if(isRedirection())
     {
@@ -90,31 +90,31 @@ void LinkStatus::reset()
             redirection_ = 0;
         }
     }
-    Q_ASSERT(!parent_);
+    Q_ASSERT(!tqparent_);
     base_URI_ = "";
 }
 
-TQString const LinkStatus::toString() const
+TQString const LinktqStatus::toString() const
 {
     TQString aux;
 
     if(!is_root_)
     {
-        Q_ASSERT(parent_);
-        aux += i18n( "Parent: %1" ).arg( parent()->absoluteUrl().prettyURL() ) + "\n";
+        Q_ASSERT(tqparent_);
+        aux += i18n( "Parent: %1" ).tqarg( tqparent()->absoluteUrl().prettyURL() ) + "\n";
     }
     Q_ASSERT(!original_url_.isNull());
 
-    aux += i18n( "URL: %1" ).arg( absoluteUrl().prettyURL() ) + "\n";
-    aux += i18n( "Original URL: %1" ).arg( originalUrl() ) + "\n";
+    aux += i18n( "URL: %1" ).tqarg( absoluteUrl().prettyURL() ) + "\n";
+    aux += i18n( "Original URL: %1" ).tqarg( originalUrl() ) + "\n";
     if(node())
-        aux += i18n( "Node: %1" ).arg( node()->content() ) + "\n";
+        aux += i18n( "Node: %1" ).tqarg( node()->content() ) + "\n";
 
     return aux;
 }
 
 
-LinkStatus* LinkStatus::lastRedirection(LinkStatus* ls)
+LinktqStatus* LinktqStatus::lastRedirection(LinktqStatus* ls)
 {
     if(ls->isRedirection())
         if(ls->redirection())
@@ -125,7 +125,7 @@ LinkStatus* LinkStatus::lastRedirection(LinkStatus* ls)
         return ls;
 }
 
-void LinkStatus::loadNode()
+void LinktqStatus::loadNode()
 {
     Q_ASSERT(node_);
 
@@ -136,32 +136,32 @@ void LinkStatus::loadNode()
     {
         setErrorOccurred(true);
         setError(i18n( "Malformed" ));
-        setStatus(LinkStatus::MALFORMED);
+        settqStatus(LinktqStatus::MALFORMED);
         kdDebug(23100) <<  "Malformed:" << endl;
         kdDebug(23100) <<  "Node: " << node()->content() << endl;
         //kdDebug(23100) <<  toString() << endl; // probable segfault
     }
 }
 
-bool LinkStatus::malformed() const // don't inline please (#include "node.h")
+bool LinktqStatus::malformed() const // don't inline please (#include "node.h")
 {
     return (malformed_ || node_->malformed());
 }
 
-void LinkStatus::setChildrenNodes(vector<Node*> const& nodes) // don't inline please (#include "node.h")
+void LinktqStatus::setChildrenNodes(vector<Node*> const& nodes) // don't inline please (#include "node.h")
 {
-    children_nodes_.reserve(nodes.size());
-    children_nodes_ = nodes;
+    tqchildren_nodes_.reserve(nodes.size());
+    tqchildren_nodes_ = nodes;
 }
 
-void LinkStatus::setMalformed(bool flag)
+void LinktqStatus::setMalformed(bool flag)
 {
     malformed_ = flag;
     if(flag)
     {
         setErrorOccurred(true);
         setError(i18n( "Malformed" ));
-        setStatus(LinkStatus::MALFORMED);
+        settqStatus(LinktqStatus::MALFORMED);
         kdDebug(23100) <<  "Malformed!" << endl;
         kdDebug(23100) <<  node()->content() << endl;
         //kdDebug(23100) <<  toString() << endl; // probable segfault
@@ -170,11 +170,11 @@ void LinkStatus::setMalformed(bool flag)
     {
         setErrorOccurred(false);
         setError("");
-        setStatus(LinkStatus::UNDETERMINED);
+        settqStatus(LinktqStatus::UNDETERMINED);
     }
 }
 
-void LinkStatus::save(TQDomElement& element) const
+void LinktqStatus::save(TQDomElement& element) const
 {
     TQDomElement child_element = element.ownerDocument().createElement("link");
 
@@ -186,7 +186,7 @@ void LinkStatus::save(TQDomElement& element) const
     // <status>
     tmp_1 = element.ownerDocument().createElement("status");
     tmp_1.setAttribute("broken", 
-                       ResultView::displayableWithStatus(this, ResultView::bad) ? 
+                       ResultView::displayableWithtqStatus(this, ResultView::bad) ? 
                                "true" : "false");
     tmp_1.appendChild(element.ownerDocument().createTextNode(statusText()));
     child_element.appendChild(tmp_1);
diff --git a/klinkstatus/src/engine/linkstatus.h b/klinkstatus/src/engine/linkstatus.h
index 59a45751..7ec26ca9 100644
--- a/klinkstatus/src/engine/linkstatus.h
+++ b/klinkstatus/src/engine/linkstatus.h
@@ -43,11 +43,11 @@ using namespace std;
 
 class Node;
 
-class LinkStatus
+class LinktqStatus
 {
 public:
 
-    enum Status {
+    enum tqStatus {
         UNDETERMINED,
         SUCCESSFULL,
         BROKEN,
@@ -59,29 +59,29 @@ public:
         MALFORMED
     };
     
-    LinkStatus();
-    LinkStatus(KURL const& absolute_url);
-    LinkStatus(Node* node, LinkStatus* parent);
-    ~LinkStatus();
+    LinktqStatus();
+    LinktqStatus(KURL const& absolute_url);
+    LinktqStatus(Node* node, LinktqStatus* tqparent);
+    ~LinktqStatus();
 
     void save(TQDomElement& element) const;
     
     void reset();
     void setRootUrl(KURL const& url);
-    void setStatus(Status status);
+    void settqStatus(tqStatus status);
     void setDepth(uint depth);
-    void setParent(LinkStatus* parent);
+    void setParent(LinktqStatus* tqparent);
     void setOriginalUrl(TQString const& url_original);
     void setLabel(TQString const& label);
     void setAbsoluteUrl(KURL const& url_absoluto);
     void setDocHtml(TQString const& doc_html);
     void setHttpHeader(HttpResponseHeader const& cabecalho_http);
-    void setStatusText(TQString const& statusText); // FIXME Legacy. This should be eliminated in favor of LinkStatus::Status
+    void setStatusText(TQString const& statusText); // FIXME Legacy. This should be eliminated in favor of LinktqStatus::tqStatus
     void setError(TQString const& error);
     void setIsRoot(bool flag);
     void setErrorOccurred(bool houve_error);
     void setIsRedirection(bool e_redirection);
-    void setRedirection(LinkStatus* redirection);
+    void setRedirection(LinktqStatus* redirection);
     void setNode(Node* node);
     void setChildrenNodes(vector<Node*> const& nodes);
     void addChildNode(Node* node);
@@ -102,25 +102,25 @@ public:
     void addReferrer(KURL const& url);
 
     KURL const& rootUrl() const;
-    Status const& status() const;
+    tqStatus const& status() const;
     uint depth() const;
     bool local() const;         // linkstatus.paradigma.co.pt == paradigma.co.pt
     bool isLocalRestrict() const; // linkstatus.paradigma.co.pt != paradigma.co.pt
-    LinkStatus const* parent() const;
+    LinktqStatus const* tqparent() const;
     TQString const& originalUrl() const;
     TQString const& label() const;
     KURL const& absoluteUrl() const;
     TQString const& docHtml() const;
     HttpResponseHeader const& httpHeader() const;
     HttpResponseHeader& httpHeader();
-    TQString statusText() const; // FIXME Legacy. This should be eliminated in favor of LinkStatus::Status
+    TQString statusText() const; // FIXME Legacy. This should be eliminated in favor of LinktqStatus::tqStatus
     TQString const& error() const;
     bool isRoot() const;
     bool errorOccurred() const;
     bool isRedirection() const;
-    LinkStatus* redirection() const;
+    LinktqStatus* redirection() const;
     Node* node() const;
-    vector<Node*> const& childrenNodes() const;
+    vector<Node*> const& tqchildrenNodes() const;
     TQString const toString() const;
     bool checked() const;
     int externalDomainDepth() const;
@@ -137,19 +137,19 @@ public:
     TreeViewItem* treeViewItem() const;
     TQValueVector<KURL> const& referrers() const;
 
-    static LinkStatus* lastRedirection(LinkStatus* ls);
+    static LinktqStatus* lastRedirection(LinktqStatus* ls);
 
 private:
 
     /**
-       Load some atributes in function of his parent node.
+       Load some atributes in function of his tqparent node.
     */
     void loadNode();
 
 private:
 
     KURL root_url_; // The URL which made the search start
-    Status status_;
+    tqStatus status_;
     int depth_;
     int external_domain_depth_; // Para se poder escolher explorar domains diferentes ate n depth
     TQString original_url_;
@@ -157,14 +157,14 @@ private:
     KURL absolute_url_;
     TQString doc_html_;
     HttpResponseHeader http_header_;
-    TQString status_text_; // FIXME Legacy. This should be eliminated in favor of LinkStatus::Status
+    TQString status_text_; // FIXME Legacy. This should be eliminated in favor of LinktqStatus::tqStatus
     TQString error_;
     bool is_root_;
     bool error_occurred_;
     bool is_redirection_;
-    vector<Node*> children_nodes_;
-    LinkStatus* parent_;
-    LinkStatus* redirection_;
+    vector<Node*> tqchildren_nodes_;
+    LinktqStatus* tqparent_;
+    LinktqStatus* redirection_;
     bool checked_;
     bool only_check_header_;
     bool malformed_;
diff --git a/klinkstatus/src/engine/linkstatus_impl.h b/klinkstatus/src/engine/linkstatus_impl.h
index 5a875b2e..4d3faf36 100644
--- a/klinkstatus/src/engine/linkstatus_impl.h
+++ b/klinkstatus/src/engine/linkstatus_impl.h
@@ -18,17 +18,17 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-inline LinkStatus::LinkStatus()
-        : status_(LinkStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
-        error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false),
+inline LinktqStatus::LinktqStatus()
+        : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
+        error_occurred_(false), is_redirection_(false), tqparent_(0), redirection_(0), checked_(false),
         only_check_header_(true), malformed_(false),
         node_(0), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
         mimetype_(""), is_error_page_(false), tree_view_item_(0)
 {}
 
-inline LinkStatus::LinkStatus(KURL const& absolute_url)
-        : status_(LinkStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
-        error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false),
+inline LinktqStatus::LinktqStatus(KURL const& absolute_url)
+        : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
+        error_occurred_(false), is_redirection_(false), tqparent_(0), redirection_(0), checked_(false),
         only_check_header_(true), malformed_(false),
         node_(0), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
         mimetype_(""), is_error_page_(false), tree_view_item_(0)
@@ -36,147 +36,147 @@ inline LinkStatus::LinkStatus(KURL const& absolute_url)
     setAbsoluteUrl(absolute_url);
 }
 
-inline LinkStatus::LinkStatus(Node* node, LinkStatus* parent)
-        : status_(LinkStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
-        error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false),
+inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* tqparent)
+        : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
+        error_occurred_(false), is_redirection_(false), tqparent_(0), redirection_(0), checked_(false),
         only_check_header_(true), malformed_(false),
         node_(node), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
         mimetype_(""), is_error_page_(false), tree_view_item_(0)
 {
     loadNode();
 
-    setDepth(parent->depth() + 1);
-    setParent(parent);
-    setRootUrl(parent->rootUrl());
+    setDepth(tqparent->depth() + 1);
+    setParent(tqparent);
+    setRootUrl(tqparent->rootUrl());
 }
 
-inline void LinkStatus::setRootUrl(KURL const& url)
+inline void LinktqStatus::setRootUrl(KURL const& url)
 {
     root_url_ = url;
 }
 
-inline void LinkStatus::setStatus(Status status)
+inline void LinktqStatus::settqStatus(tqStatus status)
 {
     status_ = status;
 }
 
-inline void LinkStatus::setDepth(uint depth)
+inline void LinktqStatus::setDepth(uint depth)
 {
     depth_ = depth;
 }
 
-inline void LinkStatus::setParent(LinkStatus* parent)
+inline void LinktqStatus::setParent(LinktqStatus* tqparent)
 {
-    Q_ASSERT(parent);
+    Q_ASSERT(tqparent);
 
-    parent_ = parent;
-    addReferrer(parent->absoluteUrl());
+    tqparent_ = tqparent;
+    addReferrer(tqparent->absoluteUrl());
 }
 
-inline void LinkStatus::setAbsoluteUrl(KURL const& url_absoluto)
+inline void LinktqStatus::setAbsoluteUrl(KURL const& url_absoluto)
 {
     absolute_url_ = url_absoluto;
 }
 
-inline void LinkStatus::setOriginalUrl(TQString const& url_original)
+inline void LinktqStatus::setOriginalUrl(TQString const& url_original)
 {
     original_url_ = url_original;
 }
 
-inline void LinkStatus::setLabel(TQString const& label)
+inline void LinktqStatus::setLabel(TQString const& label)
 {
     label_ = label;
 }
 
-inline void LinkStatus::setDocHtml(TQString const& doc_html)
+inline void LinktqStatus::setDocHtml(TQString const& doc_html)
 {
     Q_ASSERT(!doc_html.isEmpty());
     doc_html_ = doc_html;
 }
 
-inline void LinkStatus::setHttpHeader(HttpResponseHeader const& cabecalho_http)
+inline void LinktqStatus::setHttpHeader(HttpResponseHeader const& cabecalho_http)
 {
     http_header_ = cabecalho_http;
 }
 
-inline void LinkStatus::setStatusText(TQString const& status)
+inline void LinktqStatus::setStatusText(TQString const& status)
 {
     Q_ASSERT(!status.isEmpty());
     status_text_ = status;
 }
 
-inline void LinkStatus::setError(TQString const& error)
+inline void LinktqStatus::setError(TQString const& error)
 {
     Q_ASSERT(!error.isEmpty());
     error_ = error;
 }
 
-inline void LinkStatus::setErrorOccurred(bool houve_error)
+inline void LinktqStatus::setErrorOccurred(bool houve_error)
 {
     error_occurred_ = houve_error;
 }
 
-inline void LinkStatus::setIsRoot(bool flag)
+inline void LinktqStatus::setIsRoot(bool flag)
 {
     is_root_ = flag;
     label_ = i18n("ROOT");
 }
 
-inline void LinkStatus::setRedirection(LinkStatus* redirection)
+inline void LinktqStatus::setRedirection(LinktqStatus* redirection)
 {
     Q_ASSERT(redirection != NULL);
     Q_ASSERT(isRedirection());
     redirection_ = redirection;
 }
 
-inline void LinkStatus::setIsRedirection(bool e_redirection)
+inline void LinktqStatus::setIsRedirection(bool e_redirection)
 {
     is_redirection_ = e_redirection;
 }
 
-inline void LinkStatus::addChildNode(Node* node)
+inline void LinktqStatus::addChildNode(Node* node)
 {
-    children_nodes_.push_back(node);
+    tqchildren_nodes_.push_back(node);
 }
 
-inline void LinkStatus::reserveMemoryForChildrenNodes(int n)
+inline void LinktqStatus::reserveMemoryForChildrenNodes(int n)
 {
     Q_ASSERT(n > 0);
-    children_nodes_.reserve(n);
+    tqchildren_nodes_.reserve(n);
 }
 
-inline void LinkStatus::setChecked(bool flag)
+inline void LinktqStatus::setChecked(bool flag)
 {
     checked_ = flag;
 }
 
-inline void LinkStatus::setExternalDomainDepth(int p)
+inline void LinktqStatus::setExternalDomainDepth(int p)
 {
     Q_ASSERT(p >= -1);
     external_domain_depth_ = p;
 }
 
-inline void LinkStatus::setOnlyCheckHeader(bool flag)
+inline void LinktqStatus::setOnlyCheckHeader(bool flag)
 {
     only_check_header_= flag;
 }
 
-inline void LinkStatus::setHasBaseURI(bool flag)
+inline void LinktqStatus::setHasBaseURI(bool flag)
 {
     has_base_URI_ = flag;
 }
 
-inline void LinkStatus::setHasHtmlDocTitle(bool flag)
+inline void LinktqStatus::setHasHtmlDocTitle(bool flag)
 {
     has_html_doc_title_ = flag;
 }
 
-inline void LinkStatus::setBaseURI(KURL const& base_url)
+inline void LinktqStatus::setBaseURI(KURL const& base_url)
 {
     if(!base_url.isValid())
     {
         kdWarning(23100) <<  "base url not valid: " << endl
-        << "parent: " << parent()->absoluteUrl().prettyURL() << endl
+        << "tqparent: " << tqparent()->absoluteUrl().prettyURL() << endl
         << "url: " << absoluteUrl().prettyURL() << endl
         << "base url resolved: " << base_url.prettyURL() << endl;
     }
@@ -186,7 +186,7 @@ inline void LinkStatus::setBaseURI(KURL const& base_url)
     base_URI_ = base_url;
 }
 
-inline void LinkStatus::setHtmlDocTitle(TQString const& title)
+inline void LinktqStatus::setHtmlDocTitle(TQString const& title)
 {
     if(title.isNull() || title.isEmpty())
     {
@@ -199,34 +199,34 @@ inline void LinkStatus::setHtmlDocTitle(TQString const& title)
     html_doc_title_ = title;
 }
 
-inline void LinkStatus::setIgnored(bool flag)
+inline void LinktqStatus::setIgnored(bool flag)
 {
     ignored_ = flag;
 }
 
-inline void LinkStatus::setMimeType(TQString const& mimetype)
+inline void LinktqStatus::setMimeType(TQString const& mimetype)
 {
     Q_ASSERT(!mimetype.isNull() && !mimetype.isEmpty());
     mimetype_ = mimetype;
 }
 
-inline void LinkStatus::setIsErrorPage(bool flag)
+inline void LinktqStatus::setIsErrorPage(bool flag)
 {
     is_error_page_ = flag;
 }
 
-inline void LinkStatus::setIsLocalRestrict(bool flag)
+inline void LinktqStatus::setIsLocalRestrict(bool flag)
 {
     is_local_restrict_ = flag;
 }
 
-inline void LinkStatus::setTreeViewItem(TreeViewItem* tree_view_item)
+inline void LinktqStatus::setTreeViewItem(TreeViewItem* tree_view_item)
 {
     Q_ASSERT(tree_view_item);
     tree_view_item_ = tree_view_item;
 }
 
-inline void LinkStatus::addReferrer(KURL const& url)
+inline void LinktqStatus::addReferrer(KURL const& url)
 {
     Q_ASSERT(url.isValid());
 
@@ -236,67 +236,67 @@ inline void LinkStatus::addReferrer(KURL const& url)
 
 
 
-inline KURL const& LinkStatus::rootUrl() const
+inline KURL const& LinktqStatus::rootUrl() const
 {
     return root_url_;
 }
 
-inline LinkStatus::Status const& LinkStatus::status() const
+inline LinktqStatus::tqStatus const& LinktqStatus::status() const
 {
     return status_;
 }
 
-inline uint LinkStatus::depth() const
+inline uint LinktqStatus::depth() const
 {
     return depth_;
 }
 
-inline bool LinkStatus::local() const
+inline bool LinktqStatus::local() const
 {
     return external_domain_depth_ == -1;
 }
 
-inline bool LinkStatus::isLocalRestrict() const
+inline bool LinktqStatus::isLocalRestrict() const
 {
     return is_local_restrict_;
 }
 
-inline LinkStatus const* LinkStatus::parent() const
+inline LinktqStatus const* LinktqStatus::tqparent() const
 {
-    return parent_;
+    return tqparent_;
 }
 
-inline TQString const& LinkStatus::originalUrl() const
+inline TQString const& LinktqStatus::originalUrl() const
 {
     return original_url_;
 }
 
-inline TQString const& LinkStatus::label() const
+inline TQString const& LinktqStatus::label() const
 {
     return label_;
 }
 
-inline KURL const& LinkStatus::absoluteUrl() const
+inline KURL const& LinktqStatus::absoluteUrl() const
 {
     return absolute_url_;
 }
 
-inline TQString const& LinkStatus::docHtml() const
+inline TQString const& LinktqStatus::docHtml() const
 {
     return doc_html_;
 }
 
-inline HttpResponseHeader const& LinkStatus::httpHeader() const
+inline HttpResponseHeader const& LinktqStatus::httpHeader() const
 {
     return http_header_;
 }
 
-inline HttpResponseHeader& LinkStatus::httpHeader()
+inline HttpResponseHeader& LinktqStatus::httpHeader()
 {
     return http_header_;
 }
 
-inline TQString LinkStatus::statusText() const
+inline TQString LinktqStatus::statusText() const
 {
     if(errorOccurred())
         return error();
@@ -314,103 +314,103 @@ inline TQString LinkStatus::statusText() const
     }
 }
 
-inline TQString const& LinkStatus::error() const
+inline TQString const& LinktqStatus::error() const
 {
     return error_;
 }
 
-inline bool LinkStatus::isRoot() const
+inline bool LinktqStatus::isRoot() const
 {
     return is_root_;
 }
 
-inline bool LinkStatus::errorOccurred() const
+inline bool LinktqStatus::errorOccurred() const
 {
     return error_occurred_;
 }
 
-inline bool LinkStatus::isRedirection() const
+inline bool LinktqStatus::isRedirection() const
 {
     return is_redirection_;
 }
 
-inline LinkStatus* LinkStatus::redirection() const
+inline LinktqStatus* LinktqStatus::redirection() const
 {
     Q_ASSERT(isRedirection());
     
     return redirection_;
 }
 
-inline Node* LinkStatus::node() const
+inline Node* LinktqStatus::node() const
 {
     //Q_ASSERT(node_);
     return node_;
 }
 
-inline vector<Node*> const& LinkStatus::childrenNodes() const
+inline vector<Node*> const& LinktqStatus::tqchildrenNodes() const
 {
-    return children_nodes_;
+    return tqchildren_nodes_;
 }
 
-inline bool LinkStatus::checked() const
+inline bool LinktqStatus::checked() const
 {
     return checked_;
 }
 
-inline int LinkStatus::externalDomainDepth() const
+inline int LinktqStatus::externalDomainDepth() const
 {
     return external_domain_depth_;
 }
 
-inline bool LinkStatus::onlyCheckHeader() const
+inline bool LinktqStatus::onlyCheckHeader() const
 {
     return only_check_header_;
 }
 
-inline bool LinkStatus::hasBaseURI() const
+inline bool LinktqStatus::hasBaseURI() const
 {
     return has_base_URI_;
 }
 
-inline bool LinkStatus::hasHtmlDocTitle() const
+inline bool LinktqStatus::hasHtmlDocTitle() const
 {
     return has_html_doc_title_;
 }
 
-inline KURL const& LinkStatus::baseURI() const
+inline KURL const& LinktqStatus::baseURI() const
 {
     Q_ASSERT(hasBaseURI());
     return base_URI_;
 }
 
-inline TQString const& LinkStatus::htmlDocTitle() const
+inline TQString const& LinktqStatus::htmlDocTitle() const
 {
     Q_ASSERT(has_html_doc_title_);
     return html_doc_title_;
 }
 
-inline bool LinkStatus::ignored() const
+inline bool LinktqStatus::ignored() const
 {
     return ignored_;
 }
 
-inline TQString LinkStatus::mimeType() const
+inline TQString LinktqStatus::mimeType() const
 {
     Q_ASSERT(!mimetype_.isNull());
     return mimetype_;
 }
 
-inline bool LinkStatus::isErrorPage() const
+inline bool LinktqStatus::isErrorPage() const
 {
     return is_error_page_;
 }
 
-inline TreeViewItem* LinkStatus::treeViewItem() const
+inline TreeViewItem* LinktqStatus::treeViewItem() const
 {
     return tree_view_item_;
 }
 
-inline TQValueVector<KURL> const& LinkStatus::referrers() const
+inline TQValueVector<KURL> const& LinktqStatus::referrers() const
 {
     return referrers_;
 }
diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp
index c64c3a89..3a34d04c 100644
--- a/klinkstatus/src/engine/searchmanager.cpp
+++ b/klinkstatus/src/engine/searchmanager.cpp
@@ -37,8 +37,8 @@
 
 
 SearchManager::SearchManager(int max_simultaneous_connections, int time_out,
-                             TQObject *parent, const char *name)
-        : TQObject(parent, name),
+                             TQObject *tqparent, const char *name)
+        : TQObject(tqparent, name),
         max_simultaneous_connections_(max_simultaneous_connections), has_document_root_(false), 
         depth_(-1), current_depth_(0), external_domain_depth_(0),
         current_node_(0), current_index_(0), links_being_checked_(0),
@@ -106,7 +106,7 @@ void SearchManager::cleanItems()
                     ((search_results_[i])[j])[l] = 0;
                 }
                 else
-                    kdDebug(23100) <<  "LinkStatus NULL!!" << endl;
+                    kdDebug(23100) <<  "LinktqStatus NULL!!" << endl;
             }
             search_results_[i][j].clear();
         }
@@ -148,7 +148,7 @@ void SearchManager::startSearch(KURL const& root, SearchMode const& modo)
 
     searching_ = true;
 
-    //Q_ASSERT(domain_ != TQString::null);
+    //Q_ASSERT(domain_ != TQString());
     checkRoot();
 }
 
@@ -191,8 +191,8 @@ void SearchManager::checkRoot()
     LinkChecker* checker = new LinkChecker(&root_, time_out_, this, "link_checker");
     checker->setSearchManager(this);
 
-    connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)),
-            this, TQT_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *)));
+    connect(checker, TQT_SIGNAL(transactionFinished(const LinktqStatus *, LinkChecker *)),
+            this, TQT_SLOT(slotRootChecked(const LinktqStatus *, LinkChecker *)));
     /*
         connect(checker, TQT_SIGNAL(jobFinnished(LinkChecker *)),
                 this, TQT_SLOT(slotLinkCheckerFinnished(LinkChecker *)));
@@ -200,11 +200,11 @@ void SearchManager::checkRoot()
     checker->check();
 }
 
-void SearchManager::slotRootChecked(const LinkStatus * link, LinkChecker * checker)
+void SearchManager::slotRootChecked(const LinktqStatus * link, LinkChecker * checker)
 {
     kdDebug(23100) <<  "SearchManager::slotRootChecked:" << endl;
     kdDebug(23100) <<  link->absoluteUrl().url() << " -> " << 
-            LinkStatus::lastRedirection(&root_)->absoluteUrl().url() << endl;
+            LinktqStatus::lastRedirection(&root_)->absoluteUrl().url() << endl;
 
     Q_ASSERT(checked_links_ == 0);
     Q_ASSERT(search_results_.size() == 0);
@@ -217,11 +217,11 @@ void SearchManager::slotRootChecked(const LinkStatus * link, LinkChecker * check
     {
         current_depth_ = 1;
 
-        vector<LinkStatus*> no = children(LinkStatus::lastRedirection(&root_));
+        vector<LinktqStatus*> no = tqchildren(LinktqStatus::lastRedirection(&root_));
 
         emit signalLinksToCheckTotalSteps(no.size());
 
-        vector< vector<LinkStatus*> > nivel;
+        vector< vector<LinktqStatus*> > nivel;
         nivel.push_back(no);
 
         search_results_.push_back(nivel);
@@ -255,14 +255,14 @@ void SearchManager::slotRootChecked(const LinkStatus * link, LinkChecker * check
     checker = 0;
 }
 
-vector<LinkStatus*> SearchManager::children(LinkStatus* link)
+vector<LinktqStatus*> SearchManager::tqchildren(LinktqStatus* link)
 {
-    vector<LinkStatus*> children;
+    vector<LinktqStatus*> tqchildren;
 
     if(!link || link->absoluteUrl().hasRef())
-        return children;
+        return tqchildren;
 
-    vector<Node*> const& nodes = link->childrenNodes();
+    vector<Node*> const& nodes = link->tqchildrenNodes();
 
     int count = 0;
     for(uint i = 0; i != nodes.size(); ++i)
@@ -278,12 +278,12 @@ vector<LinkStatus*> SearchManager::children(LinkStatus* link)
 
         if( (node->isLink() &&
                 checkable(url, *link) &&
-                !Url::existUrl(url, children) &&
+                !Url::existUrl(url, tqchildren) &&
                 !node->url().isEmpty())
                 ||
                 node->malformed() )
         {
-            LinkStatus* ls = new LinkStatus(node, link);
+            LinktqStatus* ls = new LinktqStatus(node, link);
             ls->setAbsoluteUrl(url);
 
             if(localDomain(ls->absoluteUrl()))
@@ -310,7 +310,7 @@ vector<LinkStatus*> SearchManager::children(LinkStatus* link)
             }
             Q_ASSERT(link->externalDomainDepth() <= external_domain_depth_);
 
-            children.push_back(ls);
+            tqchildren.push_back(ls);
         }
         if(count == 50)
         {
@@ -319,7 +319,7 @@ vector<LinkStatus*> SearchManager::children(LinkStatus* link)
         }
     }
 
-    return children;
+    return tqchildren;
 }
 
 bool SearchManager::existUrl(KURL const& url, KURL const& url_parent) const
@@ -331,7 +331,7 @@ bool SearchManager::existUrl(KURL const& url, KURL const& url_parent) const
         for(uint j = 0; j != search_results_[i].size(); ++j)
             for(uint l = 0; l != (search_results_[i])[j].size(); ++l)
             {
-                LinkStatus* tmp = search_results_[i][j][l];
+                LinktqStatus* tmp = search_results_[i][j][l];
                 Q_ASSERT(tmp);                
                 if(tmp->absoluteUrl() == url)
                 { // URL exists
@@ -352,7 +352,7 @@ bool SearchManager::existUrl(KURL const& url, KURL const& url_parent) const
     return false;
 }
 
-LinkStatus const* SearchManager::linkStatus(TQString const& s_url) const
+LinktqStatus const* SearchManager::linktqStatus(TQString const& s_url) const
 {
     Q_ASSERT(!s_url.isEmpty());
 
@@ -366,7 +366,7 @@ LinkStatus const* SearchManager::linkStatus(TQString const& s_url) const
             {
                 ++count;
 
-                LinkStatus* ls = search_results_[i][j][l];
+                LinktqStatus* ls = search_results_[i][j][l];
                 Q_ASSERT(ls);
                 if(ls->absoluteUrl().url() == s_url && ls->checked())
                     return ls;
@@ -402,7 +402,7 @@ void SearchManager::continueSearch()
 {
     Q_ASSERT(!links_being_checked_);
 
-    vector<LinkStatus*> const& no = nodeToAnalize();
+    vector<LinktqStatus*> const& no = nodeToAnalize();
 
     if((uint)current_index_ < no.size())
         checkVectorLinks(no);
@@ -442,7 +442,7 @@ void SearchManager::continueSearch()
     }
 }
 
-vector<LinkStatus*> const& SearchManager::nodeToAnalize() const
+vector<LinktqStatus*> const& SearchManager::nodeToAnalize() const
 {
     Q_ASSERT( (uint)current_depth_ == search_results_.size() );
     Q_ASSERT( (uint)current_node_ < (search_results_[current_depth_ - 1]).size() );
@@ -450,14 +450,14 @@ vector<LinkStatus*> const& SearchManager::nodeToAnalize() const
     return (search_results_[current_depth_ - 1])[current_node_];
 }
 
-void SearchManager::checkVectorLinks(vector<LinkStatus*> const& links)
+void SearchManager::checkVectorLinks(vector<LinktqStatus*> const& links)
 {
     checkLinksSimultaneously(chooseLinks(links));
 }
 
-vector<LinkStatus*> SearchManager::chooseLinks(vector<LinkStatus*> const& links)
+vector<LinktqStatus*> SearchManager::chooseLinks(vector<LinktqStatus*> const& links)
 {
-    vector<LinkStatus*> escolha;
+    vector<LinktqStatus*> escolha;
     for(int i = 0; i != max_simultaneous_connections_; ++i)
     {
         if((uint)current_index_ < links.size())
@@ -466,7 +466,7 @@ vector<LinkStatus*> SearchManager::chooseLinks(vector<LinkStatus*> const& links)
     return escolha;
 }
 
-void SearchManager::checkLinksSimultaneously(vector<LinkStatus*> const& links)
+void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
 {
     Q_ASSERT(finished_connections_ <= max_simultaneous_connections_);
     finished_connections_ = 0;
@@ -480,7 +480,7 @@ void SearchManager::checkLinksSimultaneously(vector<LinkStatus*> const& links)
 
     for(uint i = 0; i != links.size(); ++i)
     {
-        LinkStatus* ls(links[i]);
+        LinktqStatus* ls(links[i]);
         Q_ASSERT(ls);
 
         TQString protocol = ls->absoluteUrl().protocol();
@@ -491,19 +491,19 @@ void SearchManager::checkLinksSimultaneously(vector<LinkStatus*> const& links)
         if(ls->malformed())
         {
             Q_ASSERT(ls->errorOccurred());
-            Q_ASSERT(ls->status() == LinkStatus::MALFORMED);
+            Q_ASSERT(ls->status() == LinktqStatus::MALFORMED);
 
             ls->setChecked(true);
             slotLinkChecked(ls, 0);
         }
 
-        else if(ls->absoluteUrl().prettyURL().contains("javascript:", false))
+        else if(ls->absoluteUrl().prettyURL().tqcontains("javascript:", false))
         {
             ++ignored_links_;
             ls->setIgnored(true);
             ls->setErrorOccurred(true);
             ls->setError(i18n( "Javascript not supported" ));
-            ls->setStatus(LinkStatus::NOT_SUPPORTED);
+            ls->settqStatus(LinktqStatus::NOT_SUPPORTED);
             ls->setChecked(true);
             slotLinkChecked(ls, 0);
         }
@@ -513,8 +513,8 @@ void SearchManager::checkLinksSimultaneously(vector<LinkStatus*> const& links)
                     ++ignored_links_;
                     ls->setIgnored(true);
                     ls->setErrorOccurred(true);
-                    ls->setError(i18n("Protocol %1 not supported").arg(protocol));
-                    ls->setStatus(LinkStatus::MALFORMED);
+                    ls->setError(i18n("Protocol %1 not supported").tqarg(protocol));
+                    ls->settqStatus(LinktqStatus::MALFORMED);
                     ls->setChecked(true);
                     slotLinkChecked(ls, 0);
                 }
@@ -524,8 +524,8 @@ void SearchManager::checkLinksSimultaneously(vector<LinkStatus*> const& links)
             LinkChecker* checker = new LinkChecker(ls, time_out_, this, "link_checker");
             checker->setSearchManager(this);
 
-            connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)),
-                    this, TQT_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *)));
+            connect(checker, TQT_SIGNAL(transactionFinished(const LinktqStatus *, LinkChecker *)),
+                    this, TQT_SLOT(slotLinkChecked(const LinktqStatus *, LinkChecker *)));
             /*
                         connect(checker, TQT_SIGNAL(jobFinnished(LinkChecker *)),
                                 this, TQT_SLOT(slotLinkCheckerFinnished(LinkChecker *)));
@@ -535,11 +535,11 @@ void SearchManager::checkLinksSimultaneously(vector<LinkStatus*> const& links)
     }
 }
 
-void SearchManager::slotLinkChecked(const LinkStatus * link, LinkChecker * checker)
+void SearchManager::slotLinkChecked(const LinktqStatus * link, LinkChecker * checker)
 {
     kdDebug(23100) <<  "SearchManager::slotLinkChecked:" << endl;
 //     kdDebug(23100) <<  link->absoluteUrl().url() << " -> " << 
-//             LinkStatus::lastRedirection((const_cast<LinkStatus*> (link)))->absoluteUrl().url() << endl;
+//             LinktqStatus::lastRedirection((const_cast<LinktqStatus*> (link)))->absoluteUrl().url() << endl;
 
     Q_ASSERT(link);
     emit signalLinkChecked(link, checker);
@@ -569,8 +569,8 @@ void SearchManager::slotLinkChecked(const LinkStatus * link, LinkChecker * check
 
 void SearchManager::addLevel()
 {
-    search_results_.push_back(vector< vector <LinkStatus*> >());
-    vector< vector <LinkStatus*> >& ultimo_nivel(search_results_[search_results_.size() - 2]);
+    search_results_.push_back(vector< vector <LinktqStatus*> >());
+    vector< vector <LinktqStatus*> >& ultimo_nivel(search_results_[search_results_.size() - 2]);
 
     number_of_level_links_ = 0;
     number_of_links_to_check_ = 0;
@@ -591,7 +591,7 @@ void SearchManager::addLevel()
         uint end_sub1 = ultimo_nivel[i].size();
         for(uint j = 0; j != end_sub1; ++j) // links
         {
-            vector <LinkStatus*> f(children( LinkStatus::lastRedirection(((ultimo_nivel[i])[j])) ));
+            vector <LinktqStatus*> f(tqchildren( LinktqStatus::lastRedirection(((ultimo_nivel[i])[j])) ));
             if(f.size() != 0)
             {
                 search_results_[search_results_.size() - 1].push_back(f);
@@ -608,7 +608,7 @@ void SearchManager::addLevel()
         emit signalLinksToCheckTotalSteps(number_of_links_to_check_);
 }
 
-bool SearchManager::checkable(KURL const& url, LinkStatus const& link_parent) const
+bool SearchManager::checkable(KURL const& url, LinktqStatus const& link_parent) const
 {
     if(existUrl(url, link_parent.absoluteUrl()))
         return false;
@@ -618,7 +618,7 @@ bool SearchManager::checkable(KURL const& url, LinkStatus const& link_parent) co
 
     if(!check_parent_dirs_)
     {
-        if(Url::parentDir(root_.absoluteUrl(), url))
+        if(Url::tqparentDir(root_.absoluteUrl(), url))
             return false;
     }
     if(!check_external_links_)
@@ -638,7 +638,7 @@ bool SearchManager::checkable(KURL const& url, LinkStatus const& link_parent) co
     return true;
 }
 
-bool SearchManager::checkableByDomain(KURL const& url, LinkStatus const& link_parent) const
+bool SearchManager::checkableByDomain(KURL const& url, LinktqStatus const& link_parent) const
 {
     bool result = false;
     if(localDomain(url))
@@ -749,7 +749,7 @@ bool SearchManager::generalDomain() const
         if(!check_parent_dirs_)
             return false;
 
-        int barra = domain_.find('/');
+        int barra = domain_.tqfind('/');
         if(barra != -1 && (uint)barra != domain_.length() - 1)
         {
             kdDebug(23100) <<  "Domain nao vago" << endl;
@@ -781,7 +781,7 @@ bool SearchManager::generalDomain() const
     }
 }
 
-bool SearchManager::onlyCheckHeader(LinkStatus* ls) const
+bool SearchManager::onlyCheckHeader(LinktqStatus* ls) const
 {
     if(search_mode_ == depth)
         return current_depth_ == depth_;
@@ -805,7 +805,7 @@ void SearchManager::slotLinkCheckerFinnished(LinkChecker * checker)
     kdDebug(23100) <<  "deleting linkchecker" << endl;
 
     Q_ASSERT(checker);
-    //Q_ASSERT(checker->linkStatus()->checked());
+    //Q_ASSERT(checker->linktqStatus()->checked());
 
     delete checker;
     checker = 0;
@@ -813,7 +813,7 @@ void SearchManager::slotLinkCheckerFinnished(LinkChecker * checker)
 
 KHTMLPart* SearchManager::htmlPart(TQString const& key_url) const
 {
-    if(!html_parts_.contains(key_url))
+    if(!html_parts_.tqcontains(key_url))
         return 0;
 
     return html_parts_[key_url];
@@ -891,7 +891,7 @@ void SearchManager::save(TQDomElement& element) const
         {
             for(uint l = 0; l != (search_results_[i])[j].size(); ++l)
             {
-                LinkStatus* ls = ((search_results_[i])[j])[l];
+                LinktqStatus* ls = ((search_results_[i])[j])[l];
                 if(ls->checked())
                     ls->save(child_element);
             }
diff --git a/klinkstatus/src/engine/searchmanager.h b/klinkstatus/src/engine/searchmanager.h
index 5f2410ac..e977eae4 100644
--- a/klinkstatus/src/engine/searchmanager.h
+++ b/klinkstatus/src/engine/searchmanager.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef GESTOR_PESQUISA_H
-#define GESTOR_PESQUISA_H
+#ifndef GESTOR_PESTQUISA_H
+#define GESTOR_PESTQUISA_H
 
 #include <kurl.h>
 
@@ -41,9 +41,10 @@ using namespace std;
 
 typedef TQMap<TQString, KHTMLPart*> KHTMLPartMap;
 
-class SearchManager: public QObject
+class SearchManager: public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -54,7 +55,7 @@ public:
     };
 
     SearchManager(int max_simultaneous_connections = 3, int time_out = 50,
-                  TQObject *parent = 0, const char *name = 0);
+                  TQObject *tqparent = 0, const char *name = 0);
     ~SearchManager();
     
     TQString toXML() const;
@@ -94,12 +95,12 @@ public:
     SearchMode const& searchMode() const;
     bool checkRegularExpressions() const { return check_regular_expressions_; }
     bool existUrl(KURL const& url, KURL const& url_parent) const;
-    LinkStatus const* linkStatus(TQString const& s_url) const;
+    LinktqStatus const* linktqStatus(TQString const& s_url) const;
     int checkedLinks() const;
     TQTime timeElapsed() const;
     bool checkParentDirs() const;
     bool checkExternalLinks() const;
-    LinkStatus const* linkStatusRoot() const;
+    LinktqStatus const* linkStatusRoot() const;
     int maxSimultaneousConnections() const;
     int timeOut() const;
     
@@ -109,20 +110,20 @@ public:
 private:
 
     void checkRoot();
-    void checkVectorLinks(vector<LinkStatus*> const& links); // corresponde a um no de um nivel de depth
-    vector<LinkStatus*> children(LinkStatus* link);
+    void checkVectorLinks(vector<LinktqStatus*> const& links); // corresponde a um no de um nivel de depth
+    vector<LinktqStatus*> tqchildren(LinktqStatus* link);
     void startSearch();
     void continueSearch();
     void finnish();
     void pause();
-    vector<LinkStatus*> const& nodeToAnalize() const;
-    vector<LinkStatus*> chooseLinks(vector<LinkStatus*> const& links);
-    void checkLinksSimultaneously(vector<LinkStatus*> const& links);
+    vector<LinktqStatus*> const& nodeToAnalize() const;
+    vector<LinktqStatus*> chooseLinks(vector<LinktqStatus*> const& links);
+    void checkLinksSimultaneously(vector<LinktqStatus*> const& links);
     void addLevel();
-    bool checkableByDomain(KURL const& url, LinkStatus const& link_parent) const;
-    bool checkable(KURL const& url, LinkStatus const& link_parent) const;
+    bool checkableByDomain(KURL const& url, LinktqStatus const& link_parent) const;
+    bool checkable(KURL const& url, LinktqStatus const& link_parent) const;
     int maximumCurrentConnections() const;
-    bool onlyCheckHeader(LinkStatus* ls) const;
+    bool onlyCheckHeader(LinktqStatus* ls) const;
 
     /*
       Entende-se por domain vago um domain do tipo www.google.pt ou google.pt, pelo que,
@@ -134,15 +135,15 @@ private:
 
 private slots:
 
-    void slotRootChecked(const LinkStatus * link, LinkChecker * checker);
-    void slotLinkChecked(const LinkStatus * link, LinkChecker * checker);
+    void slotRootChecked(const LinktqStatus * link, LinkChecker * checker);
+    void slotLinkChecked(const LinktqStatus * link, LinkChecker * checker);
     void slotSearchFinished();
     void slotLinkCheckerFinnished(LinkChecker * checker);
 
 signals:
 
-    void signalRootChecked(const LinkStatus * link, LinkChecker * checker);
-    void signalLinkChecked(const LinkStatus * link, LinkChecker * checker);
+    void signalRootChecked(const LinktqStatus * link, LinkChecker * checker);
+    void signalLinkChecked(const LinktqStatus * link, LinkChecker * checker);
     void signalSearchFinished();
     void signalSearchPaused();
     void signalAddingLevelTotalSteps(uint number_of_links);
@@ -154,7 +155,7 @@ private:
 
     int max_simultaneous_connections_;
     SearchMode search_mode_;
-    LinkStatus root_;
+    LinktqStatus root_;
     bool has_document_root_;
     KURL document_root_url_; // in case of non http protocols the document root must be explicitly given
     int depth_;
@@ -184,7 +185,7 @@ private:
     bool check_regular_expressions_;
     uint number_of_level_links_;
     uint number_of_links_to_check_;
-    vector< vector< vector <LinkStatus*> > > search_results_;
+    vector< vector< vector <LinktqStatus*> > > search_results_;
     KHTMLPartMap html_parts_;
 };
 
diff --git a/klinkstatus/src/engine/searchmanager_impl.h b/klinkstatus/src/engine/searchmanager_impl.h
index e472ccbb..0342428a 100644
--- a/klinkstatus/src/engine/searchmanager_impl.h
+++ b/klinkstatus/src/engine/searchmanager_impl.h
@@ -67,7 +67,7 @@ inline void SearchManager::setExternalDomainDepth(int depth)
 
 inline void SearchManager::setDomain(TQString const& domain)
 {
-    Q_ASSERT(domain.find("http://") == -1);
+    Q_ASSERT(domain.tqfind("http://") == -1);
     domain_ = domain;
     general_domain_ = generalDomain();
     checked_general_domain_ = true;
@@ -111,7 +111,7 @@ inline bool SearchManager::checkExternalLinks() const
     return check_external_links_;
 }
 
-inline LinkStatus const* SearchManager::linkStatusRoot() const
+inline LinktqStatus const* SearchManager::linkStatusRoot() const
 {
     return &root_;
 }
diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp
index cfbfe910..9fe9d96d 100644
--- a/klinkstatus/src/global.cpp
+++ b/klinkstatus/src/global.cpp
@@ -40,8 +40,8 @@ Global* Global::self()
     return m_self_;
 }
 
-Global::Global(TQObject *parent, const char *name)
-        : TQObject(parent, name), loop_started_(false)
+Global::Global(TQObject *tqparent, const char *name)
+        : TQObject(tqparent, name), loop_started_(false)
 {
     m_self_ = this;
     dcop_client_ = kapp->dcopClient();
@@ -176,7 +176,7 @@ void Global::execCommand(TQString const& command)
 void Global::slotGetScriptOutput(KProcess* /*process*/, char* buf, int buflen)
 {
     TQCString tmp( buf, buflen + 1 );
-    script_output_ = TQString::null;
+    script_output_ = TQString();
     script_output_ = TQString::fromLocal8Bit(tmp).remove(" ");
 }
 
diff --git a/klinkstatus/src/global.h b/klinkstatus/src/global.h
index d93e17f4..1e465404 100644
--- a/klinkstatus/src/global.h
+++ b/klinkstatus/src/global.h
@@ -22,9 +22,10 @@ class KProcess;
 /**
 @author Paulo Moura Guedes
 */
-class Global : public QObject
+class Global : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     static Global* self();
     ~Global();
@@ -39,7 +40,7 @@ public:
     static void openQuanta(TQStringList const& args);
     
 private:
-    Global(TQObject *parent = 0, const char *name = 0);
+    Global(TQObject *tqparent = 0, const char *name = 0);
     static void execCommand(TQString const& command);
 
 private slots:
diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp
index 8628cd57..6c8a8dbe 100644
--- a/klinkstatus/src/klinkstatus.cpp
+++ b/klinkstatus/src/klinkstatus.cpp
@@ -54,7 +54,7 @@ KLinkStatus::KLinkStatus()
     {
         // now that the Part is loaded, we cast it to a Part to get
         // our hands on it
-        m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this,
+        m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this),
                  "klinkstatus_part", "KParts::ReadOnlyPart" ));
 
         if (m_part)
@@ -113,13 +113,13 @@ void KLinkStatus::setupActions()
     administration.
     The easiest solution is to call close() on the mainwindow instead of 
     KApplication::quit()*/
-    KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+    KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 
     //m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
     //m_statusbarAction = KStdAction::showStatusbar(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 KLinkStatus::setupPartActions()
diff --git a/klinkstatus/src/klinkstatus.h b/klinkstatus/src/klinkstatus.h
index 14ba2934..02463f81 100644
--- a/klinkstatus/src/klinkstatus.h
+++ b/klinkstatus/src/klinkstatus.h
@@ -41,6 +41,7 @@ class KToggleAction;
 class KLinkStatus : public KParts::MainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     KLinkStatus();
     virtual ~KLinkStatus();
diff --git a/klinkstatus/src/klinkstatus.lsm b/klinkstatus/src/klinkstatus.lsm
index 94221faf..0cc4c0c1 100644
--- a/klinkstatus/src/klinkstatus.lsm
+++ b/klinkstatus/src/klinkstatus.lsm
@@ -1,5 +1,5 @@
 Begin3
-Title:          KLinkStatus -- Some description
+Title:          KLinktqStatus -- Some description
 Version:        0.2.1
 Entered-date:   
 Description:    
diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp
index 6d8df6a8..e6ce9776 100644
--- a/klinkstatus/src/klinkstatus_part.cpp
+++ b/klinkstatus/src/klinkstatus_part.cpp
@@ -55,10 +55,10 @@ const char KLinkStatusPart::version_[] = "0.3.2";
 typedef KParts::GenericFactory<KLinkStatusPart> KLinkStatusFactory;
 K_EXPORT_COMPONENT_FACTORY( libklinkstatuspart, KLinkStatusFactory )
 
-KLinkStatusPart::KLinkStatusPart(TQWidget *parentWidget, const char *widgetName,
-                                 TQObject *parent, const char *name,
+KLinkStatusPart::KLinkStatusPart(TQWidget *tqparentWidget, const char *widgetName,
+                                 TQObject *tqparent, const char *name,
                                  const TQStringList & /*string_list*/)
-    : KParts::ReadOnlyPart(parent, name), m_dlgAbout(0)
+    : KParts::ReadOnlyPart(tqparent, name), m_dlgAbout(0)
 {
     setInstance(KLinkStatusFactory::instance());
 
@@ -66,7 +66,7 @@ KLinkStatusPart::KLinkStatusPart(TQWidget *parentWidget, const char *widgetName,
     ActionManager::setInstance(action_manager_);
     initGUI();
 
-    tabwidget_ = new TabWidgetSession(parentWidget, widgetName);
+    tabwidget_ = new TabWidgetSession(tqparentWidget, widgetName);
     setWidget(tabwidget_);
     action_manager_->initTabWidget(tabwidget_);
 
diff --git a/klinkstatus/src/klinkstatus_part.h b/klinkstatus/src/klinkstatus_part.h
index e1968d6d..1e7f1009 100644
--- a/klinkstatus/src/klinkstatus_part.h
+++ b/klinkstatus/src/klinkstatus_part.h
@@ -37,9 +37,10 @@ class KAction;
 class KLinkStatusPart: public KParts::ReadOnlyPart
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KLinkStatusPart(TQWidget *parentWidget, const char *widgetName,
-                    TQObject *parent, const char *name,
+    KLinkStatusPart(TQWidget *tqparentWidget, const char *widgetName,
+                    TQObject *tqparent, const char *name,
                     const TQStringList& args);
     virtual ~KLinkStatusPart();
 
diff --git a/klinkstatus/src/parser/htmlparser.cpp b/klinkstatus/src/parser/htmlparser.cpp
index 557d0d25..ebe8e362 100644
--- a/klinkstatus/src/parser/htmlparser.cpp
+++ b/klinkstatus/src/parser/htmlparser.cpp
@@ -131,11 +131,11 @@ int HtmlParser::endOfTag(TQString const& s, int index, TQChar end_of_tag)
     if( (uint)index >= s.length() )
         return -1;
 
-    int _end_of_tag = s.find(end_of_tag, index);
+    int _end_of_tag = s.tqfind(end_of_tag, index);
     if(_end_of_tag == -1)
         return _end_of_tag;
 
-    int open_aspas = s.find('"', index);
+    int open_aspas = s.tqfind('"', index);
     if(open_aspas == -1)
         return _end_of_tag + 1;
 
@@ -147,7 +147,7 @@ int HtmlParser::endOfTag(TQString const& s, int index, TQChar end_of_tag)
 
     else
     {
-        int close_aspas = s.find('"', open_aspas + 1);
+        int close_aspas = s.tqfind('"', open_aspas + 1);
         if(close_aspas != -1)
             return endOfTag(s, close_aspas + 1, end_of_tag);
         else
@@ -202,7 +202,7 @@ void HtmlParser::parseNodesOfTypeMETA()
         NodeMETA* node = new NodeMETA(aux[i]);
         nodes_.push_back(node);
         
-        if(!is_content_type_set_ && node->atributoHTTP_EQUIV().lower() == TQString("Content-Type").lower()) {
+        if(!is_content_type_set_ && node->atributoHTTP_ETQUIV().lower() == TQString("Content-Type").lower()) {
             is_content_type_set_ = true;
             node_META_content_type_.setNode(aux[i]);
         }
@@ -218,7 +218,7 @@ TQString HtmlParser::findCharsetInMetaElement(TQString const& html)
     {
         NodeMETA node(metaTags[i]);
         
-        if(node.atributoHTTP_EQUIV().lower() == TQString("Content-Type").lower()) {
+        if(node.atributoHTTP_ETQUIV().lower() == TQString("Content-Type").lower()) {
             return node.charset();
         }
     }
@@ -259,7 +259,7 @@ void HtmlParser::parseNodesOfTypeBASE()
     if(inicio == -1 || !doc[inicio].isSpace())
         return;
 
-    fim = doc.find(">", inicio);
+    fim = doc.tqfind(">", inicio);
     if(fim == -1)
         return;
 
@@ -375,7 +375,7 @@ void HtmlParser::mostra() const
     {
         if(nodes_[i]->element() == Node::META)
         {
-#if defined Q_WS_WIN
+#if defined TQ_WS_WIN
             NodeMETA* nm = (NodeMETA*)nodes_[i];
 #else
 
@@ -383,7 +383,7 @@ void HtmlParser::mostra() const
 #endif
 
             kdDebug(23100) << nm->url() << endl
-            << nm->atributoHTTP_EQUIV() << endl
+            << nm->atributoHTTP_ETQUIV() << endl
             << nm->atributoNAME() << endl
             << nm->atributoCONTENT() << endl;
         }
diff --git a/klinkstatus/src/parser/http.cpp b/klinkstatus/src/parser/http.cpp
index 6e086739..0a62a9a2 100644
--- a/klinkstatus/src/parser/http.cpp
+++ b/klinkstatus/src/parser/http.cpp
@@ -34,8 +34,8 @@ void HttpResponseHeader::parseLocation()
   int location = findWord(cabecalho, "Location: ");  
   Q_ASSERT(location != -1);
 
-  int fim_de_linha_1 = cabecalho.find('\n', location);
-  int fim_de_linha_2 = cabecalho.find('\r', location);
+  int fim_de_linha_1 = cabecalho.tqfind('\n', location);
+  int fim_de_linha_2 = cabecalho.tqfind('\r', location);
 
   Q_ASSERT(fim_de_linha_1 != -1 || fim_de_linha_2 != -1);
 
@@ -67,11 +67,11 @@ TQString HttpResponseHeader::charset(TQString const& contentTypeHttpHeaderLine)
     if(contentTypeHttpHeaderLine.isEmpty())
         return _charset;
     
-    int index = contentTypeHttpHeaderLine.find("charset=");
+    int index = contentTypeHttpHeaderLine.tqfind("charset=");
     if(index != -1)
         index += TQString("charset=").length();
     else {
-        index = contentTypeHttpHeaderLine.find("charset:");
+        index = contentTypeHttpHeaderLine.tqfind("charset:");
         if(index != -1)
             index += TQString("charset:").length();
     }
diff --git a/klinkstatus/src/parser/http.h b/klinkstatus/src/parser/http.h
index b955d25d..2ad81012 100644
--- a/klinkstatus/src/parser/http.h
+++ b/klinkstatus/src/parser/http.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 
 
-class HttpResponseHeader: public QHttpResponseHeader
+class HttpResponseHeader: public TQHttpResponseHeader
 {
 public:
 
diff --git a/klinkstatus/src/parser/mstring.cpp b/klinkstatus/src/parser/mstring.cpp
index aa2cdec7..f84c5809 100644
--- a/klinkstatus/src/parser/mstring.cpp
+++ b/klinkstatus/src/parser/mstring.cpp
@@ -28,7 +28,7 @@ using namespace std;
 
 int findWord(TQString const& s, TQString const& palavra, uint a_partir_do_indice)
 {
-    int indice = s.find(palavra, a_partir_do_indice, false);
+    int indice = s.tqfind(palavra, a_partir_do_indice, false);
 
     if(indice == -1)
         return indice;
@@ -38,7 +38,7 @@ int findWord(TQString const& s, TQString const& palavra, uint a_partir_do_indice
 
 int findChar(TQString const& s, TQChar letra, uint a_partir_do_indice)
 {
-    int index = s.find(letra, a_partir_do_indice, false);
+    int index = s.tqfind(letra, a_partir_do_indice, false);
     if(index == -1)
         return index;
     else
@@ -173,7 +173,7 @@ vector<TQString> tokenizeWordsSeparatedByDots(TQString s)
         if(inicio == -1)
             return v;
 
-        int fim = s.find('.', inicio);
+        int fim = s.tqfind('.', inicio);
         if(fim == -1)
         {
             v.push_back(s.mid(inicio));
@@ -200,7 +200,7 @@ vector<TQString> tokenizeWordsSeparatedBy(TQString s, TQChar criteria)
         if(inicio == -1)
             return v;
 
-        int fim = s.find(criteria, inicio);
+        int fim = s.tqfind(criteria, inicio);
         if(fim == -1)
         {
             v.push_back(s.mid(inicio));
diff --git a/klinkstatus/src/parser/node.cpp b/klinkstatus/src/parser/node.cpp
index cb5fdec4..ad5ce064 100644
--- a/klinkstatus/src/parser/node.cpp
+++ b/klinkstatus/src/parser/node.cpp
@@ -39,19 +39,19 @@ TQString Node::getAttribute(TQString const& atributo)
     {
         if(content_[inicio] == '"')
         {
-            fim = content_.find("\"", inicio + 1);
+            fim = content_.tqfind("\"", inicio + 1);
             tem_aspas_ou_plicas = true;
         }
         else if(content_[inicio] == '\'')
         {
-            fim = content_.find("'", inicio + 1);
+            fim = content_.tqfind("'", inicio + 1);
             tem_aspas_ou_plicas = true;
         }
         else
         {
             int fim_bloco = nextSpaceChar(content_, inicio + 1);
-            int fim_tag = content_.find(">", inicio + 1);
-            int fim_aspas = content_.find("\"", inicio + 1);
+            int fim_tag = content_.tqfind(">", inicio + 1);
+            int fim_aspas = content_.tqfind("\"", inicio + 1);
 
             if(fim_bloco == -1 && fim_tag == -1 && fim_aspas == -1)
             {
@@ -137,7 +137,7 @@ void NodeLink::parseLinkLabel()
     
     do
     {
-        fim_tag = content_.find(">", fim_tag);
+        fim_tag = content_.tqfind(">", fim_tag);
  
         if(fim_tag != -1)
             proximo_caractere = TQChar(content_[++fim_tag]);
@@ -147,7 +147,7 @@ void NodeLink::parseLinkLabel()
 
     if(fim_tag != -1)
     {
-        int fim_label = content_.find("<", fim_tag);
+        int fim_label = content_.tqfind("<", fim_tag);
 
         if(fim_label != -1)
         {
@@ -166,7 +166,7 @@ void NodeLink::parseLinkLabel()
 void NodeMETA::parseAttributeURL()
 {
     if(attribute_http_equiv_.isEmpty())
-        parseAttributeHTTP_EQUIV();
+        parseAttributeHTTP_ETQUIV();
 
     if(upperCase(attribute_http_equiv_) == "REFRESH")
     {
@@ -183,7 +183,7 @@ void NodeMETA::parseAttributeURL()
         int aspas = -1;
         do
         {
-            aspas = attribute_url_.find("\"");
+            aspas = attribute_url_.tqfind("\"");
             if(aspas != -1)
                 attribute_url_.remove(aspas, 1);
         }
@@ -206,7 +206,7 @@ TQString NodeMETA::charset() const
     if(content.isEmpty())
         return charset;
     
-    int index = content.find("charset=");
+    int index = content.tqfind("charset=");
     if(index != -1) 
     {    
         index += TQString("charset=").length();
diff --git a/klinkstatus/src/parser/node.h b/klinkstatus/src/parser/node.h
index 0452c219..c3ecdcaa 100644
--- a/klinkstatus/src/parser/node.h
+++ b/klinkstatus/src/parser/node.h
@@ -166,7 +166,7 @@ public:
     virtual TQString const& url() const;
     virtual const TQString& linkLabel() const;
     virtual bool isLink() const;
-    TQString const& atributoHTTP_EQUIV() const;
+    TQString const& atributoHTTP_ETQUIV() const;
     TQString const& atributoNAME() const;
     TQString const& atributoCONTENT() const;
     TQString charset() const;
@@ -176,13 +176,13 @@ public:
 
 private:
     /**
-       Procura se existem os atributos HTTP-EQUIV=Refresh e URL=...
+       Procura se existem os atributos HTTP-ETQUIV=Refresh e URL=...
        Se existir considera o content do atributo URL como um link.
-       ex: <META HTTP-EQUIV=Refresh CONTENT="10; URL=http://www.htmlhelp.com/">
+       ex: <META HTTP-ETQUIV=Refresh CONTENT="10; URL=http://www.htmlhelp.com/">
     */
     void parseAttributeURL();
 
-    void parseAttributeHTTP_EQUIV();
+    void parseAttributeHTTP_ETQUIV();
     void parseAttributeNAME();
     void parseAttributeCONTENT();
 
diff --git a/klinkstatus/src/parser/node_impl.h b/klinkstatus/src/parser/node_impl.h
index 97224bd5..f1ebed13 100644
--- a/klinkstatus/src/parser/node_impl.h
+++ b/klinkstatus/src/parser/node_impl.h
@@ -214,7 +214,7 @@ inline bool NodeMETA::isLink() const
         return false;
 }
 
-inline TQString const& NodeMETA::atributoHTTP_EQUIV() const
+inline TQString const& NodeMETA::atributoHTTP_ETQUIV() const
 {
     return attribute_http_equiv_;
 }
@@ -237,16 +237,16 @@ inline bool NodeMETA::isRedirection() const
 
 inline void NodeMETA::parse()
 {
-    parseAttributeHTTP_EQUIV();
+    parseAttributeHTTP_ETQUIV();
     parseAttributeNAME();
     parseAttributeCONTENT();
 
     parseAttributeURL();
 }
 
-inline void NodeMETA::parseAttributeHTTP_EQUIV()
+inline void NodeMETA::parseAttributeHTTP_ETQUIV()
 {
-    attribute_http_equiv_ = getAttribute("HTTP-EQUIV=");
+    attribute_http_equiv_ = getAttribute("HTTP-ETQUIV=");
 }
 
 inline void NodeMETA::parseAttributeNAME()
@@ -378,12 +378,12 @@ inline NodeTITLE::NodeTITLE(TQString const& content)
 
 inline TQString const& NodeTITLE::url() const
 {
-    return TQString::null;
+    return TQString();
 }
 
 inline TQString const& NodeTITLE::linkLabel() const
 {
-    return TQString::null;
+    return TQString();
 }
 
 inline void NodeTITLE::parse()
@@ -404,8 +404,8 @@ inline TQString const& NodeTITLE::attributeTITLE() const
 inline void NodeTITLE::parseAttributeTITLE()
 {
     attribute_title_ = content_;
-    attribute_title_.replace("<TITLE>", "", false);
-    attribute_title_.replace("</TITLE>", "", false);
+    attribute_title_.tqreplace("<TITLE>", "", false);
+    attribute_title_.tqreplace("</TITLE>", "", false);
     attribute_title_.stripWhiteSpace();
     
     //kdDebug(23100) << "TITLE: " << attribute_title_ << endl;
diff --git a/klinkstatus/src/parser/url.cpp b/klinkstatus/src/parser/url.cpp
index 966bd509..164b54a6 100644
--- a/klinkstatus/src/parser/url.cpp
+++ b/klinkstatus/src/parser/url.cpp
@@ -39,13 +39,13 @@ Node::LinkType Url::resolveLinkType(TQString const& url)
         return Node::file_href;
     else if(findWord(KCharsets::resolveEntities(url), "MAILTO:") != -1)
         return Node::mailto;
-    else if( (int)url.find(":/") != -1)
+    else if( (int)url.tqfind(":/") != -1)
         return Node::href;
     else
         return Node::relative;
 }
 
-KURL Url::normalizeUrl(TQString const& string_url, LinkStatus const& link_parent, TQString const& document_root)
+KURL Url::normalizeUrl(TQString const& string_url, LinktqStatus const& link_parent, TQString const& document_root)
 {
     TQString _string_url = string_url.stripWhiteSpace();
 
@@ -124,7 +124,7 @@ KURL Url::normalizeUrl(TQString const& string_url)
     }
 }
 
-bool Url::existUrl(KURL const& url, vector<LinkStatus*> const& v)
+bool Url::existUrl(KURL const& url, vector<LinktqStatus*> const& v)
 {
     if(url.prettyURL().isEmpty())
         return true;
@@ -248,7 +248,7 @@ bool Url::hasProtocol(TQString const& url)
 /**
 	http://linkstatus.paradigma.co.pt/en/index.html&bix=bix -> /en/index.html&bix=bix
 */
-TQString Url::convertToLocal(LinkStatus const* ls)
+TQString Url::convertToLocal(LinktqStatus const* ls)
 {
     KURL url = ls->absoluteUrl();
     KURL base_url = ls->rootUrl();
@@ -294,9 +294,9 @@ bool Url::localDomain(KURL const& url1, KURL const& url2, bool restrict)
 }
 
 /**
-	Returns true if url2 is a parent of url1.
+	Returns true if url2 is a tqparent of url1.
 */
-bool Url::parentDir(KURL const& url1, KURL const& url2)
+bool Url::tqparentDir(KURL const& url1, KURL const& url2)
 {
     if(url1.protocol() != url2.protocol())
         return false;
diff --git a/klinkstatus/src/parser/url.h b/klinkstatus/src/parser/url.h
index 8e13d812..0f704783 100644
--- a/klinkstatus/src/parser/url.h
+++ b/klinkstatus/src/parser/url.h
@@ -32,20 +32,20 @@
 using namespace std;
 
 
-class LinkStatus;
+class LinktqStatus;
 
 namespace Url
 {
 Node::LinkType resolveLinkType(TQString const& url);
-KURL normalizeUrl(TQString const& string_url, LinkStatus const& link_parent, TQString const& document_root);
+KURL normalizeUrl(TQString const& string_url, LinktqStatus const& link_parent, TQString const& document_root);
 KURL normalizeUrl(TQString const& string_url);
 bool validUrl(KURL const& url);
-bool existUrl(KURL const& url, vector<LinkStatus*> const& v);
+bool existUrl(KURL const& url, vector<LinktqStatus*> const& v);
 bool equalHost(TQString const& host1, TQString const& host2, bool restrict = false);
 bool hasProtocol(TQString const& url);
-TQString convertToLocal(LinkStatus const* ls);
+TQString convertToLocal(LinktqStatus const* ls);
 bool localDomain(KURL const& url1, KURL const& url2, bool restrict = true);
-bool parentDir(KURL const& url1, KURL const& url2);
+bool tqparentDir(KURL const& url1, KURL const& url2);
 bool externalLink(KURL const& url1, KURL const& url2, bool restrict = true);
 }
 
diff --git a/klinkstatus/src/ui/celltooltip.h b/klinkstatus/src/ui/celltooltip.h
index 24303adb..4f0e850d 100644
--- a/klinkstatus/src/ui/celltooltip.h
+++ b/klinkstatus/src/ui/celltooltip.h
@@ -26,7 +26,7 @@
 
 class TableLinkstatus;
 
-class CellToolTip: public QToolTip
+class CellToolTip: public TQToolTip
 {
 public:
 
diff --git a/klinkstatus/src/ui/documentrootdialog.cpp b/klinkstatus/src/ui/documentrootdialog.cpp
index 8c55519e..622faedf 100644
--- a/klinkstatus/src/ui/documentrootdialog.cpp
+++ b/klinkstatus/src/ui/documentrootdialog.cpp
@@ -28,8 +28,8 @@
 #include <tqlabel.h>
 
 
-DocumentRootDialog::DocumentRootDialog(TQWidget *parent, TQString const& url)
-        : KDialogBase(parent, "DocumentRootDialog", true, "Choose a Document Root",
+DocumentRootDialog::DocumentRootDialog(TQWidget *tqparent, TQString const& url)
+        : KDialogBase(tqparent, "DocumentRootDialog", true, "Choose a Document Root",
                       KDialogBase::Ok, KDialogBase::Ok, true),
         m_url(url)
 {
diff --git a/klinkstatus/src/ui/documentrootdialog.h b/klinkstatus/src/ui/documentrootdialog.h
index 09657851..cf531e51 100644
--- a/klinkstatus/src/ui/documentrootdialog.h
+++ b/klinkstatus/src/ui/documentrootdialog.h
@@ -30,8 +30,9 @@ class KURLRequester;
 class DocumentRootDialog : public KDialogBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    DocumentRootDialog(TQWidget *parent, TQString const& url);
+    DocumentRootDialog(TQWidget *tqparent, TQString const& url);
     ~DocumentRootDialog();
 
     void setUrl(const TQString& theValue) { m_url = theValue; }
diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp
index 10fc7900..bcfef44c 100644
--- a/klinkstatus/src/ui/klshistorycombo.cpp
+++ b/klinkstatus/src/ui/klshistorycombo.cpp
@@ -24,8 +24,8 @@
 bool KLSHistoryCombo::items_saved_ = false;
 
 
-KLSHistoryCombo::KLSHistoryCombo(TQWidget *parent, const char *name)
-        : KHistoryCombo(parent, name)
+KLSHistoryCombo::KLSHistoryCombo(TQWidget *tqparent, const char *name)
+        : KHistoryCombo(tqparent, name)
 {
     setMaxCount(KLSConfig::maxCountComboUrl());
     
@@ -76,15 +76,15 @@ void KLSHistoryCombo::loadItems()
 
 bool KLSHistoryCombo::eventFilter( TQObject *o, TQEvent *ev )
 {
-    // Handle Ctrl+Del/Backspace etc better than the Qt widget, which always
+    // Handle Ctrl+Del/Backspace etc better than the TQt widget, which always
     // jumps to the next whitespace.
     TQLineEdit *edit = lineEdit();
-    if ( o == edit )
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(edit) )
     {
         int type = ev->type();
         if ( type == TQEvent::KeyPress )
         {
-            TQKeyEvent *e = static_cast<TQKeyEvent *>( ev );
+            TQKeyEvent *e = TQT_TQKEYEVENT( ev );
 
             if ( e->key() == Key_Return || e->key() == Key_Enter )
             {
@@ -116,7 +116,7 @@ bool KLSHistoryCombo::eventFilter( TQObject *o, TQEvent *ev )
 }
 
 /*
-   Handle Ctrl+Cursor etc better than the Qt widget, which always
+   Handle Ctrl+Cursor etc better than the TQt widget, which always
    jumps to the next whitespace. This code additionally jumps to
    the next [/#?:], which makes more sense for URLs. The list of 
    chars that will stop the cursor are '/', '.', '?', '#', ':'.
@@ -143,7 +143,7 @@ void KLSHistoryCombo::selectWord(TQKeyEvent *e)
             if( allow_space_break && text[pos].isSpace() && count > 1 )
                 break;
         }
-        while( pos >= 0 && (chars.findIndex(text[pos]) == -1 || count <= 1) );
+        while( pos >= 0 && (chars.tqfindIndex(text[pos]) == -1 || count <= 1) );
 
         if( e->state() & ShiftButton )
         {
@@ -172,7 +172,7 @@ void KLSHistoryCombo::selectWord(TQKeyEvent *e)
             if( allow_space_break && text[pos].isSpace() )
                 break;
         }
-        while( pos < (int) text.length() && chars.findIndex(text[pos]) == -1 );
+        while( pos < (int) text.length() && chars.tqfindIndex(text[pos]) == -1 );
 
         if( e->state() & ShiftButton )
         {
diff --git a/klinkstatus/src/ui/klshistorycombo.h b/klinkstatus/src/ui/klshistorycombo.h
index 1215c3d9..4627f55a 100644
--- a/klinkstatus/src/ui/klshistorycombo.h
+++ b/klinkstatus/src/ui/klshistorycombo.h
@@ -22,9 +22,10 @@ Based on KonqCombo
 class KLSHistoryCombo : public KHistoryCombo
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KLSHistoryCombo(TQWidget* parent, const char* name);
+    KLSHistoryCombo(TQWidget* tqparent, const char* name);
     ~KLSHistoryCombo();
 
     void init();
diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp
index 11ec6134..8d039558 100644
--- a/klinkstatus/src/ui/resultssearchbar.cpp
+++ b/klinkstatus/src/ui/resultssearchbar.cpp
@@ -42,46 +42,46 @@ class ResultsSearchBar::ResultsSearchBarPrivate
 {
 public:
     ResultsSearchBarPrivate()
-    : layout(0), searchLine(0), searchCombo(0), delay(400), m_lastComboIndex(0)
+    : tqlayout(0), searchLine(0), searchCombo(0), delay(400), m_lastComboIndex(0)
     {}
 
     TQString searchText;
     TQTimer timer;
-    TQHBoxLayout* layout;
+    TQHBoxLayout* tqlayout;
     KLineEdit* searchLine;
     KComboBox* searchCombo;
     int delay;
     int m_lastComboIndex;
 };
 
-ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name)
-        : TQWidget(parent, name), d(new ResultsSearchBar::ResultsSearchBarPrivate)
+ResultsSearchBar::ResultsSearchBar(TQWidget* tqparent, const char* name)
+        : TQWidget(tqparent, name), d(new ResultsSearchBar::ResultsSearchBarPrivate)
 {
-    setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
     
-    d->layout = new TQHBoxLayout(this);    
-    d->layout->setMargin(2);
-    d->layout->setSpacing(5);
+    d->tqlayout = new TQHBoxLayout(this);    
+    d->tqlayout->setMargin(2);
+    d->tqlayout->setSpacing(5);
     
     TQToolButton* clearButton = new TQToolButton(this);
     clearButton->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
     clearButton->setAutoRaise(true);
-    d->layout->addWidget(clearButton);
+    d->tqlayout->addWidget(clearButton);
 
     TQLabel* searchLabel = new TQLabel(this);
     searchLabel->setText(i18n("S&earch:"));
-    d->layout->addWidget(searchLabel);
+    d->tqlayout->addWidget(searchLabel);
 
     d->searchLine = new KLineEdit(this, "searchline");
     connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)),
             this, TQT_SLOT(slotSearchStringChanged(const TQString &)));
 
     searchLabel->setBuddy(d->searchLine);
-    d->layout->addWidget(d->searchLine);
+    d->tqlayout->addWidget(d->searchLine);
 
     TQLabel* statusLabel = new TQLabel(this);
-    statusLabel->setText( i18n("Status:") );
-    d->layout->addWidget(statusLabel);
+    statusLabel->setText( i18n("tqStatus:") );
+    d->tqlayout->addWidget(statusLabel);
 
     d->searchCombo = new KComboBox(this, "searchcombo");
     TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small);
@@ -95,7 +95,7 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name)
     d->searchCombo->insertItem(iconBroken, i18n("Broken Links"));
     d->searchCombo->insertItem(iconMalformed, i18n("Malformed Links"));
     d->searchCombo->insertItem(iconUndetermined, i18n("Undetermined Links"));
-    d->layout->addWidget(d->searchCombo);
+    d->tqlayout->addWidget(d->searchCombo);
 
     TQToolTip::add(clearButton, i18n("Clear filter"));
     TQToolTip::add( d->searchLine, i18n("Enter the terms to filter the result link list"));
@@ -147,7 +147,7 @@ void ResultsSearchBar::slotClearSearch()
     }
 }
 
-void ResultsSearchBar::slotSetStatus(int status)
+void ResultsSearchBar::slotSettqStatus(int status)
 {
     d->searchCombo->setCurrentItem(status);
 }
@@ -187,19 +187,19 @@ void ResultsSearchBar::slotActivateSearch()
 {
     kdDebug(23100) << "ResultsSearchBar::slotActivateSearch" << endl;
     
-    ResultView::Status status = selectedStatus();
+    ResultView::tqStatus status = selectedtqStatus();
     
     emit signalSearch(LinkMatcher(d->searchLine->text(), status));
 }
 
 LinkMatcher ResultsSearchBar::currentLinkMatcher() const
 {
-    return LinkMatcher(d->searchLine->text(), selectedStatus());
+    return LinkMatcher(d->searchLine->text(), selectedtqStatus());
 }
 
-ResultView::Status ResultsSearchBar::selectedStatus() const
+ResultView::tqStatus ResultsSearchBar::selectedtqStatus() const
 {
-    ResultView::Status status = ResultView::none;
+    ResultView::tqStatus status = ResultView::none;
     
     if(d->searchCombo->currentItem())
     {
diff --git a/klinkstatus/src/ui/resultssearchbar.h b/klinkstatus/src/ui/resultssearchbar.h
index 16d254c7..a51c3f72 100644
--- a/klinkstatus/src/ui/resultssearchbar.h
+++ b/klinkstatus/src/ui/resultssearchbar.h
@@ -30,11 +30,12 @@
     @author Paulo Moura Guedes <moura@kdewebdev.org>
     Based on Akregator code. Kudos ;)
 */
-class ResultsSearchBar : public QWidget
+class ResultsSearchBar : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ResultsSearchBar(TQWidget *parent = 0, const char *name = 0);
+    ResultsSearchBar(TQWidget *tqparent = 0, const char *name = 0);
     ~ResultsSearchBar();
 
     TQString const& text() const;
@@ -51,7 +52,7 @@ signals:
 
 public slots:
     void slotClearSearch();
-    void slotSetStatus(int status);
+    void slotSettqStatus(int status);
     void slotSetText(const TQString& text);
 
 private slots:
@@ -62,7 +63,7 @@ private slots:
 
 private:
     
-    ResultView::Status selectedStatus() const;
+    ResultView::tqStatus selectedtqStatus() const;
     
 private:
 
diff --git a/klinkstatus/src/ui/resultview.cpp b/klinkstatus/src/ui/resultview.cpp
index 737b901b..907559a1 100644
--- a/klinkstatus/src/ui/resultview.cpp
+++ b/klinkstatus/src/ui/resultview.cpp
@@ -20,7 +20,7 @@
 #include <kiconloader.h>
 
 const TQString ResultView::URL_LABEL = "URL";
-const TQString ResultView::STATUS_LABEL = "Status";
+const TQString ResultView::STATUS_LABEL = "tqStatus";
 const TQString ResultView::MARKUP_LABEL = "Markup";
 const TQString ResultView::LINK_LABEL_LABEL = "Label";
 
@@ -69,31 +69,31 @@ void ResultView::setColumns(TQStringList const& columns)
     number_of_columns_ = columns.size();
 }
 
-bool ResultView::displayableWithStatus(LinkStatus const* ls, Status const& status)
+bool ResultView::displayableWithtqStatus(LinktqStatus const* ls, tqStatus const& status)
 {
     if(status == ResultView::good)
     {
         return 
-                ls->status() == LinkStatus::SUCCESSFULL ||
-                ls->status() == LinkStatus::HTTP_REDIRECTION;
+                ls->status() == LinktqStatus::SUCCESSFULL ||
+                ls->status() == LinktqStatus::HTTP_REDIRECTION;
     }
     else if(status == ResultView::bad)
     {
         return 
-                ls->status() == LinkStatus::BROKEN ||
-                ls->status() == LinkStatus::HTTP_CLIENT_ERROR ||
-                ls->status() == LinkStatus::HTTP_SERVER_ERROR;
+                ls->status() == LinktqStatus::BROKEN ||
+                ls->status() == LinktqStatus::HTTP_CLIENT_ERROR ||
+                ls->status() == LinktqStatus::HTTP_SERVER_ERROR;
     }
     else if(status == ResultView::malformed)
     {
-        return ls->status() == LinkStatus::MALFORMED;
+        return ls->status() == LinktqStatus::MALFORMED;
     }
     else if(status == ResultView::undetermined)
     {
         return 
-                ls->status() == LinkStatus::UNDETERMINED ||
-                ls->status() == LinkStatus::TIMEOUT ||
-                ls->status() == LinkStatus::NOT_SUPPORTED;
+                ls->status() == LinktqStatus::UNDETERMINED ||
+                ls->status() == LinktqStatus::TIMEOUT ||
+                ls->status() == LinktqStatus::NOT_SUPPORTED;
     }
     else
         return true;
@@ -102,8 +102,8 @@ bool ResultView::displayableWithStatus(LinkStatus const* ls, Status const& statu
 
 // ******************************* ResultViewItem *****************************
 
-ResultViewItem::ResultViewItem(LinkStatus const* linkstatus, int column_index)
-        : ls_((LinkStatus*)linkstatus), column_index_(column_index)
+ResultViewItem::ResultViewItem(LinktqStatus const* linkstatus, int column_index)
+        : ls_((LinktqStatus*)linkstatus), column_index_(column_index)
 {
     Q_ASSERT(ls_);
     Q_ASSERT(column_index_ > 0);
@@ -123,7 +123,7 @@ int ResultViewItem::columnIndex() const
     return column_index_;
 }
 
-LinkStatus const* ResultViewItem::linkStatus() const
+LinktqStatus const* ResultViewItem::linktqStatus() const
 {
     Q_ASSERT(ls_);
     return ls_;
@@ -131,47 +131,47 @@ LinkStatus const* ResultViewItem::linkStatus() const
 
 TQColor const& ResultViewItem::textStatusColor() const
 {
-    if(linkStatus()->errorOccurred())
+    if(linktqStatus()->errorOccurred())
     {
-        //kdDebug(23100) <<  "ERROR: " << linkStatus()->error() << ": " << linkStatus()->absoluteUrl().prettyURL() << endl;
-        if(linkStatus()->error() == i18n( "Javascript not supported" ))
-            return Qt::lightGray;
+        //kdDebug(23100) <<  "ERROR: " << linktqStatus()->error() << ": " << linktqStatus()->absoluteUrl().prettyURL() << endl;
+        if(linktqStatus()->error() == i18n( "Javascript not supported" ))
+            return TQt::lightGray;
         else
-            return Qt::red;
+            return TQt::red;
     }
 
-    else if(linkStatus()->absoluteUrl().hasRef())
-        return Qt::blue;
+    else if(linktqStatus()->absoluteUrl().hasRef())
+        return TQt::blue;
 
-    else if(!linkStatus()->absoluteUrl().protocol().startsWith("http"))
-        return Qt::darkGreen;
+    else if(!linktqStatus()->absoluteUrl().protocol().startsWith("http"))
+        return TQt::darkGreen;
 
     else
     {
-        TQString status_code(TQString::number(linkStatus()->httpHeader().statusCode()));
+        TQString status_code(TQString::number(linktqStatus()->httpHeader().statusCode()));
 
         if(status_code[0] == '0')
         {
             kdWarning(23100) <<  "status code == 0: " << endl;
-            kdWarning(23100) <<  linkStatus()->toString() << endl;
-            kdWarning(23100) <<  linkStatus()->httpHeader().toString() << endl;
+            kdWarning(23100) <<  linktqStatus()->toString() << endl;
+            kdWarning(23100) <<  linktqStatus()->httpHeader().toString() << endl;
         }
         //Q_ASSERT(status_code[0] != '0');
 
         if(status_code[0] == '5')
-            return Qt::darkMagenta;
+            return TQt::darkMagenta;
 
         else if(status_code[0] == '4')
-            return Qt::red;
+            return TQt::red;
 
         else if(status_code[0] == '3')
-            return Qt::blue;
+            return TQt::blue;
 
         else if(status_code[0] == '2')
-            return Qt::darkGreen;
+            return TQt::darkGreen;
 
         else
-            return Qt::red;
+            return TQt::red;
     }
 }
 
diff --git a/klinkstatus/src/ui/resultview.h b/klinkstatus/src/ui/resultview.h
index 43a52427..d63fb8c0 100644
--- a/klinkstatus/src/ui/resultview.h
+++ b/klinkstatus/src/ui/resultview.h
@@ -27,7 +27,7 @@
 
 class KURL;
 
-class LinkStatus;
+class LinktqStatus;
 class CellToolTip;
 
 
@@ -43,7 +43,7 @@ public:
     static const TQString MARKUP_LABEL;
     static const TQString LINK_LABEL_LABEL;
     
-    enum Status {
+    enum tqStatus {
         none = 0,
         good,
         bad,
@@ -54,14 +54,14 @@ public:
     ResultView();
     virtual ~ResultView();
 
-    //virtual void insertResult(LinkStatus const* linkstatus) = 0;
+    //virtual void insertResult(LinktqStatus const* linkstatus) = 0;
     virtual void clear() = 0;
-    virtual void show(Status const& status) = 0;
+    virtual void show(tqStatus const& status) = 0;
     virtual void showAll() = 0;
     //virtual void ensureCellVisible(int row, int col) = 0;
 
     virtual void setColumns(TQStringList const& columns);
-    static bool displayableWithStatus(LinkStatus const* ls, Status const& status);
+    static bool displayableWithtqStatus(LinktqStatus const* ls, tqStatus const& status);
     
     int numberOfColumns() const { return number_of_columns_; }
     
@@ -105,7 +105,7 @@ private:
 class ResultViewItem
 {
 public:
-    ResultViewItem(LinkStatus const* linkstatus,
+    ResultViewItem(LinktqStatus const* linkstatus,
                    int column_index);
     virtual ~ResultViewItem();
     
@@ -113,7 +113,7 @@ public:
     virtual int columnIndex() const;
 
     virtual TQString toolTip() const = 0;
-    LinkStatus const* linkStatus() const;
+    LinktqStatus const* linktqStatus() const;
 
 protected:
 
@@ -125,9 +125,9 @@ protected:
 
 protected:
 
-    LinkStatus* ls_;
+    LinktqStatus* ls_;
     int column_index_;
-    int alignment_;
+    int tqalignment_;
 };
 
 
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index f729ca3e..0678822a 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -66,8 +66,8 @@
 
 
 SessionWidget::SessionWidget(int max_simultaneous_connections, int time_out,
-                             TQWidget* parent, const char* name, WFlags f)
-    : SessionWidgetBase(parent, name, f), search_manager_(0), 
+                             TQWidget* tqparent, const char* name, WFlags f)
+    : SessionWidgetBase(tqparent, name, f), search_manager_(0), 
         action_manager_(ActionManager::getInstance()), 
         ready_(true), to_start_(false), to_pause_(false), to_stop_(false),
         in_progress_(false), paused_(false), stopped_(true),
@@ -151,13 +151,13 @@ void SessionWidget::newSearchManager()
 
     search_manager_ = new SearchManager(KLSConfig::maxConnectionsNumber(),
                                         KLSConfig::timeOut(),
-                                        this, "search_manager");
+                                        TQT_TQOBJECT(this), "search_manager");
     Q_ASSERT(search_manager_);
 
-    connect(search_manager_, TQT_SIGNAL(signalRootChecked(const LinkStatus *, LinkChecker *)),
-            this, TQT_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *)));
-    connect(search_manager_, TQT_SIGNAL(signalLinkChecked(const LinkStatus *, LinkChecker *)),
-            this, TQT_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *)));
+    connect(search_manager_, TQT_SIGNAL(signalRootChecked(const LinktqStatus *, LinkChecker *)),
+            this, TQT_SLOT(slotRootChecked(const LinktqStatus *, LinkChecker *)));
+    connect(search_manager_, TQT_SIGNAL(signalLinkChecked(const LinktqStatus *, LinkChecker *)),
+            this, TQT_SLOT(slotLinkChecked(const LinktqStatus *, LinkChecker *)));
     connect(search_manager_, TQT_SIGNAL(signalSearchFinished()),
             this, TQT_SLOT(slotSearchFinished()));
     connect(search_manager_, TQT_SIGNAL(signalSearchPaused()),
@@ -321,7 +321,7 @@ void SessionWidget::slotCheck()
 
 void SessionWidget::keyPressEvent ( TQKeyEvent* e )
 {
-    if( e->key() == Qt::Key_Return &&
+    if( e->key() == TQt::Key_Return &&
         ( combobox_url->hasFocus() ||
               //lineedit_domain->hasFocus() ||
               //checkbox_depth->hasFocus()  ||
@@ -338,7 +338,7 @@ void SessionWidget::keyPressEvent ( TQKeyEvent* e )
         }
     }
 
-    else if(e->key() == Qt::Key_F6)
+    else if(e->key() == TQt::Key_F6)
     {
         combobox_url->lineEdit()->selectAll();
     }
@@ -356,7 +356,7 @@ bool SessionWidget::validFields()
         return true;
 }
 
-void SessionWidget::slotRootChecked(LinkStatus const* linkstatus, LinkChecker * anal)
+void SessionWidget::slotRootChecked(LinktqStatus const* linkstatus, LinkChecker * anal)
 {
     slotSetTimeElapsed();
     emit signalUpdateTabLabel(search_manager_->linkStatusRoot(), this);
@@ -368,7 +368,7 @@ void SessionWidget::slotRootChecked(LinkStatus const* linkstatus, LinkChecker *
 
     //table_linkstatus->insertResult(linkstatus);
     TreeViewItem* tree_view_item = new TreeViewItem(tree_view, tree_view->lastItem(), linkstatus);
-    LinkStatus* ls = const_cast<LinkStatus*> (linkstatus);
+    LinktqStatus* ls = const_cast<LinktqStatus*> (linkstatus);
     ls->setTreeViewItem(tree_view_item);
 
     if(linkstatus->isRedirection() && linkstatus->redirection())
@@ -378,7 +378,7 @@ void SessionWidget::slotRootChecked(LinkStatus const* linkstatus, LinkChecker *
     ActionManager::getInstance()->action("file_export_html")->setEnabled(!isEmpty());
 }
 
-void SessionWidget::slotLinkChecked(LinkStatus const* linkstatus, LinkChecker * anal)
+void SessionWidget::slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker * anal)
 {
     slotSetTimeElapsed();
 
@@ -392,15 +392,15 @@ void SessionWidget::slotLinkChecked(LinkStatus const* linkstatus, LinkChecker *
     if(linkstatus->checked())
     {
         TreeViewItem* tree_view_item = 0;
-        TreeViewItem* parent_item = linkstatus->parent()->treeViewItem();
+        TreeViewItem* tqparent_item = linkstatus->tqparent()->treeViewItem();
         bool match = resultsSearchBar->currentLinkMatcher().matches(*linkstatus);
 
         if(tree_display_)
         {
             //kdDebug(23100) << "TREE!!!!!" << endl;
-            tree_view_item = new TreeViewItem(tree_view, parent_item, parent_item->lastChild(), linkstatus);
+            tree_view_item = new TreeViewItem(tree_view, tqparent_item, tqparent_item->lastChild(), linkstatus);
 
-            parent_item->setLastChild(tree_view_item);
+            tqparent_item->setLastChild(tree_view_item);
             if(follow_last_link_checked_)
                 tree_view->ensureRowVisible(tree_view_item, tree_display_);
             
@@ -416,7 +416,7 @@ void SessionWidget::slotLinkChecked(LinkStatus const* linkstatus, LinkChecker *
             tree_view_item->setVisible(match);
         }
         
-        LinkStatus* ls = const_cast<LinkStatus*> (linkstatus);
+        LinktqStatus* ls = const_cast<LinktqStatus*> (linkstatus);
         ls->setTreeViewItem(tree_view_item);
 
         if(linkstatus->isRedirection() && linkstatus->redirection())
@@ -503,10 +503,10 @@ void SessionWidget::showBottomStatusLabel(TQListViewItem* item)
     TreeViewItem* _item = tree_view->myItem(item);
     if(_item)
     {
-        TQString status = _item->linkStatus()->statusText();
+        TQString status = _item->linktqStatus()->statusText();
         textlabel_status->setText(status);
 
-        if(textlabel_status->sizeHint().width() > textlabel_status->maximumWidth())
+        if(textlabel_status->tqsizeHint().width() > textlabel_status->maximumWidth())
             TQToolTip::add(textlabel_status, status);
         else
             TQToolTip::remove(textlabel_status);
@@ -683,7 +683,7 @@ void SessionWidget::slotApplyFilter(LinkMatcher link_matcher)
 
 void SessionWidget::slotExportAsHTML( )
 {
-    KURL url = KFileDialog::getSaveURL(TQString::null,"text/html", 0, i18n("Export Results as HTML"));
+    KURL url = KFileDialog::getSaveURL(TQString(),"text/html", 0, i18n("Export Results as HTML"));
 
     if(url.isEmpty())
         return;
diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h
index ad6136b6..a10df805 100644
--- a/klinkstatus/src/ui/sessionwidget.h
+++ b/klinkstatus/src/ui/sessionwidget.h
@@ -45,11 +45,12 @@ using namespace std;
 class SessionWidget: public SessionWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
     SessionWidget(int max_simultaneous_connections = 3, int time_out = 50,
-                  TQWidget* parent = 0, const char* name = 0, WFlags f = 0);
+                  TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0);
 
     ~SessionWidget();
 
@@ -69,7 +70,7 @@ public:
     bool stopped() const { return stopped_; }
 
 signals:
-    void signalUpdateTabLabel(const LinkStatus *, SessionWidget*);
+    void signalUpdateTabLabel(const LinktqStatus *, SessionWidget*);
     void signalSearchStarted();
     void signalSearchPaused();
     void signalSearchFinnished();
@@ -96,8 +97,8 @@ private slots:
     //virtual void slotSuggestDomain(bool toogle);
 
     void slotEnableCheckButton(const TQString &);
-    void slotRootChecked(LinkStatus const* linkstatus, LinkChecker * anal);
-    void slotLinkChecked(LinkStatus const* linkstatus, LinkChecker * anal);
+    void slotRootChecked(LinktqStatus const* linkstatus, LinkChecker * anal);
+    void slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker * anal);
     void slotSearchFinished();
     void slotSearchPaused();
     /** Shows the status of the clicked URL (row) for 5 seconds */
diff --git a/klinkstatus/src/ui/sessionwidgetbase.ui b/klinkstatus/src/ui/sessionwidgetbase.ui
index 0d194143..64870e29 100644
--- a/klinkstatus/src/ui/sessionwidgetbase.ui
+++ b/klinkstatus/src/ui/sessionwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>SessionWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SessionWidgetBase</cstring>
     </property>
@@ -12,7 +12,7 @@
             <height>683</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>300</height>
@@ -28,7 +28,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttongroup_search</cstring>
             </property>
@@ -39,31 +39,31 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout15</cstring>
+                        <cstring>tqlayout15</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="QLayoutWidget">
+                                <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout13</cstring>
+                                        <cstring>tqlayout13</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
-                                        <widget class="QToolButton">
+                                        <widget class="TQToolButton">
                                             <property name="name">
                                                 <cstring>toolButton_clear_combo</cstring>
                                             </property>
@@ -75,13 +75,13 @@
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="minimumSize">
+                                            <property name="tqminimumSize">
                                                 <size>
                                                     <width>25</width>
                                                     <height>25</height>
                                                 </size>
                                             </property>
-                                            <property name="maximumSize">
+                                            <property name="tqmaximumSize">
                                                 <size>
                                                     <width>25</width>
                                                     <height>25</height>
@@ -94,7 +94,7 @@
                                                 <bool>true</bool>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>textlabel_url</cstring>
                                             </property>
@@ -109,7 +109,7 @@
                                             <property name="text">
                                                 <string>URL: </string>
                                             </property>
-                                            <property name="alignment">
+                                            <property name="tqalignment">
                                                 <set>AlignVCenter|AlignLeft</set>
                                             </property>
                                         </widget>
@@ -150,7 +150,7 @@
                                             <property name="sizeType">
                                                 <enum>Maximum</enum>
                                             </property>
-                                            <property name="sizeHint">
+                                            <property name="tqsizeHint">
                                                 <size>
                                                     <width>16</width>
                                                     <height>20</height>
@@ -159,15 +159,15 @@
                                         </spacer>
                                     </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="QCheckBox">
+                                        <widget class="TQCheckBox">
                                             <property name="name">
                                                 <cstring>checkbox_recursively</cstring>
                                             </property>
@@ -181,7 +181,7 @@
                                                 <string>Check pages recursively</string>
                                             </property>
                                         </widget>
-                                        <widget class="QSpinBox">
+                                        <widget class="TQSpinBox">
                                             <property name="name">
                                                 <cstring>spinbox_depth</cstring>
                                             </property>
@@ -204,7 +204,7 @@
                                                 <string></string>
                                             </property>
                                         </widget>
-                                        <widget class="QCheckBox">
+                                        <widget class="TQCheckBox">
                                             <property name="name">
                                                 <cstring>checkbox_subdirs_only</cstring>
                                             </property>
@@ -212,7 +212,7 @@
                                                 <bool>true</bool>
                                             </property>
                                             <property name="text">
-                                                <string>Do &amp;not check parent folders</string>
+                                                <string>Do &amp;not check tqparent folders</string>
                                             </property>
                                         </widget>
                                         <spacer>
@@ -225,7 +225,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="sizeHint">
+                                            <property name="tqsizeHint">
                                                 <size>
                                                     <width>160</width>
                                                     <height>20</height>
@@ -234,15 +234,15 @@
                                         </spacer>
                                     </hbox>
                                 </widget>
-                                <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="QCheckBox">
+                                        <widget class="TQCheckBox">
                                             <property name="name">
                                                 <cstring>checkbox_external_links</cstring>
                                             </property>
@@ -266,7 +266,7 @@
                                             <property name="sizeType">
                                                 <enum>MinimumExpanding</enum>
                                             </property>
-                                            <property name="sizeHint">
+                                            <property name="tqsizeHint">
                                                 <size>
                                                     <width>174</width>
                                                     <height>20</height>
@@ -275,15 +275,15 @@
                                         </spacer>
                                     </hbox>
                                 </widget>
-                                <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="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>textLabel1</cstring>
                                             </property>
@@ -291,7 +291,7 @@
                                                 <string>Do not check regular expression:</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLineEdit">
+                                        <widget class="TQLineEdit">
                                             <property name="name">
                                                 <cstring>lineedit_reg_exp</cstring>
                                             </property>
@@ -306,7 +306,7 @@
                                             <property name="sizeType">
                                                 <enum>Maximum</enum>
                                             </property>
-                                            <property name="sizeHint">
+                                            <property name="tqsizeHint">
                                                 <size>
                                                     <width>16</width>
                                                     <height>20</height>
@@ -338,26 +338,26 @@
             <property name="name">
                 <cstring>tree_view</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>300</height>
                 </size>
             </property>
         </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>textlabel_progressbar</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>94</width>
                             <height>0</height>
@@ -383,9 +383,9 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -403,7 +403,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>470</width>
                             <height>32767</height>
@@ -423,22 +423,22 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout12_2</cstring>
+                        <cstring>tqlayout12_2</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>textlabel_elapsed_time</cstring>
                             </property>
@@ -460,7 +460,7 @@
                                 <string>hh:mm:ss.zzz</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="1">
+                        <widget class="TQLabel" row="1" column="1">
                             <property name="name">
                                 <cstring>textlabel_elapsed_time_value</cstring>
                             </property>
@@ -475,7 +475,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>80</width>
                                     <height>0</height>
@@ -585,12 +585,12 @@
     <tabstop>checkbox_subdirs_only</tabstop>
     <tabstop>checkbox_external_links</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot specifier="pure virtual">slotCheck()</slot>
     <slot specifier="pure virtual">slotCancel()</slot>
     <slot specifier="pure virtual">slotClearComboUrl()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klshistorycombo.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.cpp b/klinkstatus/src/ui/settings/configidentificationdialog.cpp
index f2675d81..28f00d81 100644
--- a/klinkstatus/src/ui/settings/configidentificationdialog.cpp
+++ b/klinkstatus/src/ui/settings/configidentificationdialog.cpp
@@ -29,8 +29,8 @@
 #include "../cfg/klsconfig.h"
 
 
-ConfigIdentificationDialog::ConfigIdentificationDialog(TQWidget *parent, const char *name)
- : ConfigIdentificationDialogUi(parent, name)
+ConfigIdentificationDialog::ConfigIdentificationDialog(TQWidget *tqparent, const char *name)
+ : ConfigIdentificationDialogUi(tqparent, name)
 {
     if(KLSConfig::userAgent().isEmpty())
     {
diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.h b/klinkstatus/src/ui/settings/configidentificationdialog.h
index 8bc0fa64..033a74c5 100644
--- a/klinkstatus/src/ui/settings/configidentificationdialog.h
+++ b/klinkstatus/src/ui/settings/configidentificationdialog.h
@@ -29,8 +29,9 @@
 class ConfigIdentificationDialog : public ConfigIdentificationDialogUi
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    ConfigIdentificationDialog(TQWidget *parent = 0, const char *name = 0);
+    ConfigIdentificationDialog(TQWidget *tqparent = 0, const char *name = 0);
     ~ConfigIdentificationDialog();
     
 private slots:
diff --git a/klinkstatus/src/ui/settings/configidentificationdialogui.ui b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
index 29723358..7f70dbb1 100644
--- a/klinkstatus/src/ui/settings/configidentificationdialogui.ui
+++ b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>ConfigIdentificationDialogUi</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ConfigIdentificationDialogUi</cstring>
     </property>
@@ -21,7 +21,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup4</cstring>
             </property>
@@ -37,7 +37,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>textLabel1</cstring>
                     </property>
@@ -69,7 +69,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>300</width>
                             <height>0</height>
@@ -84,7 +84,7 @@
                         <string>Default</string>
                     </property>
                 </widget>
-                <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>kcfg_SendIdentification</cstring>
                     </property>
@@ -126,7 +126,7 @@
     <tabstop>kcfg_UserAgent</tabstop>
     <tabstop>buttonDefault</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/klinkstatus/src/ui/settings/configresultsdialog.ui b/klinkstatus/src/ui/settings/configresultsdialog.ui
index 544f3273..86f579c3 100644
--- a/klinkstatus/src/ui/settings/configresultsdialog.ui
+++ b/klinkstatus/src/ui/settings/configresultsdialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>ConfigResultsDialog</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ConfigResultsDialog</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup13</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>kcfg_DisplayTreeView</cstring>
                     </property>
@@ -35,7 +35,7 @@
                         <string>Tree</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>kcfg_DisplayFlatView</cstring>
                     </property>
@@ -45,7 +45,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup13_2</cstring>
             </property>
@@ -56,7 +56,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>kcfg_FollowLastLinkChecked</cstring>
                     </property>
@@ -68,5 +68,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui
index 604a431c..df982adb 100644
--- a/klinkstatus/src/ui/settings/configsearchdialog.ui
+++ b/klinkstatus/src/ui/settings/configsearchdialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>ConfigSearchDialog</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ConfigSearchDialog</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup13</cstring>
             </property>
@@ -39,7 +39,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -55,7 +55,7 @@
                         <number>5</number>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel1_2_2</cstring>
                     </property>
@@ -93,7 +93,7 @@
                         <number>40</number>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -111,7 +111,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup8</cstring>
             </property>
@@ -144,18 +144,18 @@
                         <number>50</number>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0">
+                <widget class="TQCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>kcfg_CheckParentFolders</cstring>
                     </property>
                     <property name="text">
-                        <string>Check parent folders</string>
+                        <string>Check tqparent folders</string>
                     </property>
                     <property name="checked">
                         <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>
@@ -171,7 +171,7 @@
                         <string>Number of items in URL history:</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="3" column="0">
+                <widget class="TQCheckBox" row="3" column="0">
                     <property name="name">
                         <cstring>kcfg_CheckExternalLinks</cstring>
                     </property>
@@ -182,15 +182,15 @@
                         <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>layout21</cstring>
+                        <cstring>tqlayout21</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>kcfg_RecursiveCheck</cstring>
                             </property>
@@ -211,22 +211,22 @@
                             <property name="sizeType">
                                 <enum>Maximum</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout20</cstring>
+                                <cstring>tqlayout20</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel1_2_2_2</cstring>
                                     </property>
@@ -268,7 +268,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>buttonGroup3</cstring>
             </property>
@@ -279,7 +279,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_UseQuantaUrlPreviewPrefix</cstring>
                     </property>
@@ -295,7 +295,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>kcfg_RememberCheckSettings</cstring>
             </property>
@@ -343,7 +343,7 @@
     <tabstop>kcfg_CheckExternalLinks</tabstop>
     <tabstop>kcfg_RememberCheckSettings</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp
index 66cd06be..d640f7bd 100644
--- a/klinkstatus/src/ui/tablelinkstatus.cpp
+++ b/klinkstatus/src/ui/tablelinkstatus.cpp
@@ -46,11 +46,11 @@
 
 */
 
-TableLinkstatus::TableLinkstatus(TQWidget * parent, const char * name,
+TableLinkstatus::TableLinkstatus(TQWidget * tqparent, const char * name,
                                  int column_index_status,
                                  int column_index_label,
                                  int column_index_URL)
-        : TQTable(parent, name),
+        : TQTable(tqparent, name),
         ResultView(column_index_status, column_index_label, column_index_URL)
         //context_table_menu_(this, "context_table_menu")
 {
@@ -88,7 +88,7 @@ void TableLinkstatus::setColumns(TQStringList const& columns)
     {
         if(i == 0)
         {
-            Q_ASSERT(columns[i] == i18n("Status") && col_status_ == 1);
+            Q_ASSERT(columns[i] == i18n("tqStatus") && col_status_ == 1);
             setColumnWidth(i, STATUS_COLUMN_WIDTH);
         }
         else if(i == 1)
@@ -106,17 +106,17 @@ void TableLinkstatus::setColumns(TQStringList const& columns)
     horizontal_header->adjustHeaderSize();
 }
 
-void TableLinkstatus::insertResult(LinkStatus const* linkstatus)
+void TableLinkstatus::insertResult(LinktqStatus const* linkstatus)
 {
     insereLinha(generateRowOfTableItems(linkstatus));
 }
 
-vector<TableItem*> TableLinkstatus::generateRowOfTableItems(LinkStatus const* linkstatus)
+vector<TableItem*> TableLinkstatus::generateRowOfTableItems(LinktqStatus const* linkstatus)
 {
     vector<TableItem*> items;
     int column = 1;
 
-    TableItem* item1 = new TableItemStatus(this, TQTableItem::Never,
+    TableItem* item1 = new TableItemtqStatus(this, TQTableItem::Never,
                                            linkstatus, column++);
     TableItem* item2 = new TableItemNome(this, TQTableItem::Never,
                                          linkstatus, column++);
@@ -147,10 +147,10 @@ void TableLinkstatus::insereLinha(vector<TableItem*> items)
         setItem(row, col, items[i]);
     }
 
-    if(items[col_url_ - 1]->sizeHint().width() > columnWidth(col_url_ - 1))
+    if(items[col_url_ - 1]->tqsizeHint().width() > columnWidth(col_url_ - 1))
     {
         setColumnStretchable(col_url_ - 1, false);
-        setColumnWidth(col_url_ - 1, items[col_url_ - 1]->sizeHint().width());
+        setColumnWidth(col_url_ - 1, items[col_url_ - 1]->tqsizeHint().width());
     }
 
     ensureCellVisible(row, 0);
@@ -178,14 +178,14 @@ void TableLinkstatus::removeColunas()
     Q_ASSERT(numCols() == 0);
 }
 
-void TableLinkstatus::show(ResultView::Status const& status)
+void TableLinkstatus::show(ResultView::tqStatus const& status)
 {
     for(int i = 0; i != numRows(); ++i)
     {
         int row = i;
         TableItem* _item = myItem(row, col_status_);
 
-        if(!ResultView::displayableWithStatus(_item->linkStatus(), status))
+        if(!ResultView::displayableWithtqStatus(_item->linktqStatus(), status))
             hideRow(row);
         else
             showRow(row);
@@ -230,7 +230,7 @@ bool TableLinkstatus::textFitsInCell(int row, int col) const
     TQTableItem* itm(myItem(row, col));
     Q_ASSERT(itm);
 
-    TQSize size_hint(itm->sizeHint());
+    TQSize size_hint(itm->tqsizeHint());
     int visible_width = 0;
 
     if(col == numCols() - 1)
@@ -261,8 +261,8 @@ void TableLinkstatus::slotPopupContextMenu(int r, int w, const TQPoint& pos)
     TableItem* table_item = myItem(r, w);
     if(table_item)
     {
-        TQValueVector<KURL> referrers = table_item->linkStatus()->referrers();
-        loadContextTableMenu(referrers, table_item->linkStatus()->isRoot());
+        TQValueVector<KURL> referrers = table_item->linktqStatus()->referrers();
+        loadContextTableMenu(referrers, table_item->linktqStatus()->isRoot());
         context_table_menu_.popup(pos);
     }
 }
@@ -313,30 +313,30 @@ void TableLinkstatus::loadContextTableMenu(TQValueVector<KURL> const& referrers,
 void TableLinkstatus::slotCopyUrlToClipboard() const
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
-    TQString content(_item->linkStatus()->absoluteUrl().prettyURL());
-    QClipboard* cb = kapp->clipboard();
+    TQString content(_item->linktqStatus()->absoluteUrl().prettyURL());
+    TQClipboard* cb = kapp->clipboard();
     cb->setText(content);
 }
 
 void TableLinkstatus::slotCopyParentUrlToClipboard() const
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
-    TQString content(_item->linkStatus()->parent()->absoluteUrl().prettyURL());
-    QClipboard* cb = kapp->clipboard();
+    TQString content(_item->linktqStatus()->tqparent()->absoluteUrl().prettyURL());
+    TQClipboard* cb = kapp->clipboard();
     cb->setText(content);
 }
 
 void TableLinkstatus::slotCopyCellTextToClipboard() const
 {
     TQString cell_text(text(currentRow(), currentColumn()));
-    QClipboard* cb = kapp->clipboard();
+    TQClipboard* cb = kapp->clipboard();
     cb->setText(cell_text);
 }
 
 void TableLinkstatus::slotEditReferrersWithQuanta()
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
-    TQValueVector<KURL> referrers = _item->linkStatus()->referrers();
+    TQValueVector<KURL> referrers = _item->linktqStatus()->referrers();
 
     if(Global::isQuantaAvailableViaDCOP())
     {
@@ -369,7 +369,7 @@ void TableLinkstatus::slotEditReferrerWithQuanta(int id)
     index -= 2; // The list of referrers starts on index = 2
 
     TableItem* _item = myItem(currentRow(), currentColumn());
-    TQValueVector<KURL> referrers = _item->linkStatus()->referrers();
+    TQValueVector<KURL> referrers = _item->linktqStatus()->referrers();
     Q_ASSERT(index >= 0 && (uint)index < referrers.size());
 
     slotEditReferrerWithQuanta(referrers[index]);
@@ -386,8 +386,8 @@ void TableLinkstatus::slotEditReferrerWithQuanta(KURL const& url)
 
         if(!success)
         {
-            TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").arg(filePath);
-            KMessageBox::error(parentWidget(), message);
+            TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").tqarg(filePath);
+            KMessageBox::error(tqparentWidget(), message);
         }
     }
     else
@@ -400,7 +400,7 @@ void TableLinkstatus::slotEditReferrerWithQuanta(KURL const& url)
 void TableLinkstatus::slotViewUrlInBrowser()
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
-    KURL url = _item->linkStatus()->absoluteUrl();
+    KURL url = _item->linktqStatus()->absoluteUrl();
 
     if(url.isValid())
     {
@@ -414,13 +414,13 @@ void TableLinkstatus::slotViewParentUrlInBrowser()
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
 
-    if(_item->linkStatus()->isRoot())
+    if(_item->linktqStatus()->isRoot())
     {
         KMessageBox::sorry(this, i18n("ROOT URL."));
     }
     else
     {
-        LinkStatus const* ls_parent = _item->linkStatus()->parent();
+        LinktqStatus const* ls_parent = _item->linktqStatus()->tqparent();
         Q_ASSERT(ls_parent);
 
         KURL url = ls_parent->absoluteUrl();
@@ -439,11 +439,11 @@ void TableLinkstatus::slotViewParentUrlInBrowser()
 */
 
 TableItem::TableItem(TQTable* table, EditType et,
-                     LinkStatus const* linkstatus,
-                     int column_index, int alignment)
+                     LinktqStatus const* linkstatus,
+                     int column_index, int tqalignment)
         : TQTableItem(table, et, ""), ResultViewItem(linkstatus, column_index),
-        /*ls_((LinkStatus*)linkstatus),
-        column_index_(column_index),*/ alignment_(alignment)
+        /*ls_((LinktqStatus*)linkstatus),
+        column_index_(column_index),*/ tqalignment_(tqalignment)
 {
     //Q_ASSERT(ls_);
     //Q_ASSERT(column_index_ > 0);
@@ -467,17 +467,17 @@ int TableItem::columnIndex() const
     return ResultViewItem::columnIndex();
 }
 
-void TableItem::setAlignment(int aFlags)
+void TableItem::tqsetAlignment(int aFlags)
 {
-    alignment_ = aFlags;
+    tqalignment_ = aFlags;
 }
 
-int TableItem::alignment() const
+int TableItem::tqalignment() const
 {
-    return alignment_;
+    return tqalignment_;
 }
 /*
-LinkStatus const* const TableItem::linkStatus() const
+LinktqStatus const* const TableItem::linktqStatus() const
 {
     Q_ASSERT(ls_);
     return ls_;
@@ -485,48 +485,48 @@ LinkStatus const* const TableItem::linkStatus() const
 
 TQColor const& TableItem::textStatusColor() const
 {
-    if(linkStatus()->errorOccurred())
+    if(linktqStatus()->errorOccurred())
     {
-        //kdDebug(23100) <<  "ERROR: " << linkStatus()->error() << ": " << linkStatus()->absoluteUrl().prettyURL() << endl;
-        if(linkStatus()->error() == i18n( "Javascript not supported" ))
-            return Qt::lightGray;
+        //kdDebug(23100) <<  "ERROR: " << linktqStatus()->error() << ": " << linktqStatus()->absoluteUrl().prettyURL() << endl;
+        if(linktqStatus()->error() == i18n( "Javascript not supported" ))
+            return TQt::lightGray;
         else
-            return Qt::red;
+            return TQt::red;
     }
 
-    else if(linkStatus()->absoluteUrl().hasRef())
-        return Qt::blue;
+    else if(linktqStatus()->absoluteUrl().hasRef())
+        return TQt::blue;
 
-    else if(linkStatus()->absoluteUrl().protocol() != "http" &&
-            linkStatus()->absoluteUrl().protocol() != "https")
-        return Qt::darkGreen;
+    else if(linktqStatus()->absoluteUrl().protocol() != "http" &&
+            linktqStatus()->absoluteUrl().protocol() != "https")
+        return TQt::darkGreen;
 
     else
     {
-        TQString status_code(TQString::number(linkStatus()->httpHeader().statusCode()));
+        TQString status_code(TQString::number(linktqStatus()->httpHeader().statusCode()));
 
         if(status_code[0] == '0')
         {
             kdWarning(23100) <<  "status code == 0: " << endl;
-            kdWarning(23100) <<  linkStatus()->toString() << endl;
-            kdWarning(23100) <<  linkStatus()->httpHeader().toString() << endl;
+            kdWarning(23100) <<  linktqStatus()->toString() << endl;
+            kdWarning(23100) <<  linktqStatus()->httpHeader().toString() << endl;
         }
         //Q_ASSERT(status_code[0] != '0');
 
         if(status_code[0] == '5')
-            return Qt::darkMagenta;
+            return TQt::darkMagenta;
 
         else if(status_code[0] == '4')
-            return Qt::red;
+            return TQt::red;
 
         else if(status_code[0] == '3')
-            return Qt::blue;
+            return TQt::blue;
 
         else if(status_code[0] == '2')
-            return Qt::darkGreen;
+            return TQt::darkGreen;
 
         else
-            return Qt::red;
+            return TQt::red;
     }
 }
 */
@@ -538,7 +538,7 @@ TQColor const& TableItem::textStatusColor() const
 */
 
 TableItemURL::TableItemURL(TQTable* table, EditType et,
-                           LinkStatus const* linkstatus, int column_index)
+                           LinktqStatus const* linkstatus, int column_index)
         : TableItem(table, et, linkstatus, column_index)
 {
     setText();
@@ -546,17 +546,17 @@ TableItemURL::TableItemURL(TQTable* table, EditType et,
 
 void TableItemURL::setText()
 {
-    if(linkStatus()->node() && linkStatus()->malformed())
+    if(linktqStatus()->node() && linktqStatus()->malformed())
     {
-        if(linkStatus()->node()->url().isEmpty())
-            TQTableItem::setText( linkStatus()->node()->content().simplifyWhiteSpace() );
+        if(linktqStatus()->node()->url().isEmpty())
+            TQTableItem::setText( linktqStatus()->node()->content().simplifyWhiteSpace() );
         else
-            TQTableItem::setText( linkStatus()->node()->url() );
+            TQTableItem::setText( linktqStatus()->node()->url() );
     }
     else
     {
-        KURL url = linkStatus()->absoluteUrl();
-        TQTableItem::setText(::convertToLocal(linkStatus()));
+        KURL url = linktqStatus()->absoluteUrl();
+        TQTableItem::setText(::convertToLocal(linktqStatus()));
     }
 }
 
@@ -583,19 +583,19 @@ TQColor const& TableItemURL::textStatusColor() const
 {
     // TODO clean this code
 
-    TQString status_code(TQString::number(linkStatus()->httpHeader().statusCode()));
+    TQString status_code(TQString::number(linktqStatus()->httpHeader().statusCode()));
 
-    if(linkStatus()->errorOccurred())
+    if(linktqStatus()->errorOccurred())
     {
-        if(linkStatus()->error().contains(i18n( "Timeout" )))
+        if(linktqStatus()->error().tqcontains(i18n( "Timeout" )))
             return darkMagenta;
-        else if(linkStatus()->error().contains(i18n( "not supported" )))
+        else if(linktqStatus()->error().tqcontains(i18n( "not supported" )))
             return lightGray;
         else
             return red;
     }
-    else if(linkStatus()->absoluteUrl().protocol() != "http" &&
-            linkStatus()->absoluteUrl().protocol() != "https")
+    else if(linktqStatus()->absoluteUrl().protocol() != "http" &&
+            linktqStatus()->absoluteUrl().protocol() != "https")
         return black;
 
     else if(status_code[0] == '5')
@@ -610,53 +610,53 @@ TQColor const& TableItemURL::textStatusColor() const
 
 /*
 
-********************* TableItemStatus ***************************
+********************* TableItemtqStatus ***************************
 
 */
 
-TableItemStatus::TableItemStatus(TQTable* table, EditType et,
-                                 LinkStatus const* linkstatus, int column_index)
+TableItemtqStatus::TableItemtqStatus(TQTable* table, EditType et,
+                                 LinktqStatus const* linkstatus, int column_index)
         : TableItem(table, et, linkstatus, column_index)
 {
-    setAlignment(Qt::AlignHCenter /*| Qt :: AlignVCenter*/);
+    tqsetAlignment(TQt::AlignHCenter /*| TQt :: AlignVCenter*/);
     setText();
     setPixmap();
 }
 
-void TableItemStatus::setText()
+void TableItemtqStatus::setText()
 {
-    if(linkStatus()->errorOccurred() ||
-            linkStatus()->status() == "OK" ||
-            linkStatus()->status() == "304")
+    if(linktqStatus()->errorOccurred() ||
+            linktqStatus()->status() == "OK" ||
+            linktqStatus()->status() == "304")
     {
         TQTableItem::setText("");
     }
     else
     {
         /*
-                if(linkStatus()->httpHeader().statusCode() == 0)
+                if(linktqStatus()->httpHeader().statusCode() == 0)
                 {
-                    kdDebug(23100) <<  "TableItemStatus::setText : statusCode() == 0" << endl;
-                    kdDebug(23100) <<  linkStatus()->toString() << endl;
-                    kdDebug(23100) <<  linkStatus()->docHtml() << endl;
+                    kdDebug(23100) <<  "TableItemtqStatus::setText : statusCode() == 0" << endl;
+                    kdDebug(23100) <<  linktqStatus()->toString() << endl;
+                    kdDebug(23100) <<  linktqStatus()->docHtml() << endl;
                 }
         */
-        //Q_ASSERT(linkStatus()->httpHeader().statusCode() != 0); //<------------------------------------------------------------
-        //TQTableItem::setText( TQString::number(linkStatus()->httpHeader().statusCode()) );
-        TQTableItem::setText( linkStatus()->status() );
+        //Q_ASSERT(linktqStatus()->httpHeader().statusCode() != 0); //<------------------------------------------------------------
+        //TQTableItem::setText( TQString::number(linktqStatus()->httpHeader().statusCode()) );
+        TQTableItem::setText( linktqStatus()->status() );
     }
 }
 
-void TableItemStatus::setPixmap()
+void TableItemtqStatus::setPixmap()
 {
-    if(linkStatus()->errorOccurred())
+    if(linktqStatus()->errorOccurred())
     {
 
-        if(linkStatus()->error().contains(i18n( "Timeout" )))
+        if(linktqStatus()->error().tqcontains(i18n( "Timeout" )))
         {
             TQTableItem::setPixmap(SmallIcon("kalarm"));
         }
-        else if(linkStatus()->error() == i18n( "Malformed" ))
+        else if(linktqStatus()->error() == i18n( "Malformed" ))
         {
             TQTableItem::setPixmap(SmallIcon("bug"));
         }
@@ -665,27 +665,27 @@ void TableItemStatus::setPixmap()
             TQTableItem::setPixmap(SmallIcon("no"));
         }
     }
-    else if(linkStatus()->status() == "304")
+    else if(linktqStatus()->status() == "304")
         TQTableItem::setPixmap(UserIcon("304"));
 
-    else if(linkStatus()->status() == "OK")
+    else if(linktqStatus()->status() == "OK")
         TQTableItem::setPixmap(SmallIcon("ok"));
 }
 
-TQString TableItemStatus::toolTip() const
+TQString TableItemtqStatus::toolTip() const
 {
-    if(linkStatus()->errorOccurred() ||
-            linkStatus()->absoluteUrl().hasRef() ||
-            (linkStatus()->absoluteUrl().protocol() != "http" &&
-             linkStatus()->absoluteUrl().protocol() != "https"))
+    if(linktqStatus()->errorOccurred() ||
+            linktqStatus()->absoluteUrl().hasRef() ||
+            (linktqStatus()->absoluteUrl().protocol() != "http" &&
+             linktqStatus()->absoluteUrl().protocol() != "https"))
     {
-        return i18n("%1").arg(linkStatus()->status());
+        return i18n("%1").tqarg(linktqStatus()->status());
     }
     else
-        return i18n("%1").arg(linkStatus()->httpHeader().reasonPhrase());
+        return i18n("%1").tqarg(linktqStatus()->httpHeader().reasonPhrase());
 }
 
-void TableItemStatus::paint( TQPainter *p, const TQColorGroup &cg,
+void TableItemtqStatus::paint( TQPainter *p, const TQColorGroup &cg,
                              const TQRect &cr, bool selected )
 {
     p->fillRect( 0, 0, cr.width(), cr.height(),
@@ -716,7 +716,7 @@ void TableItemStatus::paint( TQPainter *p, const TQColorGroup &cg,
     else
         p->setPen( m_cg.text() );
     p->drawText( x + 2, 0, w - x - 4, h,
-                 wordWrap() ? (alignment() | WordBreak) : alignment(), text() );
+                 wordWrap() ? (tqalignment() | WordBreak) : tqalignment(), text() );
 }
 
 /*
@@ -726,7 +726,7 @@ void TableItemStatus::paint( TQPainter *p, const TQColorGroup &cg,
 */
 
 TableItemNome::TableItemNome(TQTable* table, EditType et,
-                             LinkStatus const* linkstatus, int column_index)
+                             LinktqStatus const* linkstatus, int column_index)
         : TableItem(table, et, linkstatus, column_index)
 {
     setText();
@@ -734,7 +734,7 @@ TableItemNome::TableItemNome(TQTable* table, EditType et,
 
 void TableItemNome::setText()
 {
-    TQString label(linkStatus()->label());
+    TQString label(linktqStatus()->label());
     if(!label.isNull())
         TQTableItem::setText(label.simplifyWhiteSpace());
 }
diff --git a/klinkstatus/src/ui/tablelinkstatus.h b/klinkstatus/src/ui/tablelinkstatus.h
index 3f7b5cb9..2d320619 100644
--- a/klinkstatus/src/ui/tablelinkstatus.h
+++ b/klinkstatus/src/ui/tablelinkstatus.h
@@ -46,9 +46,10 @@ class TableItem;
 class TableLinkstatus: public TQTable, public ResultView
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 
-    TableLinkstatus(TQWidget * parent = 0, const char * name = 0,
+    TableLinkstatus(TQWidget * tqparent = 0, const char * name = 0,
                     int column_index_status = 1,
                     int column_index_label = 2,
                     int column_index_URL = 3);
@@ -57,12 +58,12 @@ public:
     virtual void setColumns(TQStringList const& columns);
 
     /* Insere uma nova entrada no fim da tabela */
-    virtual void insertResult(LinkStatus const* linkstatus);
+    virtual void insertResult(LinktqStatus const* linkstatus);
 
 
     virtual void clear();
     void removeColunas();
-    virtual void show(ResultView::Status const& status);
+    virtual void show(ResultView::tqStatus const& status);
     virtual void showAll();
 
 
@@ -89,7 +90,7 @@ private slots:
 
 private:
 
-    vector<TableItem*> generateRowOfTableItems(LinkStatus const* linkstatus);
+    vector<TableItem*> generateRowOfTableItems(LinktqStatus const* linkstatus);
     void insereLinha(vector<TableItem*> items);
 
 private:
@@ -109,18 +110,18 @@ class TableItem: public TQTableItem, public ResultViewItem
 public:
 
     TableItem(TQTable* table, EditType et,
-              LinkStatus const* linkstatus,
-              int column_index, int alignment = Qt::AlignLeft);
+              LinktqStatus const* linkstatus,
+              int column_index, int tqalignment = TQt::AlignLeft);
     virtual ~TableItem();
 
     virtual void setColumnIndex(int i);
     virtual int columnIndex() const;
 
-    void setAlignment(int aFlags);
-    virtual int alignment() const;
+    void tqsetAlignment(int aFlags);
+    virtual int tqalignment() const;
 
     virtual TQString toolTip() const = 0;
-    //LinkStatus const* const linkStatus() const;
+    //LinktqStatus const* const linktqStatus() const;
 
 protected:
 
@@ -132,9 +133,9 @@ protected:
 
 private:
 
-    //LinkStatus* ls_;
+    //LinktqStatus* ls_;
     //int column_index_;
-    int alignment_;
+    int tqalignment_;
 };
 
 
@@ -143,7 +144,7 @@ class TableItemURL: public TableItem
 public:
 
     TableItemURL(TQTable* table, EditType et,
-                 LinkStatus const* linkstatus, int column_index = 3);
+                 LinktqStatus const* linkstatus, int column_index = 3);
     //virtual ~TableItemURL(){};
 
     virtual TQString toolTip() const;
@@ -157,13 +158,13 @@ protected:
 };
 
 
-class TableItemStatus: public TableItem
+class TableItemtqStatus: public TableItem
 {
 public:
 
-    TableItemStatus(TQTable* table, EditType et,
-                    LinkStatus const* linkstatus, int column_index = 1);
-    //virtual ~TableItemStatus(){};
+    TableItemtqStatus(TQTable* table, EditType et,
+                    LinktqStatus const* linkstatus, int column_index = 1);
+    //virtual ~TableItemtqStatus(){};
 
     virtual TQString toolTip() const;
 
@@ -180,7 +181,7 @@ class TableItemNome: public TableItem
 public:
 
     TableItemNome(TQTable* table, EditType et,
-                  LinkStatus const* linkstatus, int column_index = 2);
+                  LinktqStatus const* linkstatus, int column_index = 2);
     //virtual ~TableItemNome(){};
 
     virtual TQString toolTip() const;
diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp
index d692486a..24c89d0f 100644
--- a/klinkstatus/src/ui/tabwidgetsession.cpp
+++ b/klinkstatus/src/ui/tabwidgetsession.cpp
@@ -42,10 +42,10 @@
 #include <kiconloader.h>
 
 
-TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f)
-        : KTabWidget(parent, name, f) // tabs_ is initialized with size 17
+TabWidgetSession::TabWidgetSession(TQWidget* tqparent, const char* name, WFlags f)
+        : KTabWidget(tqparent, name, f) // tabs_ is initialized with size 17
 {
-    setFocusPolicy(TQTabWidget::NoFocus);
+    setFocusPolicy(TQ_NoFocus);
     setMargin(0);
     setTabReorderingEnabled(true);
     setHoverCloseButton(true);
@@ -117,8 +117,8 @@ SessionWidget* TabWidgetSession::newSession()
 {
     // TODO: settings: number of connections, timeout
     SessionWidget* session_widget = newSessionWidget();
-    connect(session_widget, TQT_SIGNAL(signalUpdateTabLabel(const LinkStatus *, SessionWidget*)),
-            this, TQT_SLOT(updateTabLabel(const LinkStatus *, SessionWidget*)));
+    connect(session_widget, TQT_SIGNAL(signalUpdateTabLabel(const LinktqStatus *, SessionWidget*)),
+            this, TQT_SLOT(updateTabLabel(const LinktqStatus *, SessionWidget*)));
 
     insertTab(session_widget, i18n("Session") + i18n(TQString::number(count() + 1).ascii()));
     
@@ -166,7 +166,7 @@ SessionWidget* TabWidgetSession::newSessionWidget()
     return session_widget;
 }
 
-void TabWidgetSession::updateTabLabel(LinkStatus const* linkstatus, SessionWidget* page)
+void TabWidgetSession::updateTabLabel(LinktqStatus const* linkstatus, SessionWidget* page)
 {
     TQString label;
     KURL url = linkstatus->absoluteUrl();
diff --git a/klinkstatus/src/ui/tabwidgetsession.h b/klinkstatus/src/ui/tabwidgetsession.h
index 52ec3ccd..4b315a85 100644
--- a/klinkstatus/src/ui/tabwidgetsession.h
+++ b/klinkstatus/src/ui/tabwidgetsession.h
@@ -27,7 +27,7 @@
 class TQToolButton;
 
 class SessionWidget;
-class LinkStatus;
+class LinktqStatus;
 
 
 /**
@@ -38,9 +38,10 @@ This class handles the creation and destruction of sessions, i.e, severals insta
 class TabWidgetSession : public KTabWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TabWidgetSession(TQWidget * parent = 0, const char * name = 0, WFlags f = 0);
+    TabWidgetSession(TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0);
     ~TabWidgetSession();
 
     /** Set the URL in the current session widget */
@@ -58,7 +59,7 @@ public slots:
     SessionWidget* newSession();
     SessionWidget* newSession(KURL const& url);
     void closeSession();
-    void updateTabLabel(LinkStatus const* linkstatus, SessionWidget*);
+    void updateTabLabel(LinktqStatus const* linkstatus, SessionWidget*);
     void slotLoadSettings();
     
     void slotHideSearchPanel();
diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp
index 14e0e12a..3adec065 100644
--- a/klinkstatus/src/ui/treeview.cpp
+++ b/klinkstatus/src/ui/treeview.cpp
@@ -39,8 +39,8 @@
 #include "../cfg/klsconfig.h"
 
 
-TreeView::TreeView(TQWidget *parent, const char *name)
-        : KListView(parent, name),
+TreeView::TreeView(TQWidget *tqparent, const char *name)
+        : KListView(tqparent, name),
         ResultView(),
         current_column_(0)
 {
@@ -76,9 +76,9 @@ void TreeView::setColumns(TQStringList const& columns)
         setColumnWidthMode(i, TQListView::Manual);
     }
 
-    setColumnAlignment(col_status_ - 1, Qt::AlignCenter);
+    setColumnAlignment(col_status_ - 1, TQt::AlignCenter);
     if(KLSConfig::showMarkupStatus())
-        setColumnAlignment(col_markup_ - 1, Qt::AlignCenter);
+        setColumnAlignment(col_markup_ - 1, TQt::AlignCenter);
 }
 
 void TreeView::resetColumns()
@@ -114,36 +114,36 @@ void TreeView::removeColunas()
     clear();
 }
 
-void TreeView::show(ResultView::Status const& status)
+void TreeView::show(ResultView::tqStatus const& status)
 {
     TQListViewItemIterator it(static_cast<KListView*> (this));
     while(it.current())
     {
         TreeViewItem* item = myItem(it.current());
-        if(!ResultView::displayableWithStatus(item->linkStatus(), status))
+        if(!ResultView::displayableWithtqStatus(item->linktqStatus(), status))
         {
             item->setVisible(false);
-            //kdDebug(23100) << "Hide: " << item->linkStatus()->absoluteUrl().url() << endl;
+            //kdDebug(23100) << "Hide: " << item->linktqStatus()->absoluteUrl().url() << endl;
         }
         else
         {
             item->setVisible(true);
             //item->setEnabled(true);
             /*
-            if(KLSConfig::displayTreeView() && status != ResultView::good && item->parent())
+            if(KLSConfig::displayTreeView() && status != ResultView::good && item->tqparent())
             {
-                TreeViewItem* parent = myItem(item->parent());
-                while(parent)
+                TreeViewItem* tqparent = myItem(item->tqparent());
+                while(tqparent)
                 {
-                    kdDebug(23100) << "Show: " << parent->linkStatus()->absoluteUrl().url() << endl;
+                    kdDebug(23100) << "Show: " << tqparent->linktqStatus()->absoluteUrl().url() << endl;
 
-                    parent->setVisible(true);
-                    //parent->setEnabled(false);
+                    tqparent->setVisible(true);
+                    //tqparent->setEnabled(false);
                     
-                    if(parent->parent())
-                        parent = myItem(parent->parent());
+                    if(tqparent->tqparent())
+                        tqparent = myItem(tqparent->tqparent());
                     else
-                        parent = 0;
+                        tqparent = 0;
                 }
             }
             */
@@ -159,7 +159,7 @@ void TreeView::show(LinkMatcher link_matcher)
     while(it.current())
     {
         TreeViewItem* item = myItem(it.current());
-        bool match = link_matcher.matches(*(item->linkStatus()));
+        bool match = link_matcher.matches(*(item->linktqStatus()));
         
         if(tree_display_)
             item->setEnabled(match);
@@ -199,7 +199,7 @@ void TreeView::resizeEvent(TQResizeEvent *e)
 {
     KListView::resizeEvent(e);
     resetColumns();
-    clipper()->repaint();
+    clipper()->tqrepaint();
 }
 
 void TreeView::slotPopupContextMenu(TQListViewItem* item, const TQPoint& pos, int col)
@@ -209,8 +209,8 @@ void TreeView::slotPopupContextMenu(TQListViewItem* item, const TQPoint& pos, in
     TreeViewItem* tree_item = myItem(item);
     if(tree_item)
     {
-        TQValueVector<KURL> referrers = tree_item->linkStatus()->referrers();
-        loadContextTableMenu(referrers, tree_item->linkStatus()->isRoot());
+        TQValueVector<KURL> referrers = tree_item->linktqStatus()->referrers();
+        loadContextTableMenu(referrers, tree_item->linktqStatus()->isRoot());
         context_table_menu_.popup(pos);
     }
 }
@@ -218,16 +218,16 @@ void TreeView::slotPopupContextMenu(TQListViewItem* item, const TQPoint& pos, in
 void TreeView::slotCopyUrlToClipboard() const
 {
     TreeViewItem* _item = myItem(currentItem());
-    TQString content(_item->linkStatus()->absoluteUrl().prettyURL());
-    QClipboard* cb = kapp->clipboard();
+    TQString content(_item->linktqStatus()->absoluteUrl().prettyURL());
+    TQClipboard* cb = kapp->tqclipboard();
     cb->setText(content);
 }
 
 void TreeView::slotCopyParentUrlToClipboard() const
 {
     TreeViewItem* _item = myItem(currentItem());
-    TQString content(_item->linkStatus()->parent()->absoluteUrl().prettyURL());
-    QClipboard* cb = kapp->clipboard();
+    TQString content(_item->linktqStatus()->tqparent()->absoluteUrl().prettyURL());
+    TQClipboard* cb = kapp->tqclipboard();
     cb->setText(content);
 }
 
@@ -235,14 +235,14 @@ void TreeView::slotCopyCellTextToClipboard() const
 {
     TreeViewItem* _item = myItem(currentItem());
     TQString cell_text(_item->text(current_column_));
-    QClipboard* cb = kapp->clipboard();
+    TQClipboard* cb = kapp->tqclipboard();
     cb->setText(cell_text);
 }
 
 void TreeView::slotEditReferrersWithQuanta()
 {
     TreeViewItem* _item = myItem(currentItem());
-    TQValueVector<KURL> referrers = _item->linkStatus()->referrers();
+    TQValueVector<KURL> referrers = _item->linktqStatus()->referrers();
 
     if(Global::isQuantaAvailableViaDCOP())
     {
@@ -275,7 +275,7 @@ void TreeView::slotEditReferrerWithQuanta(int id)
     index -= 2; // The list of referrers starts on index = 2
 
     TreeViewItem* _item = myItem(currentItem());
-    TQValueVector<KURL> referrers = _item->linkStatus()->referrers();
+    TQValueVector<KURL> referrers = _item->linktqStatus()->referrers();
     Q_ASSERT(index >= 0 && (uint)index < referrers.size());
 
     slotEditReferrerWithQuanta(referrers[index]);
@@ -292,8 +292,8 @@ void TreeView::slotEditReferrerWithQuanta(KURL const& url)
 
         if(!success)
         {
-            TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").arg(filePath);
-            KMessageBox::error(parentWidget(), message);
+            TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").tqarg(filePath);
+            KMessageBox::error(tqparentWidget(), message);
         }
     }
     else
@@ -306,7 +306,7 @@ void TreeView::slotEditReferrerWithQuanta(KURL const& url)
 void TreeView::slotViewUrlInBrowser()
 {
     TreeViewItem* _item = myItem(currentItem());
-    KURL url = _item->linkStatus()->absoluteUrl();
+    KURL url = _item->linktqStatus()->absoluteUrl();
 
     if(url.isValid())
     {
@@ -320,13 +320,13 @@ void TreeView::slotViewParentUrlInBrowser()
 {
     TreeViewItem* _item = myItem(currentItem());
  
-    if(_item->linkStatus()->isRoot())
+    if(_item->linktqStatus()->isRoot())
     {
         KMessageBox::sorry(this, i18n("ROOT URL."));
     }
     else
     {
-        LinkStatus const* ls_parent = _item->linkStatus()->parent();
+        LinktqStatus const* ls_parent = _item->linktqStatus()->tqparent();
         Q_ASSERT(ls_parent);
 
         KURL url = ls_parent->absoluteUrl();
@@ -392,16 +392,16 @@ TreeViewItem* TreeView::myItem(TQListViewItem* item) const
 
 /* ******************************* TreeViewItem ******************************* */
 
-TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after,
-                           LinkStatus const* linkstatus)
-        : KListViewItem(parent, after),
-        last_child_(0), root_(parent)
+TreeViewItem::TreeViewItem(TreeView* tqparent, TQListViewItem* after,
+                           LinktqStatus const* linkstatus)
+        : KListViewItem(tqparent, after),
+        last_child_(0), root_(tqparent)
 {
     init(linkstatus);
 }
 
 TreeViewItem::TreeViewItem(TreeView* root, TQListViewItem* listview_item, TQListViewItem* after,
-                           LinkStatus const* linkstatus)
+                           LinktqStatus const* linkstatus)
         : KListViewItem(listview_item, after),
         last_child_(0), root_(root)
 
@@ -412,7 +412,7 @@ TreeViewItem::TreeViewItem(TreeView* root, TQListViewItem* listview_item, TQList
 TreeViewItem::~TreeViewItem()
 {}
 
-void TreeViewItem::init(LinkStatus const* linkstatus)
+void TreeViewItem::init(LinktqStatus const* linkstatus)
 {
     setOpen(true);
 
@@ -450,15 +450,15 @@ TQString TreeViewItem::key(int column, bool) const
     switch(column)
     {
     case 1: // status column
-        return linkStatus()->statusText();
+        return linktqStatus()->statusText();
     }
 
     return text(column);
 }
 
-LinkStatus const* TreeViewItem::linkStatus() const
+LinktqStatus const* TreeViewItem::linktqStatus() const
 {
-    return column_items_[0].linkStatus();
+    return column_items_[0].linktqStatus();
 }
 
 void TreeViewItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align)
@@ -478,7 +478,7 @@ void TreeViewItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column,
 
 /* ******************************* TreeColumnViewItem ******************************* */
 
-TreeColumnViewItem::TreeColumnViewItem(TreeView* root, LinkStatus const* linkstatus, int column_index)
+TreeColumnViewItem::TreeColumnViewItem(TreeView* root, LinktqStatus const* linkstatus, int column_index)
     : root_(root), ls_(linkstatus), column_index_(column_index)
 {
     Q_ASSERT(ls_);
@@ -501,7 +501,7 @@ int TreeColumnViewItem::columnIndex() const
     return column_index_;
 }
 
-LinkStatus const* TreeColumnViewItem::linkStatus() const
+LinktqStatus const* TreeColumnViewItem::linktqStatus() const
 {
     Q_ASSERT(ls_);
     return ls_;
@@ -511,29 +511,29 @@ TQColor const& TreeColumnViewItem::textStatusColor() const
 {
     if(columnIndex() == root_->urlColumnIndex() || columnIndex() == root_->statusColumnIndex())
     {
-        if(linkStatus()->status() == LinkStatus::BROKEN)
-            return Qt::red;
-        else if(linkStatus()->status() == LinkStatus::HTTP_CLIENT_ERROR)
-            return Qt::red;
-        else if(linkStatus()->status() == LinkStatus::HTTP_REDIRECTION)
-            return Qt::black;
-        else if(linkStatus()->status() == LinkStatus::HTTP_SERVER_ERROR)
-            return Qt::darkMagenta;
-        else if(linkStatus()->status() == LinkStatus::MALFORMED)
-            return Qt::red;
-        else if(linkStatus()->status() == LinkStatus::NOT_SUPPORTED)
-            return Qt::lightGray;
-        else if(linkStatus()->status() == LinkStatus::SUCCESSFULL)
-            return Qt::black;
-        else if(linkStatus()->status() == LinkStatus::TIMEOUT)
-            return Qt::darkMagenta;
-        else if(linkStatus()->status() == LinkStatus::UNDETERMINED)
-            return Qt::blue;
+        if(linktqStatus()->status() == LinktqStatus::BROKEN)
+            return TQt::red;
+        else if(linktqStatus()->status() == LinktqStatus::HTTP_CLIENT_ERROR)
+            return TQt::red;
+        else if(linktqStatus()->status() == LinktqStatus::HTTP_REDIRECTION)
+            return TQt::black;
+        else if(linktqStatus()->status() == LinktqStatus::HTTP_SERVER_ERROR)
+            return TQt::darkMagenta;
+        else if(linktqStatus()->status() == LinktqStatus::MALFORMED)
+            return TQt::red;
+        else if(linktqStatus()->status() == LinktqStatus::NOT_SUPPORTED)
+            return TQt::lightGray;
+        else if(linktqStatus()->status() == LinktqStatus::SUCCESSFULL)
+            return TQt::black;
+        else if(linktqStatus()->status() == LinktqStatus::TIMEOUT)
+            return TQt::darkMagenta;
+        else if(linktqStatus()->status() == LinktqStatus::UNDETERMINED)
+            return TQt::blue;
         
-        return Qt::red;
+        return TQt::red;
     }        
     else
-        return Qt::black;
+        return TQt::black;
 }
 
 
@@ -544,17 +544,17 @@ TQString TreeColumnViewItem::text(int column) const
     
     if(column == root_->urlColumnIndex())
     {
-        if(linkStatus()->node() && linkStatus()->malformed())
+        if(linktqStatus()->node() && linktqStatus()->malformed())
         {
-            if(linkStatus()->node()->url().isEmpty())
-                return linkStatus()->node()->content().simplifyWhiteSpace();
+            if(linktqStatus()->node()->url().isEmpty())
+                return linktqStatus()->node()->content().simplifyWhiteSpace();
             else
-                return linkStatus()->node()->url();
+                return linktqStatus()->node()->url();
         }
         else
         {
-            KURL url = linkStatus()->absoluteUrl();
-            return Url::convertToLocal(linkStatus());
+            KURL url = linktqStatus()->absoluteUrl();
+            return Url::convertToLocal(linktqStatus());
         }        
     }
     else if(column == root_->statusColumnIndex())
@@ -563,7 +563,7 @@ TQString TreeColumnViewItem::text(int column) const
     }
     else if(column == root_->labelColumnIndex())
     {
-        TQString label(linkStatus()->label());
+        TQString label(linktqStatus()->label());
         if(!label.isNull())
             return label.simplifyWhiteSpace();
     }
@@ -577,28 +577,28 @@ TQPixmap TreeColumnViewItem::pixmap(int column) const
 
     if(column == root_->statusColumnIndex())
     {
-        if(linkStatus()->status() == LinkStatus::BROKEN)
+        if(linktqStatus()->status() == LinktqStatus::BROKEN)
             return SmallIcon("no");
-        else if(linkStatus()->status() == LinkStatus::HTTP_CLIENT_ERROR)
+        else if(linktqStatus()->status() == LinktqStatus::HTTP_CLIENT_ERROR)
             return SmallIcon("no");
-        else if(linkStatus()->status() == LinkStatus::HTTP_REDIRECTION) 
+        else if(linktqStatus()->status() == LinktqStatus::HTTP_REDIRECTION) 
         {
-            if(linkStatus()->statusText() == "304")
+            if(linktqStatus()->statusText() == "304")
                 return UserIcon("304");
             else
                 return SmallIcon("redo");
         }
-        else if(linkStatus()->status() == LinkStatus::HTTP_SERVER_ERROR)
+        else if(linktqStatus()->status() == LinktqStatus::HTTP_SERVER_ERROR)
             return SmallIcon("no");
-        else if(linkStatus()->status() == LinkStatus::MALFORMED)
+        else if(linktqStatus()->status() == LinktqStatus::MALFORMED)
             return SmallIcon("editdelete");
-        else if(linkStatus()->status() == LinkStatus::NOT_SUPPORTED)
+        else if(linktqStatus()->status() == LinktqStatus::NOT_SUPPORTED)
             return SmallIcon("help");
-        else if(linkStatus()->status() == LinkStatus::SUCCESSFULL)
+        else if(linktqStatus()->status() == LinktqStatus::SUCCESSFULL)
             return SmallIcon("ok");
-        else if(linkStatus()->status() == LinkStatus::TIMEOUT)
+        else if(linktqStatus()->status() == LinktqStatus::TIMEOUT)
             return SmallIcon("history_clear");
-        else if(linkStatus()->status() == LinkStatus::UNDETERMINED)
+        else if(linktqStatus()->status() == LinktqStatus::UNDETERMINED)
             return SmallIcon("help");
     }
     
diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h
index 4d67c4f4..ccb84bb1 100644
--- a/klinkstatus/src/ui/treeview.h
+++ b/klinkstatus/src/ui/treeview.h
@@ -29,15 +29,16 @@ that a TQTable view isn't needed at all so some day I will clean this up.
 class TreeView : public KListView, public ResultView
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     
-    TreeView(TQWidget *parent = 0, const char *name = 0);
+    TreeView(TQWidget *tqparent = 0, const char *name = 0);
     ~TreeView();
 
     virtual void setColumns(TQStringList const& columns);
     virtual void clear();
     void removeColunas();
-    virtual void show(ResultView::Status const& status);
+    virtual void show(ResultView::tqStatus const& status);
     void show(LinkMatcher link_matcher);
     virtual void showAll();
     
@@ -74,7 +75,7 @@ private:
     double columnsWidth() const;
 
 private:
-    int current_column_; // apparently it's impossible to know what is the current column
+    int current_column_; // aptqparently it's impossible to know what is the current column
     bool tree_display_;
 };
 
@@ -90,23 +91,23 @@ class TreeViewItem: public KListViewItem
 {
 public:
 
-    TreeViewItem(TreeView* parent, TQListViewItem* after,
-                 LinkStatus const* linkstatus);
-    TreeViewItem(TreeView* root, TQListViewItem* parent_item, TQListViewItem* after,
-                 LinkStatus const* linkstatus);
+    TreeViewItem(TreeView* tqparent, TQListViewItem* after,
+                 LinktqStatus const* linkstatus);
+    TreeViewItem(TreeView* root, TQListViewItem* tqparent_item, TQListViewItem* after,
+                 LinktqStatus const* linkstatus);
     virtual ~TreeViewItem();
 
     void setLastChild(TQListViewItem* last_child);
     TQListViewItem* lastChild() const;
     
     TQString key(int column, bool) const;
-    LinkStatus const* linkStatus() const;
+    LinktqStatus const* linktqStatus() const;
 
 protected:
     virtual void paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align);
 
 private:
-    void init(LinkStatus const* linkstatus);
+    void init(LinktqStatus const* linkstatus);
 
 private:
     TQValueVector<TreeColumnViewItem> column_items_;
@@ -123,19 +124,19 @@ public:
     TreeColumnViewItem()
     {}
     ;
-    TreeColumnViewItem(TreeView* root, LinkStatus const* linkstatus, int column_index);
+    TreeColumnViewItem(TreeView* root, LinktqStatus const* linkstatus, int column_index);
     ~TreeColumnViewItem();
 
     //void setColumnIndex(int i);
     int columnIndex() const;
-    LinkStatus const* linkStatus() const;
+    LinktqStatus const* linktqStatus() const;
     TQColor const& textStatusColor() const;
     TQString text(int column) const;
     TQPixmap pixmap(int column) const;
 
 private:
     TreeView* root_;
-    LinkStatus const* ls_;
+    LinktqStatus const* ls_;
     int column_index_;
 };
 
diff --git a/klinkstatus/src/utils/utils.cpp b/klinkstatus/src/utils/utils.cpp
index 25384b4b..83956dee 100644
--- a/klinkstatus/src/utils/utils.cpp
+++ b/klinkstatus/src/utils/utils.cpp
@@ -131,14 +131,14 @@ TQString htmlDocCharset[NUMBER_OF_HTML_CODES][2] = {
 
 void decode(TQString& url)
 {
-    if( (int)url.find('&') != -1)
+    if( (int)url.tqfind('&') != -1)
     {
         for(int i = 0; i != NUMBER_OF_HTML_CODES; ++i)
         {
-            int index = url.find(htmlDocCharset[i][0]);
+            int index = url.tqfind(htmlDocCharset[i][0]);
             if(index != - 1)
             {
-                url.replace(htmlDocCharset[i][0], htmlDocCharset[i][1]);
+                url.tqreplace(htmlDocCharset[i][0], htmlDocCharset[i][1]);
             }
         }
     }
@@ -146,15 +146,15 @@ void decode(TQString& url)
 /*
 void decode(string& url)
 {
-    if( (int)url.find('&') != -1)
+    if( (int)url.tqfind('&') != -1)
     {
         for(int i = 0; i != NUMBER_OF_HTML_CODES; ++i)
         {
-            int index = url.find(htmlDocCharset[i][0].latin1());
+            int index = url.tqfind(htmlDocCharset[i][0].latin1());
             if(index != - 1)
             {
                 int length = htmlDocCharset[i][0].length();
-                url.replace(index, length, htmlDocCharset[i][1].latin1());
+                url.tqreplace(index, length, htmlDocCharset[i][1].latin1());
             }
         }
     }
diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp
index 27f61cb8..320f14cd 100644
--- a/klinkstatus/src/utils/xsl.cpp
+++ b/klinkstatus/src/utils/xsl.cpp
@@ -51,7 +51,7 @@
  * The thread class that actually performs the XSL processing.
  * Using a thread allows async operation.
  */
-class KopeteXSLThread : public TQObject, public QThread
+class KopeteXSLThread : public TQObject, public TQThread
 {
 public:
     /**
@@ -106,7 +106,7 @@ void KopeteXSLThread::run()
     m_resultString = xsltTransform( m_xml, m_xsl );
     dataMutex.unlock();
     // get back to the main thread
-    qApp->postEvent( this, new TQEvent( TQEvent::User ) );
+    tqApp->postEvent( this, new TQEvent( TQEvent::User ) );
 }
 
 bool KopeteXSLThread::event( TQEvent *event )
@@ -141,7 +141,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe
     {
         if ( styleSheet )
         {
-            static TQCString appPath( TQString::fromLatin1("\"%1\"").arg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::fromLatin1("styles/data") ).front() ).utf8() );
+            static TQCString appPath( TQString::tqfromLatin1("\"%1\"").tqarg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::tqfromLatin1("styles/data") ).front() ).utf8() );
 
             static const char* params[3] = {
                 "appdata",
@@ -152,7 +152,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe
             xmlDocPtr resultDoc = xsltApplyStylesheet( styleSheet, xmlDoc, params );
             if ( resultDoc )
             {
-                // Save the result into the QString
+                // Save the result into the TQString
                 xmlChar *mem;
                 int size;
                 xmlDocDumpMemory( resultDoc, &mem, &size );
@@ -179,7 +179,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe
 
     if ( resultString.isEmpty() )
     {
-        resultString = i18n( "<div><b>KLinkStatus encountered the following error while parsing a message:</b><br />%1</div>" ).arg( errorMsg );
+        resultString = i18n( "<div><b>KLinktqStatus encountered the following error while parsing a message:</b><br />%1</div>" ).tqarg( errorMsg );
     }
 
     #ifdef RAWXSL
@@ -196,8 +196,8 @@ public:
     unsigned int flags;
 };
 
-XSLT::XSLT( const TQString &document, TQObject *parent )
-    : TQObject( parent ), d(new XSLTPrivate)
+XSLT::XSLT( const TQString &document, TQObject *tqparent )
+    : TQObject( tqparent ), d(new XSLTPrivate)
 {
     d->flags = 0;
     d->xslDoc = 0;
@@ -228,14 +228,14 @@ void XSLT::setXSLT( const TQString &_document )
     //        depend on the strings in the current styles. If these strings change
     //        they may break the parsing here.
     //
-    //        The reason I'm doing it like this is because of issues with QDOM and
-    //        namespaces in earlier Qt versions. When we drop Qt 3.1.x support we
+    //        The reason I'm doing it like this is because of issues with TQDOM and
+    //        namespaces in earlier TQt versions. When we drop TQt 3.1.x support we
     //        should probably convert this to more accurate DOM code. - Martijn
     //
     //  Actually, since we need to parse into a libxml2 document anyway, this whole
     //  nonsense could be replaced with some simple XPath expressions - JK
     //
-    TQRegExp elementMatch( TQString::fromLatin1( "<kopete-i18n>(.*)</kopete-i18n>" ) );
+    TQRegExp elementMatch( TQString::tqfromLatin1( "<kopete-i18n>(.*)</kopete-i18n>" ) );
     elementMatch.setMinimal( true );
     TQString document = _document;
     int pos;
@@ -261,21 +261,21 @@ void XSLT::setXSLT( const TQString &_document )
         {
             prependPercent = false;
 
-            if ( *it == TQString::fromLatin1( "TIME" ) )
+            if ( *it == TQString::tqfromLatin1( "TIME" ) )
             {
-                trans += TQString::fromLatin1( "<xsl:value-of select=\"@time\"/>" );
+                trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@time\"/>" );
             }
-            else if ( *it == TQString::fromLatin1( "TIMESTAMP" ) )
+            else if ( *it == TQString::tqfromLatin1( "TIMESTAMP" ) )
             {
-                trans += TQString::fromLatin1( "<xsl:value-of select=\"@timestamp\"/>" );
+                trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@timestamp\"/>" );
             }
-            else if ( *it == TQString::fromLatin1( "FORMATTEDTIMESTAMP" ) )
+            else if ( *it == TQString::tqfromLatin1( "FORMATTEDTIMESTAMP" ) )
             {
-                trans += TQString::fromLatin1( "<xsl:value-of select=\"@formattedTimestamp\"/>" );
+                trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@formattedTimestamp\"/>" );
             }
-            else if ( *it == TQString::fromLatin1( "FROM_CONTACT_DISPLAYNAME" ) )
+            else if ( *it == TQString::tqfromLatin1( "FROM_CONTACT_DISPLAYNAME" ) )
             {
-                trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
+                trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
                     "<xsl:choose>"
                         "<xsl:when test='from/contact/@contactId=from/contact/contactDisplayName/@text'>"
                             "<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/metaContactDisplayName/@text\"/>"
@@ -290,9 +290,9 @@ void XSLT::setXSLT( const TQString &_document )
                     "</xsl:attribute>"
                     "<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/contactDisplayName/@text\"/></span>" );
             }
-            else if ( *it == TQString::fromLatin1( "TO_CONTACT_DISPLAYNAME" ) )
+            else if ( *it == TQString::tqfromLatin1( "TO_CONTACT_DISPLAYNAME" ) )
             {
-                trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
+                trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
                     "<xsl:choose>"
                         "<xsl:when test='to/contact/@contactId=from/contact/contactDisplayName/@text'>"
                             "<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/metaContactDisplayName/@text\"/>"
@@ -307,37 +307,37 @@ void XSLT::setXSLT( const TQString &_document )
                     "</xsl:attribute>"
                     "<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/contactDisplayName/@text\"/></span>" );
             }
-            else if ( *it == TQString::fromLatin1( "FROM_METACONTACT_DISPLAYNAME" ) )
+            else if ( *it == TQString::tqfromLatin1( "FROM_METACONTACT_DISPLAYNAME" ) )
             {
-                trans += TQString::fromLatin1( "<span>"
+                trans += TQString::tqfromLatin1( "<span>"
                 "<xsl:attribute name=\"dir\">"
                 "<xsl:value-of select=\"from/contact/metaContactDisplayName/@dir\"/>"
                 "</xsl:attribute>"
                 "<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/metaContactDisplayName/@text\"/></span>" );
             }
-            else if ( *it == TQString::fromLatin1( "TO_METACONTACT_DISPLAYNAME" ) )
+            else if ( *it == TQString::tqfromLatin1( "TO_METACONTACT_DISPLAYNAME" ) )
             {
-                trans += TQString::fromLatin1( "<span>"
+                trans += TQString::tqfromLatin1( "<span>"
                 "<xsl:attribute name=\"dir\">"
                     "<xsl:value-of select=\"to/contact/metaContactDisplayName/@dir\"/>"
                     "</xsl:attribute>"
                 "<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/metaContactDisplayName/@text\"/></span>" );
             }
-            else if ( *it == TQString::fromLatin1( "FROM_CONTACT_ID" ) )
+            else if ( *it == TQString::tqfromLatin1( "FROM_CONTACT_ID" ) )
             {
-                trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
+                trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
                     "<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/contactDisplayName/@text\"/></xsl:attribute>"
                     "<xsl:value-of disable-output-escaping=\"yes\" select=\"from/contact/@contactId\"/></span>" );
             }
-            else if ( *it == TQString::fromLatin1( "TO_CONTACT_ID" ) )
+            else if ( *it == TQString::tqfromLatin1( "TO_CONTACT_ID" ) )
             {
-                trans += TQString::fromLatin1( "<span><xsl:attribute name=\"title\">"
+                trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
                     "<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/contactDisplayName/@text\"/></xsl:attribute>"
                     "<xsl:value-of disable-output-escaping=\"yes\" select=\"to/contact/@contactId\"/></span>" );
             }
-            else if ( *it == TQString::fromLatin1( "BODY" ) )
+            else if ( *it == TQString::tqfromLatin1( "BODY" ) )
             {
-                trans += TQString::fromLatin1( "<xsl:value-of disable-output-escaping=\"yes\" select=\"body\"/>" );
+                trans += TQString::tqfromLatin1( "<xsl:value-of disable-output-escaping=\"yes\" select=\"body\"/>" );
             }
             else
             {
@@ -349,7 +349,7 @@ void XSLT::setXSLT( const TQString &_document )
         }
         //kdDebug( 14010 ) << k_funcinfo << "Translated text: " << trans << endl;
         // Add "<kopete-i18n>" and "</kopete-i18n>" to length, hence the '+ 27'
-        document.replace( uint( pos ), orig.length() + 27, trans );
+        document.tqreplace( uint( pos ), orig.length() + 27, trans );
     }
 
     #ifdef RAWXSL
@@ -379,7 +379,7 @@ void XSLT::setXSLT( const TQString &_document )
                     //We have a flag. Enable it;
                     TQCString flagData( (const char*)child->content );
 
-                    if( flagData.contains( "Flag:" ) )
+                    if( flagData.tqcontains( "Flag:" ) )
                     {
                         flags += flagData.mid(5);
                     }
@@ -387,7 +387,7 @@ void XSLT::setXSLT( const TQString &_document )
             }
 
             if( !flags.isEmpty() )
-                setProperty("flags", flags.join( TQString::fromLatin1("|") ) );
+                setProperty("flags", flags.join( TQString::tqfromLatin1("|") ) );
         }
         else
         {
diff --git a/klinkstatus/src/utils/xsl.h b/klinkstatus/src/utils/xsl.h
index 7fb6af70..93d6a74b 100644
--- a/klinkstatus/src/utils/xsl.h
+++ b/klinkstatus/src/utils/xsl.h
@@ -32,14 +32,15 @@ class XSLTPrivate;
  * This class provides an easy to use interface to basic
  * libxslt transformations.
 */
-class XSLT : public QObject
+class XSLT : public TQObject
 {
     Q_OBJECT
+    TQ_OBJECT
 
-    Q_PROPERTY( Flags flags READ flags WRITE setFlags )
-    Q_PROPERTY( bool isValid READ isValid )
+    TQ_PROPERTY( Flags flags READ flagsProperty WRITE setFlagsProperty )
+    TQ_PROPERTY( bool isValid READ isValid )
 
-    Q_SETS( Flags )
+    TQ_SETS( Flags )
 
 public:
     /**
@@ -56,7 +57,7 @@ public:
      *
      * Constructs a new XSLT parser using the provided XSLT document
      */
-    XSLT( const TQString &xsltDocument, TQObject *parent = 0L );
+    XSLT( const TQString &xsltDocument, TQObject *tqparent = 0L );
 
     virtual ~XSLT();
 
@@ -104,6 +105,9 @@ public:
      */
     void setFlags( unsigned int flags );
 
+    inline XSLT::Flags flagsProperty() const { return (XSLT::Flags)flags(); }
+    inline void setFlagsProperty( XSLT::Flags newflags ) { setFlags((XSLT::Flags)newflags); }
+
 private:
     XSLTPrivate *d;
 };
diff --git a/kommander/Kommander-TODO.kno b/kommander/Kommander-TODO.kno
index ebbe5651..d21460b5 100644
--- a/kommander/Kommander-TODO.kno
+++ b/kommander/Kommander-TODO.kno
@@ -16,10 +16,10 @@
 \NewEntry 1 Editor
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif">
 <p><span style="font-weight:600">Layout of Edit Kommander Text dialog<br /><br />Old ideas:</span></p>
-<ul type="disc"><li>better layout</li>
+<ul type="disc"><li>better tqlayout</li>
 <li>replace list of widgets with tree of widgets</li>
 <li>replace widget class with widget pixmap in combos</li>
-<li>redesign layout</li>
+<li>redesign tqlayout</li>
 <li>cleanup Connections, not it is unusable, may be obsolete</li>
 <li>find in scripts</li>
 <li>list of non-empty scripts for current dialog</li>
@@ -37,7 +37,7 @@
 <li>use KDE dialogs, not Qt ones if possible</li>
 <li>some widget information on mouseover</li>
 <li>review of event model</li>
-<li>add more layout-handling commands (center selected widgets horizontally/vertically, fit to window width/height)</li>
+<li>add more tqlayout-handling commands (center selected widgets horizontally/vertically, fit to window width/height)</li>
 <li>handle middle click</li>
 <li>carefully check defaults, choose most useful ones</li>
 <li>add wizards? (replace current New dialogs with Kommander-based ones?)</li>
@@ -72,8 +72,8 @@
 \NewEntry 1 Other
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif">
 <p><span style="font-weight:600">Other GUI-related issues</span></p>
-<ul type="disc"><li>cleanup slots/signals/connections interface</li>
-<li>find out why slots are shown only for current tab<br /></li></ul>
+<ul type="disc"><li>cleanup Q_SLOTS/Q_SIGNALS/connections interface</li>
+<li>find out why Q_SLOTS are shown only for current tab<br /></li></ul>
 <p><span style="font-weight:600">KDE4 ideas:<br /></span></p>
 <ul type="disc"><li>create a KDevelop plugin for the editor</li>
 <li>use KFormDesigner or the new Qt Designer</li></ul>
@@ -85,7 +85,7 @@
 <ul type="disc"><li>Charset is sometimes incorrectly converted from/to local charset</li>
 <li>SubDialog crashes now</li>
 <li>Labels do not show up unless you edit their text</li>
-<li>toolbox editing is ugly after group layout is applied. Goes back to normal if the dialog is reloaded.</li>
+<li>toolbox editing is ugly after group tqlayout is applied. Goes back to normal if the dialog is reloaded.</li>
 <div></div></ul>
 </body></html>
 
@@ -147,7 +147,7 @@
 <ul type="disc"><li>detect incorrect path at shebang, allow user to choose correct one and remeber that pair</li>
 <div></div>
 <div></div></ul>
-<p><span style="font-weight:600">If we keep the old parser.<br /><br /></span><br />Make it possible to use any language with Kommander. The idea is to replace Kommander specials with language specific code in a way that it will not break conditions and loops, like now. example:<br />#!/bin/bash<br />array=&quot;1 2 3 4 5&quot;<br />for i in $array do<br />  @Label.setText($i)<br />done<br /><br />This does not work now. The idea is to replace @Widget.method() with a language specific DCOP call.<br />If the language has DCOP bindings, use those bindings to execute the dcop call. If not, use the command line<br />DCOP application. This is slower, but always works. In the above case, Kommander would replace <br />@Label.setText($i) <br />with<br />dcop kmdr-executor-PID KommanderIf setText Label $i<br /><br />Kommander will have description files for each supported language about how to execute DCOP calls.<br />If the language has DCOP bindings, this description tells the syntax of the bindings. If it doesn't have, the description gives a way how to execute external applications. This should always exists, as all languages can execute external applications.<br /><br />In KDE4, of course use DBUS instead of DCOP.<br /><br /></p>
+<p><span style="font-weight:600">If we keep the old parser.<br /><br /></span><br />Make it possible to use any language with Kommander. The idea is to replace Kommander specials with language specific code in a way that it will not break conditions and loops, like now. example:<br />#!/bin/bash<br />array=&quot;1 2 3 4 5&quot;<br />for i in $array do<br />  @Label.setText($i)<br />done<br /><br />This does not work now. The idea is to tqreplace @Widget.method() with a language specific DCOP call.<br />If the language has DCOP bindings, use those bindings to execute the dcop call. If not, use the command line<br />DCOP application. This is slower, but always works. In the above case, Kommander would tqreplace <br />@Label.setText($i) <br />with<br />dcop kmdr-executor-PID KommanderIf setText Label $i<br /><br />Kommander will have description files for each supported language about how to execute DCOP calls.<br />If the language has DCOP bindings, this description tells the syntax of the bindings. If it doesn't have, the description gives a way how to execute external applications. This should always exists, as all languages can execute external applications.<br /><br />In KDE4, of course use DBUS instead of DCOP.<br /><br /></p>
 </body></html>
 
 \NewEntry 1 Aliases
@@ -160,8 +160,8 @@
 
 \NewEntry 1 Signals
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Georgia">
-<p><span style="font-weight:600">New signals for existing widgets</span></p>
-<ul type="disc"><li>add signals for D&amp;D<br /><span style="font-style:italic">Requires  dragContent and dragType, perhaps dragSource to be set.</span></li>
+<p><span style="font-weight:600">New Q_SIGNALS for existing widgets</span></p>
+<ul type="disc"><li>add Q_SIGNALS for D&amp;D<br /><span style="font-style:italic">Requires  dragContent and dragType, perhaps dragSource to be set.</span></li>
 <li></li></ul>
 </body></html>
 
@@ -218,7 +218,7 @@
 
 \NewEntry 1 Done
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif">
-<p>New widgets include the DatePicker, Popup Menu and Toolbox. New functions inlcude widget creation, hooking and unhooking signals and slots and full slot access as well as passing and returning parameters in scripts. WooHoo! Take that do list!<br /></p>
+<p>New widgets include the DatePicker, Popup Menu and Toolbox. New functions inlcude widget creation, hooking and unhooking Q_SIGNALS and Q_SLOTS and full slot access as well as passing and returning parameters in scripts. WooHoo! Take that do list!<br /></p>
 <ul type="disc"><li>fixed dcop functions</li>
 <li>added indexed array functions</li>
 <li>made color slot work in TextEdit</li>
@@ -238,7 +238,7 @@
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif">
 <p><span style="font-weight:600">Executing Kommander scripts</span></p>
 <ul type="disc"><li>detect and handle missing plugin widgets</li>
-<li>cache @pid, @dcopid, @parentPid, perhaps calculate and cache @parentdcopid</li>
+<li>cache @pid, @dcopid, @tqparentPid, perhaps calculate and cache @tqparentdcopid</li>
 <li>handle multiple dialogs: they could be packaged in single *.tgz file, unpacked and executed internally</li>
 <div></div>
 <div><br /></div></ul>
@@ -284,7 +284,7 @@
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Georgia">
 <li type="disc"><span style="font-weight:600">ChangeLog of Kommander</span></li>
 <li type="disc"><span style="font-style:italic">See ChangeLog file for details and dates</span></li>
-<ul type="disc"><li>added @parentPid evaluated to parent process pid</li>
+<ul type="disc"><li>added @tqparentPid evaluated to tqparent process pid</li>
 <li>added @pid evaluated to current process pid</li>
 <li>added @dcopid evaluated to current process DCOP id</li>
 <li>significantly improved Kommander Text editor usability</li>
diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp
index 67491ef4..119f481b 100644
--- a/kommander/editor/actiondnd.cpp
+++ b/kommander/editor/actiondnd.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -42,7 +42,7 @@
 
 #include <klocale.h>
 
-bool QDesignerAction::addTo( TQWidget *w )
+bool TQDesignerAction::addTo( TQWidget *w )
 {
     if ( !widgetToInsert )
 	return TQAction::addTo( w );
@@ -55,7 +55,7 @@ bool QDesignerAction::addTo( TQWidget *w )
     return true;
 }
 
-bool QDesignerAction::removeFrom( TQWidget *w )
+bool TQDesignerAction::removeFrom( TQWidget *w )
 {
     if ( !widgetToInsert )
 	return TQAction::removeFrom( w );
@@ -64,70 +64,70 @@ 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 ( w->inherits( TQTOOLBAR_OBJECT_NAME_STRING ) ) {
 	TQToolBar *tb = (TQToolBar*)w;
-	wid = new QDesignerToolBarSeparator( tb->orientation(), tb );
+	wid = new TQDesignerToolBarSeparator( tb->orientation(), tb );
 	return true;
     } else if ( w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) {
 	idx = ( (TQPopupMenu*)w )->count();
@@ -137,7 +137,7 @@ bool QSeparatorAction::addTo( TQWidget *w )
     return false;
 }
 
-bool QSeparatorAction::removeFrom( TQWidget *w )
+bool TQSeparatorAction::removeFrom( TQWidget *w )
 {
     if ( w->inherits( TQTOOLBAR_OBJECT_NAME_STRING ) ) {
 	delete wid;
@@ -149,7 +149,7 @@ bool QSeparatorAction::removeFrom( TQWidget *w )
     return false;
 }
 
-TQWidget *QSeparatorAction::widget() const
+TQWidget *TQSeparatorAction::widget() const
 {
     return wid;
 }
@@ -157,15 +157,15 @@ TQWidget *QSeparatorAction::widget() const
 
 
 
-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;
@@ -173,65 +173,65 @@ 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 ) {
 	if ( w->inherits( "FormWindow" ) )
 	    formWindow = (FormWindow*)w;
-	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 ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) {
-	( (QDesignerActionGroup*)a )->widget()->installEventFilter( this );
-	actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a );
-    } else if ( a->inherits( "QSeparatorAction" ) ) {
-	( (QSeparatorAction*)a )->widget()->installEventFilter( this );
-	actionMap.insert( ( (QSeparatorAction*)a )->widget(), a );
+	( (TQDesignerActionGroup*)a )->widget()->installEventFilter( this );
+	actionMap.insert( ( (TQDesignerActionGroup*)a )->widget(), a );
+    } else if ( a->inherits( "TQSeparatorAction" ) ) {
+	( (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() && !o->parent()->inherits( "QDesignerToolBar" ) )
-	o = o->parent();
+    while ( o && o->tqparent() && !o->tqparent()->inherits( "TQDesignerToolBar" ) )
+	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 ) {
@@ -279,7 +279,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() )
@@ -287,24 +287,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 ) {
 
@@ -318,33 +318,33 @@ void QDesignerToolBar::mousePressEvent( TQMouseEvent *e )
     }
 }
 
-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() && (*it)->inherits( "QSeparatorAction" ) )
+    TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o );
+    if ( it != actionMap.end() && (*it)->inherits( "TQSeparatorAction" ) )
 	menu.insertItem( i18n("Delete Separator" ), ID_DELETE );
     else
 	menu.insertItem( i18n("Delete Item" ), ID_DELETE );
@@ -353,21 +353,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 )
@@ -380,21 +380,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 ) {
 
@@ -411,16 +411,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();
@@ -428,22 +428,22 @@ 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();
@@ -451,18 +451,18 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
     adjustSize();
 
     TQString type = a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? TQString( "application/x-designer-actiongroup" ) :
-	a->inherits( "QSeparatorAction" ) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" );
+	a->inherits( "TQSeparatorAction" ) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" );
     TQStoredDrag *drag = new TQStoredDrag( type, this );
     TQString s = TQString::number( (long)a ); // #### huha, that is evil
     drag->setEncodedData( TQCString( s.latin1() ) );
     drag->setPixmap( a->iconSet().pixmap() );
-    if ( a->inherits( "QDesignerAction" ) ) {
-	if ( formWindow->widgets()->find( ( (QDesignerAction*)a )->widget() ) )
-	    formWindow->selectWidget( ( (QDesignerAction*)a )->widget(), false );
+    if ( a->inherits( "TQDesignerAction" ) ) {
+	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();
@@ -471,9 +471,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 );
@@ -483,7 +483,7 @@ void QDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e )
 	e->accept();
 }
 
-void QDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e )
+void TQDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e )
 {
     if ( e->provides( "application/x-designer-actions" ) ||
 	 e->provides( "application/x-designer-actiongroup" ) ||
@@ -494,14 +494,14 @@ void QDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e )
     drawIndicator( calcIndicatorPos( e->pos() ) );
 }
 
-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 ( e->provides( "application/x-designer-actions" ) ||
 	 e->provides( "application/x-designer-actiongroup" ) ||
@@ -511,15 +511,15 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
 	return;
     TQString s;
     if ( e->provides( "application/x-designer-actiongroup" ) )
-	s = TQString( e->encodedData( "application/x-designer-actiongroup" ) );
+	s = TQString( e->tqencodedData( "application/x-designer-actiongroup" ) );
     else if ( e->provides( "application/x-designer-separator" ) )
-	s = TQString( e->encodedData( "application/x-designer-separator" ) );
+	s = TQString( e->tqencodedData( "application/x-designer-separator" ) );
     else
-	s = TQString( e->encodedData( "application/x-designer-actions" ) );
+	s = TQString( e->tqencodedData( "application/x-designer-actions" ) );
 
     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 )
@@ -527,14 +527,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 = (QDesignerAction*)s.toLong();
+	    a = (TQDesignerAction*)s.toLong();
 	else
-	    a = (QSeparatorAction*)s.toLong();
+	    a = (TQSeparatorAction*)s.toLong();
     } else {
-	a = (QDesignerActionGroup*)s.toLong();
+	a = (TQDesignerActionGroup*)s.toLong();
     }
 
-    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." ).
@@ -543,7 +543,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();
@@ -553,7 +553,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
 
 #endif
 
-void QDesignerToolBar::reInsert()
+void TQDesignerToolBar::reInsert()
 {
     TQAction *a = 0;
     actionMap.clear();
@@ -561,36 +561,37 @@ void QDesignerToolBar::reInsert()
     for ( a = actionList.first(); a; a = actionList.next() ) {
 	a->addTo( this );
 	if ( a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ) {
-	    actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a );
-	    if ( ( (QDesignerActionGroup*)a )->widget() )
-		( (QDesignerActionGroup*)a )->widget()->installEventFilter( this );
-	} else if ( a->inherits( "QDesignerAction" ) ) {
-	    actionMap.insert( ( (QDesignerAction*)a )->widget(), a );
-	    ( (QDesignerAction*)a )->widget()->installEventFilter( this );
-	} else if ( a->inherits( "QSeparatorAction" ) ) {
-	    actionMap.insert( ( (QSeparatorAction*)a )->widget(), a );
-	    ( (QSeparatorAction*)a )->widget()->installEventFilter( this );
+	    actionMap.insert( ( (TQDesignerActionGroup*)a )->widget(), a );
+	    if ( ( (TQDesignerActionGroup*)a )->widget() )
+		( (TQDesignerActionGroup*)a )->widget()->installEventFilter( this );
+	} else if ( a->inherits( "TQDesignerAction" ) ) {
+	    actionMap.insert( ( (TQDesignerAction*)a )->widget(), a );
+	    ( (TQDesignerAction*)a )->widget()->installEventFilter( this );
+	} else if ( a->inherits( "TQSeparatorAction" ) ) {
+	    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;
@@ -609,10 +610,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;
@@ -630,12 +632,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 );
@@ -654,7 +656,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;
@@ -662,30 +664,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 ( a->inherits( "QDesignerAction" ) )
-	    ( (QDesignerAction*)a )->remove();
+	if ( a->inherits( "TQDesignerAction" ) )
+	    ( (TQDesignerAction*)a )->remove();
     }
     TQToolBar::clear();
 }
 
-void QDesignerToolBar::installEventFilters( TQWidget *w )
+void TQDesignerToolBar::installEventFilters( TQWidget *w )
 {
     if ( !w )
 	return;
@@ -697,32 +699,32 @@ void QDesignerToolBar::installEventFilters( TQWidget *w )
 
 
 
-QDesignerMenuBar::QDesignerMenuBar( TQWidget *mw )
+TQDesignerMenuBar::TQDesignerMenuBar( TQWidget *mw )
     : TQMenuBar( mw, 0 )
 {
     show();
     setAcceptDrops( true );
-    MetaDataBase::addEntry( this );
+    MetaDataBase::addEntry( TQT_TQOBJECT(this) );
     itemNum = 0;
     mousePressed = false;
     lastIndicatorPos = TQPoint( -1, -1 );
     insertAt = -1;
-    indicator = new QDesignerIndicatorWidget( this );
+    indicator = new TQDesignerIndicatorWidget( this );
     indicator->hide();
     findFormWindow();
 }
 
-void QDesignerMenuBar::findFormWindow()
+void TQDesignerMenuBar::findFormWindow()
 {
     TQWidget *w = this;
     while ( w ) {
 	if ( w->inherits( "FormWindow" ) )
 	    formWindow = (FormWindow*)w;
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
 }
 
-void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e )
+void TQDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e )
 {
     e->accept();
     int itm = itemAtPos( e->pos() );
@@ -736,17 +738,17 @@ void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e )
     menu.insertItem( i18n("Rename Item..." ), 2 );
     int res = menu.exec( e->globalPos() );
     if ( res == 1 ) {
-	TQMenuItem *item = findItem( idAt( itm ) );
-	RemoveMenuCommand *cmd = new RemoveMenuCommand( i18n("Delete Menu '%1'" ).arg( item->text() ),
+	TQMenuItem *item = tqfindItem( idAt( itm ) );
+	RemoveMenuCommand *cmd = new RemoveMenuCommand( i18n("Delete Menu '%1'" ).tqarg( item->text() ),
 							formWindow,
-							(TQMainWindow*)parentWidget(), this,
-							(QDesignerPopupMenu*)item->popup(),
+							(TQMainWindow*)tqparentWidget(), this,
+							(TQDesignerPopupMenu*)item->popup(),
 							idAt( itm ), itm, item->text() );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
-	// #### need to do a proper invalidate and re-layout
-	parentWidget()->layout()->invalidate();
-	parentWidget()->layout()->activate();
+	// #### need to do a proper tqinvalidate and re-tqlayout
+	tqparentWidget()->tqlayout()->tqinvalidate();
+	tqparentWidget()->tqlayout()->activate();
     } else if ( res == 2 ) {
 	bool ok;
 	TQString old = text( idAt( itm ) );
@@ -754,7 +756,7 @@ void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e )
 					     text( idAt( itm ) ), &ok, 0 );
 	if ( ok ) {
 	    RenameMenuCommand *cmd = new RenameMenuCommand(
-		i18n("Rename Menu '%1' to '%2'" ).arg( old ).arg( txt ),
+		i18n("Rename Menu '%1' to '%2'" ).tqarg( old ).tqarg( txt ),
 		formWindow, this, idAt( itm ), old, txt );
 	    formWindow->commandHistory()->addCommand( cmd );
 	    cmd->execute();
@@ -762,33 +764,33 @@ void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e )
     }
 }
 
-void QDesignerMenuBar::mousePressEvent( TQMouseEvent *e )
+void TQDesignerMenuBar::mousePressEvent( TQMouseEvent *e )
 {
     lastIndicatorPos = TQPoint( -1, -1 );
     insertAt = -1;
     mousePressed = true;
-    if ( e->button() == MidButton || e->button() == RightButton )
+    if ( e->button() == Qt::MidButton || e->button() == Qt::RightButton )
 	return;
 
     dragStartPos = e->pos();
     TQMenuBar::mousePressEvent( e );
 }
 
-void QDesignerMenuBar::mouseMoveEvent( TQMouseEvent *e )
+void TQDesignerMenuBar::mouseMoveEvent( TQMouseEvent *e )
 {
-    if ( !mousePressed || e->state() == NoButton ) {
+    if ( !mousePressed || e->state() == Qt::NoButton ) {
 	TQMenuBar::mouseMoveEvent( e );
 	return;
     }
-    if ( QABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() )
+    if ( TQABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() )
 	return;
     hidePopups();
     activateItemAt( -1 );
     int itm = itemAtPos( dragStartPos );
     if ( itm == -1 )
 	return;
-    TQPopupMenu *popup = findItem( idAt( itm ) )->popup();
-    TQString txt = findItem( idAt( itm ) )->text();
+    TQPopupMenu *popup = tqfindItem( idAt( itm ) )->popup();
+    TQString txt = tqfindItem( idAt( itm ) )->text();
     removeItemAt( itm );
 
     TQStoredDrag *drag = new TQStoredDrag( "application/x-designer-menuitem", this );
@@ -812,15 +814,15 @@ void QDesignerMenuBar::mouseMoveEvent( TQMouseEvent *e )
     mousePressed = false;
 }
 
-void QDesignerMenuBar::mouseReleaseEvent( TQMouseEvent *e )
+void TQDesignerMenuBar::mouseReleaseEvent( TQMouseEvent *e )
 {
     TQMenuBar::mouseReleaseEvent( e );
     mousePressed = false;
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
-void QDesignerMenuBar::dragEnterEvent( TQDragEnterEvent *e )
+void TQDesignerMenuBar::dragEnterEvent( TQDragEnterEvent *e )
 {
     if ( e->provides( "application/x-designer-actions" ) ||
 	 e->provides( "application/x-designer-actiongroup" ) ||
@@ -832,7 +834,7 @@ void QDesignerMenuBar::dragEnterEvent( TQDragEnterEvent *e )
     insertAt = -1;
 }
 
-void QDesignerMenuBar::dragMoveEvent( TQDragMoveEvent *e )
+void TQDesignerMenuBar::dragMoveEvent( TQDragMoveEvent *e )
 {
     if ( e->provides( "application/x-designer-actions" ) ||
 	 e->provides( "application/x-designer-menuitem" ) ||
@@ -845,12 +847,12 @@ void QDesignerMenuBar::dragMoveEvent( TQDragMoveEvent *e )
 	 e->provides( "application/x-designer-actiongroup" ) ||
 	 e->provides( "application/x-designer-separator" ) ) {
 	int item = itemAtPos( e->pos() );
-	bool uieffect = TQApplication::isEffectEnabled( UI_AnimateMenu );
-	TQApplication::setEffectEnabled( UI_AnimateMenu, false );
-	if ( !qApp->activePopupWidget() )
+	bool uieffect = TQApplication::isEffectEnabled( Qt::UI_AnimateMenu );
+	TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, false );
+	if ( !tqApp->activePopupWidget() )
 	    actItem = -1;
 	activateItemAt( item );
-	TQApplication::setEffectEnabled( UI_AnimateMenu, uieffect );
+	TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, uieffect );
 	if ( item == -1 )
 	    hidePopups();
     } else {
@@ -858,28 +860,28 @@ void QDesignerMenuBar::dragMoveEvent( TQDragMoveEvent *e )
     }
 }
 
-void QDesignerMenuBar::dragLeaveEvent( TQDragLeaveEvent * )
+void TQDesignerMenuBar::dragLeaveEvent( TQDragLeaveEvent * )
 {
     mousePressed = false;
     lastIndicatorPos = TQPoint( -1, -1 );
     insertAt = -1;
 }
 
-void QDesignerMenuBar::dropEvent( TQDropEvent *e )
+void TQDesignerMenuBar::dropEvent( TQDropEvent *e )
 {
     mousePressed = false;
     if ( !e->provides( "application/x-designer-menuitem" ) )
 	return;
     e->accept();
-    TQString s( e->encodedData( "application/x-designer-menuitem" ) );
-    TQString s1 = s.left( s.find( "/" ) );
-    TQString s2 = s.mid( s.find( "/" ) + 1 );
+    TQString s( e->tqencodedData( "application/x-designer-menuitem" ) );
+    TQString s1 = s.left( s.tqfind( "/" ) );
+    TQString s2 = s.mid( s.tqfind( "/" ) + 1 );
     TQPopupMenu *popup = (TQPopupMenu*)s1.toLong();  // #### huha, that is evil
     TQString txt = s2;
     insertItem( txt, popup, -1, insertAt );
 
-    MoveMenuCommand *cmd = new MoveMenuCommand( i18n("Move Menu '%1'" ).arg( txt ), formWindow,
-						this, (QDesignerPopupMenu*)popup, oldPos, insertAt, txt );
+    MoveMenuCommand *cmd = new MoveMenuCommand( i18n("Move Menu '%1'" ).tqarg( txt ), formWindow,
+						this, (TQDesignerPopupMenu*)popup, oldPos, insertAt, txt );
     // do not execute, we did the work already
     formWindow->commandHistory()->addCommand( cmd );
 
@@ -888,12 +890,12 @@ void QDesignerMenuBar::dropEvent( TQDropEvent *e )
 
 #endif
 
-TQPoint QDesignerMenuBar::calcIndicatorPos( const TQPoint &pos )
+TQPoint TQDesignerMenuBar::calcIndicatorPos( const TQPoint &pos )
 {
     int w = frameWidth();
     insertAt = count();
     for ( int i = 0; i < (int)count(); ++i ) {
-	TQRect r = itemRect( i );
+	TQRect r = tqitemRect( i );
 	if ( pos.x() < w + r.width() / 2 ) {
 	    insertAt = i;
 	    break;
@@ -904,7 +906,7 @@ TQPoint QDesignerMenuBar::calcIndicatorPos( const TQPoint &pos )
     return TQPoint( w, 0 );
 }
 
-void QDesignerMenuBar::drawIndicator( const TQPoint &pos )
+void TQDesignerMenuBar::drawIndicator( const TQPoint &pos )
 {
     if ( lastIndicatorPos == pos )
 	return;
@@ -918,47 +920,47 @@ void QDesignerMenuBar::drawIndicator( const TQPoint &pos )
 	TQApplication::sendPostedEvents();
 }
 
-void QDesignerMenuBar::setItemNumber( int num )
+void TQDesignerMenuBar::setItemNumber( int num )
 {
     itemNum = num;
 }
 
-int QDesignerMenuBar::itemNumber() const
+int TQDesignerMenuBar::itemNumber() const
 {
     return itemNum;
 }
 
-void QDesignerMenuBar::setItemText( const TQString &s )
+void TQDesignerMenuBar::setItemText( const TQString &s )
 {
     if ( itemNum < 0 || itemNum >= (int)count() )
 	return;
     changeItem( idAt( itemNum ), s );
 }
 
-TQString QDesignerMenuBar::itemText() const
+TQString TQDesignerMenuBar::itemText() const
 {
     if ( itemNum < 0 || (int)itemNum >= (int)count() )
-	return TQString::null;
+	return TQString();
     return text( idAt( itemNum ) );
 }
 
-void QDesignerMenuBar::setItemName( const TQCString &s )
+void TQDesignerMenuBar::setItemName( const TQCString &s )
 {
     if ( itemNum < 0 || itemNum >= (int)count() )
 	return;
-    findItem( idAt( itemNum ) )->popup()->setName( s );
+    tqfindItem( idAt( itemNum ) )->popup()->setName( s );
 }
 
-TQCString QDesignerMenuBar::itemName() const
+TQCString TQDesignerMenuBar::itemName() const
 {
     if ( itemNum < 0 || itemNum >= (int)count() )
 	return "";
-    return findItem( idAt( itemNum ) )->popup()->name();
+    return tqfindItem( idAt( itemNum ) )->popup()->name();
 }
 
 
 
-QDesignerPopupMenu::QDesignerPopupMenu( TQWidget *w )
+TQDesignerPopupMenu::TQDesignerPopupMenu( TQWidget *w )
     : TQPopupMenu( w, 0 ),
       popupMenu( 0 )
 {
@@ -967,27 +969,27 @@ QDesignerPopupMenu::QDesignerPopupMenu( TQWidget *w )
     insertAt = -1;
     mousePressed = false;
     lastIndicatorPos = TQPoint( -1, -1 );
-    indicator = new QDesignerIndicatorWidget( this );
+    indicator = new TQDesignerIndicatorWidget( this );
     indicator->hide();
 }
 
-void QDesignerPopupMenu::contextMenuEvent( TQContextMenuEvent *e )
+void TQDesignerPopupMenu::contextMenuEvent( TQContextMenuEvent *e )
 {
-#if defined( Q_WS_MAC ) //the mac needs us to use context menu rather than right click
+#if defined( TQ_WS_MAC ) //the mac needs us to use context menu rather than right click
     e->accept();
-    TQMouseEvent me( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), RightButton, RightButton );
+    TQMouseEvent me( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), Qt::RightButton, Qt::RightButton );
     mousePressEvent(&me);
 #else
     Q_UNUSED( e );
 #endif
 }
 
-void QDesignerPopupMenu::mousePressEvent( TQMouseEvent *e )
+void TQDesignerPopupMenu::mousePressEvent( TQMouseEvent *e )
 {
-    if ( e->button() == MidButton )
+    if ( e->button() == Qt::MidButton )
 	return;
 
-    if ( e->button() == RightButton ) {
+    if ( e->button() == Qt::RightButton ) {
 	// A popup for a popup, we only need one, so make sure that
 	// we don't create multiple.  The timer keeps the event loop sane.
 	popupPos = e->globalPos();
@@ -1004,7 +1006,7 @@ void QDesignerPopupMenu::mousePressEvent( TQMouseEvent *e )
     TQPopupMenu::mousePressEvent( e );
 }
 
-void QDesignerPopupMenu::createPopupMenu()
+void TQDesignerPopupMenu::createPopupMenu()
 {
     // actually creates our popup for the popupmenu.
     TQPopupMenu menu( 0 );
@@ -1016,7 +1018,7 @@ void QDesignerPopupMenu::createPopupMenu()
     if ( itm == -1 )
 	return;
     TQAction *a = actionList.at( itm );
-    if ( a && a->inherits( "QSeparatorAction" ) )
+    if ( a && a->inherits( "TQSeparatorAction" ) )
 	menu.insertItem( i18n("Delete Separator" ), ID_DELETE );
     else
 	menu.insertItem( i18n("Delete Item" ), ID_DELETE );
@@ -1028,35 +1030,35 @@ void QDesignerPopupMenu::createPopupMenu()
 	    return;
 	RemoveActionFromPopupCommand *cmd = new RemoveActionFromPopupCommand(
 									     i18n("Delete Action '%1' From Popup Menu '%2'" ).
-									     arg( a->name() ).arg( caption() ),
+									     tqarg( a->name() ).tqarg( caption() ),
 									     formWindow, a, this, itm );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
     } else if ( res == ID_SEP ) {
 	TQPoint p( pos() );
 	calcIndicatorPos( mapFromGlobal( popupPos ) );
-	TQAction *a = new QSeparatorAction( 0 );
+	TQAction *a = new TQSeparatorAction( 0 );
 	AddActionToPopupCommand *cmd = new AddActionToPopupCommand(
 								   i18n("Add Separator to Popup Menu '%1'" ).
 								   arg( name() ),
 								   formWindow, a, this, insertAt );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
-	( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->hidePopups();
-	( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->activateItemAt( -1 );
+	( (TQDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->hidePopups();
+	( (TQDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->activateItemAt( -1 );
 	popup( p );
     }
     // set this back to zero so we know a popup (will soon) not exist.
     popupMenu = 0;
 }
 
-void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e )
+void TQDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e )
 {
-    if ( !mousePressed || e->state() == NoButton ) {
+    if ( !mousePressed || e->state() == Qt::NoButton ) {
 	TQPopupMenu::mouseMoveEvent( e );
 	return;
     }
-    if ( QABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() ) {
+    if ( TQABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() ) {
 	TQPopupMenu::mouseMoveEvent( e );
 	return;
     }
@@ -1067,20 +1069,20 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e )
     if ( !a )
 	return;
     RemoveActionFromPopupCommand *cmd = new RemoveActionFromPopupCommand( i18n("Delete Action '%1' From Popup Menu '%2'" ).
-									  arg( a->name() ).arg( caption() ),
+									  tqarg( a->name() ).tqarg( caption() ),
 									  formWindow, a, this, itm );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
 
     TQString type = a->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? TQString( "application/x-designer-actiongroup" ) :
-	a->inherits( "QSeparatorAction" ) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" );
+	a->inherits( "TQSeparatorAction" ) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" );
     TQStoredDrag *drag = new TQStoredDrag( type, this );
     TQString s = TQString::number( (long)a ); // #### huha, that is evil
     drag->setEncodedData( TQCString( s.latin1() ) );
     drag->setPixmap( a->iconSet().pixmap() );
     if ( !drag->drag() ) {
 	AddActionToPopupCommand *cmd = new AddActionToPopupCommand( i18n("Add Action '%1' to Popup Menu '%2'" ).
-								    arg( a->name() ).arg( name() ),
+								    tqarg( a->name() ).tqarg( name() ),
 								    formWindow, a, this, itm );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
@@ -1090,15 +1092,15 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e )
     mousePressed = false;
 }
 
-void QDesignerPopupMenu::mouseReleaseEvent( TQMouseEvent *e )
+void TQDesignerPopupMenu::mouseReleaseEvent( TQMouseEvent *e )
 {
     mousePressed = false;
     TQPopupMenu::mouseReleaseEvent( e );
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
-void QDesignerPopupMenu::dragEnterEvent( TQDragEnterEvent *e )
+void TQDesignerPopupMenu::dragEnterEvent( TQDragEnterEvent *e )
 {
     mousePressed = false;
     lastIndicatorPos = TQPoint( -1, -1 );
@@ -1108,7 +1110,7 @@ void QDesignerPopupMenu::dragEnterEvent( TQDragEnterEvent *e )
 	e->accept();
 }
 
-void QDesignerPopupMenu::dragMoveEvent( TQDragMoveEvent *e )
+void TQDesignerPopupMenu::dragMoveEvent( TQDragMoveEvent *e )
 {
     mousePressed = false;
     if ( e->provides( "application/x-designer-actions" ) ||
@@ -1120,14 +1122,14 @@ void QDesignerPopupMenu::dragMoveEvent( TQDragMoveEvent *e )
     drawIndicator( calcIndicatorPos( e->pos() ) );
 }
 
-void QDesignerPopupMenu::dragLeaveEvent( TQDragLeaveEvent * )
+void TQDesignerPopupMenu::dragLeaveEvent( TQDragLeaveEvent * )
 {
     mousePressed = false;
     indicator->hide();
     insertAt = -1;
 }
 
-void QDesignerPopupMenu::dropEvent( TQDropEvent *e )
+void TQDesignerPopupMenu::dropEvent( TQDropEvent *e )
 {
     mousePressed = false;
     if ( e->provides( "application/x-designer-actions" ) ||
@@ -1140,20 +1142,20 @@ void QDesignerPopupMenu::dropEvent( TQDropEvent *e )
     TQPoint p = pos();
     TQAction *a = 0;
     if ( e->provides( "application/x-designer-actiongroup" ) ) {
-	TQString s( e->encodedData( "application/x-designer-actiongroup" ) );
-	a = (QDesignerActionGroup*)s.toLong();
+	TQString s( e->tqencodedData( "application/x-designer-actiongroup" ) );
+	a = (TQDesignerActionGroup*)s.toLong();
     } else {
 	TQString s;
 	if ( e->provides( "application/x-designer-separator" ) ) {
-	    s = TQString( e->encodedData( "application/x-designer-separator" ) );
-	    a = (QSeparatorAction*)s.toLong();
+	    s = TQString( e->tqencodedData( "application/x-designer-separator" ) );
+	    a = (TQSeparatorAction*)s.toLong();
 	} else {
-	    s = TQString( e->encodedData( "application/x-designer-actions" ) );
-	    a = (QDesignerAction*)s.toLong();
+	    s = TQString( e->tqencodedData( "application/x-designer-actions" ) );
+	    a = (TQDesignerAction*)s.toLong();
 	}
     }
 
-    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 menu.\n"
 				  "An Action may only occur once in a given menu." ).
@@ -1162,27 +1164,27 @@ void QDesignerPopupMenu::dropEvent( TQDropEvent *e )
     }
 
     AddActionToPopupCommand *cmd = new AddActionToPopupCommand( i18n("Add Action '%1' to Popup Menu '%2'" ).
-								arg( a->name() ).arg( name() ),
+								tqarg( a->name() ).tqarg( name() ),
 								formWindow, a, this, insertAt );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
 
-    ( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->hidePopups();
-    ( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->activateItemAt( -1 );
+    ( (TQDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->hidePopups();
+    ( (TQDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->activateItemAt( -1 );
     indicator->hide();
     popup( p );
 }
 
 #endif
 
-void QDesignerPopupMenu::reInsert()
+void TQDesignerPopupMenu::reInsert()
 {
     clear();
     for ( TQAction *a = actionList.first(); a; a = actionList.next() )
 	a->addTo( this );
 }
 
-void QDesignerPopupMenu::drawIndicator( const TQPoint &pos )
+void TQDesignerPopupMenu::drawIndicator( const TQPoint &pos )
 {
     if ( lastIndicatorPos == pos )
 	return;
@@ -1196,7 +1198,7 @@ void QDesignerPopupMenu::drawIndicator( const TQPoint &pos )
 	TQApplication::sendPostedEvents();
 }
 
-TQPoint QDesignerPopupMenu::calcIndicatorPos( const TQPoint &pos )
+TQPoint TQDesignerPopupMenu::calcIndicatorPos( const TQPoint &pos )
 {
     int h = frameWidth();
     insertAt = count();
@@ -1212,18 +1214,18 @@ TQPoint QDesignerPopupMenu::calcIndicatorPos( const TQPoint &pos )
     return TQPoint( 0, h );
 }
 
-void QDesignerPopupMenu::addAction( TQAction *a )
+void TQDesignerPopupMenu::addAction( TQAction *a )
 {
     actionList.append( a );
     connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) );
 }
 
-void QDesignerPopupMenu::actionRemoved()
+void TQDesignerPopupMenu::actionRemoved()
 {
     actionList.removeRef( (TQAction*)sender() );
 }
 
-void QDesignerPopupMenu::paintEvent( TQPaintEvent *e )
+void TQDesignerPopupMenu::paintEvent( TQPaintEvent *e )
 {
     TQPopupMenu::paintEvent( e );
     if ( e->rect() != rect() )
@@ -1231,13 +1233,13 @@ void QDesignerPopupMenu::paintEvent( TQPaintEvent *e )
     lastIndicatorPos = TQPoint( -1, -1 );
 }
 
-void QDesignerPopupMenu::findFormWindow()
+void TQDesignerPopupMenu::findFormWindow()
 {
     TQWidget *w = this;
     while ( w ) {
 	if ( w->inherits( "FormWindow" ) )
 	    formWindow = (FormWindow*)w;
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
 }
 
diff --git a/kommander/editor/actiondnd.h b/kommander/editor/actiondnd.h
index af5a76e5..5d1c314d 100644
--- a/kommander/editor/actiondnd.h
+++ b/kommander/editor/actiondnd.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -30,20 +30,21 @@
 #include <tqtoolbar.h>
 #include <tqguardedptr.h>
 
-class QDesignerPopupMenu;
-class QDesignerIndicatorWidget;
+class TQDesignerPopupMenu;
+class TQDesignerIndicatorWidget;
 class FormWindow;
 
-class QDesignerActionGroup : public QActionGroup
+class TQDesignerActionGroup : public TQActionGroup
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerActionGroup( TQObject *parent )
-	: TQActionGroup( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ) {}
+    TQDesignerActionGroup( TQObject *tqparent )
+	: TQActionGroup( !tqparent || tqparent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? tqparent : 0 ), wid( 0 ), idx( -1 ) {}
 
     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:
@@ -64,15 +65,16 @@ private:
 
 };
 
-class QDesignerAction : public QAction
+class TQDesignerAction : public TQAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerAction( TQObject *parent )
-	: TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {}
-    QDesignerAction( TQWidget *w, TQObject *parent )
-	: TQAction( !parent || parent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {}
+    TQDesignerAction( TQObject *tqparent )
+	: TQAction( !tqparent || tqparent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) {}
+    TQDesignerAction( TQWidget *w, TQObject *tqparent )
+	: TQAction( !tqparent || tqparent->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) {}
 
     TQWidget *widget() const { return wid; }
     int index() const { return idx; }
@@ -98,31 +100,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 );
@@ -135,13 +139,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 );
 
@@ -157,7 +162,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 * );
@@ -187,23 +192,24 @@ private:
     TQPtrList<TQAction> actionList;
     TQMap<TQWidget*, TQAction*> actionMap;
     TQPoint dragStartPos;
-    QDesignerIndicatorWidget *indicator;
+    TQDesignerIndicatorWidget *indicator;
     bool widgetInserting;
     FormWindow *formWindow;
 
 };
 
-class QDesignerMenuBar : public QMenuBar
+class TQDesignerMenuBar : public TQMenuBar
 {
     Q_OBJECT
-    friend class QDesignerPopupMenu;
+  TQ_OBJECT
+    friend class TQDesignerPopupMenu;
 
-    Q_PROPERTY( int itemNumber WRITE setItemNumber READ itemNumber )
-    Q_PROPERTY( TQString itemText WRITE setItemText READ itemText )
-    Q_PROPERTY( TQCString itemName WRITE setItemName READ itemName )
+    TQ_PROPERTY( int itemNumber WRITE setItemNumber READ itemNumber )
+    TQ_PROPERTY( TQString itemText WRITE setItemText READ itemText )
+    TQ_PROPERTY( TQCString itemName WRITE setItemName READ itemName )
 
 public:
-    QDesignerMenuBar( TQWidget *mw );
+    TQDesignerMenuBar( TQWidget *mw );
 
     void setItemNumber( int num );
     int itemNumber() const;
@@ -217,7 +223,7 @@ protected:
     void mouseMoveEvent( TQMouseEvent *e );
     void mouseReleaseEvent( TQMouseEvent *e );
     void contextMenuEvent( TQContextMenuEvent *e );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent( TQDragEnterEvent * );
     void dragMoveEvent( TQDragMoveEvent * );
     void dragLeaveEvent( TQDragLeaveEvent * );
@@ -235,18 +241,19 @@ private:
     bool mousePressed;
     TQPoint lastIndicatorPos;
     int insertAt;
-    QDesignerIndicatorWidget *indicator;
+    TQDesignerIndicatorWidget *indicator;
     FormWindow *formWindow;
     int oldPos;
 
 };
 
-class QDesignerPopupMenu : public QPopupMenu
+class TQDesignerPopupMenu : public TQPopupMenu
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerPopupMenu( TQWidget *w );
+    TQDesignerPopupMenu( TQWidget *w );
     TQPtrList<TQAction> insertedActions() const { return actionList; }
     void addAction( TQAction *a );
     void reInsert();
@@ -259,7 +266,7 @@ protected:
     void mouseReleaseEvent( TQMouseEvent *e );
     void contextMenuEvent( TQContextMenuEvent *e );
     void paintEvent( TQPaintEvent * );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent( TQDragEnterEvent * );
     void dragMoveEvent( TQDragMoveEvent * );
     void dragLeaveEvent( TQDragLeaveEvent * );
@@ -281,7 +288,7 @@ private:
     TQPtrList<TQAction> actionList;
     TQPoint dragStartPos;
     bool mousePressed;
-    QDesignerIndicatorWidget *indicator;
+    TQDesignerIndicatorWidget *indicator;
     FormWindow *formWindow;
     TQGuardedPtr<TQPopupMenu> popupMenu;
     TQPoint popupPos;
@@ -289,12 +296,13 @@ private:
 
 };
 
-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 );
     }
diff --git a/kommander/editor/actioneditor.ui b/kommander/editor/actioneditor.ui
index 733e5b29..794849cd 100644
--- a/kommander/editor/actioneditor.ui
+++ b/kommander/editor/actioneditor.ui
@@ -2,8 +2,8 @@
 <class>ActionEditorBase</class>
 <include location="local" implDecl="in declaration">actioneditor.ui.h</include>
 <forward>class QListViewItem;</forward>
-<layoutdefaults spacing="6" margin="11"/>
-<widget class="QWidget">
+<tqlayoutdefaults spacing="6" margin="11"/>
+<widget class="TQWidget">
     <property name="name">
         <cstring>ActionEditorBase</cstring>
     </property>
@@ -18,7 +18,7 @@
     <property name="caption">
         <string>Edit Actions</string>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -30,7 +30,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -44,7 +44,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>buttonNewAction</cstring>
                     </property>
@@ -61,7 +61,7 @@
                         <string>Create new Action</string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>buttonDeleteAction</cstring>
                     </property>
@@ -78,7 +78,7 @@
                         <string>Delete current Action</string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>buttonConnect</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>
diff --git a/kommander/editor/actioneditorimpl.cpp b/kommander/editor/actioneditorimpl.cpp
index e5358100..0e4d2a8f 100644
--- a/kommander/editor/actioneditorimpl.cpp
+++ b/kommander/editor/actioneditorimpl.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -37,8 +37,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 )
 {
     listActions->addColumn( i18n("Actions" ) );
     setEnabled( false );
@@ -87,10 +87,10 @@ void ActionEditor::deleteAction()
 	    formWindow->actionList().removeRef( currentAction );
 	    delete currentAction;
 	    TQValueList<MetaDataBase::Connection> conns =
-		MetaDataBase::connections( formWindow, currentAction );
+		MetaDataBase::connections( TQT_TQOBJECT(formWindow), currentAction );
 	    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 );
 	    delete it.current();
 	    break;
@@ -98,10 +98,10 @@ void ActionEditor::deleteAction()
 	    formWindow->actionList().removeRef( currentAction );
 	    delete currentAction;
 	    TQValueList<MetaDataBase::Connection> conns =
-		MetaDataBase::connections( formWindow, currentAction );
+		MetaDataBase::connections( TQT_TQOBJECT(formWindow), currentAction );
 	    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 );
 	    delete it.current();
 	    break;
@@ -110,7 +110,7 @@ void ActionEditor::deleteAction()
     }
 
     if ( formWindow )
-	formWindow->setActiveObject( formWindow->mainContainer() );
+	formWindow->setActiveObject( TQT_TQOBJECT(formWindow->mainContainer()) );
 }
 
 void ActionEditor::newAction()
@@ -119,7 +119,7 @@ void ActionEditor::newAction()
     if ( actionParent ) {
 	if ( !actionParent->actionGroup() ||
 	     !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) )
-	    actionParent = (ActionItem*)actionParent->parent();
+	    actionParent = (ActionItem*)actionParent->tqparent();
     }
 
     ActionItem *i = 0;
@@ -151,7 +151,7 @@ void ActionEditor::newActionGroup()
     if ( actionParent ) {
 	if ( !actionParent->actionGroup() ||
 	     !actionParent->actionGroup()->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) )
-	    actionParent = (ActionItem*)actionParent->parent();
+	    actionParent = (ActionItem*)actionParent->tqparent();
     }
 
     ActionItem *i = 0;
@@ -193,7 +193,7 @@ void ActionEditor::setFormWindow( FormWindow *fw )
 	setEnabled( true );
 	for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) {
 	    ActionItem *i = 0;
-	    if ( a->parent() && a->parent()->inherits( TQACTION_OBJECT_NAME_STRING ) )
+	    if ( a->tqparent() && a->tqparent()->inherits( TQACTION_OBJECT_NAME_STRING ) )
 		continue;
 	    i = new ActionItem( listActions, a );
 	    i->setText( 0, a->name() );
@@ -211,9 +211,12 @@ void ActionEditor::setFormWindow( FormWindow *fw )
 
 void ActionEditor::insertChildActions( ActionItem *i )
 {
-    if ( !i->actionGroup() || !i->actionGroup()->children() )
+    if ( !i->actionGroup() )
 	return;
-    TQObjectListIt it( *i->actionGroup()->children() );
+    TQObjectList clo = i->actionGroup()->childrenListObject();
+    if (clo.isEmpty())
+	return;
+    TQObjectListIt it( clo );
     while ( it.current() ) {
 	TQObject *o = it.current();
 	++it;
@@ -255,7 +258,7 @@ void ActionEditor::updateActionIcon( TQAction *a )
 
 void ActionEditor::connectionsClicked()
 {
-    ConnectionEditor editor( formWindow->mainWindow(), currentAction, formWindow, formWindow );
+    ConnectionEditor editor( formWindow->mainWindow(), TQT_TQOBJECT(currentAction), TQT_TQOBJECT(formWindow), formWindow );
     editor.exec();
 }
 #include "actioneditorimpl.moc"
diff --git a/kommander/editor/actioneditorimpl.h b/kommander/editor/actioneditorimpl.h
index f6436d31..40ed78ac 100644
--- a/kommander/editor/actioneditorimpl.h
+++ b/kommander/editor/actioneditorimpl.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -30,9 +30,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/kommander/editor/actionlistview.cpp b/kommander/editor/actionlistview.cpp
index 1c764f35..20a0ee4e 100644
--- a/kommander/editor/actionlistview.cpp
+++ b/kommander/editor/actionlistview.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -24,8 +24,8 @@
 
 #include <klocale.h>
 
-ActionListView::ActionListView( TQWidget *parent, const char *name )
-    : TQListView( parent, name )
+ActionListView::ActionListView( TQWidget *tqparent, const char *name )
+    : TQListView( tqparent, name )
 {
     header()->setStretchEnabled( true );
     setRootIsDecorated( true );
@@ -38,9 +38,9 @@ ActionItem::ActionItem( TQListView *lv, TQAction *ac )
     : TQListViewItem( lv ), a( 0 ), g( 0 )
 {
     if ( ac->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) )
-	g = (QDesignerActionGroup*)ac;
+	g = (TQDesignerActionGroup*)ac;
     else
-	a = (QDesignerAction*)ac;
+	a = (TQDesignerAction*)ac;
     setDragEnabled( true );
 }
 
@@ -48,9 +48,9 @@ ActionItem::ActionItem( TQListViewItem *i, TQAction *ac )
     : TQListViewItem( i ), a( 0 ), g( 0 )
 {
     if ( ac->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) )
-	g = (QDesignerActionGroup*)ac;
+	g = (TQDesignerActionGroup*)ac;
     else
-	a = (QDesignerAction*)ac;
+	a = (TQDesignerAction*)ac;
     setDragEnabled( true );
     moveToEnd();
 }
diff --git a/kommander/editor/actionlistview.h b/kommander/editor/actionlistview.h
index 160d2abb..53a5fda6 100644
--- a/kommander/editor/actionlistview.h
+++ b/kommander/editor/actionlistview.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -24,38 +24,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/kommander/editor/asciivalidator.cpp b/kommander/editor/asciivalidator.cpp
index 6f63e626..947b3ec1 100644
--- a/kommander/editor/asciivalidator.cpp
+++ b/kommander/editor/asciivalidator.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -22,18 +22,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 )
 {
 }
 
@@ -67,7 +67,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/kommander/editor/asciivalidator.h b/kommander/editor/asciivalidator.h
index 20131f01..1c1d6c2c 100644
--- a/kommander/editor/asciivalidator.h
+++ b/kommander/editor/asciivalidator.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -25,13 +25,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/kommander/editor/assistproc.cpp b/kommander/editor/assistproc.cpp
index f5f765d8..bfe67544 100644
--- a/kommander/editor/assistproc.cpp
+++ b/kommander/editor/assistproc.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -19,8 +19,8 @@
 **********************************************************************/
 #include "assistproc.h"
 
-AssistProc::AssistProc( TQObject *parent, const char *name, const TQString &path )
-    : TQProcess( parent, name )
+AssistProc::AssistProc( TQObject *tqparent, const char *name, const TQString &path )
+    : TQProcess( tqparent, name )
 {
     assistantPath = path;
     connect( this, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(processOutput()) );
diff --git a/kommander/editor/assistproc.h b/kommander/editor/assistproc.h
index f457a8e8..93986cef 100644
--- a/kommander/editor/assistproc.h
+++ b/kommander/editor/assistproc.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -25,13 +25,14 @@
 #include <tqsocket.h>
 #include <tqstring.h>
 
-class AssistProc : public QProcess
+class AssistProc : public TQProcess
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    AssistProc( TQObject *parent=0, const char * name = 0, const TQString &path = TQString::null );
+    AssistProc( TQObject *tqparent=0, const char * name = 0, const TQString &path = TQString() );
     ~AssistProc();
-    bool run( const TQString &path = TQString::null );
+    bool run( const TQString &path = TQString() );
 
 public slots:
     bool sendRequest( const TQString &data );
diff --git a/kommander/editor/assoctexteditor.ui b/kommander/editor/assoctexteditor.ui
index e3258b73..c7af592a 100644
--- a/kommander/editor/assoctexteditor.ui
+++ b/kommander/editor/assoctexteditor.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AssocTextEditorBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>AssocTextEditorBase</cstring>
     </property>
@@ -19,15 +19,15 @@
         <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>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -38,7 +38,7 @@
                         <cstring>widgetsComboBox</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>widgetsComboBox</cstring>
                     </property>
@@ -51,7 +51,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>treeWidgetButton</cstring>
                     </property>
@@ -59,7 +59,7 @@
                         <string>...</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -70,7 +70,7 @@
                         <cstring>stateComboBox</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>stateComboBox</cstring>
                     </property>
@@ -85,7 +85,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox" row="2" column="0">
+        <widget class="TQGroupBox" row="2" column="0">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -114,14 +114,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">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel3</cstring>
                     </property>
@@ -140,7 +140,7 @@
                         <cstring>widgetComboBox</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>widgetComboBox</cstring>
                     </property>
@@ -152,7 +152,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>150</width>
                             <height>0</height>
@@ -169,14 +169,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">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>filePushButton</cstring>
                     </property>
@@ -186,7 +186,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QFrame" row="1" column="0">
+        <widget class="TQFrame" row="1" column="0">
             <property name="name">
                 <cstring>editorFrame</cstring>
             </property>
@@ -215,8 +215,8 @@
         <slot>AssocTextEditorBase_destroyed(QObject*)</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>AssocTextEditorBase_destroyed(QObject*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index cb5502a2..76bf67f6 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -70,7 +70,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
   // text editor
 /*  associatedTextEdit->setFont(KGlobalSettings::fixedFont());
   associatedTextEdit->setTabStopWidth(associatedTextEdit->fontMetrics().maxWidth() * 3);
-  associatedTextEdit->setTextFormat(Qt::PlainText);*/
+  associatedTextEdit->setTextFormat(TQt::PlainText);*/
 
   // icon for non-empty scripts
   scriptPixmap = KGlobal::iconLoader()->loadIcon("source", KIcon::Small);
@@ -89,10 +89,10 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
       break;
     }
 
-  doc = KTextEditor::createDocument ("libkatepart", a_parent, "KTextEditor::Document");
-  TQGridLayout *layout = new TQGridLayout(editorFrame, 1, 1);
+  doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(a_parent), "KTextEditor::Document");
+  TQGridLayout *tqlayout = new TQGridLayout(editorFrame, 1, 1);
   view = doc->createView(editorFrame);
-  layout->addWidget(view, 1,1);
+  tqlayout->addWidget(view, 1,1);
   partManager->addPart(doc, true);
 
   //trick to import all the KatePart actions into the dialog
@@ -113,7 +113,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
   if (a)
     a->plug(popup);
   popup->insertSeparator();
-  a = view->actionCollection()->action("edit_find");
+  a = view->actionCollection()->action("edit_tqfind");
   if (a)
     a->plug(popup);
   a = view->actionCollection()->action("edit_find_next");
@@ -122,7 +122,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
   a = view->actionCollection()->action("edit_find_prev");
   if (a)
     a->plug(popup);
-  a = view->actionCollection()->action("edit_replace");
+  a = view->actionCollection()->action("edit_tqreplace");
   if (a)
     a->plug(popup);
   popup->insertSeparator();
@@ -208,7 +208,7 @@ void AssocTextEditor::setWidget(TQWidget *a_widget)
       ++at_it;
     }
     else
-      m_atdict[(*s_it)] = TQString::null;
+      m_atdict[(*s_it)] = TQString();
   }
   m_populationText = a_atw->populationText();
 
@@ -246,7 +246,7 @@ void AssocTextEditor::setWidget(TQWidget *a_widget)
   undoIf->clearUndo();
 
 
-  if (openedWidgets.contains(m_widget))
+  if (openedWidgets.tqcontains(m_widget))
   {
     if (readOnlyAction && !readOnly)
       readOnlyAction->activate();
@@ -268,23 +268,23 @@ void AssocTextEditor::save() const
 
   if (atw->associatedText() != associatedText())
   {
-    TQString text = i18n("Set the \'text association\' of \'%1\'").arg(m_widget->name());
+    TQString text = i18n("Set the \'text association\' of \'%1\'").tqarg(m_widget->name());
     SetPropertyCommand *cmd  = new SetPropertyCommand(text, m_formWindow,
-        m_widget, m_propertyEditor, "associations", atw->associatedText(),
-        associatedText(), TQString::null, TQString::null, false);
+        TQT_TQOBJECT(m_widget), m_propertyEditor, "associations", atw->associatedText(),
+        associatedText(), TQString(), TQString(), false);
     cmd->execute();
     m_formWindow->commandHistory()->addCommand(cmd);
-    MetaDataBase::setPropertyChanged(m_widget, "associations", true);
+    MetaDataBase::setPropertyChanged(TQT_TQOBJECT(m_widget), "associations", true);
   }
   if (atw->populationText() != populationText())
   {
-    TQString text = i18n("Set the \'population text\' of \'%1\'").arg(m_widget->name());
-    SetPropertyCommand *cmd  = new SetPropertyCommand(text, m_formWindow, m_widget,
+    TQString text = i18n("Set the \'population text\' of \'%1\'").tqarg(m_widget->name());
+    SetPropertyCommand *cmd  = new SetPropertyCommand(text, m_formWindow, TQT_TQOBJECT(m_widget),
         m_propertyEditor, "populationText", atw->populationText(),
-        populationText(), TQString::null, TQString::null, false);
+        populationText(), TQString(), TQString(), false);
     cmd->execute();
     m_formWindow->commandHistory()->addCommand(cmd);
-    MetaDataBase::setPropertyChanged(m_widget, "populationText", true);
+    MetaDataBase::setPropertyChanged(TQT_TQOBJECT(m_widget), "populationText", true);
   }
 }
 
@@ -305,7 +305,7 @@ TQString AssocTextEditor::populationText() const
 TQStringList AssocTextEditor::buildWidgetList()
 {
   TQStringList widgetList;
-  TQObject* thisObject = m_formWindow->mainContainer();
+  TQObject* thisObject = TQT_TQOBJECT(m_formWindow->mainContainer());
   TQObjectList *objectList = thisObject->queryList();
   objectList->prepend(thisObject);
 
@@ -314,10 +314,10 @@ TQStringList AssocTextEditor::buildWidgetList()
     // There is a warning message with the property() function if it does not exist.
     // Verify the property exists with the meta information first */
     bool pExists = false;
-    TQMetaObject *metaObj = it.current()->metaObject();
+    TQMetaObject *metaObj = it.current()->tqmetaObject();
     if(metaObj)
     {
-      int id = metaObj->findProperty("KommanderWidget", true);
+      int id = metaObj->tqfindProperty("KommanderWidget", true);
       const TQMetaProperty *metaProp = metaObj->property(id, true);
       if(metaProp && metaProp->isValid())
         pExists = true;
@@ -363,7 +363,7 @@ void AssocTextEditor::stateChanged(int a_index)
     {
       if (hlIf->hlModeSectionName(i) == "Scripts")
         highlightPopup->insertItem(hlIf->hlModeName(i), i);
-      if (hlIf->hlModeName(i).contains(hlType, false) > 0)
+      if (hlIf->hlModeName(i).tqcontains(hlType, false) > 0)
       {
         hlIf->setHlMode(i);
         highlightPopup->setItemChecked(i, true);
@@ -427,7 +427,7 @@ void AssocTextEditor::insertFile()
   TQFile insertFile(fileName);
   if(!insertFile.open(IO_ReadOnly))
   {
-    KMessageBox::error( this, i18n("<qt>Cannot open file<br><b>%1</b></qt").arg( fileName ) );
+    KMessageBox::error( this, i18n("<qt>Cannot open file<br><b>%1</b></qt").tqarg( fileName ) );
     return;
   }
   TQTextStream insertStream(&insertFile);
@@ -454,9 +454,9 @@ void AssocTextEditor::insertFunction()
 TQString AssocTextEditor::widgetToString(TQWidget* widget, bool formatted)
 {
    if (!widget)
-     return TQString::null;
+     return TQString();
    else if (formatted)
-     return TQString("%1 (%2)").arg(widget->name()).arg(widget->className());
+     return TQString("%1 (%2)").tqarg(widget->name()).tqarg(widget->className());
    else
      return widget->name();
 }
@@ -464,7 +464,7 @@ TQString AssocTextEditor::widgetToString(TQWidget* widget, bool formatted)
 TQWidget* AssocTextEditor::widgetFromString(const TQString& name)
 {
   TQString realname = name;
-  int i = realname.find(' ');
+  int i = realname.tqfind(' ');
   if (i != -1)
     realname.truncate(i);
   return m_widgetList[realname];
diff --git a/kommander/editor/assoctexteditorimpl.h b/kommander/editor/assoctexteditorimpl.h
index 37c582ab..c9539450 100644
--- a/kommander/editor/assoctexteditorimpl.h
+++ b/kommander/editor/assoctexteditorimpl.h
@@ -49,6 +49,7 @@ class KPopupMenu;
 class AssocTextEditor : public AssocTextEditorBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   AssocTextEditor(TQWidget*, FormWindow*, PropertyEditor*, KParts::PartManager *partManager, TQWidget*, const char* = 0, bool = true);
   ~AssocTextEditor();
diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui
index 809f38ea..19c728f9 100644
--- a/kommander/editor/choosewidget.ui
+++ b/kommander/editor/choosewidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>ChooseWidgetBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ChooseWidgetBase</cstring>
     </property>
@@ -22,9 +22,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>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -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">
+                <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>
@@ -88,7 +88,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -102,15 +102,15 @@
                 <cstring>widgetView</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <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>
@@ -118,7 +118,7 @@
                         <string>Find:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>nameEdit</cstring>
                     </property>
@@ -143,7 +143,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp
index 527137b4..4fe816e2 100644
--- a/kommander/editor/choosewidgetimpl.cpp
+++ b/kommander/editor/choosewidgetimpl.cpp
@@ -55,7 +55,7 @@ void ChooseWidget::setWidget(TQWidget* w)
   TQPtrStack<TQWidget> p_widgets;
   TQPtrStack<TQListViewItem> p_items;
   
-  item = new TQListViewItem(widgetView, TQString("%1 (%2)").arg(w->name()).arg(w->className()));
+  item = new TQListViewItem(widgetView, TQString("%1 (%2)").tqarg(w->name()).tqarg(w->className()));
   item->setOpen(true);
   
   p_widgets.push(w);
@@ -68,8 +68,8 @@ void ChooseWidget::setWidget(TQWidget* w)
     for (TQObjectListIt it(*objectList); it.current(); ++it) {
       TQListViewItem* newItem = item;
       if (isKommanderWidget(*it)) 
-        newItem = new TQListViewItem(item, TQString("%1 (%2)").arg((*it)->name()).arg((*it)->className()));
-      if ((*it)->children()) {
+        newItem = new TQListViewItem(item, TQString("%1 (%2)").tqarg((*it)->name()).tqarg((*it)->className()));
+      if (!(*it)->childrenListObject().isEmpty()) {
           p_widgets.push((TQWidget*)(*it));
           p_items.push(newItem);
       }
@@ -88,12 +88,12 @@ TQString ChooseWidget::selection()
    if (widgetView->currentItem())
      return widgetView->currentItem()->text(0);
    else
-     return TQString::null;
+     return TQString();
 }
 
 void ChooseWidget::textChanged(const TQString& text)
 {
-  TQListViewItem* item = widgetView->findItem(text, 0, Qt::BeginsWith);
+  TQListViewItem* item = widgetView->tqfindItem(text, 0, TQt::BeginsWith);
   if (item) {
     widgetView->setCurrentItem(item);
     widgetView->ensureItemVisible(item);
@@ -103,10 +103,10 @@ void ChooseWidget::textChanged(const TQString& text)
 bool ChooseWidget::isKommanderWidget(TQObject* w)
 {
   bool pExists = false;
-  TQMetaObject *metaObj = w->metaObject();
+  TQMetaObject *metaObj = w->tqmetaObject();
   if (metaObj)
   {
-    int id = metaObj->findProperty("KommanderWidget", true);
+    int id = metaObj->tqfindProperty("KommanderWidget", true);
     const TQMetaProperty *metaProp = metaObj->property(id, true);
     if (metaProp && metaProp->isValid())
       pExists = true;
diff --git a/kommander/editor/choosewidgetimpl.h b/kommander/editor/choosewidgetimpl.h
index 4dea4c77..4c2bbd45 100644
--- a/kommander/editor/choosewidgetimpl.h
+++ b/kommander/editor/choosewidgetimpl.h
@@ -22,10 +22,11 @@
 class ChooseWidget : public ChooseWidgetBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   ChooseWidget(TQWidget*, const char* = 0, bool=true);
   ~ChooseWidget();
-  // Put current widget and all of its children in a tree
+  // Put current widget and all of its tqchildren in a tree
   void setWidget(TQWidget *);
   // Return current widget
   TQString selection();
diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp
index a0f8ec37..a549c915 100644
--- a/kommander/editor/command.cpp
+++ b/kommander/editor/command.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -43,7 +43,7 @@
 #include <tqmultilineedit.h>
 #include <tqptrstack.h>
 #include <tqheader.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #endif
 #include <tqaction.h>
@@ -235,8 +235,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 );
 }
 
@@ -244,8 +244,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 );
 }
 
@@ -253,32 +253,32 @@ 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()->selectWidget( TQT_TQOBJECT(widget), false );
     formWindow()->widgets()->remove( widget );
     formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( widget );
  }
@@ -312,13 +312,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 );
 	    }
@@ -326,20 +326,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 );
 	    }
@@ -347,7 +347,7 @@ void MoveCommand::unexecute()
 	}
 	formWindow()->updateSelection( w );
 	formWindow()->updateChildSelections( w );
-	formWindow()->emitUpdateProperties( w );
+	formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) );
     }
 }
 
@@ -369,13 +369,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 );
 	}
     }
@@ -395,11 +395,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 );
 	}
     }
@@ -430,7 +430,7 @@ void SetPropertyCommand::execute()
     if ( isResetCommand ) {
 	MetaDataBase::setPropertyChanged( widget, propName, false );
 	if ( WidgetFactory::resetProperty( widget, propName ) ) {
-	    if ( !formWindow()->isWidgetSelected( widget ) && widget != formWindow() )
+	    if ( !formWindow()->isWidgetSelected( widget ) && TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(formWindow()) )
 		formWindow()->selectWidget( widget );
 	    if ( editor->widget() != widget )
 		editor->setWidget( widget, formWindow() );
@@ -461,7 +461,7 @@ bool SetPropertyCommand::canMerge( Command *c )
 {
     SetPropertyCommand *cmd = (SetPropertyCommand*)c;
     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;
@@ -516,8 +516,8 @@ bool SetPropertyCommand::checkProperty()
 	    return false;
 	}
 
-	if ( widget->parent() && widget->parent()->inherits( "FormWindow" ) )
-	    formWindow()->mainWindow()->formNameChanged( (FormWindow*)( (TQWidget*)widget )->parentWidget() );
+	if ( widget->tqparent() && widget->tqparent()->inherits( "FormWindow" ) )
+	    formWindow()->mainWindow()->formNameChanged( (FormWindow*)( (TQWidget*)widget )->tqparentWidget() );
     }
     return true;
 }
@@ -532,30 +532,30 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	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" ) {
-	    MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ), v.toInt() );
-	} else if ( propName == "layoutMargin" ) {
-	    MetaDataBase::setMargin( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ), v.toInt() );
+	    widget->setProperty( "tqalignment", TQVariant( align ) );
+	} else if ( propName == "tqlayoutSpacing" ) {
+	    MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() );
+	} else if ( propName == "tqlayoutMargin" ) {
+	    MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() );
 	} else if ( propName == "toolTip" || propName == "whatsThis" || propName == "database" || propName == "frameworkCode" ) {
 	    MetaDataBase::setFakeProperty( editor->widget(), propName, v );
 	} else if ( editor->widget()->inherits( "CustomWidget" ) ) {
@@ -567,7 +567,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*)widget, MetaDataBase::fakeProperty( widget, "database" ).toStringList() );
 #endif
@@ -587,9 +587,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*)widget, v.toCursor() );
 	if ( propName == "name" && widget->isWidgetType() ) {
@@ -628,156 +628,156 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 // ------------------------------------------------------------
 
 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, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
+	tqlayout = new HorizontalLayout( wl, tqlayoutBase, fw, tqlayoutBase, false, tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
     else if ( lay == WidgetFactory::VBox )
-	layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
+	tqlayout = new VerticalLayout( wl, tqlayoutBase, fw, tqlayoutBase, false, tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
     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 );
 }
 
 // ------------------------------------------------------------
@@ -806,19 +806,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, "tab" );
+    tabPage = new TQDesignerWidget( formWindow(), tabWidget, "tab" );
     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 );
 }
 
@@ -826,7 +826,7 @@ void AddTabPageCommand::unexecute()
 {
     tabWidget->removePage( tabPage );
     tabPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -837,10 +837,10 @@ AddToolBoxPageCommand::AddToolBoxPageCommand( const TQString &n, FormWindow *fw,
                       TQToolBox *tw, const TQString &_label )
     : Command( n, fw ), toolBox( tw ), label( _label )
 {
-    page = new QDesignerWidget( formWindow(), toolBox, "tab" );
+    page = new TQDesignerWidget( formWindow(), toolBox, "tab" );
     page->hide();
     index = -1;
-    MetaDataBase::addEntry( page );
+    MetaDataBase::addEntry( TQT_TQOBJECT(page) );
 }
 
 void AddToolBoxPageCommand::execute()
@@ -849,7 +849,7 @@ void AddToolBoxPageCommand::execute()
     index = ( (EditorToolBox*)toolBox)->count();
     toolBox->insertItem(index, page, label);
     toolBox->setCurrentItem( page );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox );
 }
 
@@ -857,7 +857,7 @@ void AddToolBoxPageCommand::unexecute()
 {
     toolBox->removeItem( page );
     page->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox );
 }
 
@@ -873,19 +873,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 );
 }
 
@@ -895,15 +895,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 );
 }
 
@@ -911,7 +911,7 @@ 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 );
 }
 
@@ -929,7 +929,7 @@ void DeleteToolBoxPageCommand::execute()
 {
     toolBox->removeItem( page );
     page->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox );
 }
 
@@ -937,7 +937,7 @@ void DeleteToolBoxPageCommand::unexecute()
 {
     toolBox->insertItem(index, page, label);
     toolBox->setCurrentItem( page );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox );
 }
 
@@ -947,11 +947,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, "page" );
+    page = new TQDesignerWidget( formWindow(), wizard, "page" );
     page->hide();
     index = i;
     show = s;
-    MetaDataBase::addEntry( page );
+    MetaDataBase::addEntry( TQT_TQOBJECT(page) );
 }
 
 void AddWizardPageCommand::execute()
@@ -960,8 +960,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 );
 }
 
@@ -969,7 +969,7 @@ void AddWizardPageCommand::unexecute()
 {
     wizard->removePage( page );
     page->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -988,7 +988,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 );
 }
 
@@ -996,8 +996,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 );
 }
 
@@ -1017,7 +1017,7 @@ void RenameWizardPageCommand::execute()
 
     wizard->setTitle( page, label );
     label = oldLabel;
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
 }
 
 void RenameWizardPageCommand::unexecute()
@@ -1042,7 +1042,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 );
 }
 
@@ -1061,7 +1061,7 @@ 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 );
 #ifndef KOMMANDER
     if ( connection.receiver == formWindow()->mainContainer() )
@@ -1074,7 +1074,7 @@ void AddConnectionCommand::execute()
 
 void AddConnectionCommand::unexecute()
 {
-    MetaDataBase::removeConnection( formWindow(), connection.sender,
+    MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				    connection.signal, connection.receiver, connection.slot );
 #ifndef KOMMANDER
     if ( connection.receiver == formWindow()->mainContainer() )
@@ -1095,7 +1095,7 @@ 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 );
 #ifndef KOMMANDER
     if ( connection.receiver == formWindow()->mainContainer() )
@@ -1108,7 +1108,7 @@ void RemoveConnectionCommand::execute()
 
 void RemoveConnectionCommand::unexecute()
 {
-    MetaDataBase::addConnection( formWindow(), connection.sender,
+    MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				 connection.signal, connection.receiver, connection.slot );
 #ifndef KOMMANDER
     if ( connection.receiver == formWindow()->mainContainer() )
@@ -1131,7 +1131,7 @@ AddSlotCommand::AddSlotCommand( const TQString &name, FormWindow *fw, const TQCS
 
 void AddSlotCommand::execute()
 {
-    MetaDataBase::addSlot( formWindow(), slot, specifier, access, language, returnType );
+    MetaDataBase::addSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType );
 #ifndef KOMMANDER
     formWindow()->mainWindow()->slotsChanged();
 #endif
@@ -1141,7 +1141,7 @@ void AddSlotCommand::execute()
 
 void AddSlotCommand::unexecute()
 {
-    MetaDataBase::removeSlot( formWindow(), slot, specifier, access, language, returnType );
+    MetaDataBase::removeSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType );
 #ifndef KOMMANDER
     formWindow()->mainWindow()->slotsChanged();
 #endif
@@ -1160,7 +1160,7 @@ RemoveSlotCommand::RemoveSlotCommand( const TQString &name, FormWindow *fw, cons
 
 void RemoveSlotCommand::execute()
 {
-    MetaDataBase::removeSlot( formWindow(), slot, specifier, access, language, returnType );
+    MetaDataBase::removeSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType );
 #ifndef KOMMANDER
     formWindow()->mainWindow()->slotsChanged();
 #endif
@@ -1170,7 +1170,7 @@ void RemoveSlotCommand::execute()
 
 void RemoveSlotCommand::unexecute()
 {
-    MetaDataBase::addSlot( formWindow(), slot, specifier, access, language, returnType );
+    MetaDataBase::addSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType );
 #ifndef KOMMANDER
     formWindow()->mainWindow()->slotsChanged();
 #endif
@@ -1238,7 +1238,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 );
     }
@@ -1248,7 +1248,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 );
     }
@@ -1331,7 +1331,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;
@@ -1345,7 +1345,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;
@@ -1356,7 +1356,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;
@@ -1417,7 +1417,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 )
@@ -1434,7 +1434,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 );
@@ -1454,7 +1454,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();
@@ -1490,21 +1490,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) );
 }
 
 // ------------------------------------------------------------
@@ -1514,15 +1514,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 ) {
@@ -1537,7 +1537,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;
@@ -1546,7 +1546,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 )
@@ -1556,7 +1556,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;
@@ -1565,7 +1565,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 )
@@ -1576,7 +1576,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 )
 {
 }
@@ -1585,25 +1585,25 @@ void AddActionToToolBarCommand::execute()
 {
     action->addTo( toolBar );
 
-    if ( action->inherits( "QDesignerAction" ) ) {
-	TQString s = ( (QDesignerAction*)action )->widget()->name();
+    if ( action->inherits( "TQDesignerAction" ) ) {
+	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 );
 	}
     }
 
-    if ( action->inherits( "QDesignerAction" ) ) {
-	toolBar->insertAction( ( (QDesignerAction*)action )->widget(), action );
-	( (QDesignerAction*)action )->widget()->installEventFilter( toolBar );
-    } else if ( action->inherits( "QDesignerActionGroup" ) ) {
-	if ( ( (QDesignerActionGroup*)action )->usesDropDown() ) {
-	    toolBar->insertAction( ( (QDesignerActionGroup*)action )->widget(), action );
-	    ( (QDesignerActionGroup*)action )->widget()->installEventFilter( toolBar );
+    if ( action->inherits( "TQDesignerAction" ) ) {
+	toolBar->insertAction( ( (TQDesignerAction*)action )->widget(), action );
+	( (TQDesignerAction*)action )->widget()->installEventFilter( toolBar );
+    } else if ( action->inherits( "TQDesignerActionGroup" ) ) {
+	if ( ( (TQDesignerActionGroup*)action )->usesDropDown() ) {
+	    toolBar->insertAction( ( (TQDesignerActionGroup*)action )->widget(), action );
+	    ( (TQDesignerActionGroup*)action )->widget()->installEventFilter( toolBar );
 	}
-    } else if ( action->inherits( "QSeparatorAction" ) ) {
-	toolBar->insertAction( ( (QSeparatorAction*)action )->widget(), action );
-	( (QSeparatorAction*)action )->widget()->installEventFilter( toolBar );
+    } else if ( action->inherits( "TQSeparatorAction" ) ) {
+	toolBar->insertAction( ( (TQSeparatorAction*)action )->widget(), action );
+	( (TQSeparatorAction*)action )->widget()->installEventFilter( toolBar );
     }
     if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) {
 	if ( index == -1 )
@@ -1613,8 +1613,9 @@ void AddActionToToolBarCommand::execute()
 	toolBar->reInsert();
 	TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) );
     } else {
-	TQObjectListIt it( *action->children() );
-	if ( action->children() ) {
+	TQObjectList clo = action->childrenListObject();
+	if (!clo.isEmpty()) {
+	    TQObjectListIt it( clo );
 	    int i = 0;
 	    while ( it.current() ) {
 		TQObject *o = it.current();
@@ -1622,8 +1623,8 @@ void AddActionToToolBarCommand::execute()
 		if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) )
 		    continue;
 		// ### fix it for nested actiongroups
-		if ( o->inherits( "QDesignerAction" ) ) {
-		    QDesignerAction *ac = (QDesignerAction*)o;
+		if ( o->inherits( "TQDesignerAction" ) ) {
+		    TQDesignerAction *ac = (TQDesignerAction*)o;
 		    toolBar->insertAction( ac->widget(), ac );
 		    ac->widget()->installEventFilter( toolBar );
 		    if ( index == -1 )
@@ -1640,10 +1641,10 @@ void AddActionToToolBarCommand::execute()
 
 void AddActionToToolBarCommand::unexecute()
 {
-    if ( action->inherits( "QDesignerAction" ) ) {
-	TQString s = ( (QDesignerAction*)action )->widget()->name();
+    if ( action->inherits( "TQDesignerAction" ) ) {
+	TQString s = ( (TQDesignerAction*)action )->widget()->name();
 	s.prepend( "qt_dead_widget_" );
-	( (QDesignerAction*)action )->widget()->setName( s );
+	( (TQDesignerAction*)action )->widget()->setName( s );
     }
 
     toolBar->removeAction( action );
@@ -1652,14 +1653,15 @@ void AddActionToToolBarCommand::unexecute()
     if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (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 ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) )
 		    continue;
-		if ( o->inherits( "QDesignerAction" ) ) {
+		if ( o->inherits( "TQDesignerAction" ) ) {
 		    o->removeEventFilter( toolBar );
 		    toolBar->removeAction( (TQAction*)o );
 		}
@@ -1671,7 +1673,7 @@ void AddActionToToolBarCommand::unexecute()
 // ------------------------------------------------------------
 
 AddActionToPopupCommand::AddActionToPopupCommand( const TQString &n, FormWindow *fw,
-						  TQAction *a, QDesignerPopupMenu *p, int idx )
+						  TQAction *a, TQDesignerPopupMenu *p, int idx )
     : Command( n, fw ), action( a ), popup( p ), index( idx )
 {
 }
@@ -1684,15 +1686,16 @@ void AddActionToPopupCommand::execute()
 	    popup->insertAction( index, action );
 	} else {
 	    action->addTo( popup );
-	    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 ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) )
 			continue;
-		    QDesignerAction *ac = (QDesignerAction*)o;
+		    TQDesignerAction *ac = (TQDesignerAction*)o;
 		    popup->insertAction( index + (i++), ac );
 		}
 	    }
@@ -1700,7 +1703,7 @@ void AddActionToPopupCommand::execute()
 	popup->reInsert();
 	TQObject::connect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) );
     } else {
-	if ( !action->inherits( "QDesignerAction" ) || ( (QDesignerAction*)action )->supportsMenu() ) {
+	if ( !action->inherits( "TQDesignerAction" ) || ( (TQDesignerAction*)action )->supportsMenu() ) {
 	    action->addTo( popup );
 	    popup->insertAction( index, action );
 	    popup->reInsert();
@@ -1717,14 +1720,15 @@ void AddActionToPopupCommand::unexecute()
     if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) {
 	action->removeEventFilter( popup );
     } 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 ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) )
 		    continue;
-		if ( o->inherits( "QDesignerAction" ) ) {
+		if ( o->inherits( "TQDesignerAction" ) ) {
 		    o->removeEventFilter( popup );
 		    popup->removeAction( (TQAction*)o );
 		}
@@ -1744,21 +1748,21 @@ void AddMenuCommand::execute()
 {
     if ( !popup ) {
 	TQString n = "PopupMenu";
-	popup = new QDesignerPopupMenu( mainWindow );
-	formWindow()->unify( popup, n, true );
+	popup = new TQDesignerPopupMenu( mainWindow );
+	formWindow()->unify( TQT_TQOBJECT(popup), n, true );
 	popup->setName( n );
     }
     if ( !mainWindow->child( 0, TQMENUBAR_OBJECT_NAME_STRING ) ) {
-	menuBar = new QDesignerMenuBar( (TQWidget*)mainWindow );
+	menuBar = new TQDesignerMenuBar( (TQWidget*)mainWindow );
 	menuBar->setName( "menubar" );
     } else {
-	menuBar = (QDesignerMenuBar*)mainWindow->menuBar();
+	menuBar = (TQDesignerMenuBar*)mainWindow->menuBar();
     }
     if ( id == -1 )
 	id = mainWindow->menuBar()->insertItem( name, popup );
     else
 	id = mainWindow->menuBar()->insertItem( name, popup, id, index );
-    formWindow()->killAccels( formWindow() );
+    formWindow()->killAccels( TQT_TQOBJECT(formWindow()) );
 }
 
 void AddMenuCommand::unexecute()
@@ -1766,12 +1770,12 @@ void AddMenuCommand::unexecute()
     if ( !popup || !menuBar )
 	return;
     menuBar->removeItem( id );
-    formWindow()->killAccels( formWindow() );
+    formWindow()->killAccels( TQT_TQOBJECT(formWindow()) );
 }
 
 // ------------------------------------------------------------
 
-RenameMenuCommand::RenameMenuCommand( const TQString &n, FormWindow *fw, QDesignerMenuBar *mb,
+RenameMenuCommand::RenameMenuCommand( const TQString &n, FormWindow *fw, TQDesignerMenuBar *mb,
 				      int i, const TQString &on, const TQString &nn )
     : Command( n, fw ), menuBar( mb ), id( i ), oldName( on ), newName( nn )
 {
@@ -1780,19 +1784,19 @@ RenameMenuCommand::RenameMenuCommand( const TQString &n, FormWindow *fw, QDesign
 void RenameMenuCommand::execute()
 {
     menuBar->changeItem( id, newName );
-    formWindow()->killAccels( formWindow() );
+    formWindow()->killAccels( TQT_TQOBJECT(formWindow()) );
 }
 
 void RenameMenuCommand::unexecute()
 {
     menuBar->changeItem( id, oldName );
-    formWindow()->killAccels( formWindow() );
+    formWindow()->killAccels( TQT_TQOBJECT(formWindow()) );
 }
 
 // ------------------------------------------------------------
 
-MoveMenuCommand::MoveMenuCommand( const TQString &n, FormWindow *fw, QDesignerMenuBar *mb,
-				  QDesignerPopupMenu *p, int fidx, int tidx, const TQString &txt )
+MoveMenuCommand::MoveMenuCommand( const TQString &n, FormWindow *fw, TQDesignerMenuBar *mb,
+				  TQDesignerPopupMenu *p, int fidx, int tidx, const TQString &txt )
     : Command( n, fw ), menuBar( mb ), popup( p ), fromIdx( fidx ), toIdx( tidx ), text( txt )
 {
 }
@@ -1801,14 +1805,14 @@ void MoveMenuCommand::execute()
 {
     menuBar->removeItem( menuBar->idAt( fromIdx ) );
     menuBar->insertItem( text, popup, -1, toIdx );
-    formWindow()->killAccels( formWindow() );
+    formWindow()->killAccels( TQT_TQOBJECT(formWindow()) );
 }
 
 void MoveMenuCommand::unexecute()
 {
     menuBar->removeItem( menuBar->idAt( toIdx ) );
     menuBar->insertItem( text, popup, -1, fromIdx );
-    formWindow()->killAccels( formWindow() );
+    formWindow()->killAccels( TQT_TQOBJECT(formWindow()) );
 }
 
 // ------------------------------------------------------------
@@ -1821,9 +1825,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 {
diff --git a/kommander/editor/command.h b/kommander/editor/command.h
index a2162dca..3fd83e1c 100644
--- a/kommander/editor/command.h
+++ b/kommander/editor/command.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -44,13 +44,13 @@ class TQIconView;
 class TQMultiLineEdit;
 class TQTable;
 class TQAction;
-class QDesignerToolBar;
+class TQDesignerToolBar;
 class TQMainWindow;
-class QDesignerPopupMenu;
-class QDesignerMenuBar;
+class TQDesignerPopupMenu;
+class TQDesignerMenuBar;
 class TQToolBox;
 
-class Command : public Qt
+class Command : public TQt
 {
 public:
     Command( const TQString &n, FormWindow *fw );
@@ -120,9 +120,10 @@ private:
 };
 
 
-class CommandHistory : public QObject
+class CommandHistory : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     CommandHistory( int s );
@@ -180,7 +181,7 @@ public:
 
 private:
     TQWidget *widget;
-    TQRect geometry;
+    TQRect tqgeometry;
 
 };
 
@@ -254,7 +255,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();
@@ -262,7 +263,7 @@ public:
     Type type() const { return LayoutHorizontal; }
 
 private:
-    HorizontalLayout layout;
+    HorizontalLayout tqlayout;
 
 };
 
@@ -270,7 +271,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();
@@ -278,7 +279,7 @@ public:
     Type type() const { return LayoutHorizontalSplitter; }
 
 private:
-    HorizontalLayout layout;
+    HorizontalLayout tqlayout;
 
 };
 
@@ -286,7 +287,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();
@@ -294,7 +295,7 @@ public:
     Type type() const { return LayoutVertical; }
 
 private:
-    VerticalLayout layout;
+    VerticalLayout tqlayout;
 
 };
 
@@ -302,7 +303,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();
@@ -310,7 +311,7 @@ public:
     Type type() const { return LayoutVerticalSplitter; }
 
 private:
-    VerticalLayout layout;
+    VerticalLayout tqlayout;
 
 };
 
@@ -318,7 +319,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();
@@ -326,7 +327,7 @@ public:
     Type type() const { return LayoutGrid; }
 
 private:
-    GridLayout layout;
+    GridLayout tqlayout;
 
 };
 
@@ -334,14 +335,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;
@@ -658,7 +659,7 @@ public:
     {
 	TQString text;
 	TQPixmap pix;
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 	bool operator==( const Item & ) const { return FALSE; }
 #endif
     };
@@ -684,7 +685,7 @@ public:
     {
 	TQString text;
 	TQPixmap pix;
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 	bool operator==( const Item & ) const { return FALSE; }
 #endif
     };
@@ -744,7 +745,7 @@ public:
     {
 	TQString text;
 	TQPixmap pix;
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 	bool operator==( const Row& ) const { return FALSE; }
 #endif
     };
@@ -754,7 +755,7 @@ public:
 	TQString text;
 	TQPixmap pix;
 	TQString field;
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 	bool operator==( const Column& ) const { return FALSE; }
 #endif
     };
@@ -778,7 +779,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();
@@ -786,7 +787,7 @@ public:
 
 private:
     TQAction *action;
-    QDesignerToolBar *toolBar;
+    TQDesignerToolBar *toolBar;
     int index;
 
 };
@@ -795,7 +796,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(); }
@@ -808,7 +809,7 @@ class AddActionToPopupCommand : public Command
 {
 public:
     AddActionToPopupCommand( const TQString &n, FormWindow *fw,
-			       TQAction *a, QDesignerPopupMenu *p, int idx );
+			       TQAction *a, TQDesignerPopupMenu *p, int idx );
 
     void execute();
     void unexecute();
@@ -816,7 +817,7 @@ public:
 
 private:
     TQAction *action;
-    QDesignerPopupMenu *popup;
+    TQDesignerPopupMenu *popup;
     int index;
 
 };
@@ -825,7 +826,7 @@ class RemoveActionFromPopupCommand : public AddActionToPopupCommand
 {
 public:
     RemoveActionFromPopupCommand( const TQString &n, FormWindow *fw,
-				    TQAction *a, QDesignerPopupMenu *p, int idx )
+				    TQAction *a, TQDesignerPopupMenu *p, int idx )
 	: AddActionToPopupCommand( n, fw, a, p, idx ) {}
 
     void execute() { AddActionToPopupCommand::unexecute(); }
@@ -844,8 +845,8 @@ public:
     Type type() const { return AddMenu; }
 
 protected:
-    QDesignerMenuBar *menuBar;
-    QDesignerPopupMenu *popup;
+    TQDesignerMenuBar *menuBar;
+    TQDesignerPopupMenu *popup;
     TQMainWindow *mainWindow;
     int id;
     int index;
@@ -857,7 +858,7 @@ class RemoveMenuCommand : public AddMenuCommand
 {
 public:
     RemoveMenuCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw,
-		       QDesignerMenuBar *mb, QDesignerPopupMenu *p, int i, int idx, const TQString &mn )
+		       TQDesignerMenuBar *mb, TQDesignerPopupMenu *p, int i, int idx, const TQString &mn )
 	: AddMenuCommand( n, fw, mw ) { menuBar = mb; popup = p; id = i; index = idx, name = mn; }
 
     void execute() { AddMenuCommand::unexecute(); }
@@ -869,7 +870,7 @@ public:
 class RenameMenuCommand : public Command
 {
 public:
-    RenameMenuCommand( const TQString &n, FormWindow *fw, QDesignerMenuBar *mb,
+    RenameMenuCommand( const TQString &n, FormWindow *fw, TQDesignerMenuBar *mb,
 		       int i, const TQString &on, const TQString &nn );
 
     void execute();
@@ -877,7 +878,7 @@ public:
     Type type() const { return RenameMenu; }
 
 private:
-    QDesignerMenuBar *menuBar;
+    TQDesignerMenuBar *menuBar;
     int id;
     TQString oldName, newName;
 
@@ -886,16 +887,16 @@ private:
 class MoveMenuCommand : public Command
 {
 public:
-    MoveMenuCommand( const TQString &n, FormWindow *fw, QDesignerMenuBar *mb,
-		     QDesignerPopupMenu *p, int fidx, int tidx, const TQString &txt );
+    MoveMenuCommand( const TQString &n, FormWindow *fw, TQDesignerMenuBar *mb,
+		     TQDesignerPopupMenu *p, int fidx, int tidx, const TQString &txt );
 
     void execute();
     void unexecute();
     Type type() const { return MoveMenu; }
 
 private:
-    QDesignerMenuBar *menuBar;
-    QDesignerPopupMenu *popup;
+    TQDesignerMenuBar *menuBar;
+    TQDesignerPopupMenu *popup;
     int fromIdx, toIdx;
     TQString text;
 
@@ -911,7 +912,7 @@ public:
     Type type() const { return AddToolBar; }
 
 protected:
-    QDesignerToolBar *toolBar;
+    TQDesignerToolBar *toolBar;
     TQMainWindow *mainWindow;
 
 };
@@ -919,7 +920,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(); }
diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui
index d9e5a161..5eed9c1e 100644
--- a/kommander/editor/connectioneditor.ui
+++ b/kommander/editor/connectioneditor.ui
@@ -19,7 +19,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ConnectionEditorBase</cstring>
     </property>
@@ -116,7 +116,7 @@
                 <cstring>slotBox</cstring>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>&lt;b&gt;A list of slots for the receiver.&lt;/b&gt;&lt;p&gt;The slots that are displayed are only those which have arguments that correspond with the arguments of the signal that is currently selected in the Signal-list.&lt;/b&gt;</string>
+                <string>&lt;b&gt;A list of Q_SLOTS for the receiver.&lt;/b&gt;&lt;p&gt;The Q_SLOTS that are displayed are only those which have arguments that correspond with the arguments of the signal that is currently selected in the Signal-list.&lt;/b&gt;</string>
             </property>
         </widget>
         <widget class="KListBox" row="1" column="0">
@@ -124,18 +124,18 @@
                 <cstring>signalBox</cstring>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>Displays the list of signals that the widget emits.</string>
+                <string>Displays the list of Q_SIGNALS that the widget emits.</string>
             </property>
         </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>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>labelSignal</cstring>
                     </property>
@@ -161,7 +161,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -175,7 +175,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>labelSlot</cstring>
                     </property>
@@ -201,9 +201,9 @@
                 </widget>
             </hbox>
         </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>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -239,7 +239,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>71</width>
                             <height>21</height>
@@ -293,7 +293,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>230</width>
                             <height>20</height>
@@ -302,15 +302,15 @@
                 </spacer>
             </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>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>
@@ -331,7 +331,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>231</width>
                             <height>20</height>
@@ -368,7 +368,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>211</width>
                             <height>20</height>
@@ -390,7 +390,7 @@
     <tabstop>okButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot>addSlotClicked()</slot>
@@ -400,10 +400,10 @@
     <slot access="protected">receiverChanged( const QString &amp; )</slot>
     <slot access="protected">okClicked()</slot>
     <slot access="protected">signalChanged()</slot>
-    <slot access="protected">slotsChanged()</slot>
+    <slot access="protected">Q_SLOTSChanged()</slot>
     <slot access="protected">cancelClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>klistbox.h</includehint>
diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp
index a430290e..e6a48fde 100644
--- a/kommander/editor/connectioneditorimpl.cpp
+++ b/kommander/editor/connectioneditorimpl.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
 
  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
@@ -44,14 +44,14 @@ 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)",
-  "repaint(int,int,int,int)",
-  "repaint(const TQRect&)",
-  "repaint(const TQRegion&)",
+  "tqrepaint()",
+  "tqrepaint(bool)",
+  "tqrepaint(int,int,int,int,bool)",
+  "tqrepaint(const TQRect&,bool)",
+  "tqrepaint(const TQRegion&,bool)",
+  "tqrepaint(int,int,int,int)",
+  "tqrepaint(const TQRect&)",
+  "tqrepaint(const TQRegion&)",
   //"show()",
   //"hide()",
   "iconify()",
@@ -89,13 +89,13 @@ static const char *const ignore_signals[] = {
 };
 
 
-ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* rcvr, FormWindow* fw)
-  : ConnectionEditorBase(parent, 0, true), m_formWindow(fw)
+ConnectionEditor::ConnectionEditor(TQWidget* tqparent, TQObject* sndr, TQObject* rcvr, FormWindow* fw)
+  : ConnectionEditorBase(tqparent, 0, true), m_formWindow(fw)
 {
-  if (!rcvr || rcvr == m_formWindow)
-    rcvr = m_formWindow->mainContainer();
-  if (!sndr || sndr == m_formWindow)
-    sndr = m_formWindow->mainContainer();
+  if (!rcvr || TQT_BASE_OBJECT(rcvr) == TQT_BASE_OBJECT(m_formWindow))
+    rcvr = TQT_TQOBJECT(m_formWindow->mainContainer());
+  if (!sndr || TQT_BASE_OBJECT(sndr) == TQT_BASE_OBJECT(m_formWindow))
+    sndr = TQT_TQOBJECT(m_formWindow->mainContainer());
   m_sender = sndr;
   m_receiver = rcvr;
 
@@ -105,11 +105,11 @@ ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* r
   for (TQPtrDictIterator<TQWidget> it(*m_formWindow->widgets()); it.current(); ++it)
   {
     if (it.current()->isVisibleTo(this) &&
-        !it.current()->inherits("QLayoutWidget") &&
+        !it.current()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) &&
         !it.current()->inherits("Spacer") &&
         qstrcmp(it.current()->name(), "central widget") &&
-        !m_formWindow->isMainContainer(it.current()) &&
-        !lst.contains(it.current()->name()))
+        !m_formWindow->isMainContainer(TQT_TQOBJECT(it.current())) &&
+        !lst.tqcontains(it.current()->name()))
       lst << it.current()->name();
   }
   
@@ -152,21 +152,21 @@ bool ConnectionEditor::isSignalIgnored(const char *signal) const
   return false;
 }
 
-bool ConnectionEditor::isSlotIgnored(const QMetaData* md) 
+bool ConnectionEditor::isSlotIgnored(const TQMetaData* md) 
 {
-  if (md->access != QMetaData::Public && (md->access != QMetaData::Protected ||
-      !m_formWindow->isMainContainer((TQWidget*)m_receiver)))
+  if (md->tqt_mo_access != TQMetaData::Public && (md->tqt_mo_access != TQMetaData::Protected ||
+      !m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver))))
     return true;
   for (int i = 0; ignore_slots[i]; i++)
-    if (!qstrcmp(md->name, ignore_slots[i]))
+    if (!qstrcmp(md->tqt_mo_ci_name, ignore_slots[i]))
       return true;
-  if (!m_formWindow->isMainContainer((TQWidget *)m_receiver) && !qstrcmp(md->name, "close()"))
+  if (!m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver)) && !qstrcmp(md->tqt_mo_ci_name, "close()"))
     return true;
-  if (!qstrcmp(md->name, "setFocus()") && m_receiver->isWidgetType() && 
-     ((TQWidget*)m_receiver)->focusPolicy() == TQWidget::NoFocus)
+  if (!qstrcmp(md->tqt_mo_ci_name, "setFocus()") && m_receiver->isWidgetType() && 
+     ((TQWidget*)m_receiver)->focusPolicy() == TQ_NoFocus)
     return true;
   for (int i = 0; i<comboSender->count(); i++)
-    if (checkConnectArgs(MetaDataBase::normalizeSlot(signalBox->text(i)).latin1(), m_receiver, md->name))
+    if (checkConnectArgs(MetaDataBase::normalizeSlot(signalBox->text(i)).latin1(), m_receiver, md->tqt_mo_ci_name))
       return false;
   return true;
 }
@@ -175,11 +175,11 @@ TQObject* ConnectionEditor::objectByName(const TQString& s) const
 {
   for (TQPtrDictIterator <TQWidget> it(*m_formWindow->widgets()); it.current(); ++it)
     if (TQString(it.current()->name()) == s)
-      return it.current();
+      return TQT_TQOBJECT(it.current());
   
   for (TQPtrListIterator<TQAction> it(m_formWindow->actionList()); it.current(); ++it)
     if (TQString(it.current()->name()) == s)
-      return it.current();
+      return TQT_TQOBJECT(it.current());
   
   return 0;
 }
@@ -213,7 +213,7 @@ void ConnectionEditor::disconnectClicked()
   if (!p_item)
     return;
 
-  TQMap <TQListViewItem*, MetaDataBase::Connection>::Iterator it = m_connections.find(p_item);
+  TQMap <TQListViewItem*, MetaDataBase::Connection>::Iterator it = m_connections.tqfind(p_item);
   if (it != m_connections.end())
     m_connections.remove(it);
   delete p_item;
@@ -226,7 +226,7 @@ void ConnectionEditor::disconnectClicked()
 void ConnectionEditor::okClicked()
 {
   MacroCommand* rmConn = 0, *addConn = 0;
-  TQString n = i18n("Connect/Disconnect the signals and slots of '%1' and '%2'").arg(m_sender->name()).
+  TQString n = i18n("Connect/Disconnect the signals and slots of '%1' and '%2'").tqarg(m_sender->name()).
       arg(m_receiver->name());
   TQValueList <MetaDataBase::Connection>::Iterator cit;
   if (!m_oldConnections.isEmpty())
@@ -274,13 +274,13 @@ void ConnectionEditor::senderChanged(const TQString& s)
   if (!p_object)
     return;
   m_sender = p_object;
-  TQStrList p_sigs = m_sender->metaObject()->signalNames(true);
+  TQStrList p_sigs = m_sender->tqmetaObject()->signalNames(true);
   signalBox->clear();
   for (TQStrListIterator it(p_sigs); it.current(); ++it)
-    if (!isSignalIgnored(it.current()) && !signalBox->findItem(it.current(), Qt::ExactMatch))
+    if (!isSignalIgnored(it.current()) && !signalBox->tqfindItem(it.current(), TQt::ExactMatch))
       signalBox->insertItem(it.current());
-  if (m_sender == m_formWindow->mainContainer())
-    signalBox->insertStringList(MetaDataBase::signalList(m_formWindow));
+  if (TQT_BASE_OBJECT(m_sender) == TQT_BASE_OBJECT(m_formWindow->mainContainer()))
+    signalBox->insertStringList(MetaDataBase::signalList(TQT_TQOBJECT(m_formWindow)));
   signalBox->sort();
   signalBox->setCurrentItem(signalBox->firstItem());
   // Update slots - some may (not) have their signal equivalents now.
@@ -293,13 +293,13 @@ void ConnectionEditor::receiverChanged(const TQString& s)
   if (!p_object)
     return;
   m_receiver = p_object;
-  int n = m_receiver->metaObject()->numSlots(true);
+  int n = m_receiver->tqmetaObject()->numSlots(true);
   slotBox->clear();
   for (int i = 0; i < n; ++i)
   {
-    const QMetaData* md = m_receiver->metaObject()->slot(i, true);
-    if (!isSlotIgnored(md) && !slotBox->findItem(md->name, Qt::ExactMatch))
-      slotBox->insertItem(md->name);
+    const TQMetaData* md = m_receiver->tqmetaObject()->slot(i, true);
+    if (!isSlotIgnored(md) && !slotBox->tqfindItem(md->tqt_mo_ci_name, TQt::ExactMatch))
+      slotBox->insertItem(md->tqt_mo_ci_name);
   }
   slotBox->sort();
   slotBox->setCurrentItem(slotBox->firstItem());
@@ -336,14 +336,14 @@ void ConnectionEditor::fillConnectionsList()
 {
   connectionView->clear();
   m_connections.clear();
-  m_oldConnections = MetaDataBase::connections(m_formWindow);
+  m_oldConnections = MetaDataBase::connections(TQT_TQOBJECT(m_formWindow));
   if (!m_oldConnections.isEmpty())
   {
     TQValueList <MetaDataBase::Connection>::Iterator it = m_oldConnections.begin();
     for (; it != m_oldConnections.end(); ++it)
     {
-      if (m_formWindow->isMainContainer((TQWidget*)(*it).receiver) &&
-          !MetaDataBase::hasSlot(m_formWindow, MetaDataBase::normalizeSlot((*it).slot).latin1()))
+      if (m_formWindow->isMainContainer(TQT_TQOBJECT((*it).receiver)) &&
+          !MetaDataBase::hasSlot(TQT_TQOBJECT(m_formWindow), MetaDataBase::normalizeSlot((*it).slot).latin1()))
         continue;
       MetaDataBase::Connection conn = *it;
       KListViewItem *i = new KListViewItem(connectionView, conn.sender->name(), conn.signal, 
diff --git a/kommander/editor/connectioneditorimpl.h b/kommander/editor/connectioneditorimpl.h
index 35a3445b..35e3f2e0 100644
--- a/kommander/editor/connectioneditorimpl.h
+++ b/kommander/editor/connectioneditorimpl.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -31,8 +31,10 @@ class FormWindow;
 
 class ConnectionEditor : public ConnectionEditorBase
 {
-Q_OBJECT public:
-  ConnectionEditor(TQWidget* parent, TQObject* sender, TQObject* receiver, FormWindow* fw);
+  Q_OBJECT
+  TQ_OBJECT
+public:
+  ConnectionEditor(TQWidget* tqparent, TQObject* sender, TQObject* receiver, FormWindow* fw);
   ~ConnectionEditor();
 
 protected slots:
@@ -61,7 +63,7 @@ private:
   // Whether given signal should appear in the signal list
   bool isSignalIgnored(const char*) const;
   // Whether given slot should appear in the slot list
-  bool isSlotIgnored(const QMetaData* md);
+  bool isSlotIgnored(const TQMetaData* md);
   // Finds widget by name
   TQObject* objectByName(const TQString& s) const;
   bool hasConnection(const TQString & snder, const TQString & signal,
diff --git a/kommander/editor/createtemplate.ui b/kommander/editor/createtemplate.ui
index a6034d03..f97acfc6 100644
--- a/kommander/editor/createtemplate.ui
+++ b/kommander/editor/createtemplate.ui
@@ -19,13 +19,13 @@
 **
 *********************************************************************</comment>
 <widget>
-    <class>QDialog</class>
+    <class>TQDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>CreateTemplate</cstring>
     </property>
     <property stdset="1">
-        <name>geometry</name>
+        <name>tqgeometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -51,7 +51,7 @@
             <number>6</number>
         </property>
         <widget row="0"  column="0" >
-            <class>QLabel</class>
+            <class>TQLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel1</cstring>
@@ -66,7 +66,7 @@
             </property>
         </widget>
         <widget row="0"  column="1" >
-            <class>QLineEdit</class>
+            <class>TQLineEdit</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>editName</cstring>
@@ -81,7 +81,7 @@
             </property>
         </widget>
         <widget row="1"  column="1"  rowspan="2"  colspan="1" >
-            <class>QListBox</class>
+            <class>TQListBox</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>listClass</cstring>
@@ -96,7 +96,7 @@
             </property>
         </widget>
         <widget row="3"  column="0"  rowspan="1"  colspan="2" >
-            <class>QLayoutWidget</class>
+            <class>TQLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Layout1</cstring>
@@ -124,7 +124,7 @@
                         <enum>Expanding</enum>
                     </property>
                     <property>
-                        <name>sizeHint</name>
+                        <name>tqsizeHint</name>
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -132,7 +132,7 @@
                     </property>
                 </spacer>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>TQPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>buttonCreate</cstring>
@@ -151,7 +151,7 @@
                     </property>
                 </widget>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>TQPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButton1</cstring>
@@ -168,7 +168,7 @@
             </hbox>
         </widget>
         <widget row="1"  column="0" >
-            <class>QLabel</class>
+            <class>TQLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel2</cstring>
@@ -196,7 +196,7 @@
                 <enum>Expanding</enum>
             </property>
             <property>
-                <name>sizeHint</name>
+                <name>tqsizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kommander/editor/defs.cpp b/kommander/editor/defs.cpp
index 9f158b6d..d4e71303 100644
--- a/kommander/editor/defs.cpp
+++ b/kommander/editor/defs.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
diff --git a/kommander/editor/defs.h b/kommander/editor/defs.h
index 03cffd98..fcf4c305 100644
--- a/kommander/editor/defs.h
+++ b/kommander/editor/defs.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
diff --git a/kommander/editor/filechooser.cpp b/kommander/editor/filechooser.cpp
index dfb8575b..0133974a 100644
--- a/kommander/editor/filechooser.cpp
+++ b/kommander/editor/filechooser.cpp
@@ -4,21 +4,21 @@
 #include <kfiledialog.h>
 #include <tqlayout.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() ) );
@@ -50,7 +50,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/kommander/editor/filechooser.h b/kommander/editor/filechooser.h
index aa60518f..df518db6 100644
--- a/kommander/editor/filechooser.h
+++ b/kommander/editor/filechooser.h
@@ -6,16 +6,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/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp
index 0f5ab63c..90b9ba18 100644
--- a/kommander/editor/formfile.cpp
+++ b/kommander/editor/formfile.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
 
  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
@@ -26,10 +26,10 @@
 #include "resource.h"
 #include "workspace.h"
 
-// Qt includes
+// TQt includes
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqstatusbar.h>
+#include <statusbar.h>
 #include <tqtimer.h>
 
 // KDE includes
@@ -80,7 +80,7 @@ void FormFile::setFileName(const TQString &fn)
     return;
   if (fn.isEmpty()) {
     fileNameTemp = true;
-    if (filename.find("unnamed"))
+    if (filename.tqfind("unnamed"))
       filename = createUnnamedFileName();
     return;
   }
@@ -119,12 +119,12 @@ bool FormFile::save(bool withMsgBox)
   if (!resource.save(filename, false))
   {
     if (KMessageBox::questionYesNo(MainWindow::self, i18n("Failed to save file '%1'.\n"
-        "Do you want to use another file name?").arg(filename), TQString::null, i18n("Try Another"), i18n("Do Not Try")) == KMessageBox::Yes)
+        "Do you want to use another file name?").tqarg(filename), TQString(), i18n("Try Another"), i18n("Do Not Try")) == KMessageBox::Yes)
       return saveAs();
     else 
       return false;
   }
-  MainWindow::self->statusBar()->message(i18n("'%1' saved.").arg(filename), 3000);
+  MainWindow::self->statusBar()->message(i18n("'%1' saved.").tqarg(filename), 3000);
   ::chmod(filename.local8Bit(), S_IRWXU);
   setModified(false);
   return true;
@@ -137,9 +137,9 @@ bool FormFile::saveAs()
     f = TQString(formWindow()->name()).lower() + ".kmdr";
   bool saved = false;
   while (!saved) {
-    TQString fn = KFileDialog::getSaveFileName(TQString::null,
+    TQString fn = KFileDialog::getSaveFileName(TQString(),
       i18n("*.kmdr|Kommander Files"), MainWindow::self,
-      i18n("Save Form '%1' As").arg(formWindow()->name()));
+      i18n("Save Form '%1' As").tqarg(formWindow()->name()));
     if (fn.isEmpty())
       return false;
     TQFileInfo fi(fn);
@@ -182,7 +182,7 @@ bool FormFile::closeEvent()
   }
 
   switch (KMessageBox::warningYesNoCancel(MainWindow::self, i18n("Dialog '%1' was modified."
-  "Do you want to save it?").arg(filename), i18n("Save File?"), KStdGuiItem::save(), KStdGuiItem::discard())) {
+  "Do you want to save it?").tqarg(filename), i18n("Save File?"), KStdGuiItem::save(), KStdGuiItem::discard())) {
     case KMessageBox::Yes:
       if (!save())
         return false;
@@ -264,7 +264,7 @@ TQString FormFile::formName() const
       line = ts.readLine();
       if (!className.isEmpty())
       {
-        int end = line.find("</class>");
+        int end = line.tqfind("</class>");
         if (end == -1)
           className += line;
         else
@@ -275,9 +275,9 @@ TQString FormFile::formName() const
         continue;
       }
       int start;
-      if ((start = line.find("<class>")) != -1)
+      if ((start = line.tqfind("<class>")) != -1)
       {
-        int end = line.find("</class>");
+        int end = line.tqfind("</class>");
         if (end == -1)
           className = line.mid(start + 7);
         else
diff --git a/kommander/editor/formfile.h b/kommander/editor/formfile.h
index 89ba2f1d..d7c63bce 100644
--- a/kommander/editor/formfile.h
+++ b/kommander/editor/formfile.h
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS. �All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS. �All rights reserved.
 
  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
@@ -26,9 +26,10 @@
 
 class FormWindow;
 
-class FormFile : public QObject
+class FormFile : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     FormFile(const TQString &fn, bool temp);
diff --git a/kommander/editor/formsettings.ui b/kommander/editor/formsettings.ui
index 321de024..6e391265 100644
--- a/kommander/editor/formsettings.ui
+++ b/kommander/editor/formsettings.ui
@@ -19,7 +19,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FormSettingsBase</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -74,7 +74,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -114,7 +114,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -131,7 +131,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>spinMargin</cstring>
                     </property>
@@ -139,7 +139,7 @@
                         <number>11</number>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="1" column="1">
+                <widget class="TQSpinBox" row="1" column="1">
                     <property name="name">
                         <cstring>spinSpacing</cstring>
                     </property>
@@ -147,7 +147,7 @@
                         <number>6</number>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1_3</cstring>
                     </property>
@@ -158,7 +158,7 @@
                         <cstring>spinMargin</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>
@@ -171,7 +171,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -194,7 +194,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QMultiLineEdit" row="3" column="1" rowspan="2" colspan="1">
+                <widget class="TQMultiLineEdit" row="3" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>editComment</cstring>
                     </property>
@@ -212,14 +212,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>130</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -230,7 +230,7 @@
                         <cstring>editComment</cstring>
                     </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>
@@ -252,7 +252,7 @@
                         <string>Enter your name.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel1_2_3</cstring>
                     </property>
@@ -263,7 +263,7 @@
                         <cstring>editAuthor</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>
@@ -326,10 +326,10 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>okClicked()</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/kommander/editor/formsettingsimpl.cpp b/kommander/editor/formsettingsimpl.cpp
index f3f7c3c2..9912634f 100644
--- a/kommander/editor/formsettingsimpl.cpp
+++ b/kommander/editor/formsettingsimpl.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
 
  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
@@ -27,16 +27,16 @@
 #include <klineedit.h>
 #include <tqspinbox.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 )
 {
-  MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(fw);
+  MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(TQT_TQOBJECT(fw));
   editAuthor->setText(info.author);
   editVersion->setText(info.version);
   editLicense->setText(info.license);
   editComment->setText(info.comment);
-  spinSpacing->setValue(formwindow->layoutDefaultSpacing());
-  spinMargin->setValue(formwindow->layoutDefaultMargin());
+  spinSpacing->setValue(formwindow->tqlayoutDefaultSpacing());
+  spinMargin->setValue(formwindow->tqlayoutDefaultMargin());
 }
 
 void FormSettings::okClicked()
@@ -46,7 +46,7 @@ void FormSettings::okClicked()
   info.version = editVersion->text();
   info.license = editLicense->text();
   info.comment = editComment->text();
-  MetaDataBase::setMetaInfo(formwindow, info);
+  MetaDataBase::setMetaInfo(TQT_TQOBJECT(formwindow), info);
   formwindow->commandHistory()->setModified(true);
 
   formwindow->setLayoutDefaultSpacing(spinSpacing->value());
diff --git a/kommander/editor/formsettingsimpl.h b/kommander/editor/formsettingsimpl.h
index 194f168a..e8940b9d 100644
--- a/kommander/editor/formsettingsimpl.h
+++ b/kommander/editor/formsettingsimpl.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -28,9 +28,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/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp
index ac0712b4..2218a977 100644
--- a/kommander/editor/formwindow.cpp
+++ b/kommander/editor/formwindow.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
 
  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
@@ -17,7 +17,7 @@
 
 **********************************************************************/
 
-// Qt includes
+// TQt includes
 #include <tqaccel.h>
 #include <tqapplication.h>
 #include <tqbitmap.h>
@@ -36,7 +36,7 @@
 #include <tqpushbutton.h>
 #include <tqsizegrip.h>
 #include <tqspinbox.h>
-#include <tqstatusbar.h>
+#include <statusbar.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
@@ -54,7 +54,7 @@
 #include "sizehandle.h"
 #include "metadatabase.h"
 #include "resource.h"
-#include "layout.h"
+#include "tqlayout.h"
 #include "connectioneditorimpl.h"
 #include "widgetdatabase.h"
 #include "pixmapchooser.h"
@@ -70,9 +70,9 @@
 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())
+  TQObjectList l = start->childrenListObject();
+  if (!l.isEmpty())
+    for (TQObject *o = l.first(); o; o = l.next())
     {
       if (o->isWidgetType() && !o->inherits("SizeHandle"))
         setCursorToAll(c, ((TQWidget*)o));
@@ -81,13 +81,13 @@ 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())
+    start->setCursor(TQt::ArrowCursor);
+  TQObjectList l = start->childrenListObject();
+  if (!l.isEmpty())
+    for (TQObject *o = l.first(); o; o = l.next())
     {
       if (o->isWidgetType() && !o->inherits("SizeHandle"))
         restoreCursors(((TQWidget*)o), fw);
@@ -110,8 +110,8 @@ static void restoreCursors(TQWidget *start, FormWindow *fw)
   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)
 {
   ff = f;
@@ -119,8 +119,8 @@ FormWindow::FormWindow(FormFile *f, MainWindow *mw, TQWidget *parent, const char
   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;
@@ -129,7 +129,7 @@ FormWindow::FormWindow(FormFile *f, TQWidget *parent, const char *name)
 
 void FormWindow::init()
 {
-  MetaDataBase::addEntry(this);
+  MetaDataBase::addEntry(TQT_TQOBJECT(this));
   ff->setFormWindow(this);
   propertyWidget = 0;
   toolFixed = false;
@@ -140,7 +140,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()),
@@ -167,7 +167,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;
 
@@ -178,7 +178,7 @@ void FormWindow::init()
 void FormWindow::setMainWindow(MainWindow *w)
 {
   mainwindow = w;
-  MetaDataBase::addEntry(this);
+  MetaDataBase::addEntry(TQT_TQOBJECT(this));
   initSlots();
 }
 
@@ -190,7 +190,7 @@ FormWindow::~FormWindow()
 {
   if (MainWindow::self->objectHierarchy()->formWindow() == this)
     MainWindow::self->objectHierarchy()->setFormWindow(0, 0);
-  MetaDataBase::clear(this);
+  MetaDataBase::clear(TQT_TQOBJECT(this));
   if (ff)
     ff->setFormWindow(0);
 }
@@ -210,17 +210,17 @@ 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);
@@ -267,7 +267,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);
@@ -295,7 +295,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());
@@ -303,7 +303,7 @@ void FormWindow::insertWidget()
     int ver = m.insertItem(i18n("&Vertical"));
     int r = m.exec(TQCursor::pos());
     if (r == ver)
-        orient = Vertical;
+        orient =Qt::Vertical;
   }
 
   TQWidget *w = WidgetFactory::create(currTool, insertParent, 0, true, &currRect, orient);
@@ -312,27 +312,27 @@ void FormWindow::insertWidget()
 
   if (!savePixmapInline() && currTool == WidgetDatabase::idFromClassName("PixmapLabel"))
     ((TQLabel*)w)->setPixmap(PixmapChooser::loadPixmap("image.xpm"));
-  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, i18n("<b>A %1</b><p>%2</p>").arg(tt).arg(wt));
+        TQWhatsThis::add(w, i18n("<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);
@@ -345,8 +345,8 @@ void FormWindow::insertWidget()
   r = TQRect(p, r.size());
   if (useSizeHint)
   {
-    r.setWidth(w->sizeHint().width());
-    r.setHeight(w->sizeHint().height());
+    r.setWidth(w->tqsizeHint().width());
+    r.setHeight(w->tqsizeHint().height());
   }
 
   if (r.width() < 2 * grid().x())
@@ -354,18 +354,18 @@ 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((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);
       }
     }
@@ -381,19 +381,19 @@ void FormWindow::insertWidget()
       pos -= r.topLeft();
       np.append(pos);
     }
-    MoveCommand *mv = new MoveCommand(i18n("Reparent Widgets"), this, lst, op, np, insertParent, pw);
+    MoveCommand *mv = new MoveCommand(i18n("Retqparent Widgets"), this, lst, op, np, insertParent, pw);
     if (!toolFixed)
       mainwindow->resetTool();
     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();
   }
@@ -404,7 +404,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();
   }
@@ -414,29 +414,29 @@ void FormWindow::insertWidget(TQWidget *w, bool checkName)
 {
   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, i18n("<b>A %1</b><p>%2</p>").arg(tt).arg(wt));
+      TQWhatsThis::add(w, i18n("<b>A %1</b><p>%2</p>").tqarg(tt).tqarg(wt));
   }
 
   restoreCursors(w, this);
@@ -446,7 +446,7 @@ void FormWindow::insertWidget(TQWidget *w, bool checkName)
 
 void FormWindow::removeWidget(TQWidget *w)
 {
-  MetaDataBase::removeEntry(w);
+  MetaDataBase::removeEntry(TQT_TQOBJECT(w));
   widgets()->take(w);
 }
 
@@ -454,15 +454,15 @@ void FormWindow::handleContextMenu(TQContextMenuEvent *e, TQWidget *w)
 {
   switch (currTool) {
     case POINTER_TOOL:
-      if (!isMainContainer(w) && qstrcmp(w->name(), "central widget"))
+      if (!isMainContainer(TQT_TQOBJECT(w)) && qstrcmp(w->name(), "central widget"))
       { // 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();
+        while (w->tqparentWidget() &&  (WidgetFactory::tqlayoutType(w->tqparentWidget()) !=
+           WidgetFactory::NoLayout || !insertedWidgets.tqfind(w)))
+          w = w->tqparentWidget();
         if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) &&
           ((TQMainWindow*)mainContainer())->centralWidget() == realWidget)
         {
@@ -500,10 +500,10 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
 
   switch (currTool) {
     case POINTER_TOOL:
-        if (!isMainContainer(w) && qstrcmp(w->name(), "central widget") != 0)
+        if (!isMainContainer(TQT_TQOBJECT(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 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
@@ -513,16 +513,16 @@ 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!),
+              // only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!),
               // unselect its childs
-              if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout)
+              if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout)
               {
                 TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
                 setPropertyShowingBlocked(true);
@@ -530,60 +530,60 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
                 {
                   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)
+            sel && e->button() == Qt::LeftButton)
           { // control pressed and selected, unselect widget
-            selectWidget(w, false);
+            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()))
+            if (w->tqparentWidget() && !isMainContainer(TQT_TQOBJECT(w->tqparentWidget())) &&
+               !isCentralWidget(TQT_TQOBJECT(w->tqparentWidget())))
             {
-              targetContainer = w->parentWidget();
-              hadOwnPalette = w->parentWidget()->ownPalette();
-              restorePalette = w->parentWidget()->palette();
+              targetContainer = w->tqparentWidget();
+              hadOwnPalette = w->tqparentWidget()->ownPalette();
+              restorePalette = w->tqparentWidget()->palette();
             }
           }
         }
         else
         { // press was on the formwindow
-          if (e->button() == LeftButton)
+          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);
@@ -591,25 +591,25 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
         }
         break;
     case CONNECT_TOOL:
-        if (e->button() != LeftButton)
+        if (e->button() != Qt::LeftButton)
           break;
         saveBackground();
-        mainWindow()->statusBar()->message(i18n("Connect '%1' with...").arg(w->name()));
+        mainWindow()->statusBar()->message(i18n("Connect '%1' with...").tqarg(w->name()));
         connectStartPos = mapFromGlobal(e->globalPos());
         currentConnectPos = mapFromGlobal(e->globalPos());
-        connectSender = designerWidget(w);
-        connectReceiver = connectableObject(designerWidget(w), connectReceiver);
+        connectSender = TQT_TQOBJECT(designerWidget(TQT_TQOBJECT(w)));
+        connectReceiver = connectableObject(TQT_TQOBJECT(designerWidget(TQT_TQOBJECT(w))), connectReceiver);
         beginUnclippedPainter(false);
         drawConnectLine();
         break;
     case ORDER_TOOL:
-        if (!isMainContainer(w))
+        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);
@@ -625,25 +625,25 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
         }
         break;
     default: // any insert widget tool
-        if (e->button() == LeftButton)
+        if (e->button() == Qt::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
+          // 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()) &&
                 !wid->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !wid->inherits(TQSPLITTER_OBJECT_NAME_STRING))
               {
-                insertParent = WidgetFactory::containerOfWidget(wid); // found another parent, store it
+                insertParent = WidgetFactory::containerOfWidget(wid); // found another tqparent, store it
                 break;
               }
               else
               {
-                wid = wid->parentWidget();
+                wid = wid->tqparentWidget();
                 if (!wid)
                   break;
               }
@@ -659,13 +659,13 @@ void FormWindow::handleMouseDblClick(TQMouseEvent *, TQWidget *w)
 {
   switch (currTool) {
     case ORDER_TOOL:
-      if (!isMainContainer(w))
+      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);
@@ -685,7 +685,7 @@ void FormWindow::handleMouseDblClick(TQMouseEvent *, TQWidget *w)
 
 void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
 {
-  if ((e->state() & LeftButton) != LeftButton)
+  if ((e->state() & Qt::LeftButton) != Qt::LeftButton)
     return;
 
   TQWidget *newReceiver = (TQWidget*)connectReceiver, *oldReceiver = (TQWidget*)connectReceiver, *wid;
@@ -695,16 +695,16 @@ 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());
         // 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());
@@ -724,19 +724,19 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
         { // if we actually have to move
           if (!checkedSelectionsForMove)
           { // if not checked yet, check if the correct widget are selected...
-            if (!isWidgetSelected(w))
+            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
+          // highlight the possible new tqparent container
           TQMapConstIterator<ulong, TQPoint> it = moving.begin();
           TQWidget* wa = containerAt(e->globalPos(), ((TQWidget*)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
@@ -753,7 +753,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)
@@ -767,7 +767,7 @@ 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(TQString("%1/%2").arg(w->pos().x()).arg(w->pos().y()));
+          sizePreviewLabel->setText(TQString("%1/%2").tqarg(w->pos().x()).tqarg(w->pos().y()));
           sizePreviewLabel->adjustSize();
           TQRect lg(mapFromGlobal(e->globalPos()) + TQPoint(16, 16), sizePreviewLabel->size());
           checkPreviewGeometry(lg);
@@ -790,24 +790,24 @@ 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))
       newReceiver = wid;
-    if (newReceiver && (newReceiver->inherits("QLayoutWidget")
+    if (newReceiver && (newReceiver->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING)
         || newReceiver->inherits("Spacer")))
       newReceiver = (TQWidget*)connectReceiver;
-    drawRecRect = newReceiver != connectReceiver;
+    drawRecRect = TQT_BASE_OBJECT(newReceiver) != TQT_BASE_OBJECT(connectReceiver);
     currentConnectPos = mapFromGlobal(e->globalPos());
-    if (newReceiver && (isMainContainer(newReceiver)
-        || insertedWidgets.find(newReceiver)) && !isCentralWidget(newReceiver))
-      connectReceiver = connectableObject(newReceiver, connectReceiver);
-    mainWindow()->statusBar()->message(i18n("Connect '%1' to '%2'").arg(connectSender->name()).
+    if (newReceiver && (isMainContainer(TQT_TQOBJECT(newReceiver))
+        || insertedWidgets.tqfind(newReceiver)) && !isCentralWidget(TQT_TQOBJECT(newReceiver)))
+      connectReceiver = connectableObject(TQT_TQOBJECT(newReceiver), TQT_TQOBJECT(connectReceiver));
+    mainWindow()->statusBar()->message(i18n("Connect '%1' to '%2'").tqarg(connectSender->name()).
         arg(connectReceiver->name()));
-    qApp->processEvents();
+    tqApp->processEvents();
     if (drawRecRect)
-      restoreRect(TQRect(mapToForm(((TQWidget*)oldReceiver)->parentWidget(),
+      restoreRect(TQRect(mapToForm(((TQWidget*)oldReceiver)->tqparentWidget(),
           ((TQWidget*)oldReceiver)->pos()), ((TQWidget*)oldReceiver)->size()));
     drawConnectLine();
     break;
@@ -822,7 +822,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
 
 void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
 {
-  if (e->button() != LeftButton)
+  if (e->button() != Qt::LeftButton)
     return;
 
   switch (currTool)
@@ -832,7 +832,7 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
     {                           // we moved the widget
       sizePreviewLabel->hide();
 
-      if (moving.isEmpty() || w->pos() == *moving.find((ulong) w))
+      if (moving.isEmpty() || w->pos() == *moving.tqfind((ulong) w))
         break;
 
       // restore targetContainer
@@ -848,7 +848,7 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
         emitUpdateProperties(propertyWidget);
 
       TQMapConstIterator < ulong, TQPoint > it = moving.begin();
-      TQWidget *oldParent = ((TQWidget *) it.key())->parentWidget();
+      TQWidget *oldParent = ((TQWidget *) it.key())->tqparentWidget();
       TQWidget *newParent = oldParent;
       // check whether we have to reparent the selection
       TQWidget *wa = containerAt(e->globalPos(), ((TQWidget *) it.key()));
@@ -857,21 +857,21 @@ 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 == ((TQWidget *) it.key())->parentWidget())
+        // check whether we really have different tqparents.
+        if (wa == ((TQWidget *) 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 (KMessageBox::questionYesNo(mainWindow(),
                   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?").
-                  arg(wa->name()).arg(wa->name()), i18n("Inserting Widget"),
+                      "Break the tqlayout or cancel the operation?").
+                  tqarg(wa->name()).tqarg(wa->name()), i18n("Inserting Widget"),
                   i18n("&Break Layout"), KStdGuiItem::cancel()) == KMessageBox::No)
             goto make_move_command; // cancel
           breakLayout(wa);
@@ -883,27 +883,27 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
           TQWidget *i = (TQWidget *) it.key();
           if (!emitSelChanged && i->inherits(TQBUTTON_OBJECT_NAME_STRING))
           {
-            if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING) ||
+            if (i->tqparentWidget() && i->tqparentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING) ||
                 wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
               emitSelChanged = true;
             if (!wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
             {
-              MetaDataBase::setPropertyChanged(i, "buttonGroupId", false);
-              if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
-                ((TQButtonGroup *) i->parentWidget())->remove((TQButton *) i);
+              MetaDataBase::setPropertyChanged(TQT_TQOBJECT(i), "buttonGroupId", false);
+              if (i->tqparentWidget() && i->tqparentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
+                ((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;
@@ -935,13 +935,13 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
   case CONNECT_TOOL:
     restoreConnectionLine();
     if (connectSender)
-      restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->parentWidget(),
+      restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->tqparentWidget(),
                   ((TQWidget *) connectSender)->pos()), ((TQWidget *) connectSender)->size()));
     if (connectReceiver)
-      restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->parentWidget(),
+      restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->tqparentWidget(),
                   ((TQWidget *) connectReceiver)->pos()), ((TQWidget *) connectReceiver)->size()));
     endUnclippedPainter();
-    qApp->processEvents();
+    tqApp->processEvents();
     if (connectSender && connectReceiver)
       editConnections();
     break;
@@ -951,15 +951,15 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
     if (insertParent)
     {                           // we should insert the new widget now
       endRectDraw();
-      if (WidgetFactory::layoutType(insertParent) != WidgetFactory::NoLayout)
+      if (WidgetFactory::tqlayoutType(insertParent) != WidgetFactory::NoLayout)
       {
         if (KMessageBox::questionYesNo(mainWindow(),
                 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("Inserting Widget"),
                 i18n("&Break Layout"), KStdGuiItem::cancel()) == KMessageBox::Yes)
@@ -1064,7 +1064,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;
   }
@@ -1086,12 +1086,12 @@ 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;
   }
@@ -1100,25 +1100,25 @@ void FormWindow::selectWidget(TQObject * o, bool select)
       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 (o->inherits("QDesignerToolBar") || o->inherits("QDesignerMenuBar"))
+  if (o->inherits("TQDesignerToolBar") || o->inherits("TQDesignerMenuBar"))
     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();
@@ -1143,16 +1143,16 @@ void FormWindow::selectWidget(TQObject * o, bool select)
     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();
@@ -1168,23 +1168,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();
 }
@@ -1199,9 +1199,9 @@ void FormWindow::clearSelection(bool changePropertyDisplay)
   if (changePropertyDisplay)
   {
     TQObject *opw = propertyWidget;
-    propertyWidget = mainContainer();
+    propertyWidget = TQT_TQOBJECT(mainContainer());
     if (opw->isWidgetType())
-      repaintSelection((TQWidget *) opw);
+      tqrepaintSelection((TQWidget *) opw);
     emitShowProperties(propertyWidget);
   }
   emitSelectionChanged();
@@ -1239,7 +1239,7 @@ void FormWindow::continueRectDraw(const TQPoint & p, const TQPoint & global, TQW
   if (currRect == r)
   {
     TQString t("%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;
   }
@@ -1253,7 +1253,7 @@ void FormWindow::continueRectDraw(const TQPoint & p, const TQPoint & global, TQW
     if (t == Insert)
     {
       TQString t("%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,
@@ -1275,7 +1275,7 @@ void FormWindow::endRectDraw()
 
   if (oldRectValid)
     unclippedPainter->drawRect(currRect);
-  drawSizePreview(TQPoint(-1, -1), TQString::null);
+  drawSizePreview(TQPoint(-1, -1), TQString());
   endUnclippedPainter();
 }
 
@@ -1291,8 +1291,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;
@@ -1303,8 +1303,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)
@@ -1314,8 +1314,8 @@ void FormWindow::moveSelectedWidgets(int dx, int dy)
   {
     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();
@@ -1350,7 +1350,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;
@@ -1363,7 +1363,7 @@ void FormWindow::updateChildSelections(TQWidget * w)
   {
     for (TQObject * o = l->first(); o; o = l->next())
     {
-      if (o->isWidgetType() && insertedWidgets.find((TQWidget *) o))
+      if (o->isWidgetType() && insertedWidgets.tqfind((TQWidget *) o))
         updateSelection((TQWidget *) o);
     }
     delete l;
@@ -1374,7 +1374,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)
   {
@@ -1385,13 +1385,13 @@ void FormWindow::checkSelectionsForMove(TQWidget * w)
       if (it.current()->widget() == mainContainer())
         continue;
       ++it;
-      if (l->find(sel->widget()) == -1)
+      if (l->tqfind(TQT_TQOBJECT(sel->widget())) == -1)
       {
-        if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout)
+        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((ulong) sel->widget(), sel->widget()->pos());
           sel->widget()->raise();
@@ -1411,10 +1411,10 @@ void FormWindow::deleteWidgets()
   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())
@@ -1431,13 +1431,13 @@ void FormWindow::editAdjustSize()
   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);
@@ -1447,12 +1447,12 @@ void FormWindow::editAdjustSize()
   }
   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));
   }
@@ -1500,7 +1500,7 @@ void FormWindow::invalidCheckedSelections()
 
 void FormWindow::checkPreviewGeometry(TQRect & r)
 {
-  if (rect().contains(r))
+  if (TQT_TQRECT_OBJECT(rect()).tqcontains(r))
     return;
   if (r.left() < rect().left())
     r.moveTopLeft(TQPoint(0, r.top()));
@@ -1527,9 +1527,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);
   }
 }
 
@@ -1552,8 +1552,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;
 }
 
@@ -1564,7 +1564,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);
@@ -1618,10 +1618,10 @@ void FormWindow::currentToolChanged()
   case CONNECT_TOOL:
     restoreConnectionLine();
     if (connectSender)
-      restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->parentWidget(),
+      restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->tqparentWidget(),
                   ((TQWidget *) connectSender)->pos()), ((TQWidget *) connectSender)->size()));
     if (connectReceiver)
-      restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->parentWidget(),
+      restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->tqparentWidget(),
                   ((TQWidget *) connectReceiver)->pos()), ((TQWidget *) connectReceiver)->size()));
     endUnclippedPainter();
     break;
@@ -1652,7 +1652,7 @@ void FormWindow::currentToolChanged()
   {
   case POINTER_TOOL:
     if (propertyWidget && !isMainContainer(propertyWidget) && !isWidgetSelected(propertyWidget))
-      emitShowProperties(mainContainer());
+      emitShowProperties(TQT_TQOBJECT(mainContainer()));
     restoreCursors(this, this);
     break;
   case ORDER_TOOL:
@@ -1662,7 +1662,7 @@ void FormWindow::currentToolChanged()
       orderedWidgets.clear();
       showOrderIndicators();
       if (mainWindow()->formWindow() == this)
-        emitShowProperties(mainContainer());
+        emitShowProperties(TQT_TQOBJECT(mainContainer()));
       setCursorToAll(ArrowCursor, this);
     }
     break;
@@ -1670,14 +1670,14 @@ void FormWindow::currentToolChanged()
     mainWindow()->statusBar()->message(i18n("Drag a line to create a connection..."));
     setCursorToAll(CrossCursor, this);
     if (mainWindow()->formWindow() == this)
-      emitShowProperties(mainContainer());
+      emitShowProperties(TQT_TQOBJECT(mainContainer()));
     break;
   default:
     mainWindow()->statusBar()->message(i18n("Click on the form to insert a %1...").
         arg(WidgetDatabase::toolTip(currTool).lower()));
     setCursorToAll(CrossCursor, this);
     if (mainWindow()->formWindow() == this)
-      emitShowProperties(mainContainer());
+      emitShowProperties(TQT_TQOBJECT(mainContainer()));
     break;
   }
 }
@@ -1694,12 +1694,12 @@ void FormWindow::showOrderIndicators()
     for (TQObject * o = l->first(); o; o = l->next())
     {
       TQWidget *w = (TQWidget *) o;
-      if (w->isVisibleTo(w->parentWidget()) &&
-          insertedWidgets[(void *) w] && w->focusPolicy() != NoFocus)
+      if (w->isVisibleTo(w->tqparentWidget()) &&
+          insertedWidgets[(void *) w] && 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);
       }
     }
@@ -1743,7 +1743,7 @@ bool FormWindow::checkCustomWidgets()
   {
     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;
     }
@@ -1788,14 +1788,14 @@ void FormWindow::lowerWidgets()
 
 static 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;
@@ -1820,11 +1820,11 @@ void FormWindow::checkAccels()
       {
         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)
@@ -1844,12 +1844,12 @@ void FormWindow::checkAccels()
     {
       ok = false;
       if (KMessageBox::questionYesNo(mainWindow(),
-              i18n("Accelerator '%1' is used %2 times.").arg(it.key().upper()).arg((*it).count()),
+              i18n("Accelerator '%1' is used %2 times.").tqarg(it.key().upper()).tqarg((*it).count()),
               i18n("Check Accelerators"), i18n("&Select"), KStdGuiItem::cancel()) == KMessageBox::Yes)
       {
         clearSelection(false);
         for (wid = (*it).first(); wid; wid = (*it).next())
-          selectWidget(wid, true);
+          selectWidget(TQT_TQOBJECT(wid), true);
       }
       return;
     }
@@ -1872,11 +1872,11 @@ void FormWindow::raiseWidgets()
   commandHistory()->addCommand(cmd);
 }
 
-void FormWindow::paste(const TQString & cb, TQWidget * parent)
+void FormWindow::paste(const TQString & cb, TQWidget * tqparent)
 {
   Resource resource(mainWindow());
   resource.setWidget(this);
-  resource.paste(cb, parent);
+  resource.paste(cb, tqparent);
 }
 
 void FormWindow::selectAll()
@@ -1890,7 +1890,7 @@ void FormWindow::selectAll()
     {
       if (((TQWidget *) o)->isVisibleTo(this) && insertedWidgets[(void *) o])
       {
-        selectWidget((TQWidget *) o);
+        selectWidget(TQT_TQOBJECT(o));
       }
     }
     delete l;
@@ -1903,49 +1903,49 @@ 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)"),
+      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)"),
+      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();
@@ -1958,63 +1958,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))
+        ((TQWidget *) o)->isVisibleTo(this) && 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))
+        ((TQWidget *) o)->isVisibleTo(this) && 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))
+        ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.tqfind((TQWidget *) o))
       widgets.append((TQWidget *) o);
   }
   LayoutGridCommand *cmd = new LayoutGridCommand(i18n("Lay Out Children in a Grid"),
@@ -2035,8 +2035,8 @@ void FormWindow::breakLayout(TQWidget * w)
   {
     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)
@@ -2044,7 +2044,7 @@ void FormWindow::breakLayout(TQWidget * w)
       if (!w->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !w->inherits(TQSPLITTER_OBJECT_NAME_STRING))
         break;
     }
-    w = w->parentWidget();
+    w = w->tqparentWidget();
   }
 
   if (commands.isEmpty())
@@ -2058,16 +2058,16 @@ void FormWindow::breakLayout(TQWidget * w)
 
 BreakLayoutCommand *FormWindow::breakLayoutCommand(TQWidget * w)
 {
-  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) &&
-        ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.find((TQWidget *) o))
+        !mainWindow()->isAToolBarChild(TQT_TQOBJECT(o)) &&
+        ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.tqfind((TQWidget *) o))
       widgets.append((TQWidget *) o);
   }
   return new BreakLayoutCommand(i18n("Break Layout"), this,
@@ -2102,7 +2102,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;
@@ -2113,13 +2113,13 @@ 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) ==
+    if ((isMainContainer(TQT_TQOBJECT(w)) || insertedWidgets.tqfind(w)) && WidgetFactory::tqlayoutType(w) ==
         WidgetFactory::NoLayout)
       return true;
-    w = w->parentWidget();
+    w = w->tqparentWidget();
   }
   return false;
 }
@@ -2152,8 +2152,8 @@ void FormWindow::restoreConnectionLine()
   if (!unclippedPainter || !buffer)
     return;
 
-  int a =QABS(connectStartPos.x() - currentConnectPos.x());
-  int b = QABS(connectStartPos.y() - currentConnectPos.y());
+  int a =TQABS(connectStartPos.x() - currentConnectPos.x());
+  int b = TQABS(connectStartPos.y() - currentConnectPos.y());
   TQRect r(connectStartPos, currentConnectPos);
 
   if (a < 32 || b < 32)
@@ -2197,7 +2197,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);
@@ -2274,7 +2274,7 @@ bool FormWindow::unify(TQObject *w, TQString &s, bool changeIt)
     int num  = 1;
     TQPtrDictIterator<TQWidget> it(insertedWidgets);
     for (; it.current();)
-      if (it.current() != w && !qstrcmp(it.current()->name(), s.latin1()))
+      if (TQT_BASE_OBJECT(it.current()) != TQT_BASE_OBJECT(w) && !qstrcmp(it.current()->name(), s.latin1()))
       {
         found = true;
         if (!changeIt)
@@ -2328,7 +2328,7 @@ bool FormWindow::unify(TQObject *w, TQString &s, bool changeIt)
       }
       if (!found)
       {
-        TQObjectList *l = mainContainer()->queryList("QDesignerPopupMenu", 0, true);
+        TQObjectList *l = mainContainer()->queryList("TQDesignerPopupMenu", 0, true);
         for (TQObject *o = l->first(); o; o = l->next())
           if (o != w && !qstrcmp(o->name(), s.latin1()))
           {
@@ -2351,7 +2351,7 @@ bool FormWindow::isCustomWidgetUsed(MetaDataBase::CustomWidget *w)
 {
   TQPtrDictIterator<TQWidget> it(insertedWidgets);
   for (; it.current(); ++it)
-    if (it.current()->isA("CustomWidget") && !qstrcmp(WidgetFactory::classNameOf(it.current()),
+    if (it.current()->isA("CustomWidget") && !qstrcmp(WidgetFactory::classNameOf(TQT_TQOBJECT(it.current())),
         w->className.utf8()))
       return true;
   return false;
@@ -2359,14 +2359,14 @@ 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;
   }
 #endif
@@ -2375,9 +2375,9 @@ 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
@@ -2388,7 +2388,7 @@ bool FormWindow::isDatabaseAware() const
 void FormWindow::visibilityChanged()
 {
   if (currTool != ORDER_TOOL)
-    emitUpdateProperties(currentWidget());
+    emitUpdateProperties(TQT_TQOBJECT(currentWidget()));
   else
   {
     updateOrderIndicators();
@@ -2407,10 +2407,10 @@ 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));
 }
@@ -2421,7 +2421,7 @@ static int widgetDepth(TQWidget *w)
   while (w && !w->isTopLevel())
   {
     d++;
-    w = w->parentWidget();
+    w = w->tqparentWidget();
   }
 
   return d;
@@ -2433,7 +2433,7 @@ static bool isChildOf(TQWidget *c, TQWidget *p)
   {
     if (c == p)
       return true;
-    c = c->parentWidget();
+    c = c->tqparentWidget();
   }
   return false;
 }
@@ -2444,7 +2444,7 @@ 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);
@@ -2457,26 +2457,26 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf)
       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()))) && it.current() != mainContainer())
+      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 && !w->isTopLevel()) continue; // we did not get through the full while loop
 
     int wd = widgetDepth(it.current());
-    if (wd == depth && container &&  ((TQObjectList*)it.current()->parentWidget()->
-      children())->find(it.current()) >
-      ((TQObjectList*)container->parentWidget()->children())->find(container))
+    if (wd == depth && container &&  (it.current()->tqparentWidget()->
+      childrenListObject()).tqfind(TQT_TQOBJECT(it.current())) >
+      (container->tqparentWidget()->childrenListObject()).tqfind(TQT_TQOBJECT(container)))
       wd++;
     if (wd > depth && !isChildOf(it.current(), notParentOf)) {
       depth = wd;
@@ -2489,7 +2489,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) == TQT_BASE_OBJECT(mainContainer()));
 }
 
 void FormWindow::setMainContainer(TQWidget *w)
@@ -2497,20 +2497,20 @@ 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);
   }
 }
 
@@ -2567,7 +2567,7 @@ bool FormWindow::isCentralWidget(TQObject *w) const
 {
   if (!mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))
     return false;
-  return w == ((TQMainWindow*)mainContainer())->centralWidget();
+  return TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(((TQMainWindow*)mainContainer())->centralWidget());
 }
 
 TQObject *FormWindow::connectableObject(TQObject *w, TQObject *)
@@ -2575,12 +2575,12 @@ TQObject *FormWindow::connectableObject(TQObject *w, TQObject *)
   return w;
 }
 
-int FormWindow::layoutDefaultSpacing() const
+int FormWindow::tqlayoutDefaultSpacing() const
 {
   return defSpacing;
 }
 
-int FormWindow::layoutDefaultMargin() const
+int FormWindow::tqlayoutDefaultMargin() const
 {
   return defMargin;
 }
diff --git a/kommander/editor/formwindow.h b/kommander/editor/formwindow.h
index fd0964e7..214ea668 100644
--- a/kommander/editor/formwindow.h
+++ b/kommander/editor/formwindow.h
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS.  All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS.  All rights reserved.
 
  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
@@ -49,20 +49,21 @@ class TQPixmap;
 class TQSizeGrip;
 class FormFile;
 
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if 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();
@@ -79,20 +80,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 );
 
@@ -100,7 +101,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 );
@@ -177,8 +178,8 @@ public:
 
   void killAccels( TQObject *top );
 
-  int layoutDefaultSpacing() const;
-  int layoutDefaultMargin() const;
+  int tqlayoutDefaultSpacing() const;
+  int tqlayoutDefaultMargin() const;
   void setLayoutDefaultSpacing( int s );
   void setLayoutDefaultMargin( int s );
 
diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui
index 48616099..35d53c2c 100644
--- a/kommander/editor/functions.ui
+++ b/kommander/editor/functions.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>FunctionsDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FunctionsDialogBase</cstring>
     </property>
@@ -22,15 +22,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="2">
+        <widget class="TQLayoutWidget" row="0" column="2">
             <property name="name">
-                <cstring>layout7_2</cstring>
+                <cstring>tqlayout7_2</cstring>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1_2</cstring>
                     </property>
@@ -42,7 +42,7 @@
                     <property name="name">
                         <cstring>descriptionText</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
@@ -51,15 +51,15 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -82,14 +82,14 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>150</width>
                             <height>0</height>
                         </size>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -115,11 +115,11 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox" row="0" column="1">
+        <widget class="TQGroupBox" row="0" column="1">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>250</width>
                     <height>0</height>
@@ -132,7 +132,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="6" column="0">
+                <widget class="TQLabel" row="6" column="0">
                     <property name="name">
                         <cstring>argLabel3</cstring>
                     </property>
@@ -140,7 +140,7 @@
                         <string>Arg3</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="10" column="0">
+                <widget class="TQLabel" row="10" column="0">
                     <property name="name">
                         <cstring>argLabel5</cstring>
                     </property>
@@ -158,7 +158,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -177,7 +177,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>32</height>
@@ -190,7 +190,7 @@
                         <string>Insert function</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="8" column="0">
+                <widget class="TQLabel" row="8" column="0">
                     <property name="name">
                         <cstring>argLabel4</cstring>
                     </property>
@@ -211,9 +211,9 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="3" column="0">
+                <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -232,7 +232,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>quote1</cstring>
                             </property>
@@ -255,7 +255,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>argLabel1</cstring>
                     </property>
@@ -263,9 +263,9 @@
                         <string>Arg1</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="5" column="0">
+                <widget class="TQLayoutWidget" row="5" column="0">
                     <property name="name">
-                        <cstring>layout12</cstring>
+                        <cstring>tqlayout12</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -287,7 +287,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>quote2</cstring>
                             </property>
@@ -310,9 +310,9 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget" row="7" column="0">
+                <widget class="TQLayoutWidget" row="7" column="0">
                     <property name="name">
-                        <cstring>layout13</cstring>
+                        <cstring>tqlayout13</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -331,7 +331,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>quote3</cstring>
                             </property>
@@ -354,7 +354,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>widgetLabel</cstring>
                     </property>
@@ -362,9 +362,9 @@
                         <string>Widget:</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="9" column="0">
+                <widget class="TQLayoutWidget" row="9" column="0">
                     <property name="name">
-                        <cstring>layout14</cstring>
+                        <cstring>tqlayout14</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -383,7 +383,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>quote4</cstring>
                             </property>
@@ -406,9 +406,9 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget" row="11" column="0">
+                <widget class="TQLayoutWidget" row="11" column="0">
                     <property name="name">
-                        <cstring>layout15</cstring>
+                        <cstring>tqlayout15</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -427,7 +427,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>quote5</cstring>
                             </property>
@@ -450,9 +450,9 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget" row="13" column="0">
+                <widget class="TQLayoutWidget" row="13" column="0">
                     <property name="name">
-                        <cstring>layout16</cstring>
+                        <cstring>tqlayout16</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -471,7 +471,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>quote6</cstring>
                             </property>
@@ -494,7 +494,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLabel" row="12" column="0">
+                <widget class="TQLabel" row="12" column="0">
                     <property name="name">
                         <cstring>argLabel6</cstring>
                     </property>
@@ -502,7 +502,7 @@
                         <string>Arg6</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>argLabel2</cstring>
                     </property>
@@ -512,9 +512,9 @@
                 </widget>
             </grid>
         </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>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -530,7 +530,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>100</width>
                             <height>20</height>
@@ -578,7 +578,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>100</width>
                             <height>20</height>
@@ -587,17 +587,17 @@
                 </spacer>
             </hbox>
         </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>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>
                     <hbox>
                         <property name="name">
@@ -607,7 +607,7 @@
                             <property name="name">
                                 <cstring>clearButton</cstring>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>20</height>
@@ -623,7 +623,7 @@
                                 <string>Clear edited text</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel4</cstring>
                             </property>
@@ -695,7 +695,7 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextbrowser.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp
index a758ab30..991377f8 100644
--- a/kommander/editor/functionsimpl.cpp
+++ b/kommander/editor/functionsimpl.cpp
@@ -130,13 +130,13 @@ TQString FunctionsDialog::currentFunctionText()
     function = s + ".";
   }
   if (groupComboBox->currentText() == "Kommander")
-    return TQString("%1%2%3").arg(prefix).arg(functionListBox->currentText()).arg(params());
+    return TQString("%1%2%3").tqarg(prefix).tqarg(functionListBox->currentText()).tqarg(params());
   else if (groupComboBox->currentItem() == m_DCOP || groupComboBox->currentItem() == m_Slots)
-    return TQString("%1%2.%3%4").arg(prefix).arg(widgetComboBox->currentText().section(' ', 0, 0))
-        .arg(functionListBox->currentText().left(functionListBox->currentText().find('('))).arg(params());
+    return TQString("%1%2.%3%4").tqarg(prefix).tqarg(widgetComboBox->currentText().section(' ', 0, 0))
+        .tqarg(functionListBox->currentText().left(functionListBox->currentText().tqfind('('))).tqarg(params());
   else 
-    return TQString("%1%2%3%4").arg(prefix).arg(function)
-        .arg(functionListBox->currentText()).arg(params());
+    return TQString("%1%2%3%4").tqarg(prefix).tqarg(function)
+        .tqarg(functionListBox->currentText()).tqarg(params());
 }
 
 void FunctionsDialog::groupChanged(int index)
@@ -147,15 +147,15 @@ void FunctionsDialog::groupChanged(int index)
   if (index == m_Slots)
   {
     KommanderWidget* a_atw = dynamic_cast<KommanderWidget *>(m_widgetList[widgetComboBox->currentText()]);
-    TQStringList pFunctions = TQStringList::fromStrList(a_atw->object()->metaObject()->slotNames(true));
+    TQStringList pFunctions = TQStringList::fromStrList(a_atw->object()->tqmetaObject()->slotNames(true));
     for (uint i=0; i<pFunctions.count(); i++)
     {
       TQString slot = pFunctions[i];
       TQString slotArgStr = slot.section(TQRegExp("\\(|\\)"), 1);
-      if (slotArgStr.isEmpty() || m_acceptedSlots.contains(slotArgStr))
+      if (slotArgStr.isEmpty() || m_acceptedSlots.tqcontains(slotArgStr))
       {
         TQString name = slot.remove("()");
-        if (!m_slotList.contains(name))
+        if (!m_slotList.tqcontains(name))
         {
           m_slotList[name] = slot;
           functionListBox->insertItem(name);
@@ -195,13 +195,13 @@ void FunctionsDialog::functionChanged(int)
   { 
     KommanderWidget* w = dynamic_cast<KommanderWidget *>(m_widgetList[widgetComboBox->currentText()]);
     TQObject *o = w->object();
-    TQString slotHelp = i18n("To learn more about the slot, look at the documentation of the base Qt/KDE class, most probably <i>%1</i>.").arg(o->metaObject()->superClassName() ? TQString(o->metaObject()->superClassName()) : TQString(o->className()) );
+    TQString slotHelp = i18n("To learn more about the slot, look at the documentation of the base TQt/KDE class, most probably <i>%1</i>.").tqarg(o->tqmetaObject()->tqsuperClassName() ? TQString(o->tqmetaObject()->tqsuperClassName()) : TQString(o->className()) );
     TQString slotName = functionListBox->currentText();
     TQString slot = m_slotList[slotName];
     descriptionText->clear();
     descriptionText->setText(i18n("<qt><h3>%1</h3>"
       "<p><b>Description:</b> %2\n<p><b>Syntax:</b> <i>%3</i>%4</qt>")
-      .arg(slotName).arg(slotHelp).arg(slot).arg(""));
+      .tqarg(slotName).tqarg(slotHelp).tqarg(slot).tqarg(""));
   } else
   {
     int index = groupComboBox->currentItem();
@@ -224,8 +224,8 @@ void FunctionsDialog::functionChanged(int)
     descriptionText->clear();
     descriptionText->setText(i18n("<qt><h3>%1</h3>"
       "<p><b>Description:</b> %2\n<p><b>Syntax:</b> <i>%3</i>%4</qt>")
-      .arg(functionListBox->currentText()).arg(m_function.description())
-      .arg(m_function.prototype(pflags)).arg(defArgs));
+      .tqarg(functionListBox->currentText()).tqarg(m_function.description())
+      .tqarg(m_function.prototype(pflags)).tqarg(defArgs));
   
   }
   showParameters();
@@ -238,7 +238,7 @@ void FunctionsDialog::copyText()
   insertedText->getCursorPosition(&para, &i);  
 //   int cursorPos = insertedText->cursorPosition();
   insertedText->insert(text);
-  insertedText->setCursorPosition(para, i + text.find('(') + 1);
+  insertedText->setCursorPosition(para, i + text.tqfind('(') + 1);
 }
 
 void FunctionsDialog::showParameters()
@@ -262,7 +262,7 @@ void FunctionsDialog::showParameters()
       if (i < argsCount)
       {
         type = slotArgs[i].remove(TQRegExp("\\*|\\&|const\\s"));
-        labels[i]->setText(TQString("%1:").arg(type));
+        labels[i]->setText(TQString("%1:").tqarg(type));
       }
       quotes[i]->setChecked(true);
       quotes[i]->setShown(false);
@@ -279,7 +279,7 @@ void FunctionsDialog::showParameters()
         combos[i]->setShown(false);
         edits[i]->setShown(i < argsCount);
         edits[i]->clear();
-        if (type == "TQString")
+        if (type == TQSTRING_OBJECT_NAME_STRING)
         {
           quotes[i]->setShown(i < argsCount);
         } 
@@ -303,7 +303,7 @@ void FunctionsDialog::showParameters()
     {
       labels[i]->setShown(i < argsCount);
       if (i < argsCount)
-        labels[i]->setText(TQString("%1:").arg(m_function.argumentName(i)));
+        labels[i]->setText(TQString("%1:").tqarg(m_function.argumentName(i)));
       quotes[i]->setChecked(true);
       quotes[i]->setShown(false);
       if (m_function.argumentType(i) == "bool")
@@ -336,7 +336,7 @@ void FunctionsDialog::showParameters()
           combos[i]->setShown(false);
           edits[i]->setShown(i < argsCount);
           edits[i]->clear();
-          if (m_function.argumentType(i) == "TQString")
+          if (m_function.argumentType(i) == TQSTRING_OBJECT_NAME_STRING)
           {
             quotes[i]->setShown(i < argsCount);
           } 
@@ -362,8 +362,8 @@ TQString FunctionsDialog::params()
       TQString s = edits[i]->text();
       if (!s.isEmpty() || i < m_function.minArg())
       {
-        if (quotes[i]->isChecked() && ( (!slotsShown && m_function.argumentType(i) == "TQString") 
-            || (slotsShown && labels[i]->text().startsWith("TQString")) ) )
+        if (quotes[i]->isChecked() && ( (!slotsShown && m_function.argumentType(i) == TQSTRING_OBJECT_NAME_STRING) 
+            || (slotsShown && labels[i]->text().startsWith(TQSTRING_OBJECT_NAME_STRING)) ) )
           s = '"' + s + '"';
          pars.append(s);
       }
@@ -383,7 +383,7 @@ TQString FunctionsDialog::params()
   }
   TQString a_param = pars.join(", ");
   if (params)
-    return TQString("(%1)").arg(a_param);
+    return TQString("(%1)").tqarg(a_param);
   else
     return a_param;
 }
diff --git a/kommander/editor/functionsimpl.h b/kommander/editor/functionsimpl.h
index 05df768f..a583f199 100644
--- a/kommander/editor/functionsimpl.h
+++ b/kommander/editor/functionsimpl.h
@@ -26,6 +26,7 @@
 class FunctionsDialog : public FunctionsDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   FunctionsDialog(TQWidget*, const TQDict<TQWidget>&, bool m_useInternalParser, char* = 0, bool = true);
   ~FunctionsDialog();
diff --git a/kommander/editor/globaldefs.h b/kommander/editor/globaldefs.h
index aebf63c3..45698cde 100644
--- a/kommander/editor/globaldefs.h
+++ b/kommander/editor/globaldefs.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp
index 57dc817c..5907b348 100644
--- a/kommander/editor/hierarchyview.cpp
+++ b/kommander/editor/hierarchyview.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -74,15 +74,15 @@ static const char * const folder_xpm[]={
 
 TQListViewItem *newItem = 0;
 
-HierarchyItem::HierarchyItem( Type type, TQListViewItem *parent,
+HierarchyItem::HierarchyItem( Type type, TQListViewItem *tqparent,
             const TQString &txt1, const TQString &txt2, const TQString &txt3 )
-    : TQListViewItem( parent, txt1, txt2, txt3 ), typ( type )
+    : TQListViewItem( tqparent, txt1, txt2, txt3 ), typ( type )
 {
 }
 
-HierarchyItem::HierarchyItem( Type type, TQListView *parent,
+HierarchyItem::HierarchyItem( Type type, TQListView *tqparent,
             const TQString &txt1, const TQString &txt2, const TQString &txt3 )
-    : TQListViewItem( parent, txt1, txt2, txt3 ), typ( type )
+    : TQListViewItem( tqparent, txt1, txt2, txt3 ), typ( type )
 {
 }
 
@@ -90,8 +90,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() == Slot &&
    ( txt == "init()" || txt == "destroy()" ) ) {
@@ -177,8 +177,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 )
 {
     init_colors();
 
@@ -250,21 +250,21 @@ void HierarchyList::objectClicked( TQListViewItem *i )
     if ( formWindow == w ) {
   if ( deselect )
       formWindow->clearSelection( false );
-  formWindow->emitShowProperties( formWindow );
+  formWindow->emitShowProperties( TQT_TQOBJECT(formWindow) );
   return;
     }
 
-    if ( !formWindow->widgets()->find( w ) ) {
-  if ( w->parent() && w->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) &&
-       w->parent()->parent() &&
-       ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ||
-         w->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) {
-      if ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
-    ( (TQTabWidget*)w->parent()->parent() )->showPage( w );
+    if ( !formWindow->widgets()->tqfind( w ) ) {
+  if ( w->tqparent() && w->tqparent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) &&
+       w->tqparent()->tqparent() &&
+       ( w->tqparent()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ||
+         w->tqparent()->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) {
+      if ( w->tqparent()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
+    ( (TQTabWidget*)w->tqparent()->tqparent() )->showPage( w );
       else
-        ( (QDesignerWizard*)w->parent()->parent() )->setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) );
-      w = (TQWidget*)w->parent()->parent();
-      formWindow->emitUpdateProperties( formWindow->currentWidget() );
+        ( (TQDesignerWizard*)w->tqparent()->tqparent() )->setCurrentPage( ( (TQDesignerWizard*)w->tqparent()->tqparent() )->pageNum( w ) );
+      w = (TQWidget*)w->tqparent()->tqparent();
+      formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) );
   } else {
       return;
   }
@@ -273,7 +273,7 @@ void HierarchyList::objectClicked( TQListViewItem *i )
     if ( deselect )
   formWindow->clearSelection( false );
     if ( w->isVisibleTo( formWindow ) )
-  formWindow->selectWidget( w, true );
+  formWindow->selectWidget( TQT_TQOBJECT(w), true );
 }
 
 TQWidget *HierarchyList::findWidget( TQListViewItem *i )
@@ -310,7 +310,7 @@ void HierarchyList::changeNameOf( TQWidget *w, const TQString &name )
 
 void HierarchyList::changeDatabaseOf( TQWidget *w, const TQString & info )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( !formWindow->isDatabaseAware() )
   return;
     TQListViewItem *item = findItem( w );
@@ -329,7 +329,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" ) );
@@ -345,7 +345,7 @@ void HierarchyList::setup()
     }
 #endif
     if ( w )
-  insertObject( w, 0 );
+  insertObject( TQT_TQOBJECT(w), 0 );
 }
 
 void HierarchyList::setOpen( TQListViewItem *i, bool b )
@@ -353,11 +353,11 @@ 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 )
 {
     bool fakeMainWindow = false;
     if ( o && o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
-  TQObject *cw = ( (TQMainWindow*)o )->centralWidget();
+  TQObject *cw = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
   if ( cw ) {
       o = cw;
       fakeMainWindow = true;
@@ -366,7 +366,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
     TQListViewItem *item = 0;
     TQString className = WidgetFactory::classNameOf( o );
     if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) {
-  switch ( WidgetFactory::layoutType( (TQWidget*)o ) ) {
+  switch ( WidgetFactory::tqlayoutType( (TQWidget*)o ) ) {
   case WidgetFactory::HBox:
       className = "HBox";
       break;
@@ -382,79 +382,79 @@ 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 ( o->parent() && o->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) &&
-   o->parent()->parent() ) {
-  if ( o->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
-      name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o );
-  else if ( o->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
-      name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o );
+    if ( o->tqparent() && o->tqparent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) &&
+   o->tqparent()->tqparent() ) {
+  if ( o->tqparent()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
+      name = ( (TQTabWidget*)o->tqparent()->tqparent() )->tabLabel( (TQWidget*)o );
+  else if ( o->tqparent()->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
+      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, name, className, dbInfo );
     else
-  item = new HierarchyItem( HierarchyItem::Widget, parent, name, className, dbInfo );
-    if ( !parent )
+  item = new HierarchyItem( HierarchyItem::Widget, tqparent, name, className, dbInfo );
+    if ( !tqparent )
   item->setPixmap( 0, PixmapChooser::loadPixmap( "form.xpm", PixmapChooser::Mini ) );
-    else if ( o->inherits( "QLayoutWidget") )
-  item->setPixmap( 0, PixmapChooser::loadPixmap( "layout.xpm", PixmapChooser::Small ) );
+    else if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING) )
+  item->setPixmap( 0, PixmapChooser::loadPixmap( "tqlayout.xpm", PixmapChooser::Small ) );
     else
   item->setPixmap( 0, WidgetDatabase::iconSet( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( o ) ) ).
        pixmap( TQIconSet::Small, TQIconSet::Normal ) );
     ( (HierarchyItem*)item )->setWidget( (TQWidget*)o );
 
-    const TQObjectList *l = o->children();
-    if ( !l )
+    const TQObjectList l = o->childrenListObject();
+    if ( l.isEmpty() )
   return;
-    TQObjectListIt it( *l );
+    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 ( it.current()->parent() &&
-     ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ||
-       it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) &&
+  if (  !formWindow->widgets()->tqfind( (TQWidget*)it.current() ) ) {
+      if ( it.current()->tqparent() &&
+     ( it.current()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ||
+       it.current()->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) &&
      it.current()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) {
     TQObject *obj = it.current();
     TQObjectList *l2 = obj->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, true, false );
-    QDesignerTabWidget *tw = 0;
-    QDesignerWizard *dw = 0;
-    if ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
-        tw = (QDesignerTabWidget*)it.current()->parent();
-    if ( it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
-      dw = (QDesignerWizard*)it.current()->parent();
+    TQDesignerTabWidget *tw = 0;
+    TQDesignerWizard *dw = 0;
+    if ( it.current()->tqparent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
+        tw = (TQDesignerTabWidget*)it.current()->tqparent();
+    if ( it.current()->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
+      dw = (TQDesignerWizard*)it.current()->tqparent();
     TQWidgetStack *stack = (TQWidgetStack*)obj;
     for ( obj = l2->last(); obj; obj = l2->prev() ) {
-        if ( qstrcmp( obj->className(), "QWidgetStackPrivate::Invisible" ) == 0 ||
+        if ( qstrcmp( obj->className(), "TQWidgetStackPrivate::Invisible" ) == 0 ||
        ( tw && !tw->tabBar()->tab( stack->id( (TQWidget*)obj ) ) ) ||
        ( dw && dw->isPageRemoved( (TQWidget*)obj ) ) )
       continue;
         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;
   }
@@ -491,7 +491,7 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p )
   return;
 
     if ( w != formWindow &&
-   !formWindow->widgets()->find( w ) )
+   !formWindow->widgets()->tqfind( w ) )
   return;
 
     if ( w->isVisibleTo( formWindow ) ) {
@@ -516,13 +516,13 @@ void HierarchyList::addTabPage()
   return;
     if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
   TQTabWidget *tw = (TQTabWidget*)w;
-  AddTabPageCommand *cmd = new AddTabPageCommand( i18n("Add Page to %1" ).arg( tw->name() ), formWindow,
+  AddTabPageCommand *cmd = new AddTabPageCommand( i18n("Add Page to %1" ).tqarg( tw->name() ), formWindow,
               tw, "Tab" );
   formWindow->commandHistory()->addCommand( cmd );
   cmd->execute();
     } else if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
   TQWizard *wiz = (TQWizard*)formWindow->mainContainer();
-  AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).arg( wiz->name() ), formWindow,
+  AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).tqarg( wiz->name() ), formWindow,
                     wiz, "Page" );
   formWindow->commandHistory()->addCommand( cmd );
   cmd->execute();
@@ -537,9 +537,9 @@ void HierarchyList::removeTabPage()
     if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
   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();
@@ -547,9 +547,9 @@ void HierarchyList::removeTabPage()
     } else if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
   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 );
@@ -587,19 +587,19 @@ static HierarchyItem::Type getChildType( int type )
 void HierarchyList::insertEntry( TQListViewItem *i, const TQPixmap &pix, const TQString &s )
 {
     HierarchyItem *item = new HierarchyItem( getChildType( i->rtti() ), i, 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 );
 }
 
-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;
@@ -685,7 +685,7 @@ void HierarchyView::namePropertyChanged( TQWidget *w, const TQVariant & )
 
 void HierarchyView::databasePropertyChanged( TQWidget *w, const TQStringList& info )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQString i = info.join( "." );
     listview->changeDatabaseOf( w, i );
 #else
diff --git a/kommander/editor/hierarchyview.h b/kommander/editor/hierarchyview.h
index 8e833962..f3f1fc91 100644
--- a/kommander/editor/hierarchyview.h
+++ b/kommander/editor/hierarchyview.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -25,7 +25,7 @@
 #include <tqlistview.h>
 #include <tqtabwidget.h>
 #include <tqguardedptr.h>
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 
 class FormWindow;
 class TQCloseEvent;
@@ -35,7 +35,7 @@ class TQMouseEvent;
 class TQWizard;
 class TQToolBox;
 
-class HierarchyItem:public QListViewItem
+class HierarchyItem:public TQListViewItem
 {
 public:
   enum Type
@@ -52,9 +52,9 @@ public:
     EventFunction
   };
 
-    HierarchyItem(Type type, TQListViewItem * parent,
+    HierarchyItem(Type type, TQListViewItem * tqparent,
       const TQString & txt1, const TQString & txt2, const TQString & txt3);
-    HierarchyItem(Type type, TQListView * parent,
+    HierarchyItem(Type type, TQListView * tqparent,
       const TQString & txt1, const TQString & txt2, const TQString & txt3);
 
   void paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align);
@@ -77,11 +77,12 @@ private:
   Type typ;
 };
 
-class HierarchyList:public QListView
+class HierarchyList:public TQListView
 {
-  Q_OBJECT 
+  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(TQWidget * w);
@@ -93,7 +94,7 @@ public:
         { setUpdatesEnabled(FALSE);  triggerUpdate();  setUpdatesEnabled(TRUE);
          TQListView::drawContentsOffset(p, ox, oy, cx, cy, cw, ch); }
   void insertEntry(TQListViewItem * i, const TQPixmap & pix = TQPixmap(), const TQString & s =
-      TQString::null);
+      TQString());
 
 protected:
   void keyPressEvent(TQKeyEvent * e);
@@ -106,7 +107,7 @@ public slots:
   void removeTabPage();
 
 private:
-  void insertObject(TQObject * o, TQListViewItem * parent);
+  void insertObject(TQObject * o, TQListViewItem * tqparent);
   TQWidget *findWidget(TQListViewItem * i);
   TQListViewItem *findItem(TQWidget * w);
   TQWidget *current() const;
@@ -120,12 +121,13 @@ protected:
   bool deselect;
 };
 
-class HierarchyView : public QTabWidget
+class HierarchyView : public TQTabWidget
 {
     Q_OBJECT
+    TQ_OBJECT
 
 public:
-    HierarchyView( TQWidget *parent );
+    HierarchyView( TQWidget *tqparent );
     ~HierarchyView();
 
     void setFormWindow( FormWindow *fw, TQWidget *w );
diff --git a/kommander/editor/iconvieweditor.ui b/kommander/editor/iconvieweditor.ui
index afa18459..26d1aa8b 100644
--- a/kommander/editor/iconvieweditor.ui
+++ b/kommander/editor/iconvieweditor.ui
@@ -19,7 +19,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>IconViewEditorBase</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QIconView">
+                <widget class="TQIconView">
                     <property name="name">
                         <cstring>preview</cstring>
                     </property>
@@ -72,7 +72,7 @@
                         <string>All items in the iconview.</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
@@ -86,7 +86,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>itemNew</cstring>
                             </property>
@@ -100,7 +100,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>
@@ -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>
                     </vbox>
                 </widget>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>GroupBox1</cstring>
                     </property>
@@ -156,7 +156,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>
@@ -167,11 +167,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>
@@ -184,7 +184,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>
@@ -195,7 +195,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>
@@ -209,7 +209,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>itemPixmap</cstring>
                                     </property>
@@ -217,11 +217,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>
@@ -240,11 +240,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>
@@ -266,7 +266,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -280,7 +280,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -301,14 +301,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>
@@ -325,7 +325,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>
@@ -339,7 +339,7 @@
 				<string>Apply all changes.</string>
 			</property>
 		</widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -407,15 +407,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>
@@ -428,7 +428,7 @@
     <slot access="protected" language="C++" returnType="void">applyClicked()</slot>
     <slot access="protected" language="C++" returnType="void">cancelClicked()</slot>
     <slot access="protected" language="C++" returnType="void">choosePixmap()</slot>
-    <slot access="protected" language="C++" returnType="void">currentItemChanged( QIconViewItem * )</slot>
+    <slot access="protected" language="C++" returnType="void">currentItemChanged( TQIconViewItem * )</slot>
     <slot access="protected" language="C++" returnType="void">currentTextChanged( const QString &amp; )</slot>
     <slot access="protected" language="C++" returnType="void">deleteCurrentItem()</slot>
     <slot access="protected" language="C++" returnType="void">insertNewItem()</slot>
diff --git a/kommander/editor/iconvieweditorimpl.cpp b/kommander/editor/iconvieweditorimpl.cpp
index 9bff67ae..549e5c96 100644
--- a/kommander/editor/iconvieweditorimpl.cpp
+++ b/kommander/editor/iconvieweditorimpl.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -31,8 +31,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;
@@ -121,7 +121,7 @@ void IconViewEditor::applyClicked()
 	items.append( item );
     }
 
-    PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n("Edit Items of '%1'" ).arg( iconview->name() ),
+    PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n("Edit Items of '%1'" ).tqarg( iconview->name() ),
 								formwindow, iconview, items );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/iconvieweditorimpl.h b/kommander/editor/iconvieweditorimpl.h
index ffde0403..4e3972ff 100644
--- a/kommander/editor/iconvieweditorimpl.h
+++ b/kommander/editor/iconvieweditorimpl.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -28,9 +28,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/kommander/editor/kommander-new.xml b/kommander/editor/kommander-new.xml
index deb3d88a..8cfe86e2 100644
--- a/kommander/editor/kommander-new.xml
+++ b/kommander/editor/kommander-new.xml
@@ -25,7 +25,7 @@
       <item>cellText</item>
       <item>clear</item>
       <item>checked</item>
-      <item>children</item>
+      <item>tqchildren</item>
       <item>columnCount</item>
       <item>count</item>
       <item>currentColumn</item>
@@ -33,7 +33,7 @@
       <item>currentRow</item>
       <item>execute</item> 
       <item>findItem</item>
-      <item>geometry</item>
+      <item>tqgeometry</item>
       <item>global</item>
       <item>hasFocus</item>
       <item>insertColumn</item>
@@ -76,7 +76,7 @@
       <item>null</item>
       <item>pid</item>
       <item>dcopid</item>
-      <item>parentPid</item>
+      <item>tqparentPid</item>
       <item>debug</item>
       <item>echo</item>
       <item>env</item>
@@ -140,14 +140,14 @@
     
     <list name="kmdrstring">
       <item>str_length</item>
-      <item>str_contains</item>
-      <item>str_find</item>
-      <item>str_findRev</item>
+      <item>str_tqcontains</item>
+      <item>str_tqfind</item>
+      <item>str_tqfindRev</item>
       <item>str_left</item>
       <item>str_right</item>
       <item>str_mid</item>
       <item>str_remove</item>
-      <item>str_replace</item>
+      <item>str_tqreplace</item>
       <item>str_upper</item>
       <item>str_lower</item>
       <item>str_compare</item>
@@ -260,7 +260,7 @@
                   
       <!-- FindCommands matches many items that can be expected outside strings, substitutions etc. -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindCommands">
-      	<!-- start expression in double parentheses -->
+      	<!-- start expression in double tqparentheses -->
       	<Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression" />
         <!-- start expression in double brackets -->
         <RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[&eos;" beginRegion="expression" column="0"/>
@@ -524,7 +524,7 @@
       </context>
 
       <!-- Case is called after the case keyword is encoutered. We handle this because of
-           the lonely closing parentheses that would otherwise disturb the expr matching -->
+           the lonely closing tqparentheses that would otherwise disturb the expr matching -->
       <context attribute="Normal Text" lineEndContext="#stay" name="Case">
         <RegExpr attribute="Keyword" context="CaseIn" String="\sin\b" />
         <IncludeRules context="FindAll" />
diff --git a/kommander/editor/kommander.xml b/kommander/editor/kommander.xml
index f5880b2f..cfa64c8a 100644
--- a/kommander/editor/kommander.xml
+++ b/kommander/editor/kommander.xml
@@ -25,14 +25,14 @@
       <item>cellText</item>
       <item>clear</item>
       <item>checked</item>
-      <item>children</item>
+      <item>tqchildren</item>
       <item>count</item>
       <item>currentColumn</item>
       <item>currentItem</item>
       <item>currentRow</item>
       <item>execute</item> 
       <item>findItem</item>
-      <item>geometry</item>
+      <item>tqgeometry</item>
       <item>global</item>
       <item>hasFocus</item>
       <item>insertColumn</item>
@@ -69,7 +69,7 @@
       <item>null</item>
       <item>pid</item>
       <item>dcopid</item>
-      <item>parentPid</item>
+      <item>tqparentPid</item>
       <item>debug</item>
       <item>echo</item>
       <item>env</item>
@@ -104,14 +104,14 @@
     
     <list name="kmdrstring">
       <item>length</item>
-      <item>contains</item>
-      <item>find</item>
-      <item>findRev</item>
+      <item>tqcontains</item>
+      <item>tqfind</item>
+      <item>tqfindRev</item>
       <item>left</item>
       <item>right</item>
       <item>mid</item>
       <item>remove</item>
-      <item>replace</item>
+      <item>tqreplace</item>
       <item>upper</item>
       <item>lower</item>
       <item>compare</item>
@@ -341,8 +341,8 @@
       <item> true </item>
       <item> umount </item>
       <item> uname </item>
-      <item> unicode_start </item>
-      <item> unicode_stop </item>
+      <item> tqunicode_start </item>
+      <item> tqunicode_stop </item>
       <item> unlink </item>
       <item> utmpdump </item>
       <item> uuidgen </item>
@@ -418,7 +418,7 @@
       <item> expr </item>
       <item> fbset </item>
       <item> file </item>
-      <item> find </item>
+      <item> tqfind </item>
       <item> flex </item>
       <item> flex++ </item>
       <item> fmt </item>
@@ -598,7 +598,7 @@
 	<IncludeRules context="##Alerts" />
       </context>
       
-      <!-- FindCommentsParen consumes shell comments till EOL or a closing parenthese -->
+      <!-- FindCommentsParen consumes shell comments till EOL or a closing tqparenthese -->
       <context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsParen">
       	<DetectChar attribute="Comment" context="CommentParen" char="#" firstNonSpace="true"/>
 	<RegExpr attribute="Normal Text" context="CommentParen" String="[\s;](?=#)" />
@@ -621,7 +621,7 @@
       
       <!-- FindCommands matches many items that can be expected outside strings, substitutions etc. -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindCommands">
-      	<!-- start expression in double parentheses -->
+      	<!-- start expression in double tqparentheses -->
       	<Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression" />
 	<!-- start expression in double brackets -->
 	<RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[&eos;" beginRegion="expression" column="0"/>
@@ -900,7 +900,7 @@
       </context>
 
       <!-- Case is called after the case keyword is encoutered. We handle this because of
-           the lonely closing parentheses that would otherwise disturb the expr matching -->
+           the lonely closing tqparentheses that would otherwise disturb the expr matching -->
       <context attribute="Normal Text" lineEndContext="#stay" name="Case">
         <RegExpr attribute="Keyword" context="CaseIn" String="\sin\b" />
         <IncludeRules context="FindMost" />
diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp
index 7860aeae..998b4fce 100644
--- a/kommander/editor/layout.cpp
+++ b/kommander/editor/layout.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -19,11 +19,11 @@
 **********************************************************************/
 
 #include "formwindow.h"
-#include "layout.h"
+#include "tqlayout.h"
 #include "widgetdatabase.h"
 #include "widgetfactory.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqevent.h>
 #include <tqpainter.h>
 #include <tqpen.h>
@@ -36,34 +36,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.
 */
@@ -77,20 +77,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 ) {
@@ -112,12 +112,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 );
@@ -125,23 +125,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();
     }
 }
@@ -152,46 +152,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 || layoutBase->inherits( "QLayoutWidget" ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING );
-    if ( !layoutBase ) {
+    needMove = !tqlayoutBase;
+    needRetqparent = needMove || tqlayoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING );
+    if ( !tqlayoutBase ) {
 	if ( !useSplitter )
-	    layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( "QLayoutWidget" ),
-						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 );
     }
 }
 
@@ -203,23 +203,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 && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
-	layoutBase->hide();
-	TQString n = layoutBase->name();
+    formWindow->selectWidget( TQT_TQOBJECT(tqlayoutBase), false );
+    WidgetFactory::deleteLayout( tqlayoutBase );
+    if ( tqparent != tqlayoutBase && !tqlayoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
+	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()
@@ -228,43 +228,43 @@ void Layout::breakLayout()
     if ( !widgets.isEmpty() ) {
 	TQWidget *w;
 	for ( w = widgets.first(); w; w = widgets.next() )
-	    rects.insert( w, w->geometry() );
+	    rects.insert( w, w->tqgeometry() );
     }
-    WidgetFactory::deleteLayout( layoutBase );
-    bool needReparent = qstrcmp( layoutBase->className(), "QLayoutWidget" ) == 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;
+    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 )
@@ -299,36 +299,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 ( w->inherits( "QLayoutWidget" ) )
-		( (QLayoutWidget*)w )->updateSizePolicy();
+		tqlayout->addWidget( w );
+	    if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
+		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
 	w->show();
     }
 
-    if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
-	( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
+    if ( tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
+	( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Horizontal );
 
-    finishLayout( needMove, layout );
+    finishLayout( needMove, tqlayout );
 }
 
 
 
 
-class VerticalLayoutList : public QWidgetList
+class VerticalLayoutList : public TQWidgetList
 {
 public:
     VerticalLayoutList( const TQWidgetList &l )
@@ -363,30 +363,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 ( w->inherits( "QLayoutWidget" ) )
-		( (QLayoutWidget*)w )->updateSizePolicy();
+		tqlayout->addWidget( w );
+	    if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
+		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
 	w->show();
     }
 
-    if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
-	( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
+    if ( tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
+	( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Vertical );
 
-    finishLayout( needMove, layout );
+    finishLayout( needMove, tqlayout );
 }
 
 
@@ -729,11 +729,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();
@@ -742,21 +742,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, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 );
+		tqlayout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->tqalignment() : 0 );
 	    } else {
-		layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 );
+		tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->tqalignment() : 0 );
 	    }
-	    if ( w->inherits( "QLayoutWidget" ) )
-		( (QLayoutWidget*)w )->updateSizePolicy();
+	    if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
+		( (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()
@@ -770,7 +770,7 @@ void GridLayout::buildGrid()
     TQWidget* w;
     TQRect br;
     for ( w = widgets.first(); w; w = widgets.next() )
-	br = br.unite( w->geometry() );
+	br = br.unite( w->tqgeometry() );
 
     delete grid;
     grid = new Grid( br.height() / resolution.height() + 1,
@@ -784,7 +784,7 @@ void GridLayout::buildGrid()
 	    TQRect cr( p, resolution );
 	    for ( w = widgets.first(); w; w = widgets.next() ) {
 		    // check that the overlap is significant
-		    TQRect intersect = cr.intersect( w->geometry() );
+		    TQRect intersect = cr.intersect( w->tqgeometry() );
 		    if ( intersect.size().width() > resolution.width()/2 &&
 			 intersect.size().height() > resolution.height()/2 ) {
 			grid->setCell( r, c, w );
@@ -801,9 +801,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 );
@@ -812,11 +812,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 );
@@ -829,7 +829,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 );
@@ -846,20 +846,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 ) );
@@ -870,38 +870,38 @@ 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
 {
     return TQSize( 20, 20 );
 }
 
-TQSize Spacer::sizeHint() const
+TQSize Spacer::tqsizeHint() const
 {
     TQSize s = sh.expandedTo( TQSize(0,0) );
     if ( sizeType() == Expanding )
-	if ( orient == Horizontal )
+	if ( orient ==Qt::Horizontal )
 	    s.rheight() = 0;
 	else
 	    s.rwidth() = 0;
@@ -912,8 +912,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();
 }
 
@@ -932,7 +932,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();
@@ -941,13 +941,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/kommander/editor/layout.h b/kommander/editor/layout.h
index c8b85a3a..107a4083 100644
--- a/kommander/editor/layout.h
+++ b/kommander/editor/layout.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -31,9 +31,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 );
@@ -42,15 +43,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;
@@ -108,16 +109,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,
@@ -131,15 +133,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 );
 
@@ -152,12 +154,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,
diff --git a/kommander/editor/listboxeditor.ui b/kommander/editor/listboxeditor.ui
index 2b462987..fc03fa8f 100644
--- a/kommander/editor/listboxeditor.ui
+++ b/kommander/editor/listboxeditor.ui
@@ -19,7 +19,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ListBoxEditorBase</cstring>
     </property>
@@ -50,7 +50,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>
@@ -64,7 +64,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -85,14 +85,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>
@@ -109,7 +109,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>
@@ -123,7 +123,7 @@
 				<string>Apply all changes.</string>
 			</property>
 		</widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -139,7 +139,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>
@@ -150,7 +150,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>
@@ -167,7 +167,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>
@@ -178,7 +178,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>
@@ -186,11 +186,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>
@@ -209,11 +209,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>
@@ -229,7 +229,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>
@@ -240,11 +240,11 @@
                         <cstring>itemText</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>itemText</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -259,7 +259,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>
@@ -273,7 +273,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>
@@ -297,14 +297,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>
@@ -321,7 +321,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>
@@ -414,21 +414,21 @@
     </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>
     <slot access="protected" language="C++" returnType="void">init()</slot>
     <slot access="protected" language="C++" returnType="void">destroy()</slot>
     <slot access="protected" language="C++" returnType="void">insertNewItem()</slot>
     <slot access="protected" language="C++" returnType="void">deleteCurrentItem()</slot>
-    <slot access="protected" language="C++" returnType="void">currentItemChanged( QListBoxItem * )</slot>
+    <slot access="protected" language="C++" returnType="void">currentItemChanged( TQListBoxItem * )</slot>
     <slot access="protected" language="C++" returnType="void">currentTextChanged( const QString &amp; )</slot>
     <slot access="protected" language="C++" returnType="void">okClicked()</slot>
     <slot access="protected" language="C++" returnType="void">cancelClicked()</slot>
diff --git a/kommander/editor/listboxeditorimpl.cpp b/kommander/editor/listboxeditorimpl.cpp
index 1f820081..80382c95 100644
--- a/kommander/editor/listboxeditorimpl.cpp
+++ b/kommander/editor/listboxeditorimpl.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -32,8 +32,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;
@@ -131,7 +131,7 @@ void ListBoxEditor::applyClicked()
 	items.append( item );
     }
 
-    PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n("Edit Items of '%1'" ).arg( listbox->name() ),
+    PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n("Edit Items of '%1'" ).tqarg( listbox->name() ),
 							      formwindow, listbox, items );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/listboxeditorimpl.h b/kommander/editor/listboxeditorimpl.h
index 41bcc8a7..07e18f1f 100644
--- a/kommander/editor/listboxeditorimpl.h
+++ b/kommander/editor/listboxeditorimpl.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -29,9 +29,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/kommander/editor/listeditor.ui b/kommander/editor/listeditor.ui
index 6cafeed0..66efc1ae 100644
--- a/kommander/editor/listeditor.ui
+++ b/kommander/editor/listeditor.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>ListEditor</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ListEditor</cstring>
     </property>
@@ -25,7 +25,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>
@@ -47,7 +47,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>
@@ -55,7 +55,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>
@@ -63,7 +63,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>
@@ -71,7 +71,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>
@@ -89,7 +89,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -133,15 +133,15 @@
 <forwards>
     <forward>class QStringList;</forward>
 </forwards>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>setList( const QStringList &amp; l )</slot>
     <slot>addItem()</slot>
     <slot>renamed( QListViewItem * i )</slot>
     <slot>removeItems()</slot>
-    <slot returnType="QStringList">items()</slot>
+    <slot returnType="TQStringList">items()</slot>
     <slot>renameItem()</slot>
-</slots>
+</Q_SLOTS>
 <pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/listvieweditor.ui b/kommander/editor/listvieweditor.ui
index 32c5f135..2ec9e9ba 100644
--- a/kommander/editor/listvieweditor.ui
+++ b/kommander/editor/listvieweditor.ui
@@ -19,7 +19,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ListViewEditorBase</cstring>
     </property>
@@ -50,11 +50,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>
@@ -71,7 +71,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>
@@ -85,7 +85,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>
@@ -108,7 +108,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>
@@ -119,7 +119,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>
@@ -130,11 +130,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>
@@ -147,7 +147,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>
@@ -158,7 +158,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>
@@ -169,7 +169,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>
@@ -183,7 +183,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>itemPixmap</cstring>
                                         </property>
@@ -191,11 +191,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>
@@ -214,11 +214,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>
@@ -238,7 +238,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>
@@ -252,7 +252,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>
@@ -260,7 +260,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>
@@ -284,14 +284,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>
@@ -308,7 +308,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>
@@ -325,7 +325,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>
@@ -342,7 +342,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>
@@ -361,7 +361,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget11</cstring>
                 </property>
@@ -378,7 +378,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>
@@ -395,7 +395,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>
@@ -406,7 +406,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>
@@ -414,11 +414,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>
@@ -437,11 +437,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>
@@ -457,7 +457,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>
@@ -468,11 +468,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>
@@ -485,7 +485,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>
@@ -496,7 +496,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>colResizeable</cstring>
                                 </property>
@@ -509,7 +509,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>
@@ -523,7 +523,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>
@@ -540,7 +540,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>
@@ -554,7 +554,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>
@@ -571,7 +571,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>
@@ -589,7 +589,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -599,7 +599,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -613,7 +613,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -634,14 +634,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>
@@ -658,7 +658,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>
@@ -672,7 +672,7 @@
 				<string>Apply all changes.</string>
 			</property>
 		</widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -836,27 +836,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>
@@ -886,8 +886,8 @@
     <slot access="protected" language="C++" returnType="void">columnResizable(bool)</slot>
     <slot access="protected" language="C++" returnType="void">columnTextChanged(const QString &amp;)</slot>
     <slot access="protected" language="C++" returnType="void">columnUpClicked()</slot>
-    <slot access="protected" language="C++" returnType="void">currentColumnChanged(QListBoxItem*)</slot>
-    <slot access="protected" language="C++" returnType="void">currentItemChanged(QListViewItem*)</slot>
+    <slot access="protected" language="C++" returnType="void">currentColumnChanged(TQListBoxItem*)</slot>
+    <slot access="protected" language="C++" returnType="void">currentItemChanged(TQListViewItem*)</slot>
     <slot access="protected" language="C++" returnType="void">deleteColumnClicked()</slot>
     <slot access="protected" language="C++" returnType="void">initTabPage(const QString &amp;)</slot>
     <slot access="protected" language="C++" returnType="void">itemColChanged(int)</slot>
diff --git a/kommander/editor/listvieweditorimpl.cpp b/kommander/editor/listvieweditorimpl.cpp
index fb2f0a6a..abed8458 100644
--- a/kommander/editor/listvieweditorimpl.cpp
+++ b/kommander/editor/listvieweditorimpl.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -37,8 +37,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 );
@@ -63,7 +63,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
 void ListViewEditor::applyClicked()
 {
     setupItems();
-    PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n("Edit Items and Columns of '%1'" ).arg( listview->name() ),
+    PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n("Edit Items and Columns of '%1'" ).tqarg( listview->name() ),
 								formwindow, listview, itemsPreview );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
@@ -321,10 +321,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++;
     }
@@ -346,11 +346,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 );
     }
@@ -405,10 +405,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;
     }
@@ -427,13 +427,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++;
     }
@@ -467,13 +467,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;
     }
@@ -531,7 +531,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() ) {
@@ -548,7 +548,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/kommander/editor/listvieweditorimpl.h b/kommander/editor/listvieweditorimpl.h
index 37f9154e..9a7d7457 100644
--- a/kommander/editor/listvieweditorimpl.h
+++ b/kommander/editor/listvieweditorimpl.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -32,9 +32,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 );
 
 protected slots:
     void applyClicked();
@@ -70,7 +71,7 @@ private:
 	TQString text;
 	TQPixmap pixmap;
 	bool clickable, resizable;
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 	bool operator==( const Column& ) const { return FALSE; }
 #endif                                                                       
     };
diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index 7be1f31d..644e10d7 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -30,7 +30,7 @@
 static const char *description =
   I18N_NOOP("Kommander is a graphical editor of scripted dialogs.");
 static const char *text =
-  I18N_NOOP("Based on Qt Designer, (C) 2000 Trolltech AS.");
+  I18N_NOOP("Based on TQt Designer, (C) 2000 Trolltech AS.");
 
 static KCmdLineOptions options[] =
 {
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 069d30dd..f87b7c2c 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
 
  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
@@ -108,7 +108,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;
@@ -118,7 +118,7 @@ static TQString textNoAccel(const TQString& text)
 MainWindow::MainWindow(bool asClient)
   : KParts::DockMainWindow(0, "mainwindow", WType_TopLevel | WDestructiveClose | WGroupLeader),
       grd(10, 10), sGrid(true), snGrid(true), restoreConfig(true), splashScreen(true),
-      docPath("$QTDIR/doc/html"), client(asClient),  databaseAutoEdit(false), previewing(false)
+      docPath("$TQTDIR/doc/html"), client(asClient),  databaseAutoEdit(false), previewing(false)
 {
   m_partManager = new KParts::PartManager(this);
   //connect(m_partManager, TQT_SIGNAL(activePartChanged(KParts::Part * )),          this, TQT_SLOT(slotActivePartChanged(KParts::Part * )));
@@ -143,9 +143,9 @@ MainWindow::MainWindow(bool asClient)
   setupMDI();
   setupFileActions();
   setupEditActions();
-  layoutToolBar = new KToolBar(this, "Layout");
-  ((KToolBar *) layoutToolBar)->setFullSize(false);
-  addToolBar(layoutToolBar, i18n("Layout"));
+  tqlayoutToolBar = new KToolBar(this, "Layout");
+  ((KToolBar *) tqlayoutToolBar)->setFullSize(false);
+  addToolBar(tqlayoutToolBar, i18n("Layout"));
   setupToolActions();
   setupLayoutActions();
   setupWorkspace();
@@ -171,8 +171,8 @@ MainWindow::MainWindow(bool asClient)
 
   connect(kapp->clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged()));
   clipboardChanged();
-  layoutChilds = false;
-  layoutSelected = false;
+  tqlayoutChilds = false;
+  tqlayoutSelected = false;
   breakLayout = false;
   backPix = true;
 
@@ -191,7 +191,7 @@ MainWindow::MainWindow(bool asClient)
   w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQFRAME_OBJECT_NAME_STRING), this, 0, false);
   delete w;
 
-  assistant = new AssistProc(this, "Internal Assistant", assistantPath());
+  assistant = new AssistProc(TQT_TQOBJECT(this), "Internal Assistant", assistantPath());
   statusBar()->setSizeGripEnabled(true);
   SpecialInformation::registerSpecials();
 
@@ -237,7 +237,7 @@ void MainWindow::setupPropertyEditor()
 {
   KDockWidget *dw = createDockWidget("Property Editor", TQPixmap(), 0, i18n("Properties"));
   propertyEditor = new PropertyEditor(dw);
-  //addToolBar(dw, Qt::DockLeft);
+  //addToolBar(dw, TQt::DockLeft);
   dw->setWidget(propertyEditor);
   dw->manualDock(getMainDockWidget(), KDockWidget::DockLeft, 20);
   dw->setCaption(i18n("Property Editor"));
@@ -274,7 +274,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>"));
 }
@@ -300,7 +300,7 @@ void MainWindow::setupActionEditor()
 {
   KDockWidget *dw = createDockWidget("Action Editor", TQPixmap(), 0, i18n("Actions"));
   actionEditor = new ActionEditor(dw, "ActionEditor");
-  //addToolBar(dw, Qt::DockLeft);
+  //addToolBar(dw, TQt::DockLeft);
   dw->setWidget(actionEditor);
   dw->setCaption(i18n("Action Editor"));
   TQWhatsThis::add(actionEditor, i18n("<b>The Action Editor</b>"
@@ -368,7 +368,7 @@ int MainWindow::currentTool() const
 {
   if (!actionCurrentTool)
     return POINTER_TOOL;
-  return TQString::fromLatin1(actionCurrentTool->name()).toInt();
+  return TQString::tqfromLatin1(actionCurrentTool->name()).toInt();
 }
 
 void MainWindow::slotCreateBackups()
@@ -392,7 +392,7 @@ void MainWindow::slotCreateBackups()
     form->formFile()->setModified(true);
     if (!form->formFile()->save(false))
     {
-      KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(backupName));
+      KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").tqarg(backupName));
     }
     form->formFile()->setFileName(fileName);  
     form->formFile()->setModified(modified); 
@@ -417,7 +417,7 @@ void MainWindow::runForm()
   while ((editor = it.current()) != 0L) 
   {
     ++it;
-    static_cast<AssocTextEditor*>(editor)->save();
+    static_cast<AssocTextEditor*>(TQT_TQWIDGET(editor))->save();
   }
   delete editors;  
 
@@ -436,7 +436,7 @@ void MainWindow::runForm()
   ::stat(m_fileName.local8Bit(), &statbuf);
   if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true))
   {
-    KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").arg(m_backupName));
+    KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").tqarg(m_backupName));
     return;
   }
   form->formFile()->setFileName(m_fileName);  
@@ -446,12 +446,12 @@ void MainWindow::runForm()
   {
     if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true))
     {
-      KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup"));
+      KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").tqarg(m_fileName + ".backup"));
     }
     ::chmod(m_fileName.local8Bit(), S_IRWXU);
     KProcess* process = new KProcess;
     process->setUseShell(true);
-    (*process) << "kmdr-executor" << TQString("\"%1\"").arg(form->formFile()->fileName());
+    (*process) << "kmdr-executor" << TQString("\"%1\"").tqarg(form->formFile()->fileName());
     connect(process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), messageLog,
             TQT_SLOT(receivedStdout(KProcess*, char*, int)));
     connect(process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), messageLog,
@@ -481,7 +481,7 @@ void MainWindow::runForm4()
   while ((editor = it.current()) != 0L) 
   {
     ++it;
-    static_cast<AssocTextEditor*>(editor)->save();
+    static_cast<AssocTextEditor*>(TQT_TQWIDGET(editor))->save();
   }
   delete editors;  
 
@@ -500,7 +500,7 @@ void MainWindow::runForm4()
   ::stat(m_fileName.local8Bit(), &statbuf);
   if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true))
   {
-    KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").arg(m_backupName));
+    KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").tqarg(m_backupName));
     return;
   }
   form->formFile()->setFileName(m_fileName);  
@@ -510,12 +510,12 @@ void MainWindow::runForm4()
   {
     if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true))
     {
-      KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup"));
+      KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").tqarg(m_fileName + ".backup"));
     }
     ::chmod(m_fileName.local8Bit(), S_IRWXU);
     KProcess* process = new KProcess;
     process->setUseShell(true);
-    (*process) << "kommander" << TQString("\"%1\"").arg(form->formFile()->fileName());
+    (*process) << "kommander" << TQString("\"%1\"").tqarg(form->formFile()->fileName());
     connect(process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), messageLog,
             TQT_SLOT(receivedStdout(KProcess*, char*, int)));
     connect(process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), messageLog,
@@ -554,9 +554,9 @@ void MainWindow::showProperties(TQObject *o)
   }
   TQWidget *w = (TQWidget*)o;
   setupHierarchyView();
-  FormWindow *fw = (FormWindow*)isAFormWindowChild(w);
+  FormWindow *fw = (FormWindow*)isAFormWindowChild(TQT_TQOBJECT(w));
   if (fw) {
-    propertyEditor->setWidget(w, fw);
+    propertyEditor->setWidget(TQT_TQOBJECT(w), fw);
     hierarchyView->setFormWindow(fw, w);
   } else {
     propertyEditor->setWidget(0, 0);
@@ -596,7 +596,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
         while (w) {
           if (w->inherits("PropertyList"))
             break;
-          w = w->parentWidget(true);
+          w = w->tqparentWidget(true);
         }
         if (w) {
           propertyEditor->propertyList()->showCurrentWhatsThis();
@@ -617,7 +617,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
                 }
                 break;
     case TQEvent::MouseButtonPress:
-      if (((TQMouseEvent*)e)->button() == MidButton && dynamic_cast<KommanderWidget *>(o))
+      if (((TQMouseEvent*)e)->button() == Qt::MidButton && dynamic_cast<KommanderWidget *>(o))
       {
         AssocTextEditor *editor = new AssocTextEditor((TQWidget*)o, formWindow(), propertyEditor, m_partManager,
              this, "AssocTextEditor", false); //deletes itself!
@@ -626,27 +626,27 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
           return true;
       }
     case TQEvent::ContextMenu:
-      if (o->inherits("QDesignerPopupMenu"))
+      if (o->inherits("TQDesignerPopupMenu"))
         break;
-      if (o && currentTool() == POINTER_TOOL && (o->inherits("QDesignerMenuBar") ||
-           o->inherits("QDesignerToolBar") ||
-           (o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || o->inherits("QDesignerToolBarSeparator")) &&
-           o->parent() && o->parent()->inherits("QDesignerToolBar"))) {
+      if (o && currentTool() == POINTER_TOOL && (o->inherits("TQDesignerMenuBar") ||
+           o->inherits("TQDesignerToolBar") ||
+           (o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || o->inherits("TQDesignerToolBarSeparator")) &&
+           o->tqparent() && o->tqparent()->inherits("TQDesignerToolBar"))) {
         TQWidget *w = (TQWidget*)o;
-        if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("QDesignerToolBarSeparator"))
-          w = w->parentWidget();
-        TQWidget *pw = w->parentWidget();
+        if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("TQDesignerToolBarSeparator"))
+          w = w->tqparentWidget();
+        TQWidget *pw = w->tqparentWidget();
         while (pw) {
           if (pw->inherits("FormWindow")) {
-            ((FormWindow*)pw)->emitShowProperties(w);
-            if (!o->inherits("QDesignerToolBar"))
+            ((FormWindow*)pw)->emitShowProperties(TQT_TQOBJECT(w));
+            if (!o->inherits("TQDesignerToolBar"))
               return !o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) &&
-                  !o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) && !o->inherits("QDesignerToolBarSeparator");
+                  !o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) && !o->inherits("TQDesignerToolBarSeparator");
           }
-          pw = pw->parentWidget();
+          pw = pw->tqparentWidget();
         }
            }
-           if (o && (o->inherits("QDesignerToolBar") || o->inherits("QDockWindowHandle"))
+           if (o && (o->inherits("TQDesignerToolBar") || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING))
                 && e->type() == TQEvent::ContextMenu)
              break;
            if (isAToolBarChild(o) && currentTool() != CONNECT_TOOL)
@@ -719,7 +719,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
     case TQEvent::MouseButtonDblClick:
       if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) {
         if (o && o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && ((TQToolButton*)o)->isOn() &&
-             o->parent() && o->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow())
+             o->tqparent() && o->tqparent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow())
           formWindow()->setToolFixed();
         break;
       }
@@ -740,19 +740,19 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
     case TQEvent::Hide:
       if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator"))
         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)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator") || o->inherits("QDesignerMenuBar"))
+      if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator") || o->inherits("TQDesignerMenuBar"))
         break;
       return true;
     case TQEvent::Resize:
     case TQEvent::Move:
       if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator"))
         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);
@@ -761,25 +761,25 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
     case TQEvent::Close:
       break;
     case TQEvent::DragEnter:
-      if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) {
+      if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(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) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(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) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(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;
@@ -808,12 +808,12 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
 
 TQWidget *MainWindow::isAFormWindowChild(TQObject *o) const
 {
-  if (o->parent() && o->parent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
+  if (o->tqparent() && o->tqparent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
     return 0;
   while (o) {
     if (o->inherits("FormWindow"))
       return (TQWidget*)o;
-    o = o->parent();
+    o = o->tqparent();
   }
   return 0;
 }
@@ -821,11 +821,11 @@ TQWidget *MainWindow::isAFormWindowChild(TQObject *o) const
 TQWidget *MainWindow::isAToolBarChild(TQObject *o) const
 {
   while (o) {
-    if (o->inherits("QDesignerToolBar"))
+    if (o->inherits("TQDesignerToolBar"))
       return (TQWidget*)o;
     if (o->inherits("FormWindow"))
       return 0;
-    o = o->parent();
+    o = o->tqparent();
   }
   return 0;
 }
@@ -837,7 +837,7 @@ FormWindow *MainWindow::formWindow()
     if (qworkspace->activeWindow()->inherits("FormWindow"))
       fw = (FormWindow*)qworkspace->activeWindow();
     else if (lastActiveFormWindow &&
-              qworkspace->windowList().find(lastActiveFormWindow) != -1)
+              qworkspace->windowList().tqfind(lastActiveFormWindow) != -1)
       fw = lastActiveFormWindow;
     return fw;
   }
@@ -848,7 +848,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>"
@@ -872,12 +872,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(),
                                           WidgetDatabase::
-                                              idFromClassName(WidgetFactory::classNameOf(fw->mainContainer())));
+                                              idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(fw->mainContainer()))));
   activeWindowChanged(fw);
   emit formWindowsChanged();
 }
@@ -934,7 +934,7 @@ 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();
@@ -952,11 +952,11 @@ void MainWindow::updateUndoRedo(bool undoAvailable, bool redoAvailable,
     actionEditUndo->setEnabled(undoAvailable);
     actionEditRedo->setEnabled(redoAvailable);
     if (!undoCmd.isEmpty())
-        actionEditUndo->setText(i18n("&Undo: %1").arg(undoCmd));
+        actionEditUndo->setText(i18n("&Undo: %1").tqarg(undoCmd));
     else
         actionEditUndo->setText(i18n("&Undo: Not Available"));
     if (!redoCmd.isEmpty())
-        actionEditRedo->setText(i18n("&Redo: %1").arg(redoCmd));
+        actionEditRedo->setText(i18n("&Redo: %1").tqarg(redoCmd));
     else
         actionEditRedo->setText(i18n("&Redo: Not Available"));
 
@@ -1012,18 +1012,18 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge
 
 void MainWindow::setupRMBProperties(TQValueList<int> &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;
 
@@ -1056,7 +1056,7 @@ void MainWindow::setupRMBProperties(TQValueList<int> &ids, TQMap<TQString, int>
 void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, int> &commands, TQWidget *w)
 {
     int id;
-    // KommanderWidget doesn't derive from QObject
+    // KommanderWidget doesn't derive from TQObject
     KommanderWidget *atw = dynamic_cast<KommanderWidget *>(w);
     if(atw)
     {
@@ -1071,7 +1071,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString,
     if (w->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) {
         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);
         }
@@ -1088,7 +1088,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString,
         ids << (id = rmbWidgets->insertItem(i18n("Add Page"), -1, 0));
         commands.insert("add", id);
     }
-   if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w))))
+   if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w)))))
     {
         if (ids.isEmpty())
             ids << rmbWidgets->insertSeparator(0);
@@ -1101,7 +1101,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString,
 {
     int id;
 
-    // KommanderWidget doesn't derive from QObject
+    // KommanderWidget doesn't derive from TQObject
     KommanderWidget *atw = dynamic_cast<KommanderWidget *>(fw->mainContainer());
     if(atw)
     {
@@ -1153,49 +1153,49 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg
             text = KInputDialog::getText(i18n("Text"), i18n("New text:"), w->property("text").toString(), &ok, this);
         }
         if (ok) {
-            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 = KInputDialog::getText(i18n("Title"), i18n("New title:"), w->property("title").toString(), &ok, this);
         if (ok) {
-            TQString pn(i18n("Set the 'title' of '%1'").arg(w->name()));
-            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor,
+            TQString pn(i18n("Set the 'title' of '%1'").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 = KInputDialog::getText(i18n("Page Title"), i18n("New page title:"), w->property("pageTitle").toString(), &ok, this);
         if (ok) {
-            TQString pn(i18n("Set the 'pageTitle' of '%1'").arg(w->name()));
-            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor,
+            TQString pn(i18n("Set the 'pageTitle' of '%1'").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 '%1'").arg(w->name()));
-            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor,
+            TQString pn(i18n("Set the 'pixmap' of '%1'").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);
         }
     }
 }
@@ -1214,15 +1214,15 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
     if (w->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) {
         TQTabWidget *tw = (TQTabWidget*)w;
         if (id == commands[ "add" ]) {
-            AddTabPageCommand *cmd = new AddTabPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(),
+            AddTabPageCommand *cmd = 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();
@@ -1232,7 +1232,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
     if (w->inherits(TQTOOLBOX_OBJECT_NAME_STRING)) {
         TQToolBox *tw = (TQToolBox*)w;
         if (id == commands[ "add" ]) {
-            AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(),
+            AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand(i18n("Add Page to %1").tqarg(tw->name()), formWindow(),
                                                             tw, "Page");
             formWindow()->commandHistory()->addCommand(cmd);
             cmd->execute();
@@ -1240,16 +1240,16 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
             if (tw->currentItem()) {
                 EditorToolBox *dtw = (EditorToolBox*)tw;
                 DeleteToolBoxPageCommand *cmd = new DeleteToolBoxPageCommand(i18n("Delete Page %1 of %2").
-                                                                      arg(dtw->pageTitle()).arg(tw->name()),
+                                                                      tqarg(dtw->pageTitle()).tqarg(tw->name()),
                                                                       formWindow(), tw, tw->currentItem());
                 formWindow()->commandHistory()->addCommand(cmd);
                 cmd->execute();
             }
         }
     }
-    if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) {
+    if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) {
         if (id == commands[ "edit" ])
-            WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)), this, w, formWindow());
+            WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))), this, w, formWindow());
     }
 }
 
@@ -1267,15 +1267,15 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
     if (fw->mainContainer()->inherits(TQWIZARD_OBJECT_NAME_STRING)) {
         TQWizard *wiz = (TQWizard*)fw->mainContainer();
         if (id == commands[ "add" ]) {
-            AddWizardPageCommand *cmd = new AddWizardPageCommand(i18n("Add Page to %1").arg(wiz->name()), formWindow(),
+            AddWizardPageCommand *cmd = new AddWizardPageCommand(i18n("Add Page to %1").tqarg(wiz->name()), formWindow(),
                                                                   wiz, "Page");
             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);
                 cmd->execute();
@@ -1287,10 +1287,10 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
         } else if (id == commands[ "rename" ]) {
 
             bool ok = false;
-            QDesignerWizard *dw = (QDesignerWizard*)wiz;
+            TQDesignerWizard *dw = (TQDesignerWizard*)wiz;
             TQString text = KInputDialog::getText(i18n("Page Title"), i18n("New page title:"), 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);
                 formWindow()->commandHistory()->addCommand(cmd);
@@ -1300,11 +1300,11 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
     } else if (fw->mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) {
         TQMainWindow *mw = (TQMainWindow*)fw->mainContainer();
         if (id == commands[ "add_toolbar" ]) {
-            AddToolBarCommand *cmd = new AddToolBarCommand(i18n("Add Toolbar to '%1'").arg(formWindow()->name()), formWindow(), mw);
+            AddToolBarCommand *cmd = 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()), formWindow(), mw);
+            AddMenuCommand *cmd = new AddMenuCommand(i18n("Add Menu to '%1'").tqarg(formWindow()->name()), formWindow(), mw);
             formWindow()->commandHistory()->addCommand(cmd);
             cmd->execute();
         }
@@ -1320,8 +1320,8 @@ void MainWindow::clipboardChanged()
 
 void MainWindow::selectionChanged()
 {
-    layoutChilds = false;
-    layoutSelected = false;
+    tqlayoutChilds = false;
+    tqlayoutSelected = false;
     breakLayout = false;
     if (!formWindow()) {
         actionEditCut->setEnabled(false);
@@ -1358,7 +1358,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++;
@@ -1370,27 +1370,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);
@@ -1401,24 +1401,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 && formWindow()) {
         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);
@@ -1429,7 +1429,7 @@ void MainWindow::selectionChanged()
                 actionEditVLayout->setEnabled(true);
                 actionEditGridLayout->setEnabled(true);
                 actionEditBreakLayout->setEnabled(false);
-                layoutChilds = true;
+                tqlayoutChilds = true;
             }
         } else {
             actionEditHLayout->setEnabled(false);
@@ -1464,7 +1464,7 @@ void MainWindow::writeConfig()
 
   config->setGroup("Background");
   config->writeEntry("UsePixmap", backPix);
-  config->writeEntry("Color", qworkspace->backgroundColor().name());
+  config->writeEntry("Color", TQString(qworkspace->backgroundColor().name()));
 
   /*
   config->setGroup("Geometry");
@@ -1491,7 +1491,7 @@ void MainWindow::readConfig()
   restoreConfig = config->readBoolEntry("RestoreWorkspace", true);
   splashScreen = config->readBoolEntry("SplashScreen", true);
   docPath = config->readEntry("DocPath", docPath);
-  templPath = config->readEntry("TemplatePath", TQString::null);
+  templPath = config->readEntry("TemplatePath", TQString());
 
   config->setGroup("Grid");
   sGrid = config->readBoolEntry("Snap", true);
@@ -1541,9 +1541,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->plug(menu);
   actionEditCopy->plug(menu);
@@ -1553,12 +1553,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->plug(menu);
     actionEditCopy->plug(menu);
@@ -1620,15 +1620,15 @@ ActionEditor *MainWindow::actioneditor() const
 
 bool MainWindow::openEditor(TQWidget* w, FormWindow*)
 {
-    if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) {
-        statusBar()->message(i18n("Edit %1...").arg(w->className()));
-        WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)), this, w, formWindow());
+    if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) {
+        statusBar()->message(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;
         TQString text;
@@ -1639,13 +1639,13 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*)
             text = KInputDialog::getText(i18n("Text"), i18n("New text:"), w->property("text").toString(), &ok, this);
         }
         if (ok) {
-            TQString pn(i18n("Set the 'text' of '%2'").arg(w->name()));
-            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor,
+            TQString pn(i18n("Set the 'text' of '%2'").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;
     }
@@ -1654,13 +1654,13 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*)
         TQString text;
         text = KInputDialog::getText(i18n("Title"), i18n("New title:"), 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;
     }
@@ -1706,9 +1706,9 @@ TQString MainWindow::documentationPath() const
     TQString result = docPath;
 
     if (docPath[0] == '$') {
-        int fs = docPath.find('/');
+        int fs = docPath.tqfind('/');
         if (fs == -1)
-            fs = docPath.find('\\');
+            fs = docPath.tqfind('\\');
 
         if (fs > -1) {
             result = docPath.mid(1, fs-1);
@@ -1756,7 +1756,7 @@ void MainWindow::checkTempFiles()
 void MainWindow::showDialogHelp()
 {
     TQWidget *w = (TQWidget*)sender();
-    w = w->topLevelWidget();
+    w = w->tqtopLevelWidget();
 
     TQString link = "designer-manual-12.html#";
 
@@ -1777,9 +1777,9 @@ void MainWindow::showDialogHelp()
     else if (w->inherits("DatabaseConnectionBase"))
         link += "dialog-edit-database-connections";
     else if (w->inherits("FindDialog"))
-        link += "dialog-find-text";
+        link += "dialog-tqfind-text";
     else if (w->inherits("ReplaceDialog"))
-        link += "dialog-replace-text";
+        link += "dialog-tqreplace-text";
     else if (w->inherits("GotoLineDialog"))
         link += "dialog-go-to-line";
     else if (w->inherits("ConnectionEditorBase"))
@@ -1836,13 +1836,13 @@ void MainWindow::setModified(bool b, TQWidget *window)
       ((FormWindow *) w)->modificationChanged(b);
       return;
     }
-    w = w->parentWidget(true);
+    w = w->tqparentWidget(true);
     if (w->inherits("FormWindow"))
     {
       ((FormWindow *) w)->modificationChanged(b);
       return;
     }
-    w = w->parentWidget(true);
+    w = w->tqparentWidget(true);
   }
 }
 
@@ -1869,20 +1869,20 @@ void MainWindow::formNameChanged(FormWindow*)
 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;
 }
 
 TQString MainWindow::whatsThisFrom(const TQString&)
 {
-  return TQString::null;
+  return TQString();
 }
 
 void MainWindow::slotActivePartChanged(KParts::Part * part)
diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h
index 1f4a9346..a8ac770e 100644
--- a/kommander/editor/mainwindow.h
+++ b/kommander/editor/mainwindow.h
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
 
  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
@@ -53,7 +53,7 @@ class MessageLog;
 class ReplaceDialog;
 class Workspace;
 
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 #include <tqtoolbar.h>
 #else
 class TQToolBar;
@@ -68,6 +68,7 @@ namespace KParts {
 class MainWindow : public KParts::DockMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     MainWindow( bool asClient );
@@ -93,8 +94,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 );
     
@@ -255,7 +256,7 @@ private:
     TQWorkspace *qworkspace;
     KMenuBar *menubar;
     FormWindow *lastActiveFormWindow;
-    bool breakLayout, layoutChilds, layoutSelected;
+    bool breakLayout, tqlayoutChilds, tqlayoutSelected;
     TQPoint grd;
     bool sGrid, snGrid;
     bool restoreConfig;
@@ -279,7 +280,7 @@ private:
     TQPopupMenu *rmbFormWindow;
     TQPopupMenu *windowMenu, *fileMenu;
 
-    TQToolBar *layoutToolBar;
+    TQToolBar *tqlayoutToolBar;
     KToolBar *fileTb;
 
     Preferences *prefDia;
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index a4d4c430..f57afd72 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
 
  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
@@ -19,6 +19,10 @@
 
 #include "mainwindow.h"
 
+#ifdef QT_NO_SQL
+#define TQT_NO_SQL
+#endif // QT_NO_SQL
+
 #include <tqapplication.h>
 #include <tqclipboard.h>
 #include <tqfileinfo.h>
@@ -26,7 +30,7 @@
 #include <tqlistbox.h>
 #include <tqsignalmapper.h>
 #include <tqspinbox.h>
-#include <tqstatusbar.h>
+#include <statusbar.h>
 #include <tqstylefactory.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
@@ -47,7 +51,7 @@
 #include "connectioneditorimpl.h"
 #include "actioneditorimpl.h"
 #include "formfile.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "dbconnectionsimpl.h"
 #include "dbconnectionimpl.h"
 #endif
@@ -92,81 +96,81 @@ int forms = 0;
 
 void MainWindow::setupEditActions()
 {
-  actionEditUndo = KStdAction::undo(this, TQT_SLOT(editUndo()), actionCollection());
+  actionEditUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(editUndo()), actionCollection());
   actionEditUndo->setText(i18n("&Undo: Not Available"));
   actionEditUndo->setToolTip(i18n("Undoes the last action"));
   actionEditUndo->setWhatsThis(whatsThisFrom("Edit|Undo"));
   actionEditUndo->setEnabled(false);
 
-  actionEditRedo = KStdAction::redo(this, TQT_SLOT(editRedo()), actionCollection());
+  actionEditRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(editRedo()), actionCollection());
   actionEditRedo->setText(i18n("&Redo: Not Available"));
   actionEditRedo->setToolTip(i18n("Redoes the last undone operation"));
   actionEditRedo->setWhatsThis(whatsThisFrom("Edit|Redo"));
   actionEditRedo->setEnabled(false);
 
-  actionEditCut = KStdAction::cut(this, TQT_SLOT(editCut()), actionCollection());
+  actionEditCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(editCut()), actionCollection());
   actionEditCut->setToolTip(i18n("Cuts the selected widgets and puts them on the clipboard"));
   actionEditCut->setWhatsThis(whatsThisFrom("Edit|Cut"));
   actionEditCut->setEnabled(false);
 
-  actionEditCopy = KStdAction::copy(this, TQT_SLOT(editCopy()), actionCollection());
+  actionEditCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(editCopy()), actionCollection());
   actionEditCopy->setToolTip(i18n("Copies the selected widgets to the clipboard"));
   actionEditCopy->setWhatsThis(whatsThisFrom("Edit|Copy"));
   actionEditCopy->setEnabled(false);
 
-  actionEditPaste = KStdAction::paste(this, TQT_SLOT(editPaste()), actionCollection());
+  actionEditPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(editPaste()), actionCollection());
   actionEditPaste->setToolTip(i18n("Pastes the clipboard's contents"));
   actionEditPaste->setWhatsThis(whatsThisFrom("Edit|Paste"));
   actionEditPaste->setEnabled(false);
 
-  actionEditDelete = new KAction(i18n("Delete"), Key_Delete, this, TQT_SLOT(editDelete()),
+  actionEditDelete = new KAction(i18n("Delete"), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(editDelete()),
                                  actionCollection(), "edit_delete");
   actionEditDelete->setToolTip(i18n("Deletes the selected widgets"));
   actionEditDelete->setWhatsThis(whatsThisFrom("Edit|Delete"));
   actionEditDelete->setEnabled(false);
 
-  actionEditSelectAll = KStdAction::selectAll(this, TQT_SLOT(editSelectAll()), actionCollection());
+  actionEditSelectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(editSelectAll()), actionCollection());
   actionEditSelectAll->setToolTip(i18n("Selects all widgets"));
   actionEditSelectAll->setWhatsThis(whatsThisFrom("Edit|Select All"));
 
   actionEditRaise = new KAction(i18n("Bring to Front"), createIconSet("editraise.xpm"),
-                                KShortcut::null(), this, TQT_SLOT(editRaise()), actionCollection(), "edit_raise");
+                                KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editRaise()), actionCollection(), "edit_raise");
   actionEditRaise->setToolTip(i18n("Raises the selected widgets"));
   actionEditRaise->setEnabled(false);
 
   actionEditLower = new KAction(i18n("Send to Back"), createIconSet("editlower.xpm"),
-                                KShortcut::null(), this, TQT_SLOT(editLower()), actionCollection(), "edit_lower");
+                                KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLower()), actionCollection(), "edit_lower");
   actionEditLower->setToolTip(i18n("Lowers the selected widgets"));
   actionEditLower->setWhatsThis(i18n("Lowers the selected widgets"));
   actionEditLower->setEnabled(false);
 
-  actionEditFindGlobal = new KAction(i18n("Find in Form..."), CTRL + ALT + Key_F, this, TQT_SLOT(editFindGlobal()), actionCollection(), "edit_find_global");
+  actionEditFindGlobal = new KAction(i18n("Find in Form..."), CTRL + ALT + Key_F, TQT_TQOBJECT(this), TQT_SLOT(editFindGlobal()), actionCollection(), "edit_find_global");
   actionEditFindGlobal->setToolTip(i18n("Search for a text in the whole form."));
   actionEditFindGlobal->setWhatsThis(whatsThisFrom("Edit|Find in Form"));
   connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFindGlobal, TQT_SLOT(setEnabled(bool)));
 
-  actionEditAccels = new KAction(i18n("Check Accelerators"), ALT + Key_R, this, TQT_SLOT(editAccels()),
+  actionEditAccels = new KAction(i18n("Check Accelerators"), ALT + Key_R, TQT_TQOBJECT(this), TQT_SLOT(editAccels()),
                                  actionCollection(), "edit_check_accel");
   actionEditAccels->setToolTip(i18n("Checks if the accelerators used in the form are unique"));
   actionEditAccels->setWhatsThis(whatsThisFrom("Edit|Check Accelerator"));
   connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditAccels, TQT_SLOT(setEnabled(bool)));
 
   actionEditConnections = new KAction(i18n("Connections"), createIconSet("connecttool.xpm"),
-                                      KShortcut::null(), this, TQT_SLOT(editConnections()), actionCollection(),
+                                      KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editConnections()), actionCollection(),
                                       "edit_connections");
   actionEditConnections->setToolTip(i18n("Opens a dialog for editing connections"));
   actionEditConnections->setWhatsThis(whatsThisFrom("Edit|Connections"));
   connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditConnections, TQT_SLOT(setEnabled(bool)));
 
   actionEditFormSettings = new KAction(i18n("Form Settings..."), KShortcut::null(),
-                                       this, TQT_SLOT(editFormSettings()), actionCollection(), "edit_form");
+                                       TQT_TQOBJECT(this), TQT_SLOT(editFormSettings()), actionCollection(), "edit_form");
   actionEditFormSettings->setToolTip(i18n("Opens a dialog to change the form's settings"));
   actionEditFormSettings->setWhatsThis(whatsThisFrom("Edit|Form Settings"));
   connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFormSettings, TQT_SLOT(setEnabled(bool)));
 
   KToolBar *tb = new KToolBar(this, "Edit");
   tb->setFullSize(false);
-  TQWhatsThis::add(tb, i18n("<b>The Edit toolbar</b>%1").arg(toolbarHelp));
+  TQWhatsThis::add(tb, i18n("<b>The Edit toolbar</b>%1").tqarg(toolbarHelp));
   addToolBar(tb, i18n("Edit"));
   actionEditUndo->plug(tb);
   actionEditRedo->plug(tb);
@@ -198,70 +202,70 @@ void MainWindow::setupEditActions()
 void MainWindow::setupLayoutActions()
 {
   actionEditAdjustSize = new KAction(i18n("Adjust Size"), createIconSet("adjustsize.xpm"),
-                                     CTRL + Key_J, this, TQT_SLOT(editAdjustSize()), actionCollection(), "edit_adjust_size");
+                                     CTRL + Key_J, TQT_TQOBJECT(this), TQT_SLOT(editAdjustSize()), actionCollection(), "edit_adjust_size");
   actionEditAdjustSize->setToolTip(i18n("Adjusts the size of the selected widget"));
   actionEditAdjustSize->setWhatsThis(whatsThisFrom("Layout|Adjust Size"));
   actionEditAdjustSize->setEnabled(false);
 
-  actionEditHLayout = new KAction(i18n("Lay Out Horizontally"), createIconSet("edithlayout.xpm"),
-                                  CTRL + Key_H, this, TQT_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h");
+  actionEditHLayout = new KAction(i18n("Lay OutQt::Horizontally"), createIconSet("edithtqlayout.xpm"),
+                                  CTRL + Key_H, TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h");
   actionEditHLayout->setToolTip(i18n("Lays out the selected widgets horizontally"));
-  actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally"));
+  actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally"));
   actionEditHLayout->setEnabled(false);
 
-  actionEditVLayout = new KAction(i18n("Lay Out Vertically"), createIconSet("editvlayout.xpm"),
-                                  CTRL + Key_L, this, TQT_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v");
+  actionEditVLayout = new KAction(i18n("Lay OutQt::Vertically"), createIconSet("editvtqlayout.xpm"),
+                                  CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v");
   actionEditVLayout->setToolTip(i18n("Lays out the selected widgets vertically"));
-  actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically"));
+  actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Vertically"));
   actionEditVLayout->setEnabled(false);
 
   actionEditGridLayout = new KAction(i18n("Lay Out in a Grid"), createIconSet("editgrid.xpm"),
-                                     CTRL + Key_G, this, TQT_SLOT(editLayoutGrid()), actionCollection(), "edit_layout_grid");
+                                     CTRL + Key_G, TQT_TQOBJECT(this), TQT_SLOT(editLayoutGrid()), actionCollection(), "edit_layout_grid");
   actionEditGridLayout->setToolTip(i18n("Lays out the selected widgets in a grid"));
   actionEditGridLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out in a Grid"));
   actionEditGridLayout->setEnabled(false);
 
-  actionEditSplitHorizontal = new KAction(i18n("Lay Out Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"),
-                                          KShortcut::null(), this, TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(),
+  actionEditSplitHorizontal = new KAction(i18n("Lay OutQt::Horizontally in Splitter"), createIconSet("editvtqlayoutsplit.xpm"),
+                                          KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(),
                                           "edit_split_h");
   actionEditSplitHorizontal->setToolTip(i18n("Lays out the selected widgets horizontally in a splitter"));
-  actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally in Splitter"));
+  actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally in Splitter"));
   actionEditSplitHorizontal->setEnabled(false);
 
-  actionEditSplitVertical = new KAction(i18n("Lay Out Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"),
-                                        KShortcut::null(), this, TQT_SLOT(editLayoutVerticalSplit()), actionCollection(),
+  actionEditSplitVertical = new KAction(i18n("Lay OutQt::Vertically in Splitter"), createIconSet("edithtqlayoutsplit.xpm"),
+                                        KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutVerticalSplit()), actionCollection(),
                                         "edit_split_v");
   actionEditSplitVertical->setToolTip(i18n("Lays out the selected widgets vertically in a splitter"));
-  actionEditSplitVertical->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically (in Splitter)"));
+  actionEditSplitVertical->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Vertically (in Splitter)"));
   actionEditSplitVertical->setEnabled(false);
 
   actionEditBreakLayout = new KAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"),
-                                      CTRL + Key_B, this, TQT_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout");
-  actionEditBreakLayout->setToolTip(i18n("Breaks the selected layout"));
+                                      CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout");
+  actionEditBreakLayout->setToolTip(i18n("Breaks the selected tqlayout"));
   actionEditBreakLayout->setWhatsThis(whatsThisFrom("Layout|Break Layout"));
 
   int id = WidgetDatabase::idFromClassName("Spacer");
-  KToggleAction *a = new KToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), KShortcut::null(), this, TQT_SLOT(toolSelected()),
+  KToggleAction *a = new KToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(toolSelected()),
                                        actionCollection(), TQString::number(id).latin1());
   a->setExclusiveGroup("tool");
   a->setText(i18n("Add ") + WidgetDatabase::className(id));
-  a->setToolTip(i18n("Insert a %1").arg(WidgetDatabase::toolTip(id)));
+  a->setToolTip(i18n("Insert a %1").tqarg(WidgetDatabase::toolTip(id)));
   a->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)));
-
-  TQWhatsThis::add(layoutToolBar, i18n("<b>The Layout toolbar</b>%1").arg(toolbarHelp));
-  actionEditAdjustSize->plug(layoutToolBar);
-  layoutToolBar->addSeparator();
-  actionEditHLayout->plug(layoutToolBar);
-  actionEditVLayout->plug(layoutToolBar);
-  actionEditGridLayout->plug(layoutToolBar);
-  actionEditSplitHorizontal->plug(layoutToolBar);
-  actionEditSplitVertical->plug(layoutToolBar);
-  actionEditBreakLayout->plug(layoutToolBar);
-  layoutToolBar->addSeparator();
-  a->plug(layoutToolBar);
+      "or double click to keep the tool selected.").tqarg(WidgetDatabase::toolTip(id)).
+      tqarg(WidgetDatabase::whatsThis(id)).tqarg(WidgetDatabase::toolTip(id)));
+
+  TQWhatsThis::add(tqlayoutToolBar, i18n("<b>The Layout toolbar</b>%1").tqarg(toolbarHelp));
+  actionEditAdjustSize->plug(tqlayoutToolBar);
+  tqlayoutToolBar->addSeparator();
+  actionEditHLayout->plug(tqlayoutToolBar);
+  actionEditVLayout->plug(tqlayoutToolBar);
+  actionEditGridLayout->plug(tqlayoutToolBar);
+  actionEditSplitHorizontal->plug(tqlayoutToolBar);
+  actionEditSplitVertical->plug(tqlayoutToolBar);
+  actionEditBreakLayout->plug(tqlayoutToolBar);
+  tqlayoutToolBar->addSeparator();
+  a->plug(tqlayoutToolBar);
 
   TQPopupMenu *menu = new TQPopupMenu(this, "Layout");
   menuBar()->insertItem(i18n("&Layout"), menu);
@@ -280,21 +284,21 @@ void MainWindow::setupLayoutActions()
 void MainWindow::setupToolActions()
 {
   actionPointerTool = new KToggleAction(i18n("Pointer"), "arrow", Key_F2,
-                                        this, TQT_SLOT(toolSelected()), actionCollection(),
+                                        TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(),
                                         TQString::number(POINTER_TOOL).latin1());
   actionPointerTool->setToolTip(i18n("Selects the pointer tool"));
   actionPointerTool->setWhatsThis(whatsThisFrom("Tools|Pointer"));
   actionPointerTool->setExclusiveGroup("tool");
 
   actionConnectTool = new KToggleAction(i18n("Connect Signal/Slots"), createIconSet("connecttool.xpm"),
-                                        Key_F3, this, TQT_SLOT(toolSelected()), actionCollection(),
+                                        Key_F3, TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(),
                                         TQString::number(CONNECT_TOOL).latin1());
   actionConnectTool->setToolTip(i18n("Selects the connection tool"));
   actionConnectTool->setWhatsThis(whatsThisFrom("Tools|Connect Signals and Slots"));
   actionConnectTool->setExclusiveGroup("tool");
 
   actionOrderTool = new KToggleAction(i18n("Tab Order"), createIconSet("ordertool.xpm"),
-                                      Key_F4, this, TQT_SLOT(toolSelected()), actionCollection(),
+                                      Key_F4, TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(),
                                       TQString::number(ORDER_TOOL).latin1());
   actionOrderTool->setToolTip(i18n("Selects the tab order tool"));
   actionOrderTool->setWhatsThis(whatsThisFrom("Tools|Tab Order"));
@@ -302,7 +306,7 @@ void MainWindow::setupToolActions()
 
   KToolBar *tb = new KToolBar(this, "Tools");
   tb->setFullSize(false);
-  TQWhatsThis::add(tb, i18n("<b>The Tools toolbar</b>%1").arg(toolbarHelp));
+  TQWhatsThis::add(tb, i18n("<b>The Tools toolbar</b>%1").tqarg(toolbarHelp));
 
   addToolBar(tb, i18n("Tools"), TQMainWindow::DockTop, true);
   actionPointerTool->plug(tb);
@@ -326,14 +330,14 @@ void MainWindow::setupToolActions()
     bool plural = grp[(int) grp.length() - 1] == 's';
     if (plural)
     {
-      TQWhatsThis::add(tb, i18n("<b>The %1</b>%2").arg(grp).arg(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(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(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(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);
     TQPopupMenu *menu = new TQPopupMenu(this, grp.latin1());
@@ -344,7 +348,7 @@ void MainWindow::setupToolActions()
       if (WidgetDatabase::group(i) != grp)
         continue;               // only widgets, i.e. not forms and temp stuff
       KToggleAction *a = new KToggleAction(WidgetDatabase::className(i), KShortcut::null(),
-                                           this, TQT_SLOT(toolSelected()), actionCollection(), TQString::number(i).latin1());
+                                           TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(), TQString::number(i).latin1());
       a->setExclusiveGroup("tool");
       TQString atext = WidgetDatabase::className(i);
       if (atext[0] == 'Q')
@@ -359,11 +363,11 @@ void MainWindow::setupToolActions()
       a->setToolTip(ttip);
       if (!WidgetDatabase::isWhatsThisLoaded())
         WidgetDatabase::loadWhatsThis(documentationPath());
-      a->setToolTip(i18n("Insert a %1").arg(WidgetDatabase::className(i)));
+      a->setToolTip(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")
@@ -381,16 +385,16 @@ void MainWindow::setupToolActions()
     if (!TQFile::exists(*it))
       continue;
     TQDir dir(*it);
-    const QFileInfoList* fileList = dir.entryInfoList(TQDir::DefaultFilter, TQDir::DirsFirst | TQDir::Name);
+    const TQFileInfoList* fileList = dir.entryInfoList(TQDir::DefaultFilter, TQDir::DirsFirst | TQDir::Name);
     if (fileList)
-      for (QFileInfoListIterator fit(*fileList); fit.current(); ++fit)
+      for (TQFileInfoListIterator fit(*fileList); fit.current(); ++fit)
       {
         TQFileInfo* fi = fit.current();
         if (!fi->isFile() || fi->extension() != "kmdr")
           continue;
         TQString name = fi->baseName();
-        name = name.replace("_", " ");
-        editMenu->insertItem(name, this, TQT_SLOT(editExternalTool(int)), 0, m_editorTools.count());
+        name = name.tqreplace("_", " ");
+        editMenu->insertItem(name, TQT_TQOBJECT(this), TQT_SLOT(editExternalTool(int)), 0, m_editorTools.count());
         m_editorTools.append(fi->filePath());
       }
   }
@@ -405,29 +409,29 @@ void MainWindow::setupFileActions()
   fileTb = new KToolBar(this, "File");
   fileTb->setFullSize(false);
 
-  TQWhatsThis::add(fileTb, i18n("<b>The File toolbar</b>%1").arg(toolbarHelp));
+  TQWhatsThis::add(fileTb, i18n("<b>The File toolbar</b>%1").tqarg(toolbarHelp));
   addToolBar(fileTb, i18n("File"));
   fileMenu = new TQPopupMenu(this, "File");
   menuBar()->insertItem(i18n("&File"), fileMenu);
 
-  KAction *a = KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection());
+  KAction *a = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
   a->setToolTip(i18n("Creates a new dialog"));
   a->setWhatsThis(whatsThisFrom("File|New"));
   a->plug(fileTb);
   a->plug(fileMenu);
 
-  a = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
+  a = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
   a->setToolTip(i18n("Opens an existing dialog"));
   a->setWhatsThis(whatsThisFrom("File|Open"));
   a->plug(fileTb);
   a->plug(fileMenu);
 
-  actionRecent = KStdAction::openRecent(this,  TQT_SLOT(fileOpenRecent(const KURL&)), actionCollection());
+  actionRecent = KStdAction::openRecent(TQT_TQOBJECT(this),  TQT_SLOT(fileOpenRecent(const KURL&)), actionCollection());
   actionRecent->setToolTip(i18n("Opens recently open file"));
   actionRecent->plug(fileMenu);
 
   fileMenu->insertSeparator();
-  a = KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection());
+  a = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(fileClose()), actionCollection());
   a->setToolTip(i18n("Closes the current dialog"));
   a->setWhatsThis(whatsThisFrom("File|Close"));
   connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool)));
@@ -435,20 +439,20 @@ void MainWindow::setupFileActions()
 
   fileMenu->insertSeparator();
 
-  a = KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
+  a = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection());
   a->setToolTip(i18n("Saves the current dialog"));
   a->setWhatsThis(whatsThisFrom("File|Save"));
   connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool)));
   a->plug(fileTb);
   a->plug(fileMenu);
 
-  a = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
+  a = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection());
   a->setToolTip(i18n("Saves the current dialog with a new filename"));
   a->setWhatsThis(whatsThisFrom("File|Save As"));
   connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool)));
   a->plug(fileMenu);
 
-  a = new KAction(i18n("Save All"), "save_all", KShortcut::null(), this, TQT_SLOT(fileSaveAll()),
+  a = new KAction(i18n("Save All"), "save_all", KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(fileSaveAll()),
                   actionCollection(), "file_close_all");
   a->setToolTip(i18n("Saves all open dialogs"));
   a->setWhatsThis(whatsThisFrom("File|Save All"));
@@ -457,7 +461,7 @@ void MainWindow::setupFileActions()
 
   fileMenu->insertSeparator();
 
-  a = KStdAction::quit(kapp, TQT_SLOT(closeAllWindows()), actionCollection());
+  a = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection());
   a->setToolTip(i18n("Quits the application and prompts to save any changed dialogs"));
   a->setWhatsThis(whatsThisFrom("File|Exit"));
   a->plug(fileMenu);
@@ -470,7 +474,7 @@ void MainWindow::setupRunActions()
   menuBar()->insertItem(i18n("&Run"), menu);
 
   KAction* a = new KAction(i18n("Run Dialog"), "run", CTRL + Key_R,
-                           this, TQT_SLOT(runForm()), actionCollection(), "run");
+                           TQT_TQOBJECT(this), TQT_SLOT(runForm()), actionCollection(), "run");
   a->setToolTip(i18n("Executes dialog"));
   a->setWhatsThis(whatsThisFrom("Run|Run dialog"));
   connect(this, TQT_SIGNAL(hasActiveForm(bool)), a, TQT_SLOT(setEnabled(bool)));
@@ -478,8 +482,8 @@ void MainWindow::setupRunActions()
   a->plug(menu);
   // add KDE4 executor
 
-  KAction* b = new KAction(i18n("Run Dialog K4"), "launch", CTRL + SHIFT  + Qt::Key_R,
-                           this, TQT_SLOT(runForm4()), actionCollection(), "run4");
+  KAction* b = new KAction(i18n("Run Dialog K4"), "launch", CTRL + SHIFT  + TQt::Key_R,
+                           TQT_TQOBJECT(this), TQT_SLOT(runForm4()), actionCollection(), "run4");
   b->setToolTip(i18n("Executes dialog in KDE4"));
   b->setWhatsThis(whatsThisFrom("Run|Run dialog"));
   connect(this, TQT_SIGNAL(hasActiveForm(bool)), b, TQT_SLOT(setEnabled(bool)));
@@ -493,39 +497,39 @@ void MainWindow::setupWindowActions()
   {
     windowActionsSetup = true;
 
-    KAction* actionWindowTile = new KAction(i18n("Tile"), KShortcut::null(), qworkspace, TQT_SLOT(tile()),
+    KAction* actionWindowTile = new KAction(i18n("Tile"), KShortcut::null(), TQT_TQOBJECT(qworkspace),  TQT_SLOT(tile()),
                                    actionCollection(), "window_tile");
     actionWindowTile->setToolTip(i18n("Tiles the windows so that they are all visible"));
     actionWindowTile->setWhatsThis(whatsThisFrom("Window|Tile"));
 
-    KAction* actionWindowCascade = new KAction(i18n("Cascade"), KShortcut::null(), qworkspace, TQT_SLOT(cascade()),
+    KAction* actionWindowCascade = new KAction(i18n("Cascade"), KShortcut::null(), TQT_TQOBJECT(qworkspace),  TQT_SLOT(cascade()),
                                       actionCollection(), "window_cascade");
     actionWindowCascade->setToolTip(i18n("Cascades the windows so that all their title bars are visible"));
     actionWindowCascade->setWhatsThis(whatsThisFrom("Window|Cascade"));
 
-    KAction* actionWindowClose = new KAction(i18n("Cascade"), KShortcut::null(), qworkspace, TQT_SLOT(closeActiveWindow()),
+    KAction* actionWindowClose = new KAction(i18n("Cascade"), KShortcut::null(), TQT_TQOBJECT(qworkspace),  TQT_SLOT(closeActiveWindow()),
                                     actionCollection(), "window_close");
     actionWindowClose->setToolTip(i18n("Closes the active window"));
     actionWindowClose->setWhatsThis(whatsThisFrom("Window|Close"));
 
-    KAction* actionWindowCloseAll = new KAction(i18n("Close All"), KShortcut::null(), qworkspace,
+    KAction* actionWindowCloseAll = new KAction(i18n("Close All"), KShortcut::null(), TQT_TQOBJECT(qworkspace), 
                                        TQT_SLOT(closeAllWindows()), actionCollection(), "window_close_all");
     actionWindowCloseAll->setToolTip(i18n("Closes all form windows"));
     actionWindowCloseAll->setWhatsThis(whatsThisFrom("Window|Close All"));
 
-    KAction* actionWindowNext = new KAction(i18n("Next"), Key_F6, qworkspace,
+    KAction* actionWindowNext = new KAction(i18n("Next"), Key_F6, TQT_TQOBJECT(qworkspace), 
                                    TQT_SLOT(activateNextWindow()), actionCollection(), "window_next");
     actionWindowNext->setToolTip(i18n("Activates the next window"));
     actionWindowNext->setWhatsThis(whatsThisFrom("Window|Next"));
 
-    KAction* actionWindowPrevious = new KAction(i18n("Previous"), CTRL + SHIFT + Key_F6, qworkspace,
+    KAction* actionWindowPrevious = new KAction(i18n("Previous"), CTRL + SHIFT + Key_F6, TQT_TQOBJECT(qworkspace), 
                                        TQT_SLOT(activatePreviousWindow()), actionCollection(), "window_prev");
     actionWindowPrevious->setToolTip(i18n("Activates the previous window"));
     actionWindowPrevious->setWhatsThis(whatsThisFrom("Window|Previous"));
 
     windowMenu = new KPopupMenu(this, "Window");
     menuBar()->insertItem(i18n("&Window"), windowMenu);
-    connect(windowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(setupWindowActions()));
+    connect(windowMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(setupWindowActions()));
 
     actionWindowClose->plug(windowMenu);
     actionWindowCloseAll->plug(windowMenu);
@@ -556,13 +560,13 @@ void MainWindow::setupWindowActions()
     j++;
     TQString itemText;
     if (j < 10)
-      itemText = TQString("&%1 ").arg(j);
+      itemText = TQString("&%1 ").tqarg(j);
     if (w->inherits("FormWindow"))
       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));
   }
@@ -572,21 +576,21 @@ void MainWindow::setupWindowActions()
 void MainWindow::setupSettingsActions()
 {
   KPopupMenu *settings = new KPopupMenu(this, "Settings");
-  KAction* a = KStdAction::keyBindings(this, TQT_SLOT(editShortcuts()), actionCollection());
+  KAction* a = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editShortcuts()), actionCollection());
   a->setToolTip(i18n("Opens a dialog to change shortcuts"));
   a->plug(settings);
 
-  a = new KAction(i18n("Configure &Plugins..."), KShortcut::null(), this, TQT_SLOT(editPlugins()),
+  a = new KAction(i18n("Configure &Plugins..."), KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editPlugins()),
                   actionCollection(), "configure_plugins");
   a->setToolTip(i18n("Opens a dialog to configure plugins"));
   a->plug(settings);
 
-  a = new KAction(i18n("&Configure Editor..."), KShortcut::null(), this, TQT_SLOT(configureEditor()),
+  a = new KAction(i18n("&Configure Editor..."), KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(configureEditor()),
                   actionCollection(), "configure_editor");
   a->setToolTip(i18n("Configure various aspects of this editor."));
   a->plug(settings);
 
-  a = KStdAction::preferences(this, TQT_SLOT(editPreferences()), actionCollection());
+  a = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(editPreferences()), actionCollection());
   a->setToolTip(i18n("Opens a dialog to change preferences"));
   a->setWhatsThis(whatsThisFrom("Edit|Preferences"));
   a->plug(settings);
@@ -604,7 +608,7 @@ void MainWindow::setupHelpActions()
 void MainWindow::fileNew()
 {
   statusBar()->message(i18n("Create a new dialog..."));
-  NewForm dlg(this, TQString::null);
+  NewForm dlg(this, TQString());
   dlg.exec();
   statusBar()->clear();
 }
@@ -631,7 +635,7 @@ void MainWindow::fileOpen(const TQString & fn)
 
   TQStringList filenames;
   if (fn.isEmpty())
-    filenames = KFileDialog::getOpenFileNames(TQString::null, i18n("*.kmdr|Kommander Files"), this, i18n("Open Files"));
+    filenames = KFileDialog::getOpenFileNames(TQString(), i18n("*.kmdr|Kommander Files"), this, i18n("Open Files"));
   else
     filenames << fn;
   for (TQStringList::ConstIterator fit = filenames.constBegin(); fit != filenames.constEnd(); ++fit)
@@ -667,7 +671,7 @@ FormWindow *MainWindow::openFormWindow(const TQString &filename, bool validFileN
   }
   if (!makeNew)
   {
-    statusBar()->message(i18n("Reading file '%1'...").arg(filename));
+    statusBar()->message(i18n("Reading file '%1'...").tqarg(filename));
     if (TQFile::exists(filename))
     {
       TQApplication::setOverrideCursor(WaitCursor);
@@ -676,18 +680,18 @@ FormWindow *MainWindow::openFormWindow(const TQString &filename, bool validFileN
         ff = new FormFile(filename, false);
       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)
       {
-        statusBar()->message(i18n("Loaded file '%1'").arg(filename), 3000);
+        statusBar()->message(i18n("Loaded file '%1'").tqarg(filename), 3000);
       } else
       {
  	emit removedFormFile(ff);
 	ff->close();
         delete ff;
-        statusBar()->message(i18n("Could not load file '%1'").arg(filename), 5000);
-        KMessageBox::information(this, i18n("Could not load file '%1'").arg(filename), i18n("Load File"));
+        statusBar()->message(i18n("Could not load file '%1'").tqarg(filename), 5000);
+        KMessageBox::information(this, i18n("Could not load file '%1'").tqarg(filename), i18n("Load File"));
       }
       return (FormWindow *) resource.widget();
     } else
@@ -750,7 +754,7 @@ void MainWindow::saveAllTemp()
   if (inSaveAllTemp)
     return;
   inSaveAllTemp = true;
-  statusBar()->message(i18n("Qt Designer is crashing. Attempting to save files..."));
+  statusBar()->message(i18n("TQt Designer is crashing. Attempting to save files..."));
   TQWidgetList windows = qWorkspace()->windowList();
   TQString baseName = TQDir::homeDirPath() + "/.designer/saved-form-";
   int i = 1;
@@ -781,20 +785,20 @@ void MainWindow::fileCreateTemplate()
   for (i = 0; i < WidgetDatabase::count(); ++i)
   {
     if (WidgetDatabase::isContainer(i) && !WidgetDatabase::isForm(i) &&
-        WidgetDatabase::className(i) != "TQTabWidget" && WidgetDatabase::widgetGroup(i) != "Temp")
+        WidgetDatabase::className(i) != TQTABWIDGET_OBJECT_NAME_STRING && WidgetDatabase::widgetGroup(i) != "Temp")
     {
       dia.listClass->insertItem(WidgetDatabase::className(i));
     }
   }
 
   dia.editName->setText(i18n("NewTemplate"));
-  connect(dia.buttonCreate, TQT_SIGNAL(clicked()), this, TQT_SLOT(createNewTemplate()));
+  connect(dia.buttonCreate, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(createNewTemplate()));
   dia.exec();
 }
 
 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())
@@ -804,14 +808,14 @@ void MainWindow::createNewTemplate()
   }
 
   TQStringList templRoots;
-  const char *qtdir = getenv("QTDIR");
+  const char *qtdir = getenv("TQTDIR");
   if (qtdir)
     templRoots << qtdir;
-#ifdef QT_INSTALL_PREFIX
-  templRoots << QT_INSTALL_PREFIX;
+#ifdef TQT_INSTALL_PREFIX
+  templRoots << TQT_INSTALL_PREFIX;
 #endif
-#ifdef QT_INSTALL_DATA
-  templRoots << QT_INSTALL_DATA;
+#ifdef TQT_INSTALL_DATA
+  templRoots << TQT_INSTALL_DATA;
 #endif
   if (qtdir)                    //try the tools/designer directory last!
     templRoots << TQString(qtdir) + "/tools/designer";
@@ -841,7 +845,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;
@@ -876,7 +880,7 @@ void MainWindow::editCut()
 void MainWindow::editCopy()
 {
   if (formWindow())
-    qApp->clipboard()->setText(formWindow()->copy());
+    tqApp->clipboard()->setText(formWindow()->copy());
 }
 
 void MainWindow::editPaste()
@@ -889,21 +893,21 @@ void MainWindow::editPaste()
   if (l.count() == 1)
   {
     w = l.first();
-    if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout ||
+    if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout ||
         (!WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::
-                    classNameOf(w))) && w != formWindow()->mainContainer()))
+                    classNameOf(TQT_TQOBJECT(w)))) && w != formWindow()->mainContainer()))
       w = formWindow()->mainContainer();
   }
 
-  if (w && WidgetFactory::layoutType(w) == WidgetFactory::NoLayout)
+  if (w && WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout)
   {
-    formWindow()->paste(qApp->clipboard()->text(), WidgetFactory::containerOfWidget(w));
+    formWindow()->paste(tqApp->clipboard()->text(), WidgetFactory::containerOfWidget(w));
     hierarchyView->widgetInserted(0);
     formWindow()->commandHistory()->setModified(true);
   } else
   {
     KMessageBox::information(this, 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."), i18n("Paste Error"));
   }
@@ -941,42 +945,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()
@@ -988,7 +992,7 @@ void MainWindow::editLayoutContainerVertical()
   if (l.count() == 1)
     w = l.first();
   if (w)
-    formWindow()->layoutVerticalContainer(w);
+    formWindow()->tqlayoutVerticalContainer(w);
 }
 
 void MainWindow::editLayoutContainerHorizontal()
@@ -1000,7 +1004,7 @@ void MainWindow::editLayoutContainerHorizontal()
   if (l.count() == 1)
     w = l.first();
   if (w)
-    formWindow()->layoutHorizontalContainer(w);
+    formWindow()->tqlayoutHorizontalContainer(w);
 }
 
 void MainWindow::editLayoutContainerGrid()
@@ -1012,7 +1016,7 @@ void MainWindow::editLayoutContainerGrid()
   if (l.count() == 1)
     w = l.first();
   if (w)
-    formWindow()->layoutGridContainer(w);
+    formWindow()->tqlayoutGridContainer(w);
 }
 
 
@@ -1025,8 +1029,8 @@ 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;
@@ -1036,9 +1040,9 @@ void MainWindow::editBreakLayout()
     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)
@@ -1049,8 +1053,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);
   }
@@ -1119,7 +1123,7 @@ void MainWindow::editPreferences()
   dia->checkBoxSplash->setChecked(splashScreen);
   dia->editDocPath->setText(docPath);
   dia->checkAutoEdit->setChecked(!databaseAutoEdit);
-  connect(dia->buttonDocPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseDocPath()));
+  connect(dia->buttonDocPath, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(chooseDocPath()));
 
   if (dia->exec() == TQDialog::Accepted)
   {
@@ -1193,7 +1197,7 @@ void MainWindow::chooseDocPath()
 {
   if (!prefDia)
     return;
-  TQString fn = KFileDialog::getExistingDirectory(TQString::null, this);
+  TQString fn = KFileDialog::getExistingDirectory(TQString(), this);
   if (!fn.isEmpty())
     prefDia->editDocPath->setText(fn);
 }
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index ecaed31a..aeddb1e1 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -28,7 +28,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-MessageLog::MessageLog(TQWidget* parent, const char* name) : TQTabWidget(parent, name)
+MessageLog::MessageLog(TQWidget* tqparent, const char* name) : TQTabWidget(tqparent, name)
 {
   m_popupMenu = new KPopupMenu(this);
   m_popupMenu->insertItem(SmallIconSet("editcopy"), i18n("Copy Current &Line"), this, TQT_SLOT(copyLine()));
@@ -108,12 +108,12 @@ void MessageLog::clearContent()
 void MessageLog::copyLine()
 {
   if (m_lists[currentPageIndex()]->count())
-    kapp->clipboard()->setText(m_lists[currentPageIndex()]->currentText(), QClipboard::Clipboard);
+    kapp->tqclipboard()->setText(m_lists[currentPageIndex()]->currentText(), TQClipboard::Clipboard);
 }
 
 void MessageLog::copyContent()
 {
-  kapp->clipboard()->setText(content(), QClipboard::Clipboard);
+  kapp->tqclipboard()->setText(content(), TQClipboard::Clipboard);
 }
 
 void MessageLog::saveToFile()
@@ -125,12 +125,12 @@ void MessageLog::saveToFile()
   TQFileInfo fileinfo(url.path());
   if (fileinfo.exists() && KMessageBox::warningContinueCancel(0,
       i18n("<qt>File<br><b>%1</b><br>already exists. Overwrite it?</qt>")
-          .arg(url.path()), TQString::null, i18n("Overwrite")) == KMessageBox::Cancel)
+          .tqarg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel)
     return;
   TQFile file(url.path());
   if (!file.open(IO_WriteOnly)) {
     KMessageBox::error(0, i18n("<qt>Cannot save log file<br><b>%1</b></qt>")
-        .arg(url.url()));
+        .tqarg(url.url()));
     return;
   }
   TQTextStream textfile(&file);
diff --git a/kommander/editor/messagelog.h b/kommander/editor/messagelog.h
index ef7c8638..bf1508b6 100644
--- a/kommander/editor/messagelog.h
+++ b/kommander/editor/messagelog.h
@@ -26,12 +26,13 @@ class KProcess;
 class KPopupMenu;
 class TQListBoxItem;
    
-class MessageLog : public QTabWidget
+class MessageLog : public TQTabWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:  
   enum InfoType {Stdout, Stderr, All};
-  MessageLog(TQWidget* parent = 0, const char* name = 0);
+  MessageLog(TQWidget* tqparent = 0, const char* name = 0);
   ~MessageLog();
   virtual void insertItem(InfoType i, TQString text);
   virtual void clear(InfoType i = All);
diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp
index 3a8316b8..d8cdb32c 100644
--- a/kommander/editor/metadatabase.cpp
+++ b/kommander/editor/metadatabase.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved.
 
  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
@@ -34,7 +34,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>
@@ -110,7 +110,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;
@@ -129,7 +129,7 @@ void MetaDataBase::removeEntry( TQObject *o )
 void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bool changed )
 {
     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() );
@@ -137,24 +137,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 );
@@ -166,20 +166,20 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo
 bool MetaDataBase::isPropertyChanged( TQObject *o, const TQString &property )
 {
     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 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() );
@@ -193,7 +193,7 @@ TQStringList MetaDataBase::changedProperties( TQObject *o )
 void MetaDataBase::setPropertyComment( TQObject *o, const TQString &property, const TQString &comment )
 {
     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() );
@@ -206,20 +206,20 @@ void MetaDataBase::setPropertyComment( TQObject *o, const TQString &property, co
 TQString MetaDataBase::propertyComment( TQObject *o, const TQString &property )
 {
     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->propertyComments.find( property );
+    return *r->propertyComments.tqfind( property );
 }
 
 void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const TQVariant& value )
 {
     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() );
@@ -231,13 +231,13 @@ void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const
 TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property)
 {
     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 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 );
@@ -247,7 +247,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() );
@@ -261,7 +261,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() );
@@ -269,10 +269,10 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
     }
 
     r->spacing = spacing;
-    TQLayout * layout = 0;
-    WidgetFactory::layoutType( (TQWidget*)o, layout );
-    if ( layout )
-        layout->setSpacing( spacing );
+    TQLayout * tqlayout = 0;
+    WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout );
+    if ( tqlayout )
+        tqlayout->setSpacing( spacing );
 }
 
 int MetaDataBase::spacing( TQObject *o )
@@ -281,8 +281,8 @@ int MetaDataBase::spacing( TQObject *o )
         return -1;
     setupDataBase();
     if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
-        o = ( (TQMainWindow*)o )->centralWidget();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+        o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
+    MetaDataBaseRecord *r = db->tqfind( TQT_TQOBJECT(o) );
     if ( !r || !o->isWidgetType() ) {
         qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
                   o, o->name(), o->className() );
@@ -297,7 +297,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() );
@@ -305,12 +305,12 @@ 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 );
     if ( margin < 1 )
         margin = 1;
-    if ( layout )
-        layout->setMargin( margin );
+    if ( tqlayout )
+        tqlayout->setMargin( margin );
 }
 
 int MetaDataBase::margin( TQObject *o )
@@ -319,8 +319,8 @@ int MetaDataBase::margin( TQObject *o )
         return -1;
     setupDataBase();
     if ( o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
-        o = ( (TQMainWindow*)o )->centralWidget();
-    MetaDataBaseRecord *r = db->find( (void*)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() );
@@ -334,7 +334,7 @@ void MetaDataBase::addConnection( 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() );
@@ -352,7 +352,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() );
@@ -374,7 +374,7 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr
 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() );
@@ -387,7 +387,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() );
@@ -409,7 +409,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() );
@@ -430,7 +430,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() );
@@ -465,16 +465,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 );
@@ -485,7 +485,7 @@ void MetaDataBase::addSlot( TQObject *o, const TQCString &slot, const TQString&
                             const TQString &access, const TQString &language, 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() );
@@ -498,7 +498,7 @@ void MetaDataBase::addSlot( TQObject *o, const TQCString &slot, const TQString&
     s.access = access;
     s.language = language;
     s.returnType = returnType;
-    TQValueList<MetaDataBase::Slot>::Iterator it = r->slotList.find( s );
+    TQValueList<MetaDataBase::Slot>::Iterator it = r->slotList.tqfind( s );
     if ( it != r->slotList.end() )
         r->slotList.remove( it );
     r->slotList.append( s );
@@ -510,7 +510,7 @@ void MetaDataBase::addSlot( TQObject *o, const TQCString &slot, const TQString&
 void MetaDataBase::setSlotList( TQObject *o, const TQValueList<Slot> &slotList )
 {
     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() );
@@ -523,7 +523,7 @@ void MetaDataBase::removeSlot( TQObject *o, const TQCString &slot, const TQStrin
                                const TQString &access, const TQString &language, 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() );
@@ -546,7 +546,7 @@ void MetaDataBase::removeSlot( TQObject *o, const TQCString &slot, const TQStrin
 void MetaDataBase::removeSlot( TQObject *o, const TQString &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() );
@@ -565,7 +565,7 @@ void MetaDataBase::removeSlot( TQObject *o, const TQString &slot )
 TQValueList<MetaDataBase::Slot> 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() );
@@ -578,7 +578,7 @@ TQValueList<MetaDataBase::Slot> MetaDataBase::slotList( TQObject *o )
 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() );
@@ -596,7 +596,7 @@ bool MetaDataBase::isSlotUsed( TQObject *o, const TQCString &slot )
 void MetaDataBase::changeSlot( TQObject *o, const TQCString &slot, const TQCString &newName )
 {
     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() );
@@ -617,7 +617,7 @@ void MetaDataBase::changeSlotAttributes( TQObject *o, const TQCString &slot,
                                          const TQString &language, 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() );
@@ -639,7 +639,7 @@ void MetaDataBase::changeSlotAttributes( TQObject *o, const TQCString &slot,
 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() );
@@ -647,14 +647,14 @@ 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 ( o->inherits( "FormWindow" ) ) {
-            o = ( (FormWindow*)o )->mainContainer();
-            slotList = o->metaObject()->slotNames( true );
-            if ( slotList.find( slot ) != -1 )
+            o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
+            slotList = o->tqmetaObject()->slotNames( true );
+            if ( slotList.tqfind( slot ) != -1 )
                 return true;
         }
 
@@ -682,11 +682,11 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
 TQString MetaDataBase::languageOfSlot( 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() );
-        return TQString::null;
+        return TQString();
     }
 
     TQString sl = slot;
@@ -698,7 +698,7 @@ TQString MetaDataBase::languageOfSlot( TQObject *o, const TQCString &slot )
         if ( sl == sl2 )
             return s.language;
     }
-    return TQString::null;
+    return TQString();
 }
 
 bool MetaDataBase::addCustomWidget( CustomWidget *wid )
@@ -779,7 +779,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() );
@@ -792,7 +792,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() );
@@ -805,7 +805,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() );
@@ -818,7 +818,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() );
@@ -831,7 +831,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() );
@@ -844,7 +844,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() );
@@ -857,7 +857,7 @@ TQStringList MetaDataBase::forwards( TQObject *o )
 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() );
@@ -871,10 +871,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;
@@ -890,7 +890,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() );
@@ -903,7 +903,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() );
@@ -916,7 +916,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() );
@@ -934,7 +934,7 @@ MetaDataBase::CustomWidget::CustomWidget()
     className = "MyCustomWidget";
     includeFile = "mywidget.h";
     includePolicy = Local;
-    sizeHint = TQSize( -1, -1 );
+    tqsizeHint = TQSize( -1, -1 );
     pixmap = new TQPixmap( PixmapChooser::loadPixmap( "customwidget.xpm" ) );
     id = -1;
     sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
@@ -946,7 +946,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
@@ -958,7 +958,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w )
 void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c )
 {
     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() );
@@ -971,7 +971,7 @@ void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c )
 TQCursor MetaDataBase::cursor( TQWidget *w )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)w );
+    MetaDataBaseRecord *r = db->tqfind( (void*)w );
     if ( !r ) {
         w->unsetCursor();
         return w->cursor();
@@ -991,7 +991,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
@@ -1006,8 +1006,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 ( normalizeSlot( *it ) == normalizeSlot( signal ) )
@@ -1018,8 +1018,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( normalizeSlot( slot ) ) != -1 )
+    TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( true );
+    if ( slotList.tqfind( normalizeSlot( slot ) ) != -1 )
         return true;
 
     for ( TQValueList<MetaDataBase::Slot>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) {
@@ -1031,8 +1031,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 ) {
@@ -1047,7 +1047,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() );
@@ -1061,16 +1061,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 )
@@ -1078,7 +1078,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() );
@@ -1094,7 +1094,7 @@ void MetaDataBase::setPixmapKey( TQObject *o, int pixmap, const TQString &arg )
     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() );
@@ -1108,16 +1108,16 @@ 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();
-    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->pixmapKeys.find( pixmap );
+    return *r->pixmapKeys.tqfind( pixmap );
 }
 
 void MetaDataBase::clearPixmapKeys( TQObject *o )
@@ -1125,7 +1125,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() );
@@ -1142,7 +1142,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() );
@@ -1157,7 +1157,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() );
@@ -1187,7 +1187,7 @@ void MetaDataBase::setExportMacro( TQObject *o, const TQString &macro )
     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() );
@@ -1202,7 +1202,7 @@ TQString MetaDataBase::exportMacro( 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() );
@@ -1214,6 +1214,6 @@ TQString MetaDataBase::exportMacro( TQObject *o )
 
 bool MetaDataBase::hasObject( TQObject *o )
 {
-    return !!db->find( o );
+    return !!db->tqfind( o );
 }
 
diff --git a/kommander/editor/metadatabase.h b/kommander/editor/metadatabase.h
index d5aceff5..5251e793 100644
--- a/kommander/editor/metadatabase.h
+++ b/kommander/editor/metadatabase.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -92,7 +92,7 @@ public:
 	TQString className;
 	TQString includeFile;
 	IncludePolicy includePolicy;
-	TQSize sizeHint;
+	TQSize tqsizeHint;
 	TQSizePolicy sizePolicy;
 	TQPixmap *pixmap;
 	TQValueList<TQCString> lstSignals;
@@ -125,7 +125,7 @@ public:
     {
 	TQString name;
 	TQStringList args;
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 	bool operator==( const EventDescription& ) const { return FALSE; }
 #endif
     };
diff --git a/kommander/editor/multilineeditor.ui b/kommander/editor/multilineeditor.ui
index 9b9cbe9f..47ce1172 100644
--- a/kommander/editor/multilineeditor.ui
+++ b/kommander/editor/multilineeditor.ui
@@ -19,13 +19,13 @@
 **
 *********************************************************************</comment>
 <widget>
-    <class>QDialog</class>
+    <class>TQDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>MultiLineEditorBase</cstring>
     </property>
     <property stdset="1">
-        <name>geometry</name>
+        <name>tqgeometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -55,7 +55,7 @@
             <number>6</number>
         </property>
         <widget>
-            <class>QLabel</class>
+            <class>TQLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel1</cstring>
@@ -70,7 +70,7 @@
             </property>
         </widget>
         <widget>
-            <class>QMultiLineEdit</class>
+            <class>TQMultiLineEdit</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>preview</cstring>
@@ -85,7 +85,7 @@
             </property>
         </widget>
         <widget>
-            <class>QLayoutWidget</class>
+            <class>TQLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Layout1</cstring>
@@ -100,7 +100,7 @@
                     <number>6</number>
                 </property>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>TQPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>buttonHelp</cstring>
@@ -128,7 +128,7 @@
                         <enum>Expanding</enum>
                     </property>
                     <property>
-                        <name>sizeHint</name>
+                        <name>tqsizeHint</name>
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -136,7 +136,7 @@
                     </property>
                 </spacer>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>TQPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>buttonOk</cstring>
@@ -159,7 +159,7 @@
                     </property>
                 </widget>
 		<widget>
-			<class>QPushButton</class>
+			<class>TQPushButton</class>
 			<property stdset="1">
 				<name>name</name>
 				<cstring>buttonApply</cstring>
@@ -178,7 +178,7 @@
 			</property>
 		</widget>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>TQPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>buttonCancel</cstring>
diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp
index 2a0ec9b7..98ad65d6 100644
--- a/kommander/editor/multilineeditorimpl.cpp
+++ b/kommander/editor/multilineeditorimpl.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -28,13 +28,13 @@
 
 #include <klocale.h>
 
-MultiLineEditor::MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
-    : MultiLineEditorBase( parent, 0, true ), formwindow( fw )
+MultiLineEditor::MultiLineEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw )
+    : MultiLineEditorBase( tqparent, 0, true ), formwindow( fw )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     mlined = (TQMultiLineEdit*)editWidget;
     // #### complete list of properties here
-    preview->setAlignment( mlined->alignment() );
+    preview->tqsetAlignment( mlined->tqalignment() );
     preview->setMaxLines( mlined->maxLines() );
     preview->setWordWrap( mlined->wordWrap() );
     preview->setWrapColumnOrWidth( mlined->wrapColumnOrWidth() );
@@ -53,7 +53,7 @@ void MultiLineEditor::okClicked()
 
 void MultiLineEditor::applyClicked()
 {
-    PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n("Set Text of '%1'" ).arg( mlined->name() ),
+    PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n("Set Text of '%1'" ).tqarg( mlined->name() ),
 									  formwindow, mlined, preview->text() );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
@@ -61,8 +61,8 @@ void MultiLineEditor::applyClicked()
 }
 
 
-TextEditor::TextEditor( TQWidget *parent, const TQString &text )
-    : MultiLineEditorBase( parent, 0, true )
+TextEditor::TextEditor( TQWidget *tqparent, const TQString &text )
+    : MultiLineEditorBase( tqparent, 0, true )
 {
     buttonApply->hide();
     setCaption( i18n("Text" ) );
@@ -71,9 +71,9 @@ TextEditor::TextEditor( TQWidget *parent, const TQString &text )
     preview->selectAll();
 }
 
-TQString TextEditor::getText( TQWidget *parent, const TQString &text )
+TQString TextEditor::getText( TQWidget *tqparent, const TQString &text )
 {
-    TextEditor dlg( parent, text );
+    TextEditor dlg( tqparent, text );
     if ( dlg.exec() == TQDialog::Accepted ) {
 	TQString txt = dlg.preview->text();
 	int i = txt.length() - 1;
@@ -84,7 +84,7 @@ TQString TextEditor::getText( TQWidget *parent, const TQString &text )
 	}
 	return txt;
     }
-    return TQString::null;
+    return TQString();
 }
 
 void TextEditor::okClicked()
diff --git a/kommander/editor/multilineeditorimpl.h b/kommander/editor/multilineeditorimpl.h
index d26c7f78..a5d48479 100644
--- a/kommander/editor/multilineeditorimpl.h
+++ b/kommander/editor/multilineeditorimpl.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -29,9 +29,10 @@ class TQMultiLineEdit;
 class MultiLineEditor : public MultiLineEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw );
+    MultiLineEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw );
 
 protected slots:
     void okClicked();
@@ -46,11 +47,12 @@ private:
 class TextEditor : public MultiLineEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TextEditor( TQWidget *parent, const TQString &text );
+    TextEditor( TQWidget *tqparent, const TQString &text );
 
-    static TQString getText( TQWidget *parent, const TQString &text );
+    static TQString getText( TQWidget *tqparent, const TQString &text );
     
 protected slots:
     void okClicked();
diff --git a/kommander/editor/newform.ui b/kommander/editor/newform.ui
index 16bb0365..c1e14bd6 100644
--- a/kommander/editor/newform.ui
+++ b/kommander/editor/newform.ui
@@ -19,7 +19,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>NewFormBase</cstring>
     </property>
@@ -50,7 +50,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>
@@ -64,7 +64,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -85,14 +85,14 @@
                     <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>buttonOk</cstring>
                     </property>
@@ -109,7 +109,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>
@@ -125,7 +125,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>
@@ -155,7 +155,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
@@ -179,19 +179,19 @@
     </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>
@@ -202,9 +202,9 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<slots>
-    <slot access="protected">itemChanged( QIconViewItem * )</slot>
+<Q_SLOTS>
+    <slot access="protected">itemChanged( TQIconViewItem * )</slot>
     <slot access="protected">projectChanged( const QString &amp; )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp
index ee623e48..e1ef5662 100644
--- a/kommander/editor/newformimpl.cpp
+++ b/kommander/editor/newformimpl.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS. �All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS. �All rights reserved.
 
  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
@@ -57,7 +57,7 @@ void FormItem::insert()
   FormWindow *fw = 0;
   FormFile *ff = new FormFile(FormFile::createUnnamedFileName(), true);
   fw = new FormWindow(ff, MainWindow::self, MainWindow::self->qWorkspace(), n);
-  MetaDataBase::addEntry(fw);
+  MetaDataBase::addEntry(TQT_TQOBJECT(fw));
   TQWidget *w = 0L;
   if (fType == Dialog) 
   {
@@ -72,7 +72,7 @@ void FormItem::insert()
   if (w)
   {
     w->setProperty("useInternalParser", true);
-    MetaDataBase::setPropertyChanged(w, "useInternalParser", true);
+    MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "useInternalParser", true);
   }
   fw->setCaption(n);
   fw->resize(600, 480);
@@ -81,7 +81,7 @@ void FormItem::insert()
   // the wizard might have changed a lot, lets update everything
   MainWindow::self->actioneditor()->setFormWindow(fw);
   MainWindow::self->objectHierarchy()->setFormWindow(fw, fw);
-  fw->killAccels(fw);
+  fw->killAccels(TQT_TQOBJECT(fw));
   fw->setFocus();
 }
 
@@ -100,12 +100,12 @@ static void unifyFormName(FormWindow *fw, TQWorkspace *qworkspace)
     if (w != fw)
       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);
   fw->setCaption(n);
@@ -121,22 +121,22 @@ void CustomFormItem::insert()
     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());
     }
   }
 }
 
 
-NewForm::NewForm(TQWidget *parent, const TQString &templatePath)
-    : NewFormBase(parent, 0, true)
+NewForm::NewForm(TQWidget *tqparent, const TQString &templatePath)
+    : NewFormBase(tqparent, 0, true)
 {
   connect(helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp()));
 
@@ -165,15 +165,15 @@ NewForm::NewForm(TQWidget *parent, const TQString &templatePath)
     if (!TQFile::exists(*it))
       continue;
     TQDir dir(*it);
-    const QFileInfoList* fileList = dir.entryInfoList(TQDir::DefaultFilter, TQDir::DirsFirst | TQDir::Name);
+    const TQFileInfoList* fileList = dir.entryInfoList(TQDir::DefaultFilter, TQDir::DirsFirst | TQDir::Name);
     if (fileList)
-      for (QFileInfoListIterator fit(*fileList); fit.current(); ++fit)
+      for (TQFileInfoListIterator fit(*fileList); fit.current(); ++fit)
       {
         TQFileInfo* fi = fit.current();
         if (!fi->isFile() || fi->extension() != "kmdr")
           continue;
         TQString name = fi->baseName();
-        name = name.replace("_", " ");
+        name = name.tqreplace("_", " ");
         CustomFormItem *ci = new CustomFormItem(templateView, name);
         allItems.append(ci);
         ci->setDragEnabled(false);
diff --git a/kommander/editor/newformimpl.h b/kommander/editor/newformimpl.h
index 9aad4155..6b28a631 100644
--- a/kommander/editor/newformimpl.h
+++ b/kommander/editor/newformimpl.h
@@ -1,5 +1,5 @@
 /**********************************************************************
- This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS.  All rights reserved.
+ This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS.  All rights reserved.
 
  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
@@ -25,7 +25,7 @@
 class FormFile;
 
 
-class NewItem : public QIconViewItem
+class NewItem : public TQIconViewItem
 {
 public:
   enum Type {Form, CustomForm};
@@ -61,8 +61,9 @@ private:
 class NewForm : public NewFormBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-  NewForm( TQWidget *parent, const TQString &templatePath );
+  NewForm( TQWidget *tqparent, const TQString &templatePath );
   void accept();
 protected slots:
   void itemChanged(TQIconViewItem *item);
diff --git a/kommander/editor/orderindicator.cpp b/kommander/editor/orderindicator.cpp
index fee29150..056601b8 100644
--- a/kommander/editor/orderindicator.cpp
+++ b/kommander/editor/orderindicator.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -63,7 +63,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();
@@ -72,7 +72,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/kommander/editor/orderindicator.h b/kommander/editor/orderindicator.h
index 24cae185..ae696c95 100644
--- a/kommander/editor/orderindicator.h
+++ b/kommander/editor/orderindicator.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -25,9 +25,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/kommander/editor/paletteeditor.ui b/kommander/editor/paletteeditor.ui
index 31a4cd8a..814785dd 100644
--- a/kommander/editor/paletteeditor.ui
+++ b/kommander/editor/paletteeditor.ui
@@ -19,7 +19,7 @@
 ** not clear to you. 
 ** 
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PaletteEditorBase</cstring>
     </property>
@@ -52,7 +52,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupAutoPalette</cstring>
             </property>
@@ -67,7 +67,7 @@
             <property name="title">
                 <string>Build Palette</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignAuto</set>
             </property>
             <hbox>
@@ -80,7 +80,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 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>50</width>
                             <height>0</height>
@@ -110,7 +110,7 @@
                     <property name="text">
                         <string>&amp;3D effects:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -142,7 +142,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>
@@ -154,7 +154,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>50</width>
                             <height>0</height>
@@ -172,7 +172,7 @@
                     <property name="text">
                         <string>Back&amp;ground:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -214,14 +214,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>
@@ -231,7 +231,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox126</cstring>
             </property>
@@ -256,7 +256,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout2</cstring>
                     </property>
@@ -270,7 +270,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel1</cstring>
                             </property>
@@ -281,7 +281,7 @@
                                 <cstring>paletteCombo</cstring>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <item>
                                 <property name="text">
                                     <string>Active Palette</string>
@@ -318,7 +318,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -332,7 +332,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -353,14 +353,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>
@@ -377,7 +377,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>
@@ -501,15 +501,15 @@
     <tabstop>paletteCombo</tabstop>
     <tabstop>buttonHelp</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">onTune()</slot>
     <slot access="protected">onChoose2ndMainColor()</slot>
     <slot access="protected">onChooseMainColor()</slot>
     <slot access="protected">paletteSelected(int)</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/kommander/editor/paletteeditoradvanced.ui b/kommander/editor/paletteeditoradvanced.ui
index cf868b69..5d2c41af 100644
--- a/kommander/editor/paletteeditoradvanced.ui
+++ b/kommander/editor/paletteeditoradvanced.ui
@@ -19,7 +19,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PaletteEditorAdvancedBase</cstring>
     </property>
@@ -41,7 +41,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">
@@ -53,7 +53,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout14</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -84,7 +84,7 @@
                         <cstring>paletteCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <item>
                         <property name="text">
                             <string>Active Palette</string>
@@ -106,7 +106,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -131,7 +131,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkBuildInactive</cstring>
                     </property>
@@ -142,7 +142,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkBuildDisabled</cstring>
                     </property>
@@ -155,7 +155,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupCentral</cstring>
             </property>
@@ -172,7 +172,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <item>
                         <property name="text">
                             <string>Background</string>
@@ -238,7 +238,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>
@@ -262,14 +262,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>
@@ -325,7 +325,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -367,7 +367,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupEffect</cstring>
             </property>
@@ -384,7 +384,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout32_3</cstring>
                     </property>
@@ -398,7 +398,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>checkBuildEffect</cstring>
                             </property>
@@ -415,7 +415,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>
@@ -453,7 +453,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout31_2</cstring>
                     </property>
@@ -477,14 +477,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>
@@ -496,7 +496,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -538,7 +538,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -552,7 +552,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -573,14 +573,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>
@@ -597,7 +597,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>
@@ -743,7 +743,7 @@
     <tabstop>buttonEffect</tabstop>
     <tabstop>buttonHelp</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">onToggleBuildDisabled(bool)</slot>
@@ -756,8 +756,8 @@
     <slot access="protected">onToggleBuildInactive(bool)</slot>
     <slot access="protected">paletteSelected(int)</slot>
     <slot>showHelp()</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/kommander/editor/paletteeditoradvancedimpl.cpp b/kommander/editor/paletteeditoradvancedimpl.cpp
index 69c90c33..243576c2 100644
--- a/kommander/editor/paletteeditoradvancedimpl.cpp
+++ b/kommander/editor/paletteeditoradvancedimpl.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -35,7 +35,7 @@
     Class used by PaletteEditor for bold combobox items
 */
 
-class BoldListBoxText : public QListBoxText
+class BoldListBoxText : public TQListBoxText
 {
 public:
     BoldListBoxText( TQString text, TQListBox* lb = 0 );
@@ -59,9 +59,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() ) );
 
@@ -244,15 +244,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;
     }
 
@@ -508,17 +508,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;
     }
 
@@ -613,10 +613,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/kommander/editor/paletteeditoradvancedimpl.h b/kommander/editor/paletteeditoradvancedimpl.h
index b9c378dd..ed0bcc39 100644
--- a/kommander/editor/paletteeditoradvancedimpl.h
+++ b/kommander/editor/paletteeditoradvancedimpl.h
@@ -4,7 +4,7 @@
 /**********************************************************************
 ** 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
@@ -28,13 +28,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/kommander/editor/paletteeditorimpl.cpp b/kommander/editor/paletteeditorimpl.cpp
index bc3877f4..89d1f624 100644
--- a/kommander/editor/paletteeditorimpl.cpp
+++ b/kommander/editor/paletteeditorimpl.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -30,8 +30,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() ) );
 
@@ -275,9 +275,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/kommander/editor/paletteeditorimpl.h b/kommander/editor/paletteeditorimpl.h
index abd68dfc..54e45612 100644
--- a/kommander/editor/paletteeditorimpl.h
+++ b/kommander/editor/paletteeditorimpl.h
@@ -4,7 +4,7 @@
 /**********************************************************************
 ** 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
@@ -28,13 +28,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/kommander/editor/parser.cpp b/kommander/editor/parser.cpp
index 15374aa5..cbd3946a 100644
--- a/kommander/editor/parser.cpp
+++ b/kommander/editor/parser.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include <tqstringlist.h>
 
-class NormalizeObject : public QObject
+class NormalizeObject : public TQObject
 {
 public:
     NormalizeObject() : TQObject() {}
@@ -32,9 +32,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 ) {
@@ -42,13 +42,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 ) {
@@ -62,5 +62,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/kommander/editor/parser.h b/kommander/editor/parser.h
index ace96d9e..5fdbdc2b 100644
--- a/kommander/editor/parser.h
+++ b/kommander/editor/parser.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
diff --git a/kommander/editor/pics/images.h b/kommander/editor/pics/images.h
index 92094bdb..5850acd1 100644
--- a/kommander/editor/pics/images.h
+++ b/kommander/editor/pics/images.h
@@ -1,5 +1,5 @@
-#ifndef _QEMBED_1804289383
-#define _QEMBED_1804289383
+#ifndef _TQEMBED_1804289383
+#define _TQEMBED_1804289383
 static const unsigned int  arrow_xbm_len = 601;
 static const unsigned char arrow_xbm_data[] = {
     0x23,0x64,0x65,0x66,0x69,0x6e,0x65,0x20,0x61,0x72,0x72,0x6f,0x77,0x5f,
@@ -4717,8 +4717,8 @@ static const unsigned char small_editgrid_png_data[] = {
     0x60,0x82
 };
 
-static const unsigned int  small_edithlayout_png_len = 706;
-static const unsigned char small_edithlayout_png_data[] = {
+static const unsigned int  small_edithtqlayout_png_len = 706;
+static const unsigned char small_edithtqlayout_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -4772,8 +4772,8 @@ static const unsigned char small_edithlayout_png_data[] = {
     0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
-static const unsigned int  small_edithlayoutsplit_png_len = 809;
-static const unsigned char small_edithlayoutsplit_png_data[] = {
+static const unsigned int  small_edithtqlayoutsplit_png_len = 809;
+static const unsigned char small_edithtqlayoutsplit_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -4957,8 +4957,8 @@ static const unsigned char small_editslots_png_data[] = {
     0xae,0x42,0x60,0x82
 };
 
-static const unsigned int  small_editvlayout_png_len = 289;
-static const unsigned char small_editvlayout_png_data[] = {
+static const unsigned int  small_editvtqlayout_png_len = 289;
+static const unsigned char small_editvtqlayout_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -4982,8 +4982,8 @@ static const unsigned char small_editvlayout_png_data[] = {
     0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
-static const unsigned int  small_editvlayoutsplit_png_len = 355;
-static const unsigned char small_editvlayoutsplit_png_data[] = {
+static const unsigned int  small_editvtqlayoutsplit_png_len = 355;
+static const unsigned char small_editvtqlayoutsplit_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -7784,8 +7784,8 @@ static const unsigned char small_disabled_editgrid_png_data[] = {
     0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
-static const unsigned int  small_disabled_edithlayout_png_len = 601;
-static const unsigned char small_disabled_edithlayout_png_data[] = {
+static const unsigned int  small_disabled_edithtqlayout_png_len = 601;
+static const unsigned char small_disabled_edithtqlayout_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -7831,8 +7831,8 @@ static const unsigned char small_disabled_edithlayout_png_data[] = {
     0x35,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
-static const unsigned int  small_disabled_edithlayoutsplit_png_len = 754;
-static const unsigned char small_disabled_edithlayoutsplit_png_data[] = {
+static const unsigned int  small_disabled_edithtqlayoutsplit_png_len = 754;
+static const unsigned char small_disabled_edithtqlayoutsplit_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -7958,8 +7958,8 @@ static const unsigned char small_disabled_editpaste_png_data[] = {
     0x44,0xae,0x42,0x60,0x82
 };
 
-static const unsigned int  small_disabled_editvlayout_png_len = 617;
-static const unsigned char small_disabled_editvlayout_png_data[] = {
+static const unsigned int  small_disabled_editvtqlayout_png_len = 617;
+static const unsigned char small_disabled_editvtqlayout_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -8007,8 +8007,8 @@ static const unsigned char small_disabled_editvlayout_png_data[] = {
     0x82
 };
 
-static const unsigned int  small_disabled_editvlayoutsplit_png_len = 752;
-static const unsigned char small_disabled_editvlayoutsplit_png_data[] = {
+static const unsigned int  small_disabled_editvtqlayoutsplit_png_len = 752;
+static const unsigned char small_disabled_editvtqlayoutsplit_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -10857,7 +10857,7 @@ static struct Embed {
     { 1483, small_form_xpm_data, "small/form.xpm" },
     { 3981, small_home_xpm_data, "small/home.xpm" },
     { 5406, small_image_xpm_data, "small/image.xpm" },
-    { 3179, small_layout_xpm_data, "small/layout.xpm" },
+    { 3179, small_layout_xpm_data, "small/tqlayout.xpm" },
     { 3621, small_left_xpm_data, "small/left.xpm" },
     { 1131, small_newform_xpm_data, "small/newform.xpm" },
     { 2434, small_print_xpm_data, "small/print.xpm" },
@@ -10877,12 +10877,12 @@ static struct Embed {
     { 485, small_editcopy_png_data, "small/editcopy.png" },
     { 649, small_editcut_png_data, "small/editcut.png" },
     { 520, small_editgrid_png_data, "small/editgrid.png" },
-    { 706, small_edithlayout_png_data, "small/edithlayout.png" },
-    { 809, small_edithlayoutsplit_png_data, "small/edithlayoutsplit.png" },
+    { 706, small_edithtqlayout_png_data, "small/edithtqlayout.png" },
+    { 809, small_edithtqlayoutsplit_png_data, "small/edithtqlayoutsplit.png" },
     { 902, small_editpaste_png_data, "small/editpaste.png" },
     { 690, small_editslots_png_data, "small/editslots.png" },
-    { 289, small_editvlayout_png_data, "small/editvlayout.png" },
-    { 355, small_editvlayoutsplit_png_data, "small/editvlayoutsplit.png" },
+    { 289, small_editvtqlayout_png_data, "small/editvtqlayout.png" },
+    { 355, small_editvtqlayoutsplit_png_data, "small/editvtqlayoutsplit.png" },
     { 1408, small_exec_png_data, "small/exec.png" },
     { 313, small_filenew_png_data, "small/filenew.png" },
     { 681, small_fileopen_png_data, "small/fileopen.png" },
@@ -10925,7 +10925,7 @@ static struct Embed {
     { 572, small_undo_png_data, "small/undo.png" },
     { 733, small_disabled_editcut_xpm_data, "small/disabled/editcut.xpm" },
     { 899, small_disabled_editslots_xpm_data, "small/disabled/editslots.xpm" },
-    { 931, small_disabled_layout_xpm_data, "small/disabled/layout.xpm" },
+    { 931, small_disabled_layout_xpm_data, "small/disabled/tqlayout.xpm" },
     { 733, small_disabled_left_xpm_data, "small/disabled/left.xpm" },
     { 733, small_disabled_right_xpm_data, "small/disabled/right.xpm" },
     { 659, small_disabled_adjustsize_png_data, "small/disabled/adjustsize.png" },
@@ -10933,11 +10933,11 @@ static struct Embed {
     { 1126, small_disabled_editbreaklayout_png_data, "small/disabled/editbreaklayout.png" },
     { 931, small_disabled_editcopy_png_data, "small/disabled/editcopy.png" },
     { 735, small_disabled_editgrid_png_data, "small/disabled/editgrid.png" },
-    { 601, small_disabled_edithlayout_png_data, "small/disabled/edithlayout.png" },
-    { 754, small_disabled_edithlayoutsplit_png_data, "small/disabled/edithlayoutsplit.png" },
+    { 601, small_disabled_edithtqlayout_png_data, "small/disabled/edithtqlayout.png" },
+    { 754, small_disabled_edithtqlayoutsplit_png_data, "small/disabled/edithtqlayoutsplit.png" },
     { 901, small_disabled_editpaste_png_data, "small/disabled/editpaste.png" },
-    { 617, small_disabled_editvlayout_png_data, "small/disabled/editvlayout.png" },
-    { 752, small_disabled_editvlayoutsplit_png_data, "small/disabled/editvlayoutsplit.png" },
+    { 617, small_disabled_editvtqlayout_png_data, "small/disabled/editvtqlayout.png" },
+    { 752, small_disabled_editvtqlayoutsplit_png_data, "small/disabled/editvtqlayoutsplit.png" },
     { 587, small_disabled_filesave_png_data, "small/disabled/filesave.png" },
     { 531, small_disabled_redo_png_data, "small/disabled/redo.png" },
     { 1013, small_disabled_searchfind_png_data, "small/disabled/searchfind.png" },
@@ -10957,7 +10957,7 @@ static struct Embed {
 static const TQByteArray& qembed_findData( const char* name )
 {
     static TQDict<TQByteArray> dict;
-    TQByteArray* ba = dict.find( name );
+    TQByteArray* ba = dict.tqfind( name );
     if ( !ba ) {
 	for ( int i = 0; embed_vec[i].data; i++ ) {
 	    if ( strcmp(embed_vec[i].name, name) == 0 ) {
diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp
index 92512c68..f0e8ab3a 100644
--- a/kommander/editor/pixmapchooser.cpp
+++ b/kommander/editor/pixmapchooser.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -50,8 +50,8 @@
 #if defined(DESIGNER)
 #include "pics/images.h"
 
-#ifdef Q_WS_MACX
-//logo is 40x40 on the mac, if it changes - please notify the Qt/Mac team
+#ifdef TQ_WS_MACX
+//logo is 40x40 on the mac, if it changes - please notify the TQt/Mac team
 static const char * const logo_xpm[] = {
 "40 40 543 2",
 "  	c None",
@@ -876,8 +876,8 @@ static ImageIconProvider *imageIconProvider = 0;
 static PixmapChooser *pixmapChooser = 0;
 #endif
 
-PixmapView::PixmapView( TQWidget *parent )
-    : TQScrollView( parent )
+PixmapView::PixmapView( TQWidget *tqparent )
+    : TQScrollView( tqparent )
 {
     viewport()->setBackgroundMode( PaletteBase );
 }
@@ -886,12 +886,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 );
 }
 
@@ -907,36 +907,36 @@ void PixmapView::previewUrl( const TQUrl &u )
     }
 }
 
-TQStringList qChoosePixmaps( TQWidget *parent )
+TQStringList qChoosePixmaps( TQWidget *tqparent )
 {
     if ( !imageIconProvider && !TQFileDialog::iconProvider() )
 	TQFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) );
 
     TQString filter;
-    TQString all = qApp->translate( "qChoosePixmap", "All Pixmaps (" );
+    TQString all = tqApp->translate( "qChoosePixmap", "All Pixmaps (" );
     for ( uint i = 0; i < TQImageIO::outputFormats().count(); i++ ) {
-	filter += qApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" ).
+	filter += tqApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" ).
 		  arg( TQImageIO::outputFormats().at( i ) ).
 		  arg( "*." + TQString( TQImageIO::outputFormats().at( i ) ).lower() );
 	all += "*." + TQString( TQImageIO::outputFormats().at( i ) ).lower() + ";";
     }
-    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 (*)" );
 
-    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();
 }
 
-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() ) {
@@ -955,7 +955,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T
 	filter.prepend( all + ")\n" );
 	filter += i18n( "All Files (*)" );
 
-	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 );
@@ -966,13 +966,13 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T
 	    TQPixmap pix( fd.selectedFile() );
 	    if ( fn )
 		*fn = fd.selectedFile();
-	    MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), fd.selectedFile() );
+	    MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), fd.selectedFile() );
 	    return pix;
 	}
     }
 #ifndef KOMMANDER
     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() ) );
@@ -984,27 +984,27 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T
     }
 #endif
     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( PixmapChooser::loadPixmap( "image.xpm" ) );
-	    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( PixmapChooser::loadPixmap( "image.xpm", PixmapChooser::Mini ) )
+ImageIconProvider::ImageIconProvider( TQWidget *tqparent, const char *name )
+    : TQFileIconProvider( TQT_TQOBJECT(tqparent), name ), imagepm( PixmapChooser::loadPixmap( "image.xpm", PixmapChooser::Mini ) )
 {
     fmts = TQImage::inputFormats();
 }
@@ -1016,7 +1016,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/kommander/editor/pixmapchooser.h b/kommander/editor/pixmapchooser.h
index fe54942e..48c947a7 100644
--- a/kommander/editor/pixmapchooser.h
+++ b/kommander/editor/pixmapchooser.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -29,12 +29,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 );
@@ -44,12 +45,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 );
@@ -60,8 +62,8 @@ 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 );
 
 
 class PixmapChooser
diff --git a/kommander/editor/pixmapfunction.ui b/kommander/editor/pixmapfunction.ui
index a75869dc..fb2043d2 100644
--- a/kommander/editor/pixmapfunction.ui
+++ b/kommander/editor/pixmapfunction.ui
@@ -19,13 +19,13 @@
 **
 *********************************************************************</comment>
 <widget>
-    <class>QDialog</class>
+    <class>TQDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>PixmapFunction</cstring>
     </property>
     <property stdset="1">
-        <name>geometry</name>
+        <name>tqgeometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -51,7 +51,7 @@
             <number>6</number>
         </property>
         <widget>
-            <class>QLabel</class>
+            <class>TQLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel3</cstring>
@@ -66,7 +66,7 @@
             </property>
         </widget>
         <widget>
-            <class>QFrame</class>
+            <class>TQFrame</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Frame9</cstring>
@@ -84,10 +84,10 @@
                 <number>2</number>
             </property>
             <property>
-                <name>layoutMargin</name>
+                <name>tqlayoutMargin</name>
             </property>
             <property>
-                <name>layoutSpacing</name>
+                <name>tqlayoutSpacing</name>
             </property>
             <hbox>
                 <property stdset="1">
@@ -99,14 +99,14 @@
                     <number>0</number>
                 </property>
                 <widget>
-                    <class>QLabel</class>
+                    <class>TQLabel</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>labelFunction</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>QPixmap(</string>
+                        <string>TQPixmap(</string>
                     </property>
                     <property stdset="1">
                         <name>palette</name>
@@ -331,7 +331,7 @@
                     </property>
                 </widget>
                 <widget>
-                    <class>QLineEdit</class>
+                    <class>TQLineEdit</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>editArguments</cstring>
@@ -563,7 +563,7 @@
                     </property>
                 </widget>
                 <widget>
-                    <class>QLabel</class>
+                    <class>TQLabel</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>TextLabel5</cstring>
@@ -810,7 +810,7 @@
                 <enum>Expanding</enum>
             </property>
             <property>
-                <name>sizeHint</name>
+                <name>tqsizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -818,7 +818,7 @@
             </property>
         </spacer>
         <widget>
-            <class>QLayoutWidget</class>
+            <class>TQLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Layout3</cstring>
@@ -833,7 +833,7 @@
                     <number>6</number>
                 </property>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>TQPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>helpButton</cstring>
@@ -861,7 +861,7 @@
                         <enum>Expanding</enum>
                     </property>
                     <property>
-                        <name>sizeHint</name>
+                        <name>tqsizeHint</name>
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -869,7 +869,7 @@
                     </property>
                 </spacer>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>TQPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>buttonOk</cstring>
@@ -888,7 +888,7 @@
                     </property>
                 </widget>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>TQPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>buttonCancel</cstring>
diff --git a/kommander/editor/preferences.ui b/kommander/editor/preferences.ui
index 6bd5dac3..63ac1bb3 100644
--- a/kommander/editor/preferences.ui
+++ b/kommander/editor/preferences.ui
@@ -19,7 +19,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>Preferences</cstring>
     </property>
@@ -50,11 +50,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="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QButtonGroup" row="0" column="0" rowspan="2" colspan="1">
+                    <widget class="TQButtonGroup" row="0" column="0" rowspan="2" colspan="1">
                         <property name="name">
                             <cstring>ButtonGroup1</cstring>
                         </property>
@@ -114,7 +114,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>
@@ -131,7 +131,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>
@@ -173,7 +173,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QCheckBox" row="0" column="1">
+                    <widget class="TQCheckBox" row="0" column="1">
                         <property name="name">
                             <cstring>checkBoxShowGrid</cstring>
                         </property>
@@ -190,7 +190,7 @@
                             <string>&lt;b&gt;Customize the grid appearance for all forms.&lt;/b&gt;&lt;p&gt;When &lt;b&gt;Show Grid&lt;/b&gt; is checked, all forms show a grid.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QGroupBox" row="1" column="1">
+                    <widget class="TQGroupBox" row="1" column="1">
                         <property name="name">
                             <cstring>GroupBox1</cstring>
                         </property>
@@ -210,7 +210,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxGrid</cstring>
                                 </property>
@@ -227,7 +227,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>
@@ -241,7 +241,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>
@@ -261,7 +261,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>
@@ -281,7 +281,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>
@@ -292,7 +292,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>
@@ -317,7 +317,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -327,7 +327,7 @@
                             <string>A splash screen is displayed when starting Qt Designer if this option is checked.</string>
                         </property>
                     </spacer>
-                    <widget class="QGroupBox" row="2" column="0">
+                    <widget class="TQGroupBox" row="2" column="0">
                         <property name="name">
                             <cstring>GroupBox5</cstring>
                         </property>
@@ -344,7 +344,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxWorkspace</cstring>
                                 </property>
@@ -361,7 +361,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>
@@ -378,7 +378,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>checkAutoEdit</cstring>
                                 </property>
@@ -389,7 +389,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>Label3</cstring>
                                 </property>
@@ -400,7 +400,7 @@
                                     <cstring>editDocPath</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>Layout6</cstring>
                                 </property>
@@ -414,7 +414,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLineEdit">
+                                    <widget class="TQLineEdit">
                                         <property name="name">
                                             <cstring>editDocPath</cstring>
                                         </property>
@@ -422,7 +422,7 @@
                                             <string>&lt;b&gt;Enter the path to the documentation.&lt;/b&gt;&lt;p&gt;You may provide an $environment variable as the first part of the pathname.&lt;/p&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QToolButton">
+                                    <widget class="TQToolButton">
                                         <property name="name">
                                             <cstring>buttonDocPath</cstring>
                                         </property>
@@ -443,7 +443,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QGroupBox" row="2" column="1">
+                    <widget class="TQGroupBox" row="2" column="1">
                         <property name="name">
                             <cstring>GroupBox3</cstring>
                         </property>
@@ -460,7 +460,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxBigIcons</cstring>
                                 </property>
@@ -474,7 +474,7 @@
                                     <string>Big icons will be used in the toolbars if this is checked.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxTextLabels</cstring>
                                 </property>
@@ -493,7 +493,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
@@ -507,7 +507,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -528,14 +528,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>
@@ -552,7 +552,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/kommander/editor/previewframe.cpp b/kommander/editor/previewframe.cpp
index 3be0c2ae..53f35670 100644
--- a/kommander/editor/previewframe.cpp
+++ b/kommander/editor/previewframe.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -23,15 +23,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/kommander/editor/previewframe.h b/kommander/editor/previewframe.h
index 21ecd9a7..6447f005 100644
--- a/kommander/editor/previewframe.h
+++ b/kommander/editor/previewframe.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -26,24 +26,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/kommander/editor/previewwidget.ui b/kommander/editor/previewwidget.ui
index 317313cf..6c93d75d 100644
--- a/kommander/editor/previewwidget.ui
+++ b/kommander/editor/previewwidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>PreviewWidgetBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PreviewWidgetBase</cstring>
     </property>
@@ -31,7 +31,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
@@ -45,7 +45,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout17</cstring>
                     </property>
@@ -59,7 +59,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QButtonGroup">
+                        <widget class="TQButtonGroup">
                             <property name="name">
                                 <cstring>ButtonGroup1</cstring>
                             </property>
@@ -76,7 +76,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton1</cstring>
                                     </property>
@@ -87,7 +87,7 @@
                                         <bool>true</bool>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton2</cstring>
                                     </property>
@@ -95,7 +95,7 @@
                                         <string>RadioButton2</string>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton3</cstring>
                                     </property>
@@ -105,7 +105,7 @@
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QButtonGroup">
+                        <widget class="TQButtonGroup">
                             <property name="name">
                                 <cstring>ButtonGroup2</cstring>
                             </property>
@@ -122,7 +122,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>CheckBox1</cstring>
                                     </property>
@@ -133,7 +133,7 @@
                                         <bool>true</bool>
                                     </property>
                                 </widget>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>CheckBox2</cstring>
                                     </property>
@@ -143,7 +143,7 @@
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QProgressBar">
+                        <widget class="TQProgressBar">
                             <property name="name">
                                 <cstring>ProgressBar1</cstring>
                             </property>
@@ -153,7 +153,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
@@ -167,7 +167,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>LineEdit1</cstring>
                             </property>
@@ -175,7 +175,7 @@
                                 <string>LineEdit</string>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <item>
                                 <property name="text">
                                     <string>ComboBox</string>
@@ -185,7 +185,7 @@
                                 <cstring>ComboBox1</cstring>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout13</cstring>
                             </property>
@@ -199,12 +199,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>
@@ -214,7 +214,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QScrollBar">
+                        <widget class="TQScrollBar">
                             <property name="name">
                                 <cstring>ScrollBar1</cstring>
                             </property>
@@ -222,7 +222,7 @@
                                 <enum>Horizontal</enum>
                             </property>
                         </widget>
-                        <widget class="QSlider">
+                        <widget class="TQSlider">
                             <property name="name">
                                 <cstring>Slider1</cstring>
                             </property>
@@ -230,11 +230,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>
@@ -263,7 +263,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kommander/editor/previewwidgetimpl.cpp b/kommander/editor/previewwidgetimpl.cpp
index 6e9672be..1c6ab9cd 100644
--- a/kommander/editor/previewwidgetimpl.cpp
+++ b/kommander/editor/previewwidgetimpl.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -21,8 +21,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);
@@ -31,7 +31,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/kommander/editor/previewwidgetimpl.h b/kommander/editor/previewwidgetimpl.h
index 37080916..a2b0ef7a 100644
--- a/kommander/editor/previewwidgetimpl.h
+++ b/kommander/editor/previewwidgetimpl.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -26,9 +26,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/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index aeeaecb1..b0c71147 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -105,11 +105,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 );
@@ -155,7 +155,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 )
@@ -172,7 +172,7 @@ PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *
 PropertyItem::~PropertyItem()
 {
     if ( resetButton )
-	delete resetButton->parentWidget();
+	delete resetButton->tqparentWidget();
     resetButton = 0;
 }
 
@@ -222,8 +222,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 );
@@ -282,7 +282,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();
 }
@@ -296,7 +296,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.
  */
 
@@ -317,17 +317,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();
 }
 
@@ -337,7 +337,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
@@ -346,7 +346,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
@@ -375,7 +375,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 );
     updateResetButtonState();
@@ -389,7 +389,7 @@ TQString PropertyItem::name() const
 void PropertyItem::createResetButton()
 {
     if ( resetButton ) {
-	resetButton->parentWidget()->lower();
+	resetButton->tqparentWidget()->lower();
 	return;
     }
     TQHBox *hbox = new TQHBox( listview->viewport() );
@@ -397,8 +397,8 @@ void PropertyItem::createResetButton()
     hbox->setLineWidth( 1 );
     resetButton = new TQPushButton( hbox );
     resetButton->setPixmap( PixmapChooser::loadPixmap( "resetproperty.xpm", PixmapChooser::Mini ) );
-    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() ),
@@ -425,13 +425,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 );
@@ -439,8 +439,8 @@ 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->tqparentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
+    listview->moveChild( resetButton->tqparentWidget(), r.x() + r.width() - 8, r.y() );
     resetButton->setFixedHeight( r.height() - 3 );
 }
 
@@ -475,18 +475,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
@@ -509,7 +509,7 @@ void PropertyItem::drawCustomContents( TQPainter *, const TQRect & )
 
 TQString PropertyItem::currentItem() const
 {
-    return TQString::null;
+    return TQString();
 }
 
 int PropertyItem::currentIntItem() const
@@ -532,15 +532,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();
 }
 
@@ -548,7 +548,7 @@ void PropertyItem::setText( int col, const TQString &t )
 {
     TQString txt( t );
     if ( col == 1 )
-	txt = txt.replace( TQRegExp( "\n" ), " " );
+	txt = txt.tqreplace( TQRegExp( "\n" ), " " );
     TQListViewItem::setText( col, txt );
 }
 
@@ -582,13 +582,13 @@ TQLineEdit *PropertyTextItem::lined()
 
     if ( asciiOnly ) {
 	if ( PropertyItem::name() == "name" )
-	    lin->setValidator( new AsciiValidator( lin, "ascii_validator" ) );
+	    lin->setValidator( new AsciiValidator( TQT_TQOBJECT(lin), "ascii_validator" ) );
 	else
 	    lin->setValidator( new AsciiValidator( TQString("!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~"
 							   "\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();
     } else {
@@ -762,7 +762,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() ) );
@@ -837,11 +837,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 );
@@ -853,7 +853,7 @@ QDateEdit *PropertyDateItem::lined()
 
 PropertyDateItem::~PropertyDateItem()
 {
-    delete (QDateEdit*)lin;
+    delete (TQDateEdit*)lin;
     lin = 0;
 }
 
@@ -912,11 +912,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 );
@@ -928,7 +928,7 @@ QTimeEdit *PropertyTimeItem::lined()
 
 PropertyTimeItem::~PropertyTimeItem()
 {
-    delete (QTimeEdit*)lin;
+    delete (TQTimeEdit*)lin;
     lin = 0;
 }
 
@@ -987,11 +987,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 );
@@ -1003,7 +1003,7 @@ QDateTimeEdit *PropertyDateTimeItem::lined()
 
 PropertyDateTimeItem::~PropertyDateTimeItem()
 {
-    delete (QDateTimeEdit*)lin;
+    delete (TQDateTimeEdit*)lin;
     lin = 0;
 }
 
@@ -1540,8 +1540,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr
     box = new TQHBox( listview->viewport() );
     box->hide();
     pixPrev = new TQLabel( box );
-    pixPrev->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
-    pixPrev->setBackgroundColor( pixPrev->colorGroup().color( TQColorGroup::Base ) );
+    pixPrev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
+    pixPrev->setBackgroundColor( pixPrev->tqcolorGroup().color( TQColorGroup::Base ) );
     button = new TQPushButton( "...", box );
     button->setFixedWidth( 20 );
     box->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
@@ -1580,7 +1580,7 @@ void PropertyPixmapItem::setValue( const TQVariant &v )
     else
 	pixPrev->setPixmap( v.toIconSet().pixmap() );
     PropertyItem::setValue( v );
-    repaint();
+    tqrepaint();
 }
 
 void PropertyPixmapItem::getPixmap()
@@ -1605,8 +1605,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r )
     TQPixmap pix( (!iconSet ? value().toPixmap() : value().toIconSet().pixmap()) );
     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();
@@ -1617,8 +1617,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();
@@ -1834,7 +1834,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();
@@ -1901,7 +1901,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;
@@ -2003,7 +2003,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();
@@ -2112,7 +2112,7 @@ void PropertySizePolicyItem::setValue( const TQVariant &v )
 	return;
 
     TQString s = TQString( "%1/%2/%2/%2" );
-    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() );
@@ -2185,7 +2185,7 @@ void PropertyPaletteItem::setValue( const TQVariant &v )
     TQString s;
     palettePrev->setPalette( v.toPalette() );
     PropertyItem::setValue( v );
-    repaint();
+    tqrepaint();
 }
 
 void PropertyPaletteItem::getPalette()
@@ -2197,8 +2197,8 @@ void PropertyPaletteItem::getPalette()
     if ( w->inherits( TQSCROLLVIEW_OBJECT_NAME_STRING ) )
 	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
@@ -2218,8 +2218,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 );
@@ -2271,11 +2271,11 @@ TQComboBox *PropertyCursorItem::combo()
 
     cur = TQBitmap(sizev_width, sizev_height, sizev_bits, true);
     cur.setMask( cur );
-    comb->insertItem( cur, i18n("Size Vertical"), TQObject::SizeVerCursor );
+    comb->insertItem( cur, i18n("SizeQt::Vertical"), TQObject::SizeVerCursor );
 
     cur = TQBitmap(sizeh_width, sizeh_height, sizeh_bits, true);
     cur.setMask( cur );
-    comb->insertItem( cur, i18n("Size Horizontal"), TQObject::SizeHorCursor );
+    comb->insertItem( cur, i18n("SizeQt::Horizontal"), TQObject::SizeHorCursor );
 
     cur = TQBitmap(sizef_width, sizef_height, sizef_bits, true);
     cur.setMask( cur );
@@ -2295,11 +2295,11 @@ TQComboBox *PropertyCursorItem::combo()
 
     cur = TQBitmap(vsplit_width, vsplit_height, vsplit_bits, true);
     cur.setMask( cur );
-    comb->insertItem( cur, i18n("Split Vertical"), TQObject::SplitVCursor );
+    comb->insertItem( cur, i18n("SplitQt::Vertical"), TQObject::SplitVCursor );
 
     cur = TQBitmap(hsplit_width, hsplit_height, hsplit_bits, true);
     cur.setMask( cur );
-    comb->insertItem( cur, i18n("Split Horizontal"), TQObject::SplitHCursor );
+    comb->insertItem( cur, i18n("SplitQt::Horizontal"), TQObject::SplitHCursor );
 
     cur = TQBitmap(hand_width, hand_height, hand_bits, true);
     cur.setMask( cur );
@@ -2325,7 +2325,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() );
@@ -2348,7 +2348,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 );
@@ -2461,9 +2461,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" )
@@ -2477,11 +2477,11 @@ 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;
+	return (QVariant::Type)TQVariant::Region;
     if ( s == "Bitmap" )
 	return TQVariant::Bitmap;
     if ( s == "Cursor" )
@@ -2497,17 +2497,17 @@ static TQVariant::Type type_to_variant( const TQString &s )
     return TQVariant::Invalid;
 }
 
-#ifndef QT_NO_SQL
-static bool parent_is_data_aware( TQObject *o )
+#ifndef TQT_NO_SQL
+static bool tqparent_is_data_aware( TQObject *o )
 {
     if ( !o->inherits( TQWIDGET_OBJECT_NAME_STRING ) )
 	return false;
     TQWidget *w = (TQWidget*)o;
-    TQWidget *p = w->parentWidget();
+    TQWidget *p = w->tqparentWidget();
     while ( p && !p->isTopLevel() ) {
-	if ( p->inherits( "QDesignerDataBrowser" ) || p->inherits( "QDesignerDataView" ) )
+	if ( p->inherits( "TQDesignerDataBrowser" ) || p->inherits( "TQDesignerDataView" ) )
 	    return true;
-	p = p->parentWidget();
+	p = p->tqparentWidget();
     }
     return false;
 }
@@ -2522,24 +2522,24 @@ void PropertyList::setupProperties()
     if ( !editor->widget() )
 	return;
     bool allProperties = !editor->widget()->inherits( "Spacer" );
-    TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties );
+    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((TQWidget*)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 ( editor->widget()->inherits( "QDesignerToolBar" ) || editor->widget()->inherits( "QDesignerMenuBar" ) ) {
+	if ( editor->widget()->inherits( "TQDesignerToolBar" ) || editor->widget()->inherits( "TQDesignerMenuBar" ) ) {
 	    if ( qstrcmp( p->name(), "minimumHeight" ) == 0 )
 		continue;
 	    if ( qstrcmp( p->name(), "minimumWidth" ) == 0 )
@@ -2552,14 +2552,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((TQWidget*)editor->widget()) ) ) {
 	    if ( qstrcmp( p->name(), "geometry" ) == 0 )
 		continue;
 	} else { // hide some toplevel-only stuff
@@ -2573,9 +2573,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 ( w->inherits( "QLayoutWidget" ) || w->inherits( "Spacer" ) ) {
+	    if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || w->inherits( "Spacer" ) ) {
 		if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
 		    continue;
 		if ( qstrcmp( p->name(), "minimumHeight" ) == 0 )
@@ -2588,9 +2588,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;
@@ -2632,17 +2632,17 @@ 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() ||
-		 !editor->widget()->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) )
+		 !editor->widget()->tqparent() ||
+		 !editor->widget()->tqparent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) )
 		continue;
 	}
 
 
 	if ( p->designable(w) ) {
 	    if ( p->isSetType() ) {
-		if ( TQString( p->name() ) == "alignment" ) {
+		if ( TQString( p->name() ) == "tqalignment" ) {
 		    TQStringList lst;
 		    lst << p->valueToKey( AlignAuto )
 			<< p->valueToKey( AlignLeft )
@@ -2672,14 +2672,14 @@ void PropertyList::setupProperties()
 			    item->setChanged( true, false );
 		    }
 		} else {
-		    qWarning( "Sets except 'alignment' not supported yet.... %s.", p->name() );
+		    qWarning( "Sets except 'tqalignment' not supported yet.... %s.", p->name() );
 		}
 	    } else if ( p->isEnumType() ) {
 		TQStrList l = p->enumKeys();
 		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 << l.at( i );
@@ -2693,7 +2693,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();
 	    }
@@ -2702,19 +2702,19 @@ void PropertyList::setupProperties()
 	}
     }
 
-    if ( !w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) &&
-	 w->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
-	item = new PropertyIntItem( this, item, 0, "layoutSpacing", true );
+    if ( !w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && !w->inherits( "TQDesignerMenuBar" ) && !w->inherits( "TQDesignerToolBar" ) &&
+	 w->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
+	item = new PropertyIntItem( this, item, 0, "tqlayoutSpacing", true );
 	setPropertyValue( item );
 	item->setChanged( true );
-	item = new PropertyIntItem( this, item, 0, "layoutMargin", true );
+	item = new PropertyIntItem( this, item, 0, "tqlayoutMargin", true );
 	setPropertyValue( item );
 	item->setChanged( true );
     }
 
 
-    if ( !w->inherits( "Spacer" ) && !w->inherits( "QLayoutWidget" ) && !w->inherits( TQACTION_OBJECT_NAME_STRING ) &&
-	 !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) ) {
+    if ( !w->inherits( "Spacer" ) && !w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) && !w->inherits( TQACTION_OBJECT_NAME_STRING ) &&
+	 !w->inherits( "TQDesignerMenuBar" ) && !w->inherits( "TQDesignerToolBar" ) ) {
 	item = new PropertyTextItem( this, item, 0, "toolTip", true, false );
 	setPropertyValue( item );
 	if ( MetaDataBase::isPropertyChanged( editor->widget(), "toolTip" ) )
@@ -2725,9 +2725,9 @@ void PropertyList::setupProperties()
 	    item->setChanged( true, false );
     }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( !editor->widget()->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !editor->widget()->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) &&
-	 !editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && parent_is_data_aware( editor->widget() ) ) {
+	 !editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && tqparent_is_data_aware( editor->widget() ) ) {
 	item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w );
 	setPropertyValue( item );
 	if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) )
@@ -2750,7 +2750,7 @@ void PropertyList::setupProperties()
 	MetaDataBase::CustomWidget *cw = ( (CustomWidget*)w )->customWidget();
 	if ( 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 ) );
@@ -2768,7 +2768,7 @@ void PropertyList::setupProperties()
 	sort();
 	setSorting( -1 );
 	setCurrentItem( firstChild() );
-	qApp->processEvents();
+	tqApp->processEvents();
     }
 
     updateEditorSize();
@@ -2785,7 +2785,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name,
     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:
@@ -2882,7 +2882,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() ),
@@ -2921,10 +2921,10 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
 	return true;
 
     PropertyItem *i = (PropertyItem*)currentItem();
-    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;
@@ -2946,7 +2946,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
 	}
     } else if ( e->type() == TQEvent::FocusOut && o->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) && 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() ) {
@@ -2961,7 +2961,7 @@ 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 ) {
@@ -2996,7 +2996,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 );
@@ -3048,9 +3048,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" );
 }
 
@@ -3061,33 +3061,33 @@ 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" ) {
-	    ( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) );
-	} else if ( i->name() == "layoutMargin" ) {
-	    ( (PropertyIntItem*)i )->setValue( MetaDataBase::margin( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) );
+	} else if ( i->name() == "tqlayoutSpacing" ) {
+	    ( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) );
+	} else if ( i->name() == "tqlayoutMargin" ) {
+	    ( (PropertyIntItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (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" ) ) {
@@ -3134,7 +3134,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(),
@@ -3224,24 +3224,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()
@@ -3278,8 +3278,8 @@ void PropertyList::readPropertyDocs()
 // ------------------------------------------------------------
 
 #ifndef KOMMANDER
-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 );
@@ -3307,7 +3307,7 @@ void EventList::setup()
 	    return;
 	for ( TQValueList<MetaDataBase::EventDescription>::Iterator it = events.begin(); it != events.end(); ++it ) {
 	    HierarchyItem *eventItem = new HierarchyItem( HierarchyItem::Event, this, (*it).name,
-							  TQString::null, TQString::null );
+							  TQString(), TQString() );
 	    eventItem->setOpen( true );
 	    TQStringList funcs = MetaDataBase::eventFunctions( editor->widget(),
 							      (*it).name,
@@ -3318,7 +3318,7 @@ void EventList::setup()
 #endif
 	    for ( TQStringList::Iterator fit = funcs.begin(); fit != funcs.end(); ++fit ) {
 		HierarchyItem *item = new HierarchyItem( HierarchyItem::EventFunction, eventItem,
-							 *fit, TQString::null, TQString::null );
+							 *fit, TQString(), TQString() );
 		item->setPixmap( 0, PixmapChooser::loadPixmap( "editslots.xpm" ) );
 	    }
 #if 0 // ### for conversation from old to new
@@ -3327,12 +3327,12 @@ void EventList::setup()
 #endif
 	}
     } else {
-	TQStrList sigs = editor->widget()->metaObject()->signalNames( true );
+	TQStrList sigs = editor->widget()->tqmetaObject()->signalNames( true );
 	sigs.remove( "destroyed()" );
 	TQStrListIterator it( sigs );
 	while ( it.current() ) {
 	    HierarchyItem *eventItem = new HierarchyItem( HierarchyItem::Event, this,
-							  it.current(), TQString::null, TQString::null );
+							  it.current(), TQString(), TQString() );
 	    eventItem->setOpen( true );
 	    TQValueList<MetaDataBase::Connection> conns =
 		MetaDataBase::connections( formWindow, editor->widget(), formWindow->mainContainer() );
@@ -3341,7 +3341,7 @@ void EventList::setup()
 		     MetaDataBase::normalizeSlot( TQString( it.current() ) ) )
 		    continue;
 		HierarchyItem *item = new HierarchyItem( HierarchyItem::EventFunction, eventItem,
-							 (*cit).slot, TQString::null, TQString::null );
+							 (*cit).slot, TQString(), TQString() );
 		item->setPixmap( 0, PixmapChooser::loadPixmap( "editslots.xpm" ) );
 	    }
 	    ++it;
@@ -3354,7 +3354,7 @@ 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;
 #ifndef KOMMANDER
@@ -3363,7 +3363,7 @@ void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e )
     if ( MetaDataBase::hasEvents( "C++" ) ) {
 #endif
 	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;
@@ -3380,7 +3380,7 @@ void EventList::setCurrent( TQWidget * )
 
 void EventList::objectClicked( TQListViewItem *i )
 {
-    if ( !i || !i->parent() )
+    if ( !i || !i->tqparent() )
 	return;
     formWindow->mainWindow()->editFunction( i->text( 0 ) );
 }
@@ -3402,29 +3402,29 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
 #else
 	if ( MetaDataBase::hasEvents( "C++" ) ) {
 #endif
-	    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, PixmapChooser::loadPixmap( "editslots.xpm" ), s );
-    } else if ( res == DEL_ITEM && i->parent() ) {
+	insertEntry( i->tqparent() ? i->tqparent() : i, PixmapChooser::loadPixmap( "editslots.xpm" ), s );
+    } else if ( res == DEL_ITEM && i->tqparent() ) {
 #ifndef KOMMANDER
 	if ( MetaDataBase::hasEvents( formWindow->project()->language() ) ) {
 #else
 	if ( MetaDataBase::hasEvents( "C++" ) ) {
 #endif
-	    TQListViewItem *p = i->parent();
+	    TQListViewItem *p = i->tqparent();
 	    delete i;
 	    save( p );
 	} else {
 	    MetaDataBase::Connection conn;
 	    conn.sender = editor->widget();
 	    conn.receiver = formWindow->mainContainer();
-	    conn.signal = i->parent()->text( 0 );
+	    conn.signal = i->tqparent()->text( 0 );
 	    conn.slot = i->text( 0 );
 	    delete i;
 	    RemoveConnectionCommand *cmd = new RemoveConnectionCommand( i18n("Remove Connection" ),
@@ -3443,9 +3443,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 ) ) {
@@ -3464,7 +3464,7 @@ void EventList::renamed( TQListViewItem *i )
 	if ( MetaDataBase::hasEvents( "C++" ) ) {
 #endif
 
-	    save( i->parent() );
+	    save( i->tqparent() );
 	    editor->formWindow()->mainWindow()->
 #ifndef KOMMANDER
 		editFunction( i->text( 0 ), editor->formWindow()->project()->language(), true );
@@ -3475,7 +3475,7 @@ void EventList::renamed( TQListViewItem *i )
 	    MetaDataBase::Connection conn;
 	    conn.sender = editor->widget();
 	    conn.receiver = formWindow->mainContainer();
-	    conn.signal = i->parent()->text( 0 );
+	    conn.signal = i->tqparent()->text( 0 );
 	    conn.slot = i->text( 0 );
 	    AddConnectionCommand *cmd = new AddConnectionCommand( i18n("Add Connection" ),
 								  formWindow,
@@ -3491,7 +3491,7 @@ void EventList::renamed( TQListViewItem *i )
 				   "C++", "void" );
 #endif
 	    editor->formWindow()->mainWindow()->
-		editFunction( i->text( 0 ).left( i->text( 0 ).find( "(" ) ),
+		editFunction( i->text( 0 ).left( i->text( 0 ).tqfind( "(" ) ),
 #ifndef KOMMANDER
 			      editor->formWindow()->project()->language(), true );
 #else
@@ -3535,8 +3535,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" ) );
@@ -3563,11 +3563,11 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw )
 #endif
     if ( w && w == wid ) {
 	bool ret = true;
-	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;
 		}
@@ -3588,7 +3588,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();
@@ -3662,7 +3662,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();
@@ -3671,24 +3671,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()
diff --git a/kommander/editor/propertyeditor.h b/kommander/editor/propertyeditor.h
index 42e64e3e..262f0376 100644
--- a/kommander/editor/propertyeditor.h
+++ b/kommander/editor/propertyeditor.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -44,11 +44,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 );
@@ -118,7 +118,7 @@ private:
     bool open, changed;
     PropertyItem *property;
     TQString propertyName;
-    TQPtrList<PropertyItem> children;
+    TQPtrList<PropertyItem> tqchildren;
     TQColor backColor;
     TQPushButton *resetButton;
 
@@ -128,6 +128,7 @@ class PropertyTextItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyTextItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -164,6 +165,7 @@ class PropertyBoolItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyBoolItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -188,6 +190,7 @@ class PropertyIntItem : public TQObject,
 			public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyIntItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -213,6 +216,7 @@ class PropertyDoubleItem : public TQObject,
 			public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyDoubleItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -236,6 +240,7 @@ class PropertyListItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyListItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -271,6 +276,7 @@ class PropertyFontItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyFontItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -300,6 +306,7 @@ class PropertyCoordItem : public TQObject,
 			  public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum Type { Rect, Size, Point };
@@ -329,10 +336,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();
@@ -363,6 +371,7 @@ class PropertyPixmapItem : public TQObject,
 			   public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyPixmapItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -393,6 +402,7 @@ class PropertySizePolicyItem : public TQObject,
 			  public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertySizePolicyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -419,6 +429,7 @@ class PropertyPaletteItem : public TQObject,
 			    public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyPaletteItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -447,6 +458,7 @@ class PropertyCursorItem : public TQObject,
 			   public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyCursorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -472,6 +484,7 @@ class PropertyDatabaseItem : public TQObject,
 			     public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyDatabaseItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName, bool wField );
@@ -495,9 +508,10 @@ private:
 
 };
 
-class PropertyList : public QListView
+class PropertyList : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyList( PropertyEditor *e );
@@ -550,12 +564,13 @@ private:
 
 };
 
-class PropertyEditor : public QTabWidget
+class PropertyEditor : public TQTabWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PropertyEditor( TQWidget *parent );
+    PropertyEditor( TQWidget *tqparent );
 
     TQObject *widget() const;
 
@@ -575,7 +590,7 @@ public:
 
     TQString currentProperty() const;
     TQString classOfCurrentProperty() const;
-    TQMetaObject* metaObjectOfCurrentProperty() const;
+    TQMetaObject* tqmetaObjectOfCurrentProperty() const;
 
     void resetFocus();
 
@@ -602,6 +617,7 @@ class PropertyDateItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyDateItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -616,8 +632,8 @@ private slots:
     void setValue();
 
 private:
-    QDateEdit *lined();
-    TQGuardedPtr<QDateEdit> lin;
+    TQDateEdit *lined();
+    TQGuardedPtr<TQDateEdit> lin;
 
 };
 
@@ -625,6 +641,7 @@ class PropertyTimeItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -639,8 +656,8 @@ private slots:
     void setValue();
 
 private:
-    QTimeEdit *lined();
-    TQGuardedPtr<QTimeEdit> lin;
+    TQTimeEdit *lined();
+    TQGuardedPtr<TQTimeEdit> lin;
 
 };
 
@@ -648,6 +665,7 @@ class PropertyDateTimeItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyDateTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -662,8 +680,8 @@ private slots:
     void setValue();
 
 private:
-    QDateTimeEdit *lined();
-    TQGuardedPtr<QDateTimeEdit> lin;
+    TQDateTimeEdit *lined();
+    TQGuardedPtr<TQDateTimeEdit> lin;
 
 };
 
diff --git a/kommander/editor/qcompletionedit.cpp b/kommander/editor/qcompletionedit.cpp
index 4ba5e366..61d0407e 100644
--- a/kommander/editor/qcompletionedit.cpp
+++ b/kommander/editor/qcompletionedit.cpp
@@ -4,8 +4,8 @@
 #include <tqapplication.h>
 #include <tqvbox.h>
 
-QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name )
-    : TQLineEdit( parent, name ), aAdd( false ), caseSensitive( false )
+QCompletionEdit::QCompletionEdit( 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 );
@@ -62,8 +62,8 @@ void QCompletionEdit::placeListBox()
 	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() )
@@ -90,7 +90,7 @@ void QCompletionEdit::updateListBox()
 
 bool QCompletionEdit::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 ) {
@@ -133,7 +133,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 ||
@@ -154,7 +154,7 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
 
 void QCompletionEdit::addCompletionEntry( const TQString &entry )
 {
-    if ( compList.find( entry ) == compList.end() ) {
+    if ( compList.tqfind( entry ) == compList.end() ) {
 	compList << entry;
 	compList.sort();
     }
@@ -162,7 +162,7 @@ void QCompletionEdit::addCompletionEntry( const TQString &entry )
 
 void QCompletionEdit::removeCompletionEntry( const TQString &entry )
 {
-    TQStringList::Iterator it = compList.find( entry );
+    TQStringList::Iterator it = compList.tqfind( entry );
     if ( it != compList.end() )
 	compList.remove( it );
 }
diff --git a/kommander/editor/qcompletionedit.h b/kommander/editor/qcompletionedit.h
index 169dacb5..4dee6ba5 100644
--- a/kommander/editor/qcompletionedit.h
+++ b/kommander/editor/qcompletionedit.h
@@ -1,5 +1,5 @@
-#ifndef QCOMPLETIONEDIT_H
-#define QCOMPLETIONEDIT_H
+#ifndef TQCOMPLETIONEDIT_H
+#define TQCOMPLETIONEDIT_H
 
 #include <tqlineedit.h>
 #include <tqstringlist.h>
@@ -7,14 +7,15 @@
 class TQListBox;
 class TQVBox;
 
-class QCompletionEdit : public QLineEdit
+class QCompletionEdit : 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 );
+    QCompletionEdit( TQWidget *tqparent = 0, const char *name = 0 );
 
     bool autoAdd() const;
     TQStringList completionList() const;
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index d1c93cea..02cd1eec 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -27,11 +27,11 @@
 #include "tqdom.h"
 #include "widgetdatabase.h"
 #include "widgetfactory.h"
-#include "layout.h"
+#include "tqlayout.h"
 #include "domtool.h"
 #include "command.h"
 #include "pixmapchooser.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "database.h"
 #endif
 #include "actiondnd.h"
@@ -68,7 +68,7 @@
 #include <tqregexp.h>
 #include <zlib.h>
 #include <tqdatetime.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #endif
 
@@ -84,12 +84,12 @@ static TQString makeIndent( int indent )
 static TQString entitize( const TQString &s, bool attribute = false )
 {
     TQString s2 = s;
-    s2 = s2.replace( TQRegExp( "&" ), "&amp;" );
-    s2 = s2.replace( TQRegExp( ">" ), "&gt;" );
-    s2 = s2.replace( TQRegExp( "<" ), "&lt;" );
+    s2 = s2.tqreplace( TQRegExp( "&" ), "&amp;" );
+    s2 = s2.tqreplace( TQRegExp( ">" ), "&gt;" );
+    s2 = s2.tqreplace( TQRegExp( "<" ), "&lt;" );
     if ( attribute ) {
-	s2 = s2.replace( TQRegExp( "\"" ), "&quot;" );
-	s2 = s2.replace( TQRegExp( "'" ), "&apos;" );
+	s2 = s2.tqreplace( TQRegExp( "\"" ), "&quot;" );
+	s2 = s2.tqreplace( TQRegExp( "'" ), "&apos;" );
     }
     return s2;
 }
@@ -166,7 +166,7 @@ bool Resource::load( FormFile *ff )
     TQFile f( ff->absFileName() );
     f.open( IO_ReadOnly );
 
-    bool b = load( ff, &f );
+    bool b = load( ff, TQT_TQIODEVICE(&f) );
     f.close();
 
     return b;
@@ -181,7 +181,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
     TQString content = stream.read();
     if (content.startsWith("#!"))
     {
-      content = content.mid(content.find('\n'));
+      content = content.mid(content.tqfind('\n'));
     }
     if ( !doc.setContent( content) ) {
 	// qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine );
@@ -195,7 +195,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
     formwindow->setProject( MainWindow::self->currProject() );
 #endif
     formwindow->setMainWindow( mainwindow );
-    MetaDataBase::addEntry( formwindow );
+    MetaDataBase::addEntry( TQT_TQOBJECT(formwindow) );
 
 #ifndef KOMMANDER
     if (!langIface) {
@@ -290,9 +290,9 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
     metaInfo.license = e.firstChild().toText().data();
 	} 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() == "tqlayoutdefaults" ) {
+	    formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->tqlayoutDefaultSpacing() ) ).toInt() );
+	    formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->tqlayoutDefaultMargin() ) ).toInt() );
 	}
 
 	e = e.nextSibling().toElement();
@@ -303,13 +303,13 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
     if ( !customWidgets.isNull() )
 	loadCustomWidgets( customWidgets, this );
 
-#if defined (QT_NON_COMMERCIAL)
+#if defined (TQT_NON_COMMERCIAL)
     bool previewMode = MainWindow::self->isPreviewing();
     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;
@@ -364,11 +364,11 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
 		if ( slot.returnType.isEmpty() )
 		    slot.returnType = "void";
 		slot.slot = n.firstChild().toText().data();
-		if ( !MetaDataBase::hasSlot( formwindow, slot.slot, true ) )
-		    MetaDataBase::addSlot( formwindow, slot.slot, slot.specifier,
+		if ( !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), slot.slot, true ) )
+		    MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier,
 					   slot.access, slot.language, slot.returnType );
 		else
-		    MetaDataBase::changeSlotAttributes( formwindow, slot.slot,
+		    MetaDataBase::changeSlotAttributes( TQT_TQOBJECT(formwindow), slot.slot,
 							slot.specifier, slot.access,
 							slot.language, slot.returnType );
 	    }
@@ -386,11 +386,11 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
 	loadTabOrder( tabOrder );
 
     if ( formwindow ) {
-	MetaDataBase::setIncludes( formwindow, metaIncludes );
-	MetaDataBase::setForwards( formwindow, metaForwards );
-	MetaDataBase::setSignalList( formwindow, metaSignals );
-	MetaDataBase::setMetaInfo( formwindow, metaInfo );
-	MetaDataBase::setExportMacro( formwindow->mainContainer(), exportMacro );
+	MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), metaIncludes );
+	MetaDataBase::setForwards( TQT_TQOBJECT(formwindow), metaForwards );
+	MetaDataBase::setSignalList( TQT_TQOBJECT(formwindow), metaSignals );
+	MetaDataBase::setMetaInfo( TQT_TQOBJECT(formwindow), metaInfo );
+	MetaDataBase::setExportMacro( TQT_TQOBJECT(formwindow->mainContainer()), exportMacro );
     }
 
 
@@ -400,14 +400,14 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
     }
 
     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;
@@ -422,7 +422,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;
 }
@@ -439,7 +439,7 @@ bool Resource::save( TQIODevice* dev )
       ts << formwindow->mainContainer()->property("shebang").toString() << endl;
     ts << "<!DOCTYPE UI><UI version=\"3.0\" stdsetdef=\"1\">" << endl;
     saveMetaInfoBefore( ts, 0 );
-    saveObject( formwindow->mainContainer(), 0, ts, 0 );
+    saveObject( TQT_TQOBJECT(formwindow->mainContainer()), 0, ts, 0 );
     if ( formwindow->mainContainer()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
 	saveMenuBar( (TQMainWindow*)formwindow->mainContainer(), ts, 0 );
 	saveToolBars( (TQMainWindow*)formwindow->mainContainer(), ts, 0 );
@@ -450,7 +450,7 @@ bool Resource::save( TQIODevice* dev )
 	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 );
@@ -463,7 +463,7 @@ bool Resource::save( TQIODevice* dev )
 TQString Resource::copy()
 {
     if ( !formwindow )
-	return TQString::null;
+	return TQString();
 
     copying = true;
     TQString s;
@@ -473,17 +473,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 );
@@ -495,7 +495,7 @@ TQString Resource::copy()
 }
 
 
-void Resource::paste( const TQString &cb, TQWidget *parent )
+void Resource::paste( const TQString &cb, TQWidget *tqparent )
 {
     if ( !formwindow )
 	return;
@@ -533,33 +533,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();
     }
@@ -571,7 +571,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() && !(obj->isA("ScriptObject")) )
 	return;
@@ -580,12 +580,12 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	const char* className = WidgetFactory::classNameOf( obj );
 	if ( obj->isA( "CustomWidget" ) )
 	    usedCustomWidgets << TQString( className );
-	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 ) {
@@ -601,7 +601,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	} else {
 	    closeTag = makeIndent( indent ) + "</widget>\n";
         if ( qstrcmp( className, "KmdrMainWindow" ) == 0 ) {
-          ts << makeIndent( indent ) << "<widget class=\"QMainWindow\"" << attributes << ">" << endl;
+          ts << makeIndent( indent ) << "<widget class=\"TQMainWindow\"" << attributes << ">" << endl;
         } else {
 	       ts << makeIndent( indent ) << "<widget class=\"" << className << "\"" << attributes << ">" << endl;
         }
@@ -619,7 +619,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	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 )
@@ -627,9 +627,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++;
@@ -642,21 +642,21 @@ 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 ( ::qt_cast<TQToolBox*>(obj) ) {
+    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++;
@@ -665,7 +665,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;
@@ -673,7 +673,7 @@ 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;
         }
@@ -683,9 +683,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    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++;
@@ -698,12 +698,12 @@ 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 ( obj->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
-	saveChildrenOf( ( (TQMainWindow*)obj )->centralWidget(), ts, indent );
+	saveChildrenOf( TQT_TQOBJECT(( (TQMainWindow*)obj )->centralWidget()), ts, indent );
     } else {
 	saveChildrenOf( obj, ts, indent );
     }
@@ -778,11 +778,11 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 	}
 	saveItem( lv->firstChild(), ts, indent - 1 );
     }
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     else if ( obj->inherits( TQTABLE_OBJECT_NAME_STRING ) ) {
 	TQTable *table = (TQTable*)obj;
 	int i;
-	TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table );
+	TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) );
 	bool isDataTable = table->inherits( TQDATATABLE_OBJECT_NAME_STRING );
 	for ( i = 0; i < table->horizontalHeader()->count(); ++i ) {
 	    if ( !table->horizontalHeader()->label( i ).isNull() &&
@@ -801,7 +801,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 		if ( table->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !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;
 		}
@@ -865,11 +865,11 @@ void Resource::savePixmap( const TQPixmap &p, TQTextStream &ts, int indent, cons
 	ts << makeIndent( indent ) << "<" + tagname + ">" << saveInCollection( p ) << "</" + tagname + ">" << endl;
 #ifndef KOMMANDER
     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;
 #endif
     else
-	ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapArgument( formwindow, p.serialNumber() )
+	ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapArgument( TQT_TQOBJECT(formwindow), p.serialNumber() )
 	   << "</" + tagname + ">" << endl;
 }
 
@@ -881,7 +881,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;
     }
 #ifndef KOMMANDER
@@ -895,11 +895,11 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname*
     {
 	TQPixmap pix;
         pix = PixmapChooser::loadPixmap( "image.xpm" );
-	MetaDataBase::setPixmapKey( formwindow, pix.serialNumber(), arg );
+	MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg );
 	return pix;
     }
     TQPixmap pix = PixmapChooser::loadPixmap( "image.xpm" );
-    MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg );
+    MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg );
     return pix;
 }
 
@@ -929,19 +929,19 @@ void Resource::saveItem( const TQStringList &text, const TQPtrList<TQPixmap> &pi
 
 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 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 ( !obj->inherits( TQSPLITTER_OBJECT_NAME_STRING ) &&
 	 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>";
@@ -957,19 +957,19 @@ 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 );
 
     }
 
-    for ( TQPtrListIterator<TQObject> it ( *l ); it.current(); ++it )
+    for ( TQPtrListIterator<TQObject> it ( l ); it.current(); ++it )
 	saveObject( it.current(), grid, ts, indent );
     if ( !closeTag.isEmpty() ) {
 	indent--;
@@ -984,43 +984,43 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
     changed = MetaDataBase::changedProperties( w );
     if ( w->isWidgetType() ) {
 	if ( w->inherits( "Spacer" ) ) {
-	    if ( !changed.contains( "sizeHint" ) )
-		changed << "sizeHint";
-	    if ( !changed.contains( "geometry" ) )
+	    if ( !changed.tqcontains( "tqsizeHint" ) )
+		changed << "tqsizeHint";
+	    if ( !changed.tqcontains( "geometry" ) )
 		changed << "geometry";
 	}
     } else if ( w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { // #### should be cleaner (RS)
 	changed << "margin" << "spacing";
     }
 
-    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( !w->inherits( "Spacer" ) );
+    TQStrList lst = w->tqmetaObject()->propertyNames( !w->inherits( "Spacer" ) );
     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 ( w->inherits( TQLABEL_OBJECT_NAME_STRING ) && qstrcmp( p->name(), "pixmap" ) == 0 &&
 	     ( !( (TQLabel*)w )->pixmap() || ( (TQLabel*)w )->pixmap()->isNull() ) )
 	    continue;
-	if ( w->inherits( "QDesignerMenuBar" ) &&
+	if ( w->inherits( "TQDesignerMenuBar" ) &&
 	     ( qstrcmp( p->name(), "itemName" ) == 0 || qstrcmp( p->name(), "itemNumber" ) == 0 ||
 	       qstrcmp( p->name(), "itemText" ) == 0 ) )
 	    continue;
@@ -1066,7 +1066,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 ) {
@@ -1079,18 +1079,18 @@ 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" )
+    if ( name == "hAlign" || name =="vAlign" || name == "wordwrap" || name == "tqlayoutMargin" || name =="tqlayoutSpacing" )
 	return;
     int num, unum;
     double dob;
     TQString comment;
-    if ( w && formwindow->widgets()->find( (TQWidget*)w ) )
+    if ( w && formwindow->widgets()->tqfind( (TQWidget*)w ) )
 	comment = MetaDataBase::propertyComment( w, name );
     switch ( t ) {
     case TQVariant::String:
@@ -1108,9 +1108,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
 	num = value.toInt();
 	if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {
 	    if ( name == "spacing" )
-		num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) );
+		num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) );
 	    else if ( name == "margin" )
-		num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) );
+		num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) );
 	}
 	ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl;
 	break;
@@ -1126,9 +1126,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
 	unum = value.toUInt();
 	if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {
 	    if ( name == "spacing" )
-		num = MetaDataBase::spacing( WidgetFactory::layoutParent( (TQLayout*)w ) );
+		num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) );
 	    else if ( name == "margin" )
-		num = MetaDataBase::margin( WidgetFactory::layoutParent( (TQLayout*)w ) );
+		num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) );
 	}
 	ts << makeIndent( indent ) << "<number>" << TQString::number( unum ) << "</number>" << endl;
 	break;
@@ -1172,9 +1172,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() )
@@ -1240,7 +1240,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();
@@ -1303,7 +1303,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 );
     }
@@ -1316,7 +1316,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();
@@ -1335,7 +1335,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
     TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING );
 
     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 )
 	    return 0;
 	if ( !mainContainerSet ) {
@@ -1346,16 +1346,16 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 	w = (TQWidget*)obj;
 	if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
 	    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:
@@ -1365,13 +1365,13 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 
 	if ( !toplevel )
 	    toplevel = w;
-	layout = 0;
+	tqlayout = 0;
 
 	if ( w && formwindow ) {
-	    if ( !parent || ( !parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) )
+	    if ( !tqparent || ( !tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) )
 		formwindow->insertWidget( w, pasting );
-	    else if ( parent && ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) )
-		MetaDataBase::addEntry( w );
+	    else if ( tqparent && ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) || tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) )
+		MetaDataBase::addEntry( TQT_TQOBJECT(w) );
         if (w->inherits("Dialog"))
           dynamic_cast<Dialog*>(w)->setUseInternalParser(false);
 	}
@@ -1379,22 +1379,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 ) {
@@ -1402,16 +1402,16 @@ 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 ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
+	    if ( tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
 		if ( attrib == "title" )
-		    ( (TQTabWidget*)parent )->insertTab( w, v.toString() );
+		    ( (TQTabWidget*)tqparent )->insertTab( w, v.toString() );
 	    } else
-        if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) {
+        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, v.toString() );
+		    ( (TQWizard*)tqparent )->addPage( w, v.toString() );
 	    }
 	} else if ( n.tagName() == "item" ) {
 	    createItem( n, w );
@@ -1428,7 +1428,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 	n = n.nextSibling().toElement();
     }
 
-    return w;
+    return TQT_TQOBJECT(w);
 }
 
 void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
@@ -1469,7 +1469,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
 	if ( !resizeable )
 	    lv->header()->setResizeEnabled( resizeable, i );
     }
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     else if ( widget->inherits( TQTABLE_OBJECT_NAME_STRING ) ) {
 	TQTable *table = (TQTable*)widget;
 	bool isRow;
@@ -1483,7 +1483,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" );
@@ -1508,7 +1508,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
 }
@@ -1534,7 +1534,7 @@ 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 ) ) ) )
+    if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) )
 	return;
 
     if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
@@ -1605,7 +1605,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();
@@ -1618,23 +1618,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 ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
-	    ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() );
+    if ( tqlayout ) {
+	if ( tqlayout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
+	    ( (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;
 }
@@ -1644,9 +1644,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 ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING )  ) {// no layouts in metadatabase... (RS)
+    if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING )  ) {// 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" )
@@ -1657,9 +1657,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 );
     }
 
@@ -1688,7 +1688,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_BASE_OBJECT(obj) != TQT_BASE_OBJECT(toplevel) ) {
 		TQStringList lst = MetaDataBase::fakeProperty( obj, "database" ).toStringList();
 		if ( lst.count() > 2 )
 		    dbControls.insert( obj->name(), lst[ 2 ] );
@@ -1743,11 +1743,11 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
     }
 
     if ( prop == "geometry" ) {
-	if ( obj == toplevel ) {
+	if ( TQT_BASE_OBJECT(obj) == toplevel ) {
 	    hadGeometry = true;
 	    toplevel->resize( v.toRect().size() );
 	    return;
-	} else if ( obj == formwindow->mainContainer() ) {
+	} else if ( TQT_BASE_OBJECT(obj) == formwindow->mainContainer() ) {
 	    hadGeometry = true;
 	    formwindow->resize( v.toRect().size() );
 	    return;
@@ -1756,11 +1756,11 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
 
     if ( obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {
 	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;
 	}
 	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;
 	}
     }
@@ -1768,10 +1768,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) == formwindow->mainContainer() ) {
 	    formwindow->setName( v.toCString() );
 	}
     }
@@ -1916,17 +1916,17 @@ void Resource::saveConnections( TQTextStream &ts, int indent )
 {
     ts << makeIndent( indent ) << "<connections>" << endl;
     indent++;
-    TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( formwindow );
+    TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( TQT_TQOBJECT(formwindow) );
     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::normalizeSlot( (*it).slot ).latin1() ) )
+	if ( formwindow->isMainContainer( TQT_TQOBJECT((*it).receiver) ) &&
+	     !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), MetaDataBase::normalizeSlot( (*it).slot ).latin1() ) )
 	    continue;
 
 	if ( conn.sender->inherits( "CustomWidget" ) ) {
@@ -1995,7 +1995,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();
@@ -2013,7 +2013,7 @@ void Resource::loadConnections( const TQDomElement &e )
 		} else if ( n2.tagName() == "receiver" ) {
 		    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 ) {
@@ -2028,10 +2028,10 @@ 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 ) {
 #ifndef KOMMANDER
@@ -2044,7 +2044,7 @@ void Resource::loadConnections( const TQDomElement &e )
 						     TQStringList::split( ',', conn.slot ), false );
 		}
 #else
-		    MetaDataBase::addConnection( formwindow ? formwindow : toplevel,
+		    MetaDataBase::addConnection( formwindow ? TQT_TQOBJECT(formwindow) : TQT_TQOBJECT(toplevel),
 						 conn.sender, conn.signal, conn.receiver, conn.slot );
 #endif
 	    }
@@ -2061,11 +2061,11 @@ void Resource::loadConnections( const TQDomElement &e )
 	    if ( slot.returnType.isEmpty() )
 		slot.returnType = "void";
 	    slot.slot = n.firstChild().toText().data();
-	    if ( !MetaDataBase::hasSlot( formwindow, slot.slot, true ) )
-		MetaDataBase::addSlot( formwindow, slot.slot, slot.specifier,
+	    if ( !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), slot.slot, true ) )
+		MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier,
 				       slot.access, slot.language, slot.returnType );
 	    else
-		MetaDataBase::changeSlotAttributes( formwindow, slot.slot,
+		MetaDataBase::changeSlotAttributes( TQT_TQOBJECT(formwindow), slot.slot,
 						    slot.specifier, slot.access,
 						    slot.language, slot.returnType );
 	}
@@ -2080,7 +2080,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++;
@@ -2090,8 +2090,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;
@@ -2147,9 +2147,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" ) {
@@ -2214,7 +2214,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;
     }
@@ -2254,7 +2254,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 = formwindow->name();
   ts << makeIndent(indent) << "<class>" << entitize(cn) << "</class>" << endl;
   if (!info.comment.isEmpty())
@@ -2269,8 +2269,8 @@ void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent )
 
 void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 {
-    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow );
-	TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formwindow );
+    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(formwindow) );
+	TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formwindow) );
 	TQString extensionInclude;
 	bool needExtensionInclude = false;
 	if ( !includes.isEmpty() || needExtensionInclude ) {
@@ -2291,7 +2291,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++;
@@ -2300,7 +2300,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	    indent--;
 	    ts << makeIndent( indent ) << "</forwards>" << endl;
 	}
-	TQStringList sigs = MetaDataBase::signalList( formwindow );
+	TQStringList sigs = MetaDataBase::signalList( TQT_TQOBJECT(formwindow) );
 	if ( !sigs.isEmpty() ) {
 	    ts << makeIndent( indent ) << "<signals>" << endl;
 	    indent++;
@@ -2309,7 +2309,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	    indent--;
 	    ts << makeIndent( indent ) << "</signals>" << endl;
 
-	TQValueList<MetaDataBase::Slot> slotList = MetaDataBase::slotList( formwindow );
+	TQValueList<MetaDataBase::Slot> slotList = MetaDataBase::slotList( TQT_TQOBJECT(formwindow) );
 	if ( !slotList.isEmpty() ) {
 	    ts << makeIndent( indent ) << "<slots>" << endl;
 	    indent++;
@@ -2339,11 +2339,11 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	;
     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;
 }
 
 TQColorGroup Resource::loadColorGroup( const TQDomElement &e )
@@ -2367,9 +2367,10 @@ 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;
@@ -2428,12 +2429,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();
 	while ( !n2.isNull() ) {
@@ -2449,10 +2450,10 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e )
 	    }
 	    n2 = n2.nextSibling().toElement();
 	}
-	if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) )
+	if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) )
 	    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();
 	while ( !n2.isNull() ) {
@@ -2471,7 +2472,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e )
 	    }
 	    n2 = n2.nextSibling().toElement();
 	}
-	if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) )
+	if ( !tqparent->inherits( TQACTION_OBJECT_NAME_STRING ) )
 	    formwindow->actionList().append( a );
     }
 }
@@ -2481,9 +2482,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();
     }
@@ -2495,8 +2496,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() ) {
@@ -2504,23 +2505,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 ( a->inherits( "QSeparatorAction" ) ) {
+		if ( a->inherits( "TQSeparatorAction" ) ) {
 		    ts << makeIndent( indent ) << "<separator/>" << endl;
 		} else {
-		    if ( a->inherits( "QDesignerAction" ) && !( (QDesignerAction*)a )->supportsMenu() ) {
-			TQWidget *w = ( (QDesignerAction*)a )->widget();
+		    if ( a->inherits( "TQDesignerAction" ) && !( (TQDesignerAction*)a )->supportsMenu() ) {
+			TQWidget *w = ( (TQDesignerAction*)a )->widget();
 			ts <<  makeIndent( indent ) << "<widget class=\""
-			   << WidgetFactory::classNameOf( w ) << "\">" << endl;
+			   << WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) << "\">" << endl;
 			indent++;
-			saveObjectProperties( w, ts, indent );
-			const char *className = WidgetFactory::classNameOf( w );
+			saveObjectProperties( TQT_TQOBJECT(w), ts, indent );
+			const char *className = WidgetFactory::classNameOf( TQT_TQOBJECT(w) );
 			if ( w->isA( "CustomWidget" ) )
 			    usedCustomWidgets << TQString( className );
-			if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) )
-			    saveItems( w, ts, indent );
+			if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) )
+			    saveItems( TQT_TQOBJECT(w), ts, indent );
 			indent--;
 			ts << makeIndent( indent ) << "</widget>" << endl;
 		    } else {
@@ -2542,18 +2543,18 @@ void Resource::saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent )
 	return;
     ts << makeIndent( indent ) << "<menubar>" << endl;
     indent++;
-    saveObjectProperties( mw->menuBar(), ts, indent );
+    saveObjectProperties( TQT_TQOBJECT(mw->menuBar()), ts, indent );
 
     for ( int i = 0; i < (int)mw->menuBar()->count(); ++i ) {
 	ts << makeIndent( indent ) << "<item text=\"" << entitize( mw->menuBar()->text( mw->menuBar()->idAt( i ) ) )
-	   << "\" name=\"" << entitize( mw->menuBar()->findItem( mw->menuBar()->idAt( i ) )->popup()->name() ) << "\">" << endl;
+	   << "\" name=\"" << entitize( mw->menuBar()->tqfindItem( mw->menuBar()->idAt( i ) )->popup()->name() ) << "\">" << endl;
 	indent++;
-	TQMenuItem *m = mw->menuBar()->findItem( mw->menuBar()->idAt( i ) );
+	TQMenuItem *m = mw->menuBar()->tqfindItem( mw->menuBar()->idAt( i ) );
 	if ( !m )
 	    continue;
-	TQPtrList<TQAction> actionList = ( (QDesignerPopupMenu*)m->popup() )->insertedActions();
+	TQPtrList<TQAction> actionList = ( (TQDesignerPopupMenu*)m->popup() )->insertedActions();
 	for ( TQAction *a = actionList.first(); a; a = actionList.next() ) {
-	    if ( a->inherits( "QSeparatorAction" ) )
+	    if ( a->inherits( "TQSeparatorAction" ) )
 		ts <<  makeIndent( indent ) << "<separator/>" << endl;
 	    else
 		ts <<  makeIndent( indent ) << "<action name=\"" << a->name() << "\"/>" << endl;
@@ -2569,11 +2570,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" ) {
@@ -2583,17 +2584,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();
 	    }
@@ -2606,10 +2607,10 @@ void Resource::loadMenuBar( const TQDomElement &e )
 {
     TQDomElement n = e.firstChild().toElement();
     TQMainWindow *mw = ( (TQMainWindow*)formwindow->mainContainer() );
-    QDesignerMenuBar *mb = new QDesignerMenuBar( mw );
+    TQDesignerMenuBar *mb = new TQDesignerMenuBar( mw );
     while ( !n.isNull() ) {
 	if ( n.tagName() == "item" ) {
-	    QDesignerPopupMenu *popup = new QDesignerPopupMenu( mw );
+	    TQDesignerPopupMenu *popup = new TQDesignerPopupMenu( mw );
 	    popup->setName( n.attribute( "name" ) );
 	    TQDomElement n2 = n.firstChild().toElement();
 	    while ( !n2.isNull() ) {
@@ -2620,7 +2621,7 @@ void Resource::loadMenuBar( const TQDomElement &e )
 			popup->addAction( a );
 		    }
 		} else if ( n2.tagName() == "separator" ) {
-		    TQAction *a = new QSeparatorAction( 0 );
+		    TQAction *a = new TQSeparatorAction( 0 );
 		    a->addTo( popup );
 		    popup->addAction( a );
 		}
@@ -2628,7 +2629,7 @@ void Resource::loadMenuBar( const TQDomElement &e )
 	    }
 	    mb->insertItem( n.attribute( "text" ), popup );
 	} else if ( n.tagName() == "property" ) {
-	    setObjectProperty( mb, n.attribute( "name" ), n.firstChild().toElement() );
+	    setObjectProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() );
 	}
 	n = n.nextSibling().toElement();
     }
@@ -2667,11 +2668,11 @@ void Resource::saveFormCode()
 	for ( ; sit != slotList.end(); ++sit ) {
 	    MetaDataBase::Slot slot = *sit;
 	    TQMap<TQString, TQString>::Iterator it =
-		functionBodies.find( MetaDataBase::normalizeSlot( (*sit).slot ) );
+		functionBodies.tqfind( MetaDataBase::normalizeSlot( (*sit).slot ) );
 	    LanguageInterface::Function func;
 	    func.name = slot.slot;
 	    func.body = *it;
-	    func.comments = MetaDataBase::functionComments( formwindow, func.name );
+	    func.comments = MetaDataBase::functionComments( TQT_TQOBJECT(formwindow), func.name );
 	    func.returnType = slot.returnType;
 	    funcs.append( func );
 	}
@@ -2699,14 +2700,14 @@ void Resource::saveFormCode()
 static TQString make_function_pretty( const TQString &s )
 {
     TQString res = s;
-    if ( res.find( ")" ) - res.find( "(" ) == 1 )
+    if ( res.tqfind( ")" ) - res.tqfind( "(" ) == 1 )
 	return res;
-    res.replace( TQRegExp( "[(]" ), "( " );
-    res.replace( TQRegExp( "[)]" ), " )" );
-    res.replace( TQRegExp( "&" ), " &" );
-    res.replace( TQRegExp( "[*]" ), " *" );
-    res.replace( TQRegExp( "," ), ", " );
-    res.replace( TQRegExp( ":" ), " : " );
+    res.tqreplace( TQRegExp( "[(]" ), "( " );
+    res.tqreplace( TQRegExp( "[)]" ), " )" );
+    res.tqreplace( TQRegExp( "&" ), " &" );
+    res.tqreplace( TQRegExp( "[*]" ), " *" );
+    res.tqreplace( TQRegExp( "," ), ", " );
+    res.tqreplace( TQRegExp( ":" ), " : " );
     res = res.simplifyWhiteSpace();
     return res;
 }
@@ -2724,7 +2725,7 @@ void Resource::loadFunctions( const TQDomElement &e )
 	}
 	n = n.nextSibling().toElement();
     }
-    MetaDataBase::setFunctionBodies( formwindow, bodies, TQString::null, TQString::null );
+    MetaDataBase::setFunctionBodies( TQT_TQOBJECT(formwindow), bodies, TQString(), TQString() );
     if ( !bodies.isEmpty() ) {
 	LanguageInterface *iface = langIface;
 	if ( !iface )
@@ -2739,14 +2740,14 @@ void Resource::loadFunctions( const TQDomElement &e )
 #endif
 		continue;
 	    TQString sl( (*it).slot );
-	    TQString comments = MetaDataBase::functionComments( formwindow, sl );
+	    TQString comments = MetaDataBase::functionComments( TQT_TQOBJECT(formwindow), sl );
 	    if ( !comments.isEmpty() )
 		code += comments + "\n";
 	    code += iface->createFunctionStart( formwindow->name(), make_function_pretty( sl ),
 					       ( (*it).returnType.isEmpty() ?
 						 TQString( "void" ) :
 						 (*it).returnType ) );
-	    TQMap<TQString, TQString>::Iterator bit = bodies.find( MetaDataBase::normalizeSlot( (*it).slot ) );
+	    TQMap<TQString, TQString>::Iterator bit = bodies.tqfind( MetaDataBase::normalizeSlot( (*it).slot ) );
 	    if ( bit != bodies.end() )
 		code += "\n" + *bit + "\n\n";
 	    else
@@ -2820,25 +2821,25 @@ void Resource::loadExtraSource()
 
     for ( TQValueList<LanguageInterface::Function>::Iterator fit = functions.begin();
 	  fit != functions.end(); ++fit ) {
-	if ( MetaDataBase::hasSlot( formwindow, (*fit).name.latin1() ) )
-	    MetaDataBase::changeSlot( formwindow, (*fit).name.latin1(), (*fit).name.latin1() );
+	if ( MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), (*fit).name.latin1() ) )
+	    MetaDataBase::changeSlot( TQT_TQOBJECT(formwindow), (*fit).name.latin1(), (*fit).name.latin1() );
 	else
-	    MetaDataBase::addSlot( formwindow, (*fit).name.latin1(), "virtual", "public", lang, (*fit).returnType );
-	MetaDataBase::setFunctionComments( formwindow, (*fit).name, (*fit).comments );
+	    MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), (*fit).name.latin1(), "virtual", "public", lang, (*fit).returnType );
+	MetaDataBase::setFunctionComments( TQT_TQOBJECT(formwindow), (*fit).name, (*fit).comments );
 	bodies.insert( MetaDataBase::normalizeSlot( (*fit).name ), (*fit).body );
     }
-    MetaDataBase::setFunctionBodies( formwindow, bodies, TQString::null, TQString::null );
+    MetaDataBase::setFunctionBodies( TQT_TQOBJECT(formwindow), bodies, TQString(), TQString() );
 
     TQStringList v = MetaDataBase::variables( formwindow );
     TQStringList::Iterator vit;
     for ( vit = vars.begin(); vit != vars.end(); ++vit )
 	v << *vit;
-    MetaDataBase::setVariables( formwindow, v );
+    MetaDataBase::setVariables( TQT_TQOBJECT(formwindow), v );
 
     TQStringList f = MetaDataBase::forwards( formwindow );
     for ( vit = forwards.begin(); vit != forwards.end(); ++vit )
 	f << *vit;
-    MetaDataBase::setForwards( formwindow, f );
+    MetaDataBase::setForwards( TQT_TQOBJECT(formwindow), f );
 
     TQValueList<MetaDataBase::Include> incls = MetaDataBase::includes( formwindow );
     for ( vit = includesImpl.begin(); vit != includesImpl.end(); ++vit ) {
@@ -2853,6 +2854,6 @@ void Resource::loadExtraSource()
 	inc.location = "in declaration";
 	incls << inc;
     }
-    MetaDataBase::setIncludes( formwindow, incls );
+    MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), incls );
 }
 #endif
diff --git a/kommander/editor/resource.h b/kommander/editor/resource.h
index b01bd233..1684df20 100644
--- a/kommander/editor/resource.h
+++ b/kommander/editor/resource.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -38,7 +38,7 @@ class TQPalette;
 class FormWindow;
 class MainWindow;
 class TQDomElement;
-class QDesignerGridLayout;
+class TQDesignerGridLayout;
 class TQListViewItem;
 class TQMainWindow;
 #ifndef KOMMANDER
@@ -71,13 +71,13 @@ 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 );
 
 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 );
@@ -103,8 +103,8 @@ private:
 //    void saveFormCode();
 #endif
 
-    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);
@@ -117,7 +117,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 );
     TQColorGroup loadColorGroup( const TQDomElement &e );
diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp
index a5ebe0ec..af5efea9 100644
--- a/kommander/editor/sizehandle.cpp
+++ b/kommander/editor/sizehandle.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -30,8 +30,8 @@
 
 #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 );
@@ -39,7 +39,7 @@ SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s )
     widget = 0;
     dir =d ;
     setMouseTracking( false );
-    formWindow = parent;
+    formWindow = tqparent;
     sel = s;
     updateCursor();
 }
@@ -93,7 +93,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 );
@@ -102,7 +102,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() );
@@ -110,13 +110,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 ) {
@@ -208,7 +208,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
     sel->updateGeometry();
     oldPressPos += ( p - pos() );
 
-    formWindow->sizePreview()->setText( TQString( "%1/%2" ).arg( widget->width() ).arg( widget->height() ) );
+    formWindow->sizePreview()->setText( TQString( "%1/%2" ).tqarg( widget->width() ).tqarg( widget->height() ) );
     formWindow->sizePreview()->adjustSize();
     TQRect lg( formWindow->mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ),
 	      formWindow->sizePreview()->size() );
@@ -216,55 +216,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 ) );
     }
@@ -282,7 +282,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 ) {
@@ -306,7 +306,7 @@ void WidgetSelection::updateGeometry()
     if ( !wid )
 	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/kommander/editor/sizehandle.h b/kommander/editor/sizehandle.h
index 50d3ea1c..4def5429 100644
--- a/kommander/editor/sizehandle.h
+++ b/kommander/editor/sizehandle.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -30,14 +30,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();
@@ -68,7 +69,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/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp
index 4502b2a3..95f57d39 100644
--- a/kommander/editor/styledbutton.cpp
+++ b/kommander/editor/styledbutton.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -32,10 +32,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()));
@@ -43,12 +43,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()
@@ -111,12 +111,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 );
 }
@@ -145,25 +145,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 ) );
@@ -178,7 +178,7 @@ void StyledButton::onEditor()
 {
     switch (edit) {
     case ColorEditor: {
-        TQColor c = palette().active().background();
+        TQColor c = tqpalette().active().background();
 	if ( KColorDialog::getColor( c, this ) == TQDialog::Accepted ) {
 	    setColor( c );
 	    emit changed();
@@ -210,7 +210,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() ) {
@@ -237,7 +237,7 @@ void StyledButton::mouseMoveEvent(TQMouseEvent* e)
 #endif
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 void StyledButton::dragEnterEvent( TQDragEnterEvent *e )
 {
     setFocus();
@@ -252,7 +252,7 @@ void StyledButton::dragEnterEvent( TQDragEnterEvent *e )
 void StyledButton::dragLeaveEvent( TQDragLeaveEvent * )
 {
     if ( hasFocus() )
-	parentWidget()->setFocus();
+	tqparentWidget()->setFocus();
 }
 
 void StyledButton::dragMoveEvent( TQDragMoveEvent *e )
@@ -286,5 +286,5 @@ void StyledButton::dropEvent( TQDropEvent *e )
 	e->ignore();
     }
 }
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
 #include "styledbutton.moc"
diff --git a/kommander/editor/styledbutton.h b/kommander/editor/styledbutton.h
index cb5f4e92..a8daca52 100644
--- a/kommander/editor/styledbutton.h
+++ b/kommander/editor/styledbutton.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -28,22 +28,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 );
@@ -58,8 +59,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; }
 
@@ -72,12 +73,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/kommander/editor/tableeditor.ui b/kommander/editor/tableeditor.ui
index 26345a3f..b3331a98 100644
--- a/kommander/editor/tableeditor.ui
+++ b/kommander/editor/tableeditor.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>TableEditorBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>TableEditorBase</cstring>
     </property>
@@ -28,7 +28,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTable" row="0" column="0">
+        <widget class="TQTable" row="0" column="0">
             <column>
                 <property name="text">
                     <string>1</string>
@@ -52,7 +52,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>
@@ -66,7 +66,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <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">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -111,7 +111,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>
@@ -125,7 +125,7 @@
 				<string>Apply all changes.</string>
 			</property>
 		</widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -141,11 +141,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>
@@ -172,14 +172,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>
@@ -194,14 +194,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>
@@ -218,7 +218,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>
@@ -235,7 +235,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>
@@ -243,7 +243,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>
@@ -251,7 +251,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>
@@ -265,7 +265,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>
@@ -273,7 +273,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>
@@ -287,7 +287,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>labelColumnPixmap</cstring>
                                         </property>
@@ -295,11 +295,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>
@@ -318,11 +318,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>
@@ -340,7 +340,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>
@@ -351,7 +351,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>
@@ -362,7 +362,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>
@@ -373,12 +373,12 @@
                                     <cstring>comboFields</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="2" column="1">
+                            <widget class="TQLineEdit" row="2" column="1">
                                 <property name="name">
                                     <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>
@@ -386,7 +386,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>
@@ -398,7 +398,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>rows_tab</cstring>
                 </property>
@@ -425,14 +425,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>
@@ -449,12 +449,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>
@@ -481,14 +481,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>
@@ -496,7 +496,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>
@@ -504,7 +504,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>
@@ -518,7 +518,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>
@@ -529,7 +529,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>
@@ -540,7 +540,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>
@@ -554,7 +554,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>labelRowPixmap</cstring>
                                         </property>
@@ -562,11 +562,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>
@@ -585,11 +585,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>
@@ -607,7 +607,7 @@
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QLineEdit" row="0" column="1">
+                            <widget class="TQLineEdit" row="0" column="1">
                                 <property name="name">
                                     <cstring>editRowText</cstring>
                                 </property>
@@ -645,15 +645,15 @@
     </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>
@@ -693,15 +693,15 @@
     </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>
@@ -769,9 +769,9 @@
     <slot access="protected" language="C++" returnType="void">chooseRowPixmapClicked()</slot>
     <slot access="protected" language="C++" returnType="void">columnTextChanged( const QString &amp; )</slot>
     <slot access="protected" language="C++" returnType="void">columnUpClicked()</slot>
-    <slot access="protected" language="C++" returnType="void">currentColumnChanged( QListBoxItem * )</slot>
+    <slot access="protected" language="C++" returnType="void">currentColumnChanged( TQListBoxItem * )</slot>
     <slot access="protected" language="C++" returnType="void">currentFieldChanged( const QString &amp; )</slot>
-    <slot access="protected" language="C++" returnType="void">currentRowChanged( QListBoxItem * )</slot>
+    <slot access="protected" language="C++" returnType="void">currentRowChanged( TQListBoxItem * )</slot>
     <slot access="protected" language="C++" returnType="void">deleteColPixmapClicked()</slot>
     <slot access="protected" language="C++" returnType="void">deleteColumnClicked()</slot>
     <slot access="protected" language="C++" returnType="void">deleteRowClicked()</slot>
diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp
index 58cc554d..e5b39340 100644
--- a/kommander/editor/tableeditorimpl.cpp
+++ b/kommander/editor/tableeditorimpl.cpp
@@ -1,5 +1,5 @@
 #include "tableeditorimpl.h"
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #endif
 #include "formwindow.h"
@@ -21,15 +21,15 @@
 
 #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( "" );
 
@@ -39,7 +39,7 @@ TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *f
 	labelTable->hide();
 	labelTableValue->hide();
     }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) {
 	// ## why does this behave weird?
 	//	TabWidget->removePage( rows_tab );
@@ -93,7 +93,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 );
@@ -130,13 +130,13 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i )
 	labelColumnPixmap->setText( "" );
     editColumnText->blockSignals( false );
 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     if ( editTable->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) {
-	TQString s = *fieldMap.find( listColumns->index( i ) );
+	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 );
     }
@@ -173,7 +173,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();
@@ -188,7 +188,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();
@@ -201,14 +201,14 @@ 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 );
@@ -226,14 +226,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 );
@@ -267,7 +267,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(),
@@ -296,13 +296,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 ) {
@@ -312,7 +312,7 @@ void TableEditor::applyClicked()
 	    row.pix = table->verticalHeader()->iconSet( i )->pixmap();
 	rows.append( row );
     }
-    PopulateTableCommand *cmd = new PopulateTableCommand( i18n("Edit Rows and Columns of '%1' " ).arg( editTable->name() ),
+    PopulateTableCommand *cmd = new PopulateTableCommand( i18n("Edit Rows and Columns of '%1' " ).tqarg( editTable->name() ),
 							  formWindow, editTable, rows, cols );
     cmd->execute();
     formWindow->commandHistory()->addCommand( cmd );
@@ -332,7 +332,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
@@ -342,7 +342,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
@@ -360,7 +360,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
@@ -370,7 +370,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
@@ -378,10 +378,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 ),
@@ -392,7 +392,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 );
     }
 
@@ -425,7 +425,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() );
@@ -438,7 +438,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/kommander/editor/tableeditorimpl.h b/kommander/editor/tableeditorimpl.h
index 5fb1ccc4..c0b8ce85 100644
--- a/kommander/editor/tableeditorimpl.h
+++ b/kommander/editor/tableeditorimpl.h
@@ -11,9 +11,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/kommander/editor/templates/Configuration_Dialog.ui b/kommander/editor/templates/Configuration_Dialog.ui
index 199f5b90..4724398b 100644
--- a/kommander/editor/templates/Configuration_Dialog.ui
+++ b/kommander/editor/templates/Configuration_Dialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MyDialog2</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>MyDialog2</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListBox" row="0" column="0">
+        <widget class="TQListBox" row="0" column="0">
             <item>
                 <property name="text">
                     <string>New Item</string>
@@ -43,11 +43,11 @@
                 </sizepolicy>
             </property>
         </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>Widget2</cstring>
                 </property>
@@ -55,7 +55,7 @@
                     <string>Tab</string>
                 </attribute>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget3</cstring>
                 </property>
@@ -64,7 +64,7 @@
                 </attribute>
             </widget>
         </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>Layout1</cstring>
             </property>
@@ -78,7 +78,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>
@@ -123,7 +123,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -152,5 +152,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui b/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui
index 77d77cb3..6d9edca0 100644
--- a/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui
+++ b/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MyDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>MyDialog</cstring>
     </property>
@@ -15,7 +15,7 @@
     <property name="sizeGripEnabled">
         <bool>true</bool>
     </property>
-    <widget class="QLayoutWidget">
+    <widget class="TQLayoutWidget">
         <property name="name">
             <cstring>Layout1</cstring>
         </property>
@@ -37,7 +37,7 @@
             <property name="spacing">
                 <number>6</number>
             </property>
-            <widget class="QPushButton">
+            <widget class="TQPushButton">
                 <property name="name">
                     <cstring>buttonHelp</cstring>
                 </property>
@@ -61,14 +61,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>
@@ -82,7 +82,7 @@
                     <bool>true</bool>
                 </property>
             </widget>
-            <widget class="QPushButton">
+            <widget class="TQPushButton">
                 <property name="name">
                     <cstring>buttonCancel</cstring>
                 </property>
@@ -110,5 +110,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/templates/Dialog_with_Buttons_(Right).ui b/kommander/editor/templates/Dialog_with_Buttons_(Right).ui
index fd2c01f0..93650a87 100644
--- a/kommander/editor/templates/Dialog_with_Buttons_(Right).ui
+++ b/kommander/editor/templates/Dialog_with_Buttons_(Right).ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MyDialog</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>MyDialog</cstring>
     </property>
@@ -15,7 +15,7 @@
     <property name="sizeGripEnabled">
         <bool>true</bool>
     </property>
-    <widget class="QLayoutWidget">
+    <widget class="TQLayoutWidget">
         <property name="name">
             <cstring>Layout5</cstring>
         </property>
@@ -37,7 +37,7 @@
             <property name="spacing">
                 <number>6</number>
             </property>
-            <widget class="QPushButton">
+            <widget class="TQPushButton">
                 <property name="name">
                     <cstring>buttonOk</cstring>
                 </property>
@@ -51,7 +51,7 @@
                     <bool>true</bool>
                 </property>
             </widget>
-            <widget class="QPushButton">
+            <widget class="TQPushButton">
                 <property name="name">
                     <cstring>buttonCancel</cstring>
                 </property>
@@ -62,7 +62,7 @@
                     <bool>true</bool>
                 </property>
             </widget>
-            <widget class="QPushButton">
+            <widget class="TQPushButton">
                 <property name="name">
                     <cstring>buttonHelp</cstring>
                 </property>
@@ -86,7 +86,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>20</width>
                         <height>20</height>
@@ -110,5 +110,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/templates/Tab_Dialog.ui b/kommander/editor/templates/Tab_Dialog.ui
index a2ad9315..4e0a7124 100644
--- a/kommander/editor/templates/Tab_Dialog.ui
+++ b/kommander/editor/templates/Tab_Dialog.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MyDialog1</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>MyDialog1</cstring>
     </property>
@@ -25,11 +25,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>
@@ -37,7 +37,7 @@
                     <string>Tab</string>
                 </attribute>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget9</cstring>
                 </property>
@@ -46,7 +46,7 @@
                 </attribute>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -60,7 +60,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -84,14 +84,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>
@@ -105,7 +105,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -134,5 +134,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/timestamp.cpp b/kommander/editor/timestamp.cpp
index e92fc78f..62cac72d 100644
--- a/kommander/editor/timestamp.cpp
+++ b/kommander/editor/timestamp.cpp
@@ -1,7 +1,7 @@
  /**********************************************************************
 ** 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
@@ -24,8 +24,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/kommander/editor/timestamp.h b/kommander/editor/timestamp.h
index d3e061f9..1df9f916 100644
--- a/kommander/editor/timestamp.h
+++ b/kommander/editor/timestamp.h
@@ -1,7 +1,7 @@
  /**********************************************************************
 ** 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
@@ -25,12 +25,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/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp
index 3661f700..73349c3b 100644
--- a/kommander/editor/widgetdatabase.cpp
+++ b/kommander/editor/widgetdatabase.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -53,13 +53,13 @@ static TQStrList *wGroups;
 static TQStrList *invisibleGroups;
 static bool whatsThisLoaded = false;
 #ifndef KOMMANDER
-static QPluginManager<WidgetInterface> *widgetPluginManager = 0;
+static TQPluginManager<WidgetInterface> *widgetPluginManager = 0;
 #endif
 static bool plugins_set_up = false;
 static bool was_in_setup = false;
 
 #ifndef KOMMANDER
-TQCleanupHandler<QPluginManager<WidgetInterface> > cleanup_manager;
+TQCleanupHandler<TQPluginManager<WidgetInterface> > cleanup_manager;
 #endif
 
 WidgetDatabaseRecord::WidgetDatabaseRecord()
@@ -89,7 +89,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.
 */
 
 /*!
@@ -134,35 +134,35 @@ void WidgetDatabase::setupDataBase( int id )
   /* Designer widgets */
   r = new WidgetDatabaseRecord;
   r->iconName = "pushbutton.xpm";
-  r->name = "TQPushButton";
+  r->name = TQPUSHBUTTON_OBJECT_NAME_STRING;
   r->group = widgetGroup("Buttons");
   r->toolTip = i18n("Push Button");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "toolbutton.xpm";
-  r->name = "TQToolButton";
+  r->name = TQTOOLBUTTON_OBJECT_NAME_STRING;
   r->group = widgetGroup("Buttons");
   r->toolTip = i18n("Tool Button");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "radiobutton.xpm";
-  r->name = "TQRadioButton";
+  r->name = TQRADIOBUTTON_OBJECT_NAME_STRING;
   r->group = widgetGroup("Buttons");
   r->toolTip = i18n("Radio Button");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "checkbox.xpm";
-  r->name = "TQCheckBox";
+  r->name = TQCHECKBOX_OBJECT_NAME_STRING;
   r->group = widgetGroup("Buttons");
   r->toolTip = i18n("Check Box");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "groupbox.xpm";
-  r->name = "TQGroupBox";
+  r->name = TQGROUPBOX_OBJECT_NAME_STRING;
   r->group = widgetGroup("Containers");
   r->toolTip = i18n("Group Box");
   r->isContainer = true;
@@ -170,7 +170,7 @@ void WidgetDatabase::setupDataBase( int id )
 
   r = new WidgetDatabaseRecord;
   r->iconName = "buttongroup.xpm";
-  r->name = "TQButtonGroup";
+  r->name = TQBUTTONGROUP_OBJECT_NAME_STRING;
   r->group = widgetGroup("Containers");
   r->toolTip = i18n("Button Group");
   r->isContainer = true;
@@ -178,7 +178,7 @@ void WidgetDatabase::setupDataBase( int id )
 
   r = new WidgetDatabaseRecord;
   r->iconName = "frame.xpm";
-  r->name = "TQFrame";
+  r->name = TQFRAME_OBJECT_NAME_STRING;
   r->group = widgetGroup("Containers");
   r->toolTip = i18n("Frame");
   r->isContainer = true;
@@ -186,7 +186,7 @@ void WidgetDatabase::setupDataBase( int id )
 
   r = new WidgetDatabaseRecord;
   r->iconName = "tabwidget.xpm";
-  r->name = "TQTabWidget";
+  r->name = TQTABWIDGET_OBJECT_NAME_STRING;
   r->group = widgetGroup("Containers");
   r->toolTip = i18n("Tabwidget");
   r->isContainer = true;
@@ -194,41 +194,41 @@ void WidgetDatabase::setupDataBase( int id )
 
   r = new WidgetDatabaseRecord;
   r->iconName = "listbox.xpm";
-  r->name = "TQListBox";
+  r->name = TQLISTBOX_OBJECT_NAME_STRING;
   r->group = widgetGroup("Views");
   r->toolTip = i18n("List Box");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "listview.xpm";
-  r->name = "TQListView";
+  r->name = TQLISTVIEW_OBJECT_NAME_STRING;
   r->group = widgetGroup("Views");
   r->toolTip = i18n("List View");
   append(r);
 
-#if !defined(QT_NO_ICONVIEW) || defined(UIC)
+#if !defined(TQT_NO_ICONVIEW) || defined(UIC)
   r = new WidgetDatabaseRecord;
   r->iconName = "iconview.xpm";
-  r->name = "TQIconView";
+  r->name = TQICONVIEW_OBJECT_NAME_STRING;
   r->group = widgetGroup("Views");
   r->toolTip = i18n("Icon View");
   append(r);
 #endif
 
-#if !defined(QT_NO_TABLE)
+#if !defined(TQT_NO_TABLE)
   r = new WidgetDatabaseRecord;
   r->iconName = "table.xpm";
-  r->name = "TQTable";
+  r->name = TQTABLE_OBJECT_NAME_STRING;
   r->group = widgetGroup("Views");
   r->toolTip = i18n("Table");
   append(r);
 #endif
 
-#if !defined(QT_NO_SQL)
+#if !defined(TQT_NO_SQL)
   r = new WidgetDatabaseRecord;
   r->iconName = "datatable.xpm";
   r->includeFile = "tqdatatable.h";
-  r->name = "TQDataTable";
+  r->name = TQDATATABLE_OBJECT_NAME_STRING;
   r->group = widgetGroup("Database");
   r->toolTip = i18n("Data Table");
   append(r);
@@ -236,21 +236,21 @@ void WidgetDatabase::setupDataBase( int id )
 
   r = new WidgetDatabaseRecord;
   r->iconName = "lineedit.xpm";
-  r->name = "TQLineEdit";
+  r->name = TQLINEEDIT_OBJECT_NAME_STRING;
   r->group = widgetGroup("Input");
   r->toolTip = i18n("Line Edit");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "spinbox.xpm";
-  r->name = "TQSpinBox";
+  r->name = TQSPINBOX_OBJECT_NAME_STRING;
   r->group = widgetGroup("Input");
   r->toolTip = i18n("Spin Box");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "dateedit.xpm";
-  r->name = "QDateEdit";
+  r->name = TQDATEEDIT_OBJECT_NAME_STRING;
   r->group = widgetGroup("Input");
   r->toolTip = i18n("Date Edit");
   r->includeFile = "tqdatetimeedit.h";
@@ -258,7 +258,7 @@ void WidgetDatabase::setupDataBase( int id )
 
   r = new WidgetDatabaseRecord;
   r->iconName = "timeedit.xpm";
-  r->name = "QTimeEdit";
+  r->name = TQTIMEEDIT_OBJECT_NAME_STRING;
   r->group = widgetGroup("Input");
   r->toolTip = i18n("Time Edit");
   r->includeFile = "tqdatetimeedit.h";
@@ -266,7 +266,7 @@ void WidgetDatabase::setupDataBase( int id )
 
   r = new WidgetDatabaseRecord;
   r->iconName = "datetimeedit.xpm";
-  r->name = "QDateTimeEdit";
+  r->name = TQDATETIMEEDIT_OBJECT_NAME_STRING;
   r->group = widgetGroup("Input");
   r->toolTip = i18n("Date-Time Edit");
   r->includeFile = "tqdatetimeedit.h";
@@ -274,77 +274,77 @@ void WidgetDatabase::setupDataBase( int id )
 
   r = new WidgetDatabaseRecord;
   r->iconName = "multilineedit.xpm";
-  r->name = "TQMultiLineEdit";
+  r->name = TQMULTILINEEDIT_OBJECT_NAME_STRING;
   r->group = widgetGroup("Temp");
   r->toolTip = i18n("Multi Line Edit");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "richtextedit.xpm";
-  r->name = "TQTextEdit";
+  r->name = TQTEXTEDIT_OBJECT_NAME_STRING;
   r->group = widgetGroup("Input");
   r->toolTip = i18n("Rich Text Edit");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "combobox.xpm";
-  r->name = "TQComboBox";
+  r->name = TQCOMBOBOX_OBJECT_NAME_STRING;
   r->group = widgetGroup("Input");
   r->toolTip = i18n("Combo Box");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "slider.xpm";
-  r->name = "TQSlider";
+  r->name = TQSLIDER_OBJECT_NAME_STRING;
   r->group = widgetGroup("Input");
   r->toolTip = i18n("Slider");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "scrollbar.xpm";
-  r->name = "TQScrollBar";
+  r->name = TQSCROLLBAR_OBJECT_NAME_STRING;
   r->group = widgetGroup("Input");
   r->toolTip = i18n("Scrollbar");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "dial.xpm";
-  r->name = "TQDial";
+  r->name = TQDIAL_OBJECT_NAME_STRING;
   r->group = widgetGroup("Input");
   r->toolTip = i18n("Dial");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "label.xpm";
-  r->name = "TQLabel";
+  r->name = TQLABEL_OBJECT_NAME_STRING;
   r->group = widgetGroup("Temp");
   r->toolTip = i18n("Label");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "lcdnumber.xpm";
-  r->name = "TQLCDNumber";
+  r->name = TQLCDNUMBER_OBJECT_NAME_STRING;
   r->group = widgetGroup("Display");
   r->toolTip = i18n("LCD Number");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "progress.xpm";
-  r->name = "TQProgressBar";
+  r->name = TQPROGRESSBAR_OBJECT_NAME_STRING;
   r->group = widgetGroup("Display");
   r->toolTip = i18n("Progress Bar");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "textview.xpm";
-  r->name = "TQTextView";
+  r->name = TQTEXTVIEW_OBJECT_NAME_STRING;
   r->group = widgetGroup("Temp");
   r->toolTip = i18n("Text View");
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "textbrowser.xpm";
-  r->name = "TQTextBrowser";
+  r->name = TQTEXTBROWSER_OBJECT_NAME_STRING;
   r->group = widgetGroup("Display");
   r->toolTip = i18n("Text Browser");
   append(r);
@@ -355,42 +355,42 @@ void WidgetDatabase::setupDataBase( int id )
   r->group = widgetGroup("Temp");
   r->toolTip = i18n("Spacer");
   r->whatsThis =
-      i18n("The Spacer provides horizontal and vertical spacing to be able to manipulate the behaviour of layouts.");
+      i18n("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;
   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;
@@ -398,36 +398,36 @@ void WidgetDatabase::setupDataBase( int id )
 
   r = new WidgetDatabaseRecord;
   r->iconName = "tabwidget.xpm";
-  r->name = "QDesignerTabWidget";
+  r->name = "TQDesignerTabWidget";
   r->group = widgetGroup("Temp");
   r->isContainer = true;
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "tabwidget.xpm";
-  r->name = "QDesignerWidget";
+  r->name = "TQDesignerWidget";
   r->group = widgetGroup("Temp");
   r->isContainer = true;
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "tabwidget.xpm";
-  r->name = "QDesignerDialog";
+  r->name = "TQDesignerDialog";
   r->group = widgetGroup("Temp");
   r->isContainer = true;
   append(r);
 
   r = new WidgetDatabaseRecord;
   r->iconName = "";
-  r->name = "TQMainWindow";
+  r->name = TQMAINWINDOW_OBJECT_NAME_STRING;
   r->includeFile = "tqmainwindow.h";
   r->group = widgetGroup("Temp");
   r->isContainer = true;
   append(r);
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
   r = new WidgetDatabaseRecord;
-  r->name = "TQDataBrowser";
+  r->name = TQDATABROWSER_OBJECT_NAME_STRING;
   r->includeFile = "tqdatabrowser.h";
   r->group = widgetGroup("Database");
   r->toolTip = "Data Browser";
@@ -436,7 +436,7 @@ void WidgetDatabase::setupDataBase( int id )
   append(r);
 
   r = new WidgetDatabaseRecord;
-  r->name = "TQDataView";
+  r->name = TQDATAVIEW_OBJECT_NAME_STRING;
   r->includeFile = "tqdataview.h";
   r->group = widgetGroup("Database");
   r->toolTip = "Data View";
@@ -764,7 +764,7 @@ TQString WidgetDatabase::className( int id )
     setupDataBase( id );
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
-	return TQString::null;
+	return TQString();
     return r->name;
 }
 
@@ -777,7 +777,7 @@ TQString WidgetDatabase::group( int id )
     setupDataBase( id );
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
-	return TQString::null;
+	return TQString();
     return r->group;
 }
 
@@ -790,7 +790,7 @@ TQString WidgetDatabase::toolTip( int id )
     setupDataBase( id );
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
-	return TQString::null;
+	return TQString();
     return r->toolTip;
 }
 
@@ -803,7 +803,7 @@ TQString WidgetDatabase::whatsThis( int id )
     setupDataBase( id );
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
-	return TQString::null;
+	return TQString();
     return r->whatsThis;
 }
 
@@ -816,7 +816,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;
@@ -833,7 +833,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 )
@@ -849,7 +849,7 @@ 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 = n.mid( 1 );
@@ -867,14 +867,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
@@ -883,7 +883,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 )
@@ -904,7 +904,7 @@ void WidgetDatabase::insert( int index, WidgetDatabaseRecord *r )
     widget_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 )
@@ -916,7 +916,7 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r )
 
 TQString WidgetDatabase::widgetGroup( const TQString &g )
 {
-    if ( wGroups->find( g ) == -1 )
+    if ( wGroups->tqfind( g ) == -1 )
 	wGroups->append( g );
     return g;
 }
@@ -945,7 +945,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()
@@ -957,7 +957,7 @@ int WidgetDatabase::numWidgetGroups()
 bool WidgetDatabase::isGroupVisible( const TQString &g )
 {
     setupDataBase( -1 );
-    return invisibleGroups->find( g ) == -1;
+    return invisibleGroups->tqfind( g ) == -1;
 }
 
 int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r )
@@ -997,20 +997,20 @@ 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
 #ifndef KOMMANDER
 #if defined(UIC)
 bool dbnounload = false;
 TQStringList *dbpaths = 0;
 #endif
 
-QPluginManager<WidgetInterface> *widgetManager()
+TQPluginManager<WidgetInterface> *widgetManager()
 {
     if ( !widgetPluginManager ) {
 #ifndef KOMMANDER
-	widgetPluginManager = new QPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(), "/designer" );
+	widgetPluginManager = new TQPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(), "/designer" );
 #else
-	widgetPluginManager = new QPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(), "" );
+	widgetPluginManager = new TQPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(), "" );
 #endif
 
 	cleanup_manager.add( &widgetPluginManager );
diff --git a/kommander/editor/widgetdatabase.h b/kommander/editor/widgetdatabase.h
index 3e4078c5..24b14530 100644
--- a/kommander/editor/widgetdatabase.h
+++ b/kommander/editor/widgetdatabase.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -25,10 +25,10 @@
 #include <tqstring.h>
 #ifndef KOMMANDER
 #include "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();
 #endif
 
 struct WidgetDatabaseRecord
@@ -42,7 +42,7 @@ struct WidgetDatabaseRecord
     int nameCounter;
 };
 
-class WidgetDatabase : public Qt
+class WidgetDatabase : public TQt
 {
 public:
     WidgetDatabase();
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index 2becbd33..920a3605 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -29,7 +29,7 @@
 #include "mainwindow.h"
 #include "formwindow.h"
 #include "pixmapchooser.h"
-#include "layout.h"
+#include "tqlayout.h"
 #include "listboxeditorimpl.h"
 #include "listvieweditorimpl.h"
 #include "iconvieweditorimpl.h"
@@ -37,7 +37,7 @@
 #ifndef KOMMANDER
 #include "widgetinterface.h"
 #endif
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include "tableeditorimpl.h"
 #endif
 
@@ -46,10 +46,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>
@@ -81,7 +81,7 @@
 #include <tqmenubar.h>
 #include <tqapplication.h>
 #include <tqsplitter.h>
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "database.h"
 #endif
 
@@ -123,13 +123,13 @@ FormWindow *find_formwindow( TQWidget *w )
     for (;;) {
 	if ( w->inherits( "FormWindow" ) )
 	    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 );
@@ -137,54 +137,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: {
@@ -232,7 +232,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;
 	    }
@@ -241,7 +241,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++;
 	}
 
@@ -269,20 +269,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;
 		}
 
@@ -303,7 +303,7 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
     return false;
 }
 
-int QDesignerWizard::currentPageNum() const
+int TQDesignerWizard::currentPageNum() const
 {
     for ( int i = 0; i < pageCount(); ++i ) {
 	if ( page( i ) == currentPage() )
@@ -312,7 +312,7 @@ int QDesignerWizard::currentPageNum() const
     return 0;
 }
 
-void QDesignerWizard::setCurrentPage( int i )
+void TQDesignerWizard::setCurrentPage( int i )
 {
     if ( i < currentPageNum() ) {
 	while ( i < currentPageNum() ) {
@@ -330,30 +330,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 )
@@ -362,23 +362,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 );
 }
 
@@ -387,10 +387,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.
 */
@@ -399,26 +399,26 @@ TQMap< int, TQStringList > *changedProperties = 0;
 void WidgetFactory::saveDefaultProperties( TQWidget *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 );
 }
 
 static void saveChangedProperties( TQWidget *w, int id )
 {
-    TQStringList l = MetaDataBase::changedProperties( w );
+    TQStringList l = MetaDataBase::changedProperties( TQT_TQOBJECT(w) );
     changedProperties->insert( id, l );
 }
 
-EditorTabWidget::EditorTabWidget( TQWidget *parent, const char *name )
-    : TabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( false )
+EditorTabWidget::EditorTabWidget( TQWidget *tqparent, const char *name )
+    : TabWidget( tqparent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( false )
 {
     tabBar()->setAcceptDrops( true );
     tabBar()->installEventFilter( this );
@@ -464,7 +464,7 @@ int EditorTabWidget::count() const
 
 bool EditorTabWidget::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: {
@@ -512,7 +512,7 @@ bool EditorTabWidget::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;
 	    }
@@ -521,7 +521,7 @@ bool EditorTabWidget::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++;
 	}
 
@@ -549,20 +549,20 @@ bool EditorTabWidget::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;
 		}
 
@@ -584,8 +584,8 @@ bool EditorTabWidget::eventFilter( TQObject *o, TQEvent *e )
 }
 
 
-EditorToolBox::EditorToolBox( TQWidget *parent, const char *name )
-    : ToolBox( parent, name )
+EditorToolBox::EditorToolBox( TQWidget *tqparent, const char *name )
+    : ToolBox( tqparent, name )
 {
     setAcceptDrops( true );
 }
@@ -631,12 +631,12 @@ int EditorToolBox::count() const
 
 
 /*!  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);
   //qDebug("Trying to create '%s'", n.latin1());
@@ -652,108 +652,108 @@ 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);
+  w = createWidget(n, tqparent, name ? name : s, init, r, orient);
   //qDebug("Trying to create '%s', widget (id=%d) - %s", s, id, w ? "successful" : "failure");
   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))
+  if (!defaultProperties->tqcontains(id))
     saveDefaultProperties(w, id);
-  if (!changedProperties->contains(id))
+  if (!changedProperties->tqcontains(id))
     saveChangedProperties(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;
 
     if ( widget && !widget->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) &&
-	 ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) ||
-	   widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) )
+	 ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ||
+	   widget && widget->tqparentWidget() && widget->tqparentWidget()->inherits( "FormWindow" ) ) )
 	margin = MainWindow::self->currentLayoutDefaultMargin();
 
-    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( TQTOOLBOX_OBJECT_NAME_STRING ) )
+    if ( !tqlayout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
     widget = ((TQToolBox*)widget)->currentItem();
 
-    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( TQMAINWINDOW_OBJECT_NAME_STRING ) )
+    if ( !tqlayout && widget && widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
 	widget = ((TQMainWindow*)widget)->centralWidget();
 
-    if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
+    if ( !tqlayout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
 	widget = ((TQWidgetStack*)widget)->visibleWidget();
 
-    MetaDataBase::addEntry( widget );
+    MetaDataBase::addEntry( TQT_TQOBJECT(widget) );
 
-    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 );
-	gb->layout()->setMargin( 0 );
-	gb->layout()->setSpacing( 0 );
+	gb->tqlayout()->setMargin( 0 );
+	gb->tqlayout()->setSpacing( 0 );
 	TQLayout *l;
 	switch ( type ) {
 	case HBox:
-	    l = new TQHBoxLayout( gb->layout() );
-	    MetaDataBase::setMargin( gb, margin );
-	    MetaDataBase::setSpacing( gb, spacing );
-	    l->setAlignment( AlignTop );
-	    MetaDataBase::addEntry( l );
+	    l = new TQHBoxLayout( gb->tqlayout() );
+	    MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin );
+	    MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing );
+	    l->tqsetAlignment( AlignTop );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 	    return l;
 	case VBox:
-	    l = new TQVBoxLayout( gb->layout(), spacing );
-	    MetaDataBase::setMargin( gb, margin );
-	    MetaDataBase::setSpacing( gb, spacing );
-	    l->setAlignment( AlignTop );
-	    MetaDataBase::addEntry( l );
+	    l = new TQVBoxLayout( gb->tqlayout(), spacing );
+	    MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin );
+	    MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing );
+	    l->tqsetAlignment( AlignTop );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 	    return l;
 	case Grid:
-	    l = new QDesignerGridLayout( gb->layout() );
-	    MetaDataBase::setMargin( gb, margin );
-	    MetaDataBase::setSpacing( gb, spacing );
-	    l->setAlignment( AlignTop );
-	    MetaDataBase::addEntry( l );
+	    l = new TQDesignerGridLayout( gb->tqlayout() );
+	    MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin );
+	    MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing );
+	    l->tqsetAlignment( AlignTop );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 	    return l;
 	default:
 	    return 0;
 	}
     } else {
-	if ( layout ) {
+	if ( tqlayout ) {
 	    TQLayout *l;
 	    switch ( type ) {
 	    case HBox:
-		l = new TQHBoxLayout( layout );
-		MetaDataBase::addEntry( l );
+		l = new TQHBoxLayout( tqlayout );
+		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		l->setSpacing( spacing );
 		l->setMargin( margin );
-		MetaDataBase::addEntry( l );
+		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		return l;
 	    case VBox:
-		l = new TQVBoxLayout( layout );
-		MetaDataBase::addEntry( l );
+		l = new TQVBoxLayout( tqlayout );
+		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		l->setSpacing( spacing );
 		l->setMargin( margin );
-		MetaDataBase::addEntry( l );
+		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		return l;
 	    case Grid: {
-		l = new QDesignerGridLayout( layout );
-		MetaDataBase::addEntry( l );
+		l = new TQDesignerGridLayout( tqlayout );
+		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		l->setSpacing( spacing );
 		l->setMargin( margin );
-		MetaDataBase::addEntry( l );
+		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		return l;
 	    }
 	    default:
@@ -764,39 +764,39 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou
 	    switch ( type ) {
 	    case HBox:
 		l = new TQHBoxLayout( widget );
-		MetaDataBase::addEntry( l );
+		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		if ( widget ) {
-		    MetaDataBase::setMargin( widget, margin );
-		    MetaDataBase::setSpacing( widget, spacing );
+		    MetaDataBase::setMargin( TQT_TQOBJECT(widget), margin );
+		    MetaDataBase::setSpacing( TQT_TQOBJECT(widget), spacing );
 		} else {
 		    l->setMargin( margin );
 		    l->setSpacing( margin );
 		}
-		MetaDataBase::addEntry( l );
+		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		return l;
 	    case VBox:
 		l = new TQVBoxLayout( widget );
-		MetaDataBase::addEntry( l );
+		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		if ( widget ) {
-		    MetaDataBase::setMargin( widget, margin );
-		    MetaDataBase::setSpacing( widget, spacing );
+		    MetaDataBase::setMargin( TQT_TQOBJECT(widget), margin );
+		    MetaDataBase::setSpacing( TQT_TQOBJECT(widget), spacing );
 		} else {
 		    l->setMargin( margin );
 		    l->setSpacing( margin );
 		}
-		MetaDataBase::addEntry( l );
+		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		return l;
 	    case Grid: {
-		l = new QDesignerGridLayout( widget );
-		MetaDataBase::addEntry( l );
+		l = new TQDesignerGridLayout( widget );
+		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		if ( widget ) {
-		    MetaDataBase::setMargin( widget, margin );
-		    MetaDataBase::setSpacing( widget, spacing );
+		    MetaDataBase::setMargin( TQT_TQOBJECT(widget), margin );
+		    MetaDataBase::setSpacing( TQT_TQOBJECT(widget), spacing );
 		} else {
 		    l->setMargin( margin );
 		    l->setSpacing( margin );
 		}
-		MetaDataBase::addEntry( l );
+		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		return l;
 	    }
 	    default:
@@ -819,17 +819,17 @@ void WidgetFactory::deleteLayout( TQWidget *widget )
 	widget = ((TQMainWindow*)widget)->centralWidget();
     if ( widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
 	widget = ((TQWidgetStack*)widget)->visibleWidget();
-    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)
@@ -837,11 +837,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
     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 && ((FormWindow *) w)->mainContainer()->inherits(TQDIALOG_OBJECT_NAME_STRING));
@@ -850,43 +850,43 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
   {
     if (init)
     {
-      QDesignerToolButton *tb = new QDesignerToolButton(parent, name);
+      TQDesignerToolButton *tb = new TQDesignerToolButton(tqparent, name);
       tb->setText("...");
       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;
@@ -895,30 +895,30 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 #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"));
@@ -927,7 +927,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
     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)
     {
@@ -936,91 +936,91 @@ 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)
   {
-    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 == 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 == 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 &&
-        (parent->inherits("FormWindow") || parent->inherits(TQWIZARD_OBJECT_NAME_STRING)
-            || parent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || parent->inherits(TQTOOLBOX_OBJECT_NAME_STRING) || parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)))
+    if (tqparent &&
+        (tqparent->inherits("FormWindow") || tqparent->inherits(TQWIZARD_OBJECT_NAME_STRING)
+            || tqparent->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || tqparent->inherits(TQTOOLBOX_OBJECT_NAME_STRING) || tqparent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)))
     {
-      FormWindow *fw = find_formwindow(parent);
+      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 (parent && parent->inherits("FormWindow"))
-      dia = new QDesignerDialog((FormWindow *) parent, parent, name);
+    if (tqparent && tqparent->inherits("FormWindow"))
+      dia = new TQDesignerDialog((FormWindow *) tqparent, tqparent, name);
     else
-      dia = new TQDialog(parent, name);
-    if (parent && !parent->inherits("MainWindow"))
-      dia->reparent(parent, TQPoint(0, 0), true);
+      dia = new TQDialog(tqparent, name);
+    if (tqparent && !tqparent->inherits("MainWindow"))
+      dia->reparent(tqparent, TQPoint(0, 0), true);
     return dia;
   } else if (className == TQWIZARD_OBJECT_NAME_STRING)
   {
-    TQWizard *wiz = new QDesignerWizard(parent, name);
-    if (parent && !parent->inherits("MainWindow"))
+    TQWizard *wiz = new TQDesignerWizard(tqparent, name);
+    if (tqparent && !tqparent->inherits("MainWindow"))
     {
-      wiz->reparent(parent, TQPoint(0, 0), true);
+      wiz->reparent(tqparent, TQPoint(0, 0), true);
     }
-    if (init && parent && parent->inherits("FormWindow"))
+    if (init && tqparent && tqparent->inherits("FormWindow"))
     {
-      QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, wiz, "page");
-      MetaDataBase::addEntry(dw);
+      TQDesignerWidget *dw = new TQDesignerWidget((FormWindow *) tqparent, wiz, "page");
+      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)
@@ -1031,53 +1031,53 @@ 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)
@@ -1087,38 +1087,38 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
     return l;
   } else if (className == TQMAINWINDOW_OBJECT_NAME_STRING)
   {
-    TQMainWindow *mw = new KmdrMainWindow(parent, name, 0);
-    mw->setDockEnabled(Qt::DockMinimized, false);
-    QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, mw, "central widget");
+    TQMainWindow *mw = new KmdrMainWindow(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;
   }
-#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
 #ifdef KOMMANDER
 
   if (className == "LineEdit")
-    return new LineEdit(parent, name);
+    return new LineEdit(tqparent, name);
   else if (className == "ListView")
   {
-    TQListView *lv = new TQListView(parent, name);
+    TQListView *lv = new TQListView(tqparent, name);
     lv->setSorting(-1);
     if (init)
     {
@@ -1130,29 +1130,29 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
   else if (className == "Dialog")
   {
     TQDialog *dia = 0;
-    if (parent && parent->inherits("FormWindow"))
-      dia = new EditorDialog((FormWindow *) parent, parent, name);
+    if (tqparent && tqparent->inherits("FormWindow"))
+      dia = new EditorDialog((FormWindow *) tqparent, tqparent, name);
     else
-      dia = new Dialog(parent, name, false);
+      dia = new Dialog(tqparent, name, false);
 
-    if (parent)
-      dia->reparent(parent, TQPoint(0, 0), true);
+    if (tqparent)
+      dia->reparent(tqparent, TQPoint(0, 0), true);
     return dia;
   } 
   else if (className == "Wizard")
   {
     //qDebug("Creating Wizard...");
     TQWizard *wiz;
-    if (parent && parent->inherits("FormWindow"))
-      wiz = new QDesignerWizard(parent, name);
+    if (tqparent && tqparent->inherits("FormWindow"))
+      wiz = new TQDesignerWizard(tqparent, name);
     else
-      wiz = new Wizard(parent, name);
-    if (parent)
-      wiz->reparent(parent, TQPoint(0, 0), true);
-    if (init && parent && parent->inherits("FormWindow"))
+      wiz = new Wizard(tqparent, name);
+    if (tqparent)
+      wiz->reparent(tqparent, TQPoint(0, 0), true);
+    if (init && tqparent && tqparent->inherits("FormWindow"))
     {
-      QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, wiz, "page");
-      MetaDataBase::addEntry(dw);
+      TQDesignerWidget *dw = new TQDesignerWidget((FormWindow *) tqparent, wiz, "page");
+      MetaDataBase::addEntry(TQT_TQOBJECT(dw));
       wiz->addPage(dw, i18n("Page 1"));
       wiz->addPage(dw, i18n("Page 2"));
       TQTimer::singleShot(0, wiz, TQT_SLOT(next()));
@@ -1161,74 +1161,74 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
   } 
   else if (className == "TabWidget")
   {
-    TQTabWidget *tw = new EditorTabWidget(parent, name);
+    TQTabWidget *tw = new EditorTabWidget(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 == "ToolBox")
   {
-    TQToolBox *tw = new EditorToolBox(parent, name);
+    TQToolBox *tw = new EditorToolBox(tqparent, name);
     if (init)
     {
-      FormWindow *fw = find_formwindow(parent);
-      TQWidget *w = fw ? new QDesignerWidget(fw, tw, "toolbox") : new TQWidget(tw, "toolbox");
+      FormWindow *fw = find_formwindow(tqparent);
+      TQWidget *w = fw ? new TQDesignerWidget(fw, tw, "toolbox") : new TQWidget(tw, "toolbox");
       tw->addItem(w, i18n("Page 1"));
-      MetaDataBase::addEntry(w);
-      w = fw ? new QDesignerWidget(fw, tw, "toolbox") : new TQWidget(tw, "toolbox");
+      MetaDataBase::addEntry(TQT_TQOBJECT(w));
+      w = fw ? new TQDesignerWidget(fw, tw, "toolbox") : new TQWidget(tw, "toolbox");
       tw->addItem(w, i18n("Page 2"));
-      MetaDataBase::addEntry(tw);
-      MetaDataBase::addEntry(w);
+      MetaDataBase::addEntry(TQT_TQOBJECT(tw));
+      MetaDataBase::addEntry(TQT_TQOBJECT(w));
     }
     return tw;
   }
   else if (className == "ExecButton")
-    return new ExecButton(parent, name);
+    return new ExecButton(tqparent, name);
   else if (className == "CloseButton")
-    return new CloseButton(parent, name);
+    return new CloseButton(tqparent, name);
   else if (className == "SubDialog")
-    return new SubDialog(parent, name);
+    return new SubDialog(tqparent, name);
   else if (className == "FileSelector")
-    return new FileSelector(parent, name);
+    return new FileSelector(tqparent, name);
   else if (className == "TextEdit")
-    return new TextEdit(parent, name);
+    return new TextEdit(tqparent, name);
   else if (className == "RadioButton")
-    return new RadioButton(parent, name);
+    return new RadioButton(tqparent, name);
   else if (className == "ButtonGroup")
-    return new ButtonGroup(parent, name);
+    return new ButtonGroup(tqparent, name);
   else if (className == "GroupBox")
-    return new GroupBox(parent, name);
+    return new GroupBox(tqparent, name);
   else if (className == "CheckBox")
-    return new CheckBox(parent, name);
+    return new CheckBox(tqparent, name);
   else if (className == "ComboBox")
-    return new ComboBox(parent, name);
+    return new ComboBox(tqparent, name);
   else if (className == "SpinBoxInt")
-    return new SpinBoxInt(parent, name);
+    return new SpinBoxInt(tqparent, name);
   else if (className == "ListBox")
-    return new ListBox(parent, name);
+    return new ListBox(tqparent, name);
   else if (className == "ScriptObject")
-    return new ScriptObject(parent, name);
+    return new ScriptObject(tqparent, name);
   else if (className == "RichTextEditor")
-    return new RichTextEditor(parent, name);
+    return new RichTextEditor(tqparent, name);
   else if (className == "DatePicker")
-    return new DatePicker(parent, name);
+    return new DatePicker(tqparent, name);
   else if (className == "PopupMenu")
-    return new PopupMenu(parent, name);
+    return new PopupMenu(tqparent, name);
   else if (className == "FontDialog")
-    return new FontDialog(parent, name);
+    return new FontDialog(tqparent, name);
   else if (className == "AboutDialog")
-    return new AboutDialog(parent, name);
+    return new AboutDialog(tqparent, name);
   else if (className == "TreeWidget")
   {
-    TQListView *lv = new TreeWidget(parent, name);
+    TQListView *lv = new TreeWidget(tqparent, name);
     lv->setSorting(-1);
     if (init)
     {
@@ -1238,33 +1238,33 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
     return lv;
   } else if (className == "Slider")
   {
-    Slider *s = new Slider(parent, name);
+    Slider *s = new Slider(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;
   }
 #endif
 
-  TQWidget *w = KommanderFactory::createWidget(className, parent, name);
+  TQWidget *w = KommanderFactory::createWidget(className, tqparent, name);
   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 ( w && w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
 	w = ((TQTabWidget*)w)->currentPage();
@@ -1278,19 +1278,19 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay
 	w = ((TQWidgetStack*)w)->visibleWidget();
 
     if ( w && w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
-	return ( (TQSplitter*)w )->orientation() == Horizontal ? HBox : VBox;
+	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 ( w->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
-	TQObjectList *l = lay->queryList( TQLAYOUT_OBJECT_NAME_STRING );
+	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 ( lay->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
 	return HBox;
@@ -1304,13 +1304,13 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay
 /*!
   \overload
 */
-WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout )
+WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQLayout *tqlayout )
 {
-    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;
 }
@@ -1318,25 +1318,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
@@ -1363,22 +1363,22 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *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->parentWidget() && w->parentWidget()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
-	w = w->parentWidget();
+    if ( w->tqparentWidget() && w->tqparentWidget()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
+	w = w->tqparentWidget();
     while ( w ) {
-	if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ||
-	     w && w->parentWidget() && w->parentWidget()->inherits( "FormWindow" ) )
+	if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ||
+	     w && w->tqparentWidget() && w->tqparentWidget()->inherits( "FormWindow" ) )
 	    return w;
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
     return w;
 }
@@ -1391,15 +1391,15 @@ 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 true;
 
-    if ( o->inherits( TQTABBAR_OBJECT_NAME_STRING ) || ::qt_cast<TQToolBox*>(o->parent()) )
+    if ( o->inherits( TQTABBAR_OBJECT_NAME_STRING ) || ::tqqt_cast<TQToolBox*>(o->tqparent()) )
 	return true;
     else if ( o->inherits( TQSIZEGRIP_OBJECT_NAME_STRING ) )
 	return true;
-    else if ( o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) && o->parent() && o->parent()->inherits( TQTABBAR_OBJECT_NAME_STRING ) )
+    else if ( o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) && o->tqparent() && o->tqparent()->inherits( TQTABBAR_OBJECT_NAME_STRING ) )
 	return true;
-    else if ( o->parent() && o->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) && o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) )
+    else if ( o->tqparent() && o->tqparent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) && o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) )
 	return true;
-    else if ( o->parent() && o->parent()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) && o->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
+    else if ( o->tqparent() && o->tqparent()->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) && o->inherits( TQMENUBAR_OBJECT_NAME_STRING ) )
 	return true;
     else if ( o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) )
 	return true;
@@ -1415,43 +1415,43 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o )
  */
 const char* WidgetFactory::classNameOf( TQObject* o )
 {
-  if (o->inherits("QDesignerTabWidget"))
-    return "TQTabWidget";
+  if (o->inherits("TQDesignerTabWidget"))
+    return TQTABWIDGET_OBJECT_NAME_STRING;
 #ifdef KOMMANDER
   else if (o->inherits("EditorTabWidget"))
     return "TabWidget";
   else if (o->inherits("EditorToolBox"))
     return "ToolBox";
 #endif
-  else if (o->inherits("QDesignerDialog"))
-    return "TQDialog";
-  else if (o->inherits("QDesignerWidget"))
-    return "TQWidget";
+  else if (o->inherits("TQDesignerDialog"))
+    return TQDIALOG_OBJECT_NAME_STRING;
+  else if (o->inherits("TQDesignerWidget"))
+    return TQWIDGET_OBJECT_NAME_STRING;
   else if (o->inherits("CustomWidget"))
     return ((CustomWidget *) o)->realClassName().latin1();
-  else if (o->inherits("QDesignerLabel"))
-    return "TQLabel";
-  else if (o->inherits("QDesignerWizard"))
-    return "TQWizard";
+  else if (o->inherits("TQDesignerLabel"))
+    return TQLABEL_OBJECT_NAME_STRING;
+  else if (o->inherits("TQDesignerWizard"))
+    return TQWIZARD_OBJECT_NAME_STRING;
   else if (o->inherits("EditorWizard"))
     return "Wizard";
-  else if (o->inherits("QDesignerPushButton"))
-    return "TQPushButton";
-  else if (o->inherits("QDesignerToolButton"))
-    return "TQToolButton";
-  else if (o->inherits("QDesignerRadioButton"))
-    return "TQRadioButton";
-  else if (o->inherits("QDesignerCheckBox"))
-    return "TQCheckBox";
-  else if (o->inherits("QDesignerMenuBar"))
-    return "TQMenuBar";
-  else if (o->inherits("QDesignerToolBar"))
-    return "TQToolBar";
-#ifndef QT_NO_SQL
-  else if (o->inherits("QDesignerDataBrowser"))
-    return "TQDataBrowser";
-  else if (o->inherits("QDesignerDataView"))
-    return "TQDataView";
+  else if (o->inherits("TQDesignerPushButton"))
+    return TQPUSHBUTTON_OBJECT_NAME_STRING;
+  else if (o->inherits("TQDesignerToolButton"))
+    return TQTOOLBUTTON_OBJECT_NAME_STRING;
+  else if (o->inherits("TQDesignerRadioButton"))
+    return TQRADIOBUTTON_OBJECT_NAME_STRING;
+  else if (o->inherits("TQDesignerCheckBox"))
+    return TQCHECKBOX_OBJECT_NAME_STRING;
+  else if (o->inherits("TQDesignerMenuBar"))
+    return TQMENUBAR_OBJECT_NAME_STRING;
+  else if (o->inherits("TQDesignerToolBar"))
+    return TQTOOLBAR_OBJECT_NAME_STRING;
+#ifndef TQT_NO_SQL
+  else if (o->inherits("TQDesignerDataBrowser"))
+    return TQDATABROWSER_OBJECT_NAME_STRING;
+  else if (o->inherits("TQDesignerDataView"))
+    return TQDATAVIEW_OBJECT_NAME_STRING;
 #endif
   else if (o->inherits("EditorDialog"))
     return "Dialog";
@@ -1466,12 +1466,12 @@ const char* WidgetFactory::classNameOf( TQObject* o )
 void WidgetFactory::initChangedProperties( TQObject *o )
 {
     MetaDataBase::setPropertyChanged( o, "name", true );
-    if ( !o->inherits( "QDesignerToolBar" ) && !o->inherits( "QDesignerMenuBar" ) )
+    if ( !o->inherits( "TQDesignerToolBar" ) && !o->inherits( "TQDesignerMenuBar" ) )
 	MetaDataBase::setPropertyChanged( o, "geometry", true );
 
     if ( o->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || o->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING) || o->inherits( TQCHECKBOX_OBJECT_NAME_STRING ) || o->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) )
 	MetaDataBase::setPropertyChanged( o, "text", true );
-    else if (::qt_cast<TQToolButton*>(o) && ::qt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) {
+    else 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 );
@@ -1484,7 +1484,7 @@ void WidgetFactory::initChangedProperties( TQObject *o )
     } else if ( o->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) || o->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
 	MetaDataBase::setPropertyChanged( o, "pageTitle", true );
 	MetaDataBase::setPropertyChanged( o, "pageName", true );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     } else if ( o->inherits( TQTABLE_OBJECT_NAME_STRING ) && !o->inherits( TQDATATABLE_OBJECT_NAME_STRING ) ) {
 	MetaDataBase::setPropertyChanged( o, "numRows", true );
 	MetaDataBase::setPropertyChanged( o, "numCols", true );
@@ -1494,7 +1494,7 @@ void WidgetFactory::initChangedProperties( TQObject *o )
 	    t->verticalHeader()->setLabel( i, TQString::number( i + 1 ) );
 	}
 #endif
-    } 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 );
@@ -1503,9 +1503,9 @@ void WidgetFactory::initChangedProperties( TQObject *o )
         MetaDataBase::setPropertyChanged( o, "itemBackgroundMode", true );
     } else if ( o->inherits( TQSPLITTER_OBJECT_NAME_STRING )  ) {
 	MetaDataBase::setPropertyChanged( o, "orientation", true );
-    } else if ( o->inherits( "QDesignerToolBar" )  ) {
+    } else if ( o->inherits( "TQDesignerToolBar" )  ) {
 	MetaDataBase::setPropertyChanged( o, "label", true );
-    } else if ( o->inherits( "QDesignerMenuBar" )  ) {
+    } else if ( o->inherits( "TQDesignerMenuBar" )  ) {
 	MetaDataBase::setPropertyChanged( o, "itemName", true );
 	MetaDataBase::setPropertyChanged( o, "itemNumber", true );
 	MetaDataBase::setPropertyChanged( o, "itemText", true );
@@ -1530,7 +1530,7 @@ bool WidgetFactory::hasSpecialEditor( int id )
     return true;
   if (className == TQTEXTEDIT_OBJECT_NAME_STRING || className == TQMULTILINEEDIT_OBJECT_NAME_STRING)
     return true;
-  if (className.contains("Table"))
+  if (className.tqcontains("Table"))
     return true;
 
   return false;
@@ -1544,13 +1544,13 @@ bool WidgetFactory::hasItems( int id )
     return true;
   if (className.mid(1) == "ListBox" || className.mid(1) == "ListView" ||
       className.mid(1) == "IconView" || className.mid(1) == "ComboBox" ||
-      className.contains("Table"))
+      className.tqcontains("Table"))
     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);
 
@@ -1562,7 +1562,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget,
 
     TQComboBox *cb = (TQComboBox *) editWidget;
 
-    ListBoxEditor *e = new ListBoxEditor(parent, cb->listBox(), fw);
+    ListBoxEditor *e = new ListBoxEditor(tqparent, cb->listBox(), fw);
     e->exec();
     delete e;
 
@@ -1572,7 +1572,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget,
   }
   if (className == "TextEdit" || className == "TextBrowser")
   {
-    MultiLineEditor *e = new MultiLineEditor(parent, editWidget, fw);
+    MultiLineEditor *e = new MultiLineEditor(tqparent, editWidget, fw);
     e->exec();
     delete e;
     return;
@@ -1582,7 +1582,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget,
     if (!editWidget->inherits(TQLISTVIEW_OBJECT_NAME_STRING))
       return;
     TQListView *lv = (TQListView *) editWidget;
-    ListViewEditor *e = new ListViewEditor(parent, lv, fw);
+    ListViewEditor *e = new ListViewEditor(tqparent, lv, fw);
     e->exec();
     delete e;
     return;
@@ -1591,7 +1591,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget,
   {
     if (!editWidget->inherits(TQLISTBOX_OBJECT_NAME_STRING))
       return;
-    ListBoxEditor *e = new ListBoxEditor(parent, editWidget, fw);
+    ListBoxEditor *e = new ListBoxEditor(tqparent, editWidget, fw);
     e->exec();
     delete e;
     return;
@@ -1601,7 +1601,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget,
   {
     if (!editWidget->inherits(TQLISTBOX_OBJECT_NAME_STRING))
       return;
-    ListBoxEditor *e = new ListBoxEditor(parent, editWidget, fw);
+    ListBoxEditor *e = new ListBoxEditor(tqparent, editWidget, fw);
     e->exec();
     delete e;
     return;
@@ -1612,7 +1612,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget,
     if (!editWidget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING))
       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();
@@ -1624,7 +1624,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget,
     if (!editWidget->inherits(TQLISTVIEW_OBJECT_NAME_STRING))
       return;
     TQListView *lv = (TQListView *) editWidget;
-    ListViewEditor *e = new ListViewEditor(parent, lv, fw);
+    ListViewEditor *e = new ListViewEditor(tqparent, lv, fw);
     e->exec();
     delete e;
     return;
@@ -1634,7 +1634,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget,
   {
     if (!editWidget->inherits(TQICONVIEW_OBJECT_NAME_STRING))
       return;
-    IconViewEditor *e = new IconViewEditor(parent, editWidget, fw);
+    IconViewEditor *e = new IconViewEditor(tqparent, editWidget, fw);
     e->exec();
     delete e;
     return;
@@ -1642,15 +1642,15 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget,
 
   if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING || className == TQTEXTEDIT_OBJECT_NAME_STRING)
   {
-    MultiLineEditor *e = new MultiLineEditor(parent, editWidget, fw);
+    MultiLineEditor *e = new MultiLineEditor(tqparent, editWidget, fw);
     e->exec();
     delete e;
     return;
   }
-#ifndef QT_NO_TABLE
-  if (className.contains("Table"))
+#ifndef TQT_NO_TABLE
+  if (className.tqcontains("Table"))
   {
-    TableEditor *e = new TableEditor(parent, editWidget, fw);
+    TableEditor *e = new TableEditor(tqparent, editWidget, fw);
     e->exec();
     delete e;
     return;
@@ -1662,14 +1662,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 );
@@ -1678,33 +1678,33 @@ 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" ) {
-	if ( w->inherits( "QLayoutWidget" ) )
+    } else if ( propName == "tqlayoutMargin" ) {
+	if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
 	    return TQVariant( 0 );
 	else if ( MainWindow::self->formWindow() )
-	    return TQVariant( MainWindow::self->formWindow()->layoutDefaultMargin() );
-    } else if ( propName == "layoutSpacing" ) {
+	    return TQVariant( MainWindow::self->formWindow()->tqlayoutDefaultMargin() );
+    } else if ( propName == "tqlayoutSpacing" ) {
 	if ( MainWindow::self->formWindow() )
-	    return TQVariant( MainWindow::self->formWindow()->layoutDefaultSpacing() );
+	    return TQVariant( MainWindow::self->formWindow()->tqlayoutDefaultSpacing() );
     }
 
-    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";
@@ -1724,17 +1724,17 @@ TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propNam
 	    if ( ( v & AlignBottom ) == AlignBottom )
 		return "AlignBottom";
 	}
-	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 )
@@ -1745,13 +1745,13 @@ TQVariant WidgetFactory::property( TQObject *w, const char *name )
     return MetaDataBase::fakeProperty( w, 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;
@@ -1761,12 +1761,12 @@ void QDesignerLabel::updateBuddy()
     delete l;
 }
 
-void QDesignerWidget::paintEvent( TQPaintEvent *e )
+void TQDesignerWidget::paintEvent( TQPaintEvent *e )
 {
     formwindow->paintGrid( this, e );
 }
 
-void QDesignerDialog::paintEvent( TQPaintEvent *e )
+void TQDesignerDialog::paintEvent( TQPaintEvent *e )
 {
     formwindow->paintGrid( this, e );
 }
@@ -1776,12 +1776,12 @@ void EditorDialog::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 ||
@@ -1792,14 +1792,15 @@ 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();
+    TQObjectList clo = childrenListObject();
+    if ( clo.isEmpty() || clo.count() == 0 ) {
+	sp = TQWidget::tqsizePolicy();
 	return;
     }
 
@@ -1816,23 +1817,23 @@ 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 && parentLayout->mainWidget()->inherits("QLayoutWidget") )
-		parentLayout = 0;
+	TQLayout *tqparentLayout = 0;
+	if ( tqparent() && tqparent()->isWidgetType() ) {
+	    tqparentLayout = ((TQWidget *)tqparent())->tqlayout();
+	    if ( tqparentLayout && tqparentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) )
+		tqparentLayout = 0;
 	}
 
-	TQObjectListIt it( *children() );
+	TQObjectListIt it( childrenListObject() );
 	TQObject *o;
 
-	if ( layout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) {
-	    if ( parentLayout && parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
+	if ( tqlayout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) {
+	    if ( tqparentLayout && tqparentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
 		vt = TQSizePolicy::Minimum;
 	    else
 		vt = TQSizePolicy::Fixed;
@@ -1843,17 +1844,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 ( layout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) {
-	    if ( parentLayout && parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
+	} else if ( tqlayout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) {
+	    if ( tqparentLayout && tqparentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
 		ht = TQSizePolicy::Minimum;
 	    else
 		ht = TQSizePolicy::Fixed;
@@ -1864,22 +1865,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 ( layout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
+	} else if ( tqlayout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
 	    ht = TQSizePolicy::Fixed;
 	    vt = TQSizePolicy::Fixed;
-	    if ( parentLayout ) {
-		if ( parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
+	    if ( tqparentLayout ) {
+		if ( tqparentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
 		    ht = TQSizePolicy::Minimum;
-		else if ( parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
+		else if ( tqparentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
 		    vt = TQSizePolicy::Minimum;
 	    }
 
@@ -1889,22 +1890,29 @@ 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 )
 	    ht = TQSizePolicy::Expanding;
-	if ( layout()->expanding() & TQSizePolicy::Vertically )
+	if ( tqlayout()->expandingDirections() & TQSizePolicy::Vertically )
 	    vt = TQSizePolicy::Expanding;
+#else // USE_QT4
+	if ( tqlayout()->expanding() & TQSizePolicy::Horizontally )
+	    ht = TQSizePolicy::Expanding;
+	if ( tqlayout()->expanding() & TQSizePolicy::Vertically )
+	    vt = TQSizePolicy::Expanding;
+#endif // USE_QT4
 
-	layout()->invalidate();
+	tqlayout()->tqinvalidate();
     }
 
     sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt );
@@ -1913,11 +1921,11 @@ void QLayoutWidget::updateSizePolicy()
 
 void CustomWidget::paintEvent( TQPaintEvent *e )
 {
-    if ( parentWidget() && parentWidget()->inherits( "FormWindow" ) ) {
-	( (FormWindow*)parentWidget() )->paintGrid( this, e );
+    if ( tqparentWidget() && tqparentWidget()->inherits( "FormWindow" ) ) {
+	( (FormWindow*)tqparentWidget() )->paintGrid( this, e );
     } else {
 	TQPainter p( this );
-	p.fillRect( rect(), colorGroup().dark() );
+	p.fillRect( rect(), tqcolorGroup().dark() );
 	p.drawPixmap( ( width() - cusw->pixmap->width() ) / 2,
 		      ( height() - cusw->pixmap->height() ) / 2,
 		      *cusw->pixmap );
diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h
index 74713544..bfde50ec 100644
--- a/kommander/editor/widgetfactory.h
+++ b/kommander/editor/widgetfactory.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -58,7 +58,7 @@ class TQWidget;
 class TQLayout;
 class FormWindow;
 
-class WidgetFactory : public Qt
+class WidgetFactory : public TQt
 {
     friend class CustomWidgetFactory;
 
@@ -70,15 +70,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 );
@@ -90,7 +90,7 @@ public:
 
     static bool hasSpecialEditor( int id );
     static bool hasItems( int id );
-    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 );
@@ -101,21 +101,22 @@ public:
     static void saveDefaultProperties( TQWidget *w, int id );
 
 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 );
 
 };
 
 
-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 );
@@ -140,11 +141,12 @@ private:
 class EditorTabWidget : public TabWidget
 {
     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:
-    EditorTabWidget( TQWidget *parent, const char *name );
+    EditorTabWidget( TQWidget *tqparent, const char *name );
 
     int currentPage() const;
     void setCurrentPage( int i );
@@ -169,11 +171,12 @@ private:
 class EditorToolBox : public ToolBox
 {
     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:
-    EditorToolBox( TQWidget *parent, const char *name );
+    EditorToolBox( TQWidget *tqparent, const char *name );
 
     int currentPage() const;
     void setCurrentPage( int i );
@@ -185,14 +188,15 @@ public:
     int count() const;
 };
 
-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 )
+  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 )
 public:
-    QDesignerWizard( TQWidget *parent, const char *name ) : TQWizard( parent, name ) {}
+    TQDesignerWizard( TQWidget *tqparent, const char *name ) : TQWizard( tqparent, name ) {}
     
     int currentPageNum() const;
     void setCurrentPage( int i );
@@ -204,7 +208,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); }
 
     void reject() {}
 
@@ -212,7 +216,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;
     };
@@ -220,12 +224,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( TQWidget::tqsizePolicy() ) {}
 
     TQSizePolicy sizePolicy() const;
     void updateSizePolicy();
@@ -238,24 +243,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; }
@@ -270,41 +276,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;
@@ -328,13 +336,14 @@ 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 ) {}
+    TQDesignerWidget( FormWindow *fw, TQWidget *tqparent, const char *name )
+	: TQWidget( tqparent, name, WResizeNoErase ), formwindow( fw ) {}
 
 protected:
     void paintEvent( TQPaintEvent *e );
@@ -344,13 +353,14 @@ private:
 
 };
 
-class QDesignerDialog : public QDialog
+class TQDesignerDialog : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerDialog( FormWindow *fw, TQWidget *parent, const char *name )
-	: TQDialog( parent, name, FALSE, WResizeNoErase ), formwindow( fw ) {}
+    TQDesignerDialog( FormWindow *fw, TQWidget *tqparent, const char *name )
+	: TQDialog( tqparent, name, FALSE, WResizeNoErase ), formwindow( fw ) {}
 
 protected:
     void paintEvent( TQPaintEvent *e );
@@ -360,96 +370,100 @@ 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 );
 	}
     }
 
@@ -458,10 +472,11 @@ public:
 class EditorDialog : public Dialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    EditorDialog( FormWindow *fw, TQWidget *parent, const char *name )
-	: Dialog( parent, name, FALSE, WResizeNoErase ), formwindow( fw ) { }
+    EditorDialog( FormWindow *fw, TQWidget *tqparent, const char *name )
+	: Dialog( tqparent, name, FALSE, WResizeNoErase ), formwindow( fw ) { }
 
 protected:
     void paintEvent( TQPaintEvent *e );
diff --git a/kommander/editor/widgetinterface.h b/kommander/editor/widgetinterface.h
index bf6bcd55..364e9871 100644
--- a/kommander/editor/widgetinterface.h
+++ b/kommander/editor/widgetinterface.h
@@ -1,7 +1,7 @@
  /**********************************************************************
 ** 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
@@ -21,9 +21,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/kommander/editor/wizardeditor.ui b/kommander/editor/wizardeditor.ui
index c73e2628..f575a13a 100644
--- a/kommander/editor/wizardeditor.ui
+++ b/kommander/editor/wizardeditor.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>WizardEditorBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>WizardEditorBase</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout19</cstring>
             </property>
@@ -39,7 +39,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout14</cstring>
                     </property>
@@ -53,7 +53,7 @@
                         <property name="spacing">
                             <number>2</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>pagesLabel</cstring>
                             </property>
@@ -61,14 +61,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>
@@ -82,7 +82,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>buttonAdd</cstring>
                             </property>
@@ -90,7 +90,7 @@
                                 <string>&amp;Add</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>buttonRemove</cstring>
                             </property>
@@ -108,14 +108,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>
@@ -126,7 +126,7 @@
                                 <pixmap>image0</pixmap>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>buttonDown</cstring>
                             </property>
@@ -141,7 +141,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -155,7 +155,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -176,14 +176,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>
@@ -200,7 +200,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>
@@ -214,7 +214,7 @@
 				<string>Apply all changes.</string>
 			</property>
 		</widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -302,7 +302,7 @@
         <slot>cancelClicked()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">addClicked()</slot>
@@ -315,6 +315,6 @@
     <slot access="protected">okClicked()</slot>
     <slot access="protected">removeClicked()</slot>
     <slot access="protected">upClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/wizardeditorimpl.cpp b/kommander/editor/wizardeditorimpl.cpp
index dfed9a2f..602f8376 100644
--- a/kommander/editor/wizardeditorimpl.cpp
+++ b/kommander/editor/wizardeditorimpl.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -31,8 +31,8 @@
 
 #include <klocale.h>
 
-WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw )
-    : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w )
+WizardEditor::WizardEditor( TQWidget *tqparent, TQWizard *w, FormWindow *fw )
+    : WizardEditorBase( tqparent, 0 ), formwindow( fw ), wizard( w )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     fillListBox();
@@ -109,7 +109,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 );
 
@@ -128,7 +128,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 );
 
@@ -148,8 +148,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
@@ -168,8 +168,8 @@ 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
@@ -199,7 +199,7 @@ void WizardEditor::itemSelected( int index )
     bool ok = false;
     TQString text = KInputDialog::getText( i18n("Page Title"), i18n("New page title:" ), listBox->text( index ), &ok, this );
     if ( ok ) {
-	TQString pn( i18n("Rename page %1 of %2" ).arg( listBox->text( index ) ).arg( wizard->name() ) );
+	TQString pn( i18n("Rename page %1 of %2" ).tqarg( listBox->text( index ) ).tqarg( wizard->name() ) );
 	RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formwindow, wizard, index, text );
 	commands.append( cmd );
 	listBox->changeItem( text, index );
diff --git a/kommander/editor/wizardeditorimpl.h b/kommander/editor/wizardeditorimpl.h
index 128aa467..bc5f68bf 100644
--- a/kommander/editor/wizardeditorimpl.h
+++ b/kommander/editor/wizardeditorimpl.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -32,9 +32,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/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp
index 90f0891d..ecccce3d 100644
--- a/kommander/editor/workspace.cpp
+++ b/kommander/editor/workspace.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -102,11 +102,11 @@ static TQPixmap *filePixmap = 0;
 static TQPixmap* formPixmap = 0;
 
 #ifndef KOMMANDER
-WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p )
+WorkspaceItem::WorkspaceItem( TQListView *tqparent, Project* p )
 #else
-WorkspaceItem::WorkspaceItem( TQListView *parent )
+WorkspaceItem::WorkspaceItem( TQListView *tqparent )
 #endif
-    : TQListViewItem( parent )
+    : TQListViewItem( tqparent )
 {
     init();
 #ifndef KOMMANDER
@@ -118,8 +118,8 @@ WorkspaceItem::WorkspaceItem( TQListView *parent )
 }
 
 #ifndef KOMMANDER
-WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf )
-    : TQListViewItem( parent )
+WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf )
+    : TQListViewItem( tqparent )
 {
     init();
     sourceFile = sf;
@@ -128,8 +128,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf )
 }
 #endif
 
-WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type )
-    : TQListViewItem( parent )
+WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type type )
+    : TQListViewItem( tqparent )
 {
     init();
     formFile = ff;
@@ -146,8 +146,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type )
     }
 }
 
-WorkspaceItem::WorkspaceItem( TQListView *parent, FormFile* ff, Type type )
-    : TQListViewItem( parent )
+WorkspaceItem::WorkspaceItem( TQListView *tqparent, FormFile* ff, Type type )
+    : TQListViewItem( tqparent )
 {
     init();
     formFile = ff;
@@ -180,7 +180,7 @@ 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 );
 
 #ifndef KOMMANDER
     if ( type() == FormSourceType && !formFile->hasFormCode() ) {
@@ -188,7 +188,7 @@ void WorkspaceItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
   g.setColor( TQColorGroup::HighlightedText, listView()->palette().disabled().color( TQColorGroup::Text) );
     } else {
 #endif
-  g.setColor( TQColorGroup::Text, Qt::black );
+  g.setColor( TQColorGroup::Text, TQt::black );
 #ifndef KOMMANDER
     }
 #endif
@@ -236,7 +236,7 @@ TQString WorkspaceItem::text( int column ) const
 #endif
     }
 
-    return TQString::null; // shut up compiler
+    return TQString(); // shut up compiler
 }
 
 void WorkspaceItem::fillCompletionList( TQStringList& completion )
@@ -310,8 +310,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;
 }
 
@@ -328,8 +328,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 ),
 #ifndef KOMMANDER
   project( 0 ), completionDirty( false )
@@ -485,9 +485,9 @@ void Workspace::update( FormFile* ff )
 {
     TQListViewItem* i = findItem( ff );
     if ( i ) {
-  i->repaint();
+  i->tqrepaint();
   if ( (i = i->firstChild()) )
-      i->repaint();
+      i->tqrepaint();
     }
 }
 
@@ -559,7 +559,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() ) {
@@ -583,7 +583,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();
@@ -699,7 +699,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos )
   break;
 #endif
     case OPEN_SOURCE:
-  itemClicked( LeftButton, i, pos );
+  itemClicked( Qt::LeftButton, i, pos );
   break;
 #ifndef KOMMANDER
     case REMOVE_FORM: // FIXME
@@ -707,10 +707,10 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos )
   break;
 #endif
     case OPEN_FORM:
-  itemClicked( LeftButton, i, pos );
+  itemClicked( Qt::LeftButton, i, pos );
   break;
     case OPEN_FORM_SOURCE:
-  itemClicked( LeftButton, i, pos );
+  itemClicked( Qt::LeftButton, i, pos );
   break;
     default:
   break;
@@ -720,7 +720,7 @@ 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 );
 }
@@ -755,7 +755,7 @@ void Workspace::bufferChosen( const TQString &buffer )
   bufferEdit->setText( "" );
 
 #ifndef KOMMANDER
-    if ( MainWindow::self->projectFileNames().contains( buffer ) ) {
+    if ( MainWindow::self->projectFileNames().tqcontains( buffer ) ) {
   MainWindow::self->setCurrentProjectByFilename( buffer );
   return;
     }
@@ -764,7 +764,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/kommander/editor/workspace.h b/kommander/editor/workspace.h
index 61f772dd..99470207 100644
--- a/kommander/editor/workspace.h
+++ b/kommander/editor/workspace.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -40,21 +40,21 @@ class QCompletionEdit;
     class SourceEditor;
 #endif
 
-class WorkspaceItem : public QListViewItem
+class WorkspaceItem : public TQListViewItem
 {
 public:
     enum Type { ProjectType, FormFileType, FormSourceType, SourceFileType };
 
 #ifndef KOMMANDER
-    //WorkspaceItem( TQListView *parent, Project* p );
+    //WorkspaceItem( TQListView *tqparent, Project* p );
 #else
-    WorkspaceItem(TQListView *parent);
+    WorkspaceItem(TQListView *tqparent);
 #endif
 #ifndef KOMMANDER
-//    WorkspaceItem( TQListViewItem *parent, SourceFile* sf );
+//    WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf );
 #endif
-    WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type t = FormFileType );
-    WorkspaceItem( TQListView *parent, FormFile* ff, Type t = FormFileType );
+    WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type t = FormFileType );
+    WorkspaceItem( TQListView *tqparent, FormFile* ff, Type t = FormFileType );
 
     void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
 
@@ -91,12 +91,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 );
 
 #ifndef KOMMANDER
     void setCurrentProject( Project *pro );
diff --git a/kommander/examples/current/a1.kmdr b/kommander/examples/current/a1.kmdr
index e8b99ac3..7399bc73 100755
--- a/kommander/examples/current/a1.kmdr
+++ b/kommander/examples/current/a1.kmdr
@@ -49,7 +49,7 @@ debug("pid="+pid)</string>
                 <cstring>StatusBar8</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout37</cstring>
             </property>
@@ -121,7 +121,7 @@ debug("pid="+pid)</string>
                 <string>and again</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout83</cstring>
             </property>
@@ -145,7 +145,7 @@ debug("pid="+pid)</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>0</height>
@@ -176,7 +176,7 @@ StatusBar8.setText("Returned: "+b)</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>46</width>
                             <height>0</height>
@@ -185,7 +185,7 @@ StatusBar8.setText("Returned: "+b)</string>
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout84</cstring>
             </property>
@@ -209,7 +209,7 @@ StatusBar8.setText("Returned: "+b)</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>80</width>
                             <height>0</height>
@@ -243,7 +243,7 @@ StatusBar8.setText("Returned: "+b)</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>60</width>
                             <height>0</height>
@@ -254,5 +254,5 @@ StatusBar8.setText("Returned: "+b)</string>
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/b1.kmdr b/kommander/examples/current/b1.kmdr
index 09725243..bc02ab80 100755
--- a/kommander/examples/current/b1.kmdr
+++ b/kommander/examples/current/b1.kmdr
@@ -26,7 +26,7 @@ else
   StatusBar9.insertItem("ARG1="+_ARG1, 1)
   StatusBar9.insertItem("ARG2="+_ARG2, 2)
 endif
-//message_info(parentPid)</string>
+//message_info(tqparentPid)</string>
             <string></string>
         </stringlist>
     </property>
@@ -82,7 +82,7 @@ endif
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>111</width>
                     <height>0</height>
@@ -104,7 +104,7 @@ endif
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>50</width>
                     <height>0</height>
@@ -120,8 +120,8 @@ endif
             </property>
             <property name="associations" stdset="0">
                 <stringlist>
-                    <string>//message_info("parentPid = "+parentPid+"\npid = "+pid)
-dcop("kmdr-executor-"+parentPid, "KommanderIf", "setText(QString,QString)", "StatusBar8", "Hello")
+                    <string>//message_info("tqparentPid = "+tqparentPid+"\npid = "+pid)
+dcop("kmdr-executor-"+tqparentPid, "KommanderIf", "setText(QString,QString)", "StatusBar8", "Hello")
 </string>
                 </stringlist>
             </property>
@@ -131,5 +131,5 @@ dcop("kmdr-executor-"+parentPid, "KommanderIf", "setText(QString,QString)", "Sta
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr
index d9b14fd1..6a084397 100755
--- a/kommander/examples/current/editor-poc.kmdr
+++ b/kommander/examples/current/editor-poc.kmdr
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>KEdemo</class>
-<widget class="QMainWindow">
+<widget class=TQMAINWINDOW_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>KEdemo</cstring>
     </property>
@@ -73,7 +73,7 @@ _file["dirty"] = true</string>
             </property>
             <property name="associations" stdset="0">
                 <stringlist>
-                    <string>@Input.text("Kommander Edit", "Text to find", "")</string>
+                    <string>@Input.text("Kommander Edit", "Text to tqfind", "")</string>
                 </stringlist>
             </property>
         </widget>
@@ -179,16 +179,16 @@ while chrs &lt; maxc do
   //debug("link test = "+str_mid(a, ch, 2)+" pos="+ch)
   if str_mid(a, ch, 2) == "&lt;a" then
     inlink = true
-    lb = str_toint(str_find(a, "\"", ch)+1)
-    le = str_toint(str_find(a, "\"", lb))
+    lb = str_toint(str_tqfind(a, "\"", ch)+1)
+    le = str_toint(str_tqfind(a, "\"", lb))
     linkscript = str_mid(a, lb, le-lb)
     //debug("link data - "+lb+" "+le+" "+linkscript)
   elseif str_mid(a, ch, 3) == "&lt;p&gt;" then
     lc = lc + 1
     cc = 0
   endif
-  ck1 = str_toint(str_find(a, "&gt;", ch))+1
-  ck2 = str_find(a, "&lt;", ck1)
+  ck1 = str_toint(str_tqfind(a, "&gt;", ch))+1
+  ck2 = str_tqfind(a, "&lt;", ck1)
   if ck1 == -1 || ck2 == -1 then
     break
   endif
@@ -303,9 +303,9 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1))
         &lt;stringlist&gt;
             &lt;string&gt;&lt;/string&gt;
             &lt;string&gt;@Array.setValue(help, "Proof of concept", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Kommander MainWindow frames!&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;As Kommander took on functionality an attempt was made to make a MainWindow Kommander widget. Sadly it was a huge time loss for two developers who both gave up after days of trying. The problem was with the editor. However you can use a Qt Designer generated UI file renamed to a *.kmdr file. Into this frame you can place your widgets and make a working application where nearly everything works.&amp;lt;/p&amp;gt;")
-@Array.setValue(help, "Known limitations", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Known limitations&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;As of this writing what is known not to work on the Kommander side is the settings read and write. There is no Initialize or Destroy section as there is no Kommander Text, however there are signals for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any Actions as these are QActions from Designer and KActions are not derived from QActions in KDE 3x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Given that this is an unsupported use of Kommander it everything that does work makes it suitable for probably most small application uses.. &amp;lt;/p&amp;gt;")
+@Array.setValue(help, "Known limitations", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Known limitations&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;As of this writing what is known not to work on the Kommander side is the settings read and write. There is no Initialize or Destroy section as there is no Kommander Text, however there are Q_SIGNALS for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any Actions as these are QActions from Designer and KActions are not derived from QActions in KDE 3x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Given that this is an unsupported use of Kommander it everything that does work makes it suitable for probably most small application uses.. &amp;lt;/p&amp;gt;")
 @Array.setValue(help, "Rolling your own", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Rolling your own&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;It is our intention to have a template in the 1.3 release of a MainWindow, but if you have Qt Designer for Qt 3x you can easily start a window design, save it, rename to *.kmdr and open in Kommander. Remember not to add widgets in Designer as Kommander will not recognize them.&amp;lt;/p&amp;gt;")
-@Array.setValue(help, "Using Actions", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Using Actions&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;If you want to get the goodies, menus, toolbars and accelerator keys, you need to use actions. Kommander has an Action editor on the window menu under Views. There you can add actions and there is a shortcut to connecting them with signals and slots. To get everything working select an Action and look in the properties menu for settings like name, text and icon. For menus and toolbars try right clicking on them for context menus. Now from the Action View drag an Action to the menu or toolbar. See the visual feedback? Just connect your Action to a script and you have three different ways to call it.&amp;lt;/p&amp;gt;
+@Array.setValue(help, "Using Actions", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Using Actions&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;If you want to get the goodies, menus, toolbars and accelerator keys, you need to use actions. Kommander has an Action editor on the window menu under Views. There you can add actions and there is a shortcut to connecting them with Q_SIGNALS and Q_SLOTS. To get everything working select an Action and look in the properties menu for settings like name, text and icon. For menus and toolbars try right clicking on them for context menus. Now from the Action View drag an Action to the menu or toolbar. See the visual feedback? Just connect your Action to a script and you have three different ways to call it.&amp;lt;/p&amp;gt;
 ")
 @Array.setValue(help, "Link examples", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Link examples&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;This demo shows examples of linking. Links will show in the TextEdit widget, but they don't do anything. In the TextBrowser they open web pages and email links, but of course you can't edit in the TextBrowser. If you don't mind writing some script you can set up your own link handling, which I've done here. Note that it will follow links anywhere in the editor. If the link is a widget name it assumes it to be a script and calls it. If not it looks to see if it is a web link and calls that&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;It would be easy to extend this script to accept link parameters and process emails. You could also make a reference to other text objects, tab widget tabs, pretty much anything you can think of.&amp;lt;/p&amp;gt;")
 @Array.setValue(help, "How this help works", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;How this help works&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;Do you wonder where this help came from? It is possible to use KDE help if you write DocBook, make it and install it. This quick help is fast and can contain &amp;lt;i&amp;gt;rich text&amp;lt;/i&amp;gt;. To look at the dialog copy the text in the hidden TextEdit (set to text mode so as not to muck things up with rich text interperting XML) and paste it to a text editor like KWrite. Save it as a Kommander file and open it in the Kommander Editor.&amp;lt;/p&amp;gt;")
@@ -331,7 +331,7 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1))
         &lt;property name="spacing"&gt;
             &lt;number&gt;6&lt;/number&gt;
         &lt;/property&gt;
-        &lt;widget class="QSplitter" row="0" column="0" rowspan="2" colspan="2"&gt;
+        &lt;widget class=TQSPLITTER_OBJECT_NAME_STRING row="0" column="0" rowspan="2" colspan="2"&gt;
             &lt;property name="name"&gt;
                 &lt;cstring&gt;Splitter5&lt;/cstring&gt;
             &lt;/property&gt;
@@ -428,7 +428,7 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1))
         &lt;slot&gt;execute()&lt;/slot&gt;
     &lt;/connection&gt;
 &lt;/connections&gt;
-&lt;layoutdefaults spacing="6" margin="11"/&gt;
+&lt;tqlayoutdefaults spacing="6" margin="11"/&gt;
 &lt;/UI&gt;
 </string>
             </property>
@@ -1064,5 +1064,5 @@ TextEdit5.setColor(color)</string>
         <slot>setChecked(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/keyvaluecombo.kmdr b/kommander/examples/current/keyvaluecombo.kmdr
index 9815c333..b4a35126 100644
--- a/kommander/examples/current/keyvaluecombo.kmdr
+++ b/kommander/examples/current/keyvaluecombo.kmdr
@@ -63,7 +63,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10)
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
             <property name="name">
                 <cstring>Layout27</cstring>
             </property>
@@ -100,7 +100,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10)
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>Layout30</cstring>
             </property>
@@ -122,7 +122,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10)
                         <string>Right click for menu</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="2">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="2">
                     <property name="name">
                         <cstring>Layout24</cstring>
                     </property>
@@ -164,7 +164,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10)
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
                     <property name="name">
                         <cstring>Layout23</cstring>
                     </property>
@@ -227,7 +227,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10)
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0">
             <property name="name">
                 <cstring>Layout31</cstring>
             </property>
@@ -384,5 +384,5 @@ endif</string>
     <tabstop>ComboBox10</tabstop>
     <tabstop>ListBox1</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/kpartmwframe.kmdr b/kommander/examples/current/kpartmwframe.kmdr
index 134f28af..6e334aa6 100755
--- a/kommander/examples/current/kpartmwframe.kmdr
+++ b/kommander/examples/current/kpartmwframe.kmdr
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>KKPdemo</class>
-<widget class="QMainWindow">
+<widget class=TQMAINWINDOW_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>KKPdemo</cstring>
     </property>
@@ -58,7 +58,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
@@ -95,7 +95,7 @@ _loadup = 2
                                 <stringlist>
                                     <string>#!kommander
 if widgetExists("ScriptObject13") then
-  TextBrowser1.setText("This text was written by a script on the parent frame window. It could have been a dialog, but we chose to illustrate with a MainWindow for this demo.")
+  TextBrowser1.setText("This text was written by a script on the tqparent frame window. It could have been a dialog, but we chose to illustrate with a MainWindow for this demo.")
   ScriptObject13.execute
 else
   message_error("You do not have the KPart child dialog loaded")
@@ -614,5 +614,5 @@ endif</string>
         <slot>execute()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/kpartpart.kmdr b/kommander/examples/current/kpartpart.kmdr
index 928ecdc6..0763fada 100755
--- a/kommander/examples/current/kpartpart.kmdr
+++ b/kommander/examples/current/kpartpart.kmdr
@@ -42,16 +42,16 @@
             </property>
             <property name="text">
                 <string>You can click the test button to insert text
-If you are loaded in the parent frame you can click the rocket icon on the toolbar or use the function menu to select "Talk to KPart". 
+If you are loaded in the tqparent frame you can click the rocket icon on the toolbar or use the function menu to select "Talk to KPart". 
 
-Any Kommander program can be run as a KPart. You need the KPart plugin to load KParts. Note that running Kommander programs as KParts is not without risks. For one thing you loose DCOP in the parent and the old parser ceases to work. Additionally since all widgets are accecssible from the parent and duplicate widget name can cause a Kommander lock up. 
+Any Kommander program can be run as a KPart. You need the KPart plugin to load KParts. Note that running Kommander programs as KParts is not without risks. For one thing you loose DCOP in the tqparent and the old parser ceases to work. Additionally since all widgets are accecssible from the tqparent and duplicate widget name can cause a Kommander lock up. 
 
-Because of all this and the fact that the Actions on the unsupported MainWindow are incompatible it is impossible for the child to talk with the parent. On this dialog we use a timer on the parent polling the child for requests every 100 ms. It's a crude hack but it does yield acceptable behavior. 
+Because of all this and the fact that the Actions on the unsupported MainWindow are incompatible it is impossible for the child to talk with the tqparent. On this dialog we use a timer on the tqparent polling the child for requests every 100 ms. It's a crude hack but it does yield acceptable behavior. 
 
 This demo is intended to run both kpartwmframe.kmdr and kpartpart.kmdr. </string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
             <property name="name">
                 <cstring>Layout70</cstring>
             </property>
@@ -75,7 +75,7 @@ This demo is intended to run both kpartwmframe.kmdr and kpartpart.kmdr. </string
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>75</width>
                             <height>0</height>
@@ -97,7 +97,7 @@ endif
 if _LOADED == true then
   kpmessage.setText("You have mail")
 else
-  message_info("this only works when loaded as a KPart in it's parent window")
+  message_info("this only works when loaded as a KPart in it's tqparent window")
 endif
 </string>
                         </stringlist>
@@ -122,7 +122,7 @@ endif
                     </property>
                     <property name="associations" stdset="0">
                         <stringlist>
-                            <string>message_info("We just got a message from our parent frame!", "Parent called Child")</string>
+                            <string>message_info("We just got a message from our tqparent frame!", "Parent called Child")</string>
                         </stringlist>
                     </property>
                 </widget>
@@ -156,7 +156,7 @@ endif
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>0</height>
@@ -167,5 +167,5 @@ endif
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/passvariables.kmdr b/kommander/examples/current/passvariables.kmdr
index 2d3b9e03..95270a83 100644
--- a/kommander/examples/current/passvariables.kmdr
+++ b/kommander/examples/current/passvariables.kmdr
@@ -90,7 +90,7 @@ LineEdit6.setText(ret)</string>
             <property name="text">
                 <string>Set</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -101,7 +101,7 @@ LineEdit6.setText(ret)</string>
             <property name="text">
                 <string>Pass back</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -124,7 +124,7 @@ LineEdit6.setText(ret)</string>
                 <stringlist>
                     <string>// test for PHP
 pt = exec("php --version")
-if str_contains(pt, "Zend") then
+if str_tqcontains(pt, "Zend") then
   php = ScriptObjectPHP.execute(LineEdit7.text,LineEdit1.text,LineEdit2.text)
   LineEdit4.setText(php)
 else
@@ -140,7 +140,7 @@ endif</string>
             <property name="text">
                 <string>Pass back</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -151,7 +151,7 @@ endif</string>
             <property name="text">
                 <string>Set with @</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -162,7 +162,7 @@ endif</string>
             <property name="text">
                 <string>Return</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -178,7 +178,7 @@ endif</string>
             <property name="text">
                 <string>Return</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -272,14 +272,14 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>108</width>
                     <height>0</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="7">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="7">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -303,7 +303,7 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>71</width>
                             <height>0</height>
@@ -368,7 +368,7 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>71</width>
                             <height>0</height>
@@ -412,5 +412,5 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
         <slot>popup(int,int)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/tableselect.kmdr b/kommander/examples/current/tableselect.kmdr
index 09dd6cd8..a8617103 100755
--- a/kommander/examples/current/tableselect.kmdr
+++ b/kommander/examples/current/tableselect.kmdr
@@ -51,7 +51,7 @@ AboutDialog9.setBugAddress("eric@kdewebdev.org")</string>
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="1" column="3" rowspan="1" colspan="2">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="3" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -99,7 +99,7 @@ AboutDialog9.setBugAddress("eric@kdewebdev.org")</string>
                 </widget>
             </grid>
         </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>
@@ -348,7 +348,7 @@ TextBrowser1.setText(result)
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>24</width>
                     <height>24</height>
@@ -407,7 +407,7 @@ end
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>24</width>
                     <height>24</height>
@@ -498,5 +498,5 @@ end
         <slot>popup(int,int)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/checkmail.kmdr b/kommander/examples/old/checkmail.kmdr
index d4fda432..75aff6d0 100644
--- a/kommander/examples/old/checkmail.kmdr
+++ b/kommander/examples/old/checkmail.kmdr
@@ -40,5 +40,5 @@
         </property>
     </widget>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/ex1.kmdr b/kommander/examples/old/ex1.kmdr
index a916ee22..f2c53005 100644
--- a/kommander/examples/old/ex1.kmdr
+++ b/kommander/examples/old/ex1.kmdr
@@ -101,5 +101,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/execprogram.kmdr b/kommander/examples/old/execprogram.kmdr
index 1149a3e2..7dc9a07b 100644
--- a/kommander/examples/old/execprogram.kmdr
+++ b/kommander/examples/old/execprogram.kmdr
@@ -35,7 +35,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -59,7 +59,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -89,7 +89,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -100,5 +100,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/firstform.kmdr.kmdr b/kommander/examples/old/firstform.kmdr.kmdr
index 68993392..e01c228e 100644
--- a/kommander/examples/old/firstform.kmdr.kmdr
+++ b/kommander/examples/old/firstform.kmdr.kmdr
@@ -35,7 +35,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -84,5 +84,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/form1.kmdr b/kommander/examples/old/form1.kmdr
index e44b1e14..1d75334d 100644
--- a/kommander/examples/old/form1.kmdr
+++ b/kommander/examples/old/form1.kmdr
@@ -92,5 +92,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/form2.kmdr b/kommander/examples/old/form2.kmdr
index 060fda56..fa488f56 100644
--- a/kommander/examples/old/form2.kmdr
+++ b/kommander/examples/old/form2.kmdr
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -73,7 +73,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>Layout1</cstring>
                     </property>
@@ -114,5 +114,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/form3.kmdr b/kommander/examples/old/form3.kmdr
index 2b1ffbb2..18eb8bae 100644
--- a/kommander/examples/old/form3.kmdr
+++ b/kommander/examples/old/form3.kmdr
@@ -58,5 +58,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/form4.kmdr b/kommander/examples/old/form4.kmdr
index 831c2878..672dbb51 100644
--- a/kommander/examples/old/form4.kmdr
+++ b/kommander/examples/old/form4.kmdr
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -84,5 +84,5 @@
         <slot>setWidgetText(const QString&amp;)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/form5.kmdr b/kommander/examples/old/form5.kmdr
index 7efeafda..fd71919e 100644
--- a/kommander/examples/old/form5.kmdr
+++ b/kommander/examples/old/form5.kmdr
@@ -64,7 +64,7 @@
             <bool>true</bool>
         </property>
     </widget>
-    <widget class="QLabel">
+    <widget class=TQLABEL_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>TextLabel1</cstring>
         </property>
@@ -152,7 +152,7 @@
             <bool>true</bool>
         </property>
     </widget>
-    <widget class="QLabel">
+    <widget class=TQLABEL_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>TextLabel1_2</cstring>
         </property>
@@ -342,5 +342,5 @@ Ha ha. We got it all with Kommander!</string>
         <slot>setText(const QString&amp;)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/newfile.kmdr b/kommander/examples/old/newfile.kmdr
index f02ca8e8..e753c6c0 100644
--- a/kommander/examples/old/newfile.kmdr
+++ b/kommander/examples/old/newfile.kmdr
@@ -15,7 +15,7 @@
     <property name="caption">
         <string>Quick Start</string>
     </property>
-    <widget class="QLabel">
+    <widget class=TQLABEL_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>TextLabel2</cstring>
         </property>
@@ -31,7 +31,7 @@
             <string>Title:</string>
         </property>
     </widget>
-    <widget class="QLabel">
+    <widget class=TQLABEL_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>TextLabel1</cstring>
         </property>
@@ -930,5 +930,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/populate.kmdr b/kommander/examples/old/populate.kmdr
index a5c5090d..71b9cd3d 100644
--- a/kommander/examples/old/populate.kmdr
+++ b/kommander/examples/old/populate.kmdr
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -39,7 +39,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>Layout1</cstring>
                     </property>
@@ -107,5 +107,5 @@
         <slot>populate()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/resize.kmdr b/kommander/examples/old/resize.kmdr
index 27ff5309..869cce3b 100644
--- a/kommander/examples/old/resize.kmdr
+++ b/kommander/examples/old/resize.kmdr
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -65,7 +65,7 @@
                         <enum>Directory</enum>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -73,7 +73,7 @@
                         <string>Source directory:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -83,7 +83,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -97,7 +97,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel3</cstring>
                     </property>
@@ -115,7 +115,7 @@
                         </stringlist>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel4</cstring>
                     </property>
@@ -143,7 +143,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>141</width>
                             <height>0</height>
@@ -152,7 +152,7 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -176,7 +176,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>251</width>
                             <height>0</height>
@@ -213,5 +213,5 @@ done
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/selectedwidgettext.kmdr b/kommander/examples/old/selectedwidgettext.kmdr
index 058b6d86..60711066 100644
--- a/kommander/examples/old/selectedwidgettext.kmdr
+++ b/kommander/examples/old/selectedwidgettext.kmdr
@@ -50,7 +50,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -90,7 +90,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>0</width>
                             <height>30</height>
@@ -101,5 +101,5 @@
         </widget>
     </hbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/settings.kmdr b/kommander/examples/old/settings.kmdr
index 1e028434..f336d645 100644
--- a/kommander/examples/old/settings.kmdr
+++ b/kommander/examples/old/settings.kmdr
@@ -35,7 +35,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout7</cstring>
             </property>
@@ -49,7 +49,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -83,7 +83,7 @@
                         </stringlist>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>Layout6</cstring>
                     </property>
@@ -97,7 +97,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
                             <property name="name">
                                 <cstring>Layout5</cstring>
                             </property>
@@ -158,7 +158,7 @@ Items")
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>Layout2</cstring>
                     </property>
@@ -182,7 +182,7 @@ Items")
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -215,7 +215,7 @@ Items")
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -260,5 +260,5 @@ Items")
         <slot>populate()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/simplelist.kmdr b/kommander/examples/old/simplelist.kmdr
index 42a32323..2bb27af7 100644
--- a/kommander/examples/old/simplelist.kmdr
+++ b/kommander/examples/old/simplelist.kmdr
@@ -15,7 +15,7 @@
     <property name="caption">
         <string>Form1</string>
     </property>
-    <widget class="QLabel">
+    <widget class=TQLABEL_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>TextLabel1</cstring>
         </property>
@@ -210,5 +210,5 @@
         </property>
     </widget>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/tar.kmdr b/kommander/examples/old/tar.kmdr
index 37fcd10d..35922292 100644
--- a/kommander/examples/old/tar.kmdr
+++ b/kommander/examples/old/tar.kmdr
@@ -131,7 +131,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout9</cstring>
             </property>
@@ -281,14 +281,14 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>30</width>
                                             <height>16</height>
                                         </size>
                                     </property>
                                 </spacer>
-                                <widget class="QLayoutWidget">
+                                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
                                     <property name="name">
                                         <cstring>Layout7</cstring>
                                     </property>
@@ -329,7 +329,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout5</cstring>
             </property>
@@ -343,7 +343,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -358,7 +358,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
@@ -372,7 +372,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -390,7 +390,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
             <property name="name">
                 <cstring>Layout7</cstring>
             </property>
@@ -414,7 +414,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>103</width>
                             <height>0</height>
@@ -439,7 +439,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>104</width>
                             <height>0</height>
@@ -464,7 +464,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>103</width>
                             <height>0</height>
@@ -475,5 +475,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/tidy.kmdr b/kommander/examples/old/tidy.kmdr
index 096dec40..a96f5119 100644
--- a/kommander/examples/old/tidy.kmdr
+++ b/kommander/examples/old/tidy.kmdr
@@ -29,7 +29,7 @@
             <property name="name">
                 <cstring>TabWidget1</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -51,7 +51,7 @@
                     <property name="title">
                         <string>Non Tidy Option</string>
                     </property>
-                    <widget class="QLabel">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING>
                         <property name="name">
                             <cstring>TextLabel4</cstring>
                         </property>
@@ -119,7 +119,7 @@ instances of Quanta running.</string>
                         </stringlist>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -356,7 +356,7 @@ instances of Quanta running.</string>
                     </property>
                 </widget>
             </widget>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -373,7 +373,7 @@ instances of Quanta running.</string>
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QLayoutWidget" row="0" column="0">
+                    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
                         <property name="name">
                             <cstring>Layout1</cstring>
                         </property>
@@ -477,7 +477,7 @@ instances of Quanta running.</string>
                                     </stringlist>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
                                 <property name="name">
                                     <cstring>TextLabel1_2</cstring>
                                 </property>
@@ -541,7 +541,7 @@ instances of Quanta running.</string>
                                     </stringlist>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2</cstring>
                                 </property>
@@ -613,7 +613,7 @@ instances of Quanta running.</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -889,7 +889,7 @@ instances of Quanta running.</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -1012,7 +1012,7 @@ escape-cdata			Boolean    	y/n, yes/no, t/f, true/false, 1/0
 language			String     	-
 ncr				Boolean    	y/n, yes/no, t/f, true/false, 1/0
 output-bom			AutoBool   	auto, y/n, yes/no, t/f, true/false, 1/0
-replace-color			Boolean    	y/n, yes/no, t/f, true/false, 1/0
+tqreplace-color			Boolean    	y/n, yes/no, t/f, true/false, 1/0
 css-prefix			Name       	CSS1 selector
 new-inline-tags			Tag names  	tagX, tagY, ...
 new-blocklevel-tags		Tag names  	tagX, tagY, ...
@@ -1091,7 +1091,7 @@ fi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>131</width>
                     <height>0</height>
@@ -1108,7 +1108,7 @@ fi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>121</width>
                     <height>0</height>
@@ -1155,5 +1155,5 @@ fi
         <slot>setWidgetText(const QString&amp;)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/widgetgenerator.kmdr b/kommander/examples/old/widgetgenerator.kmdr
index 00ef6262..0c8da2e6 100644
--- a/kommander/examples/old/widgetgenerator.kmdr
+++ b/kommander/examples/old/widgetgenerator.kmdr
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <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>Layout12</cstring>
             </property>
@@ -49,7 +49,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -125,10 +125,10 @@ public:
 	virtual QString populationText() const;
 	virtual void setPopulationText(QString);
 
-public slots:
+public Q_SLOTS:
 	virtual void setWidgetText(const QString &amp;);
 	virtual void populate();
-signals:
+Q_SIGNALS:
 	void widgetOpened();
 	void widgetTextChanged(const QString &amp;);
 protected:
@@ -236,7 +236,7 @@ void @className::showEvent( QShowEvent *e )
     emit widgetOpened();
 }
 
-#include \"$classNameLower.moc\"
+#include \"$classNameLower.tqmoc\"
 "
 
 echo "$headerContent" &gt; @directory/$classNameLower.h
@@ -265,7 +265,7 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -274,7 +274,7 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>Layout37</cstring>
             </property>
@@ -288,7 +288,7 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -296,7 +296,7 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
                         <string>Author:</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel6</cstring>
                     </property>
@@ -304,7 +304,7 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
                         <string>Email:</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -312,7 +312,7 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
                         <string>Description:</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel3</cstring>
                     </property>
@@ -320,7 +320,7 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
                         <string>Date started:</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel4</cstring>
                     </property>
@@ -328,7 +328,7 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
                         <string>Class name:</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel7</cstring>
                     </property>
@@ -336,7 +336,7 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
                         <string>Base class name:</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel5</cstring>
                     </property>
@@ -346,7 +346,7 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1">
             <property name="name">
                 <cstring>Layout36</cstring>
             </property>
@@ -434,5 +434,5 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/old/wizard.kmdr b/kommander/examples/old/wizard.kmdr
index 87f50c38..052cfc3a 100755
--- a/kommander/examples/old/wizard.kmdr
+++ b/kommander/examples/old/wizard.kmdr
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>Wizard1</class>
-<widget class="QWizard">
+<widget class=TQWIZARD_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>Wizard1</cstring>
     </property>
@@ -15,7 +15,7 @@
     <property name="caption">
         <string>Demo Wizard</string>
     </property>
-    <widget class="QWidget">
+    <widget class=TQWIDGET_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>page</cstring>
         </property>
@@ -132,7 +132,7 @@
             </property>
         </widget>
     </widget>
-    <widget class="QWidget">
+    <widget class=TQWIDGET_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>page</cstring>
         </property>
@@ -189,7 +189,7 @@
             </property>
         </widget>
     </widget>
-    <widget class="QWidget">
+    <widget class=TQWIDGET_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>page</cstring>
         </property>
@@ -297,5 +297,5 @@
         <slot>execute()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/append.kmdr b/kommander/examples/tutorial/append.kmdr
index fe22a4c3..51b24cde 100644
--- a/kommander/examples/tutorial/append.kmdr
+++ b/kommander/examples/tutorial/append.kmdr
@@ -40,7 +40,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -64,7 +64,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -100,7 +100,7 @@ dcop @dcopid KommanderIf changeWidgetText TextEdit1 "$TEXT"
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -111,5 +111,5 @@ dcop @dcopid KommanderIf changeWidgetText TextEdit1 "$TEXT"
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/arrays.kmdr b/kommander/examples/tutorial/arrays.kmdr
index dd4b18c6..b884affc 100644
--- a/kommander/examples/tutorial/arrays.kmdr
+++ b/kommander/examples/tutorial/arrays.kmdr
@@ -36,7 +36,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -93,7 +93,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -117,7 +117,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -181,7 +181,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -200,5 +200,5 @@
         <slot>populate()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/calc.kmdr b/kommander/examples/tutorial/calc.kmdr
index 5e0082f4..21bddb4e 100644
--- a/kommander/examples/tutorial/calc.kmdr
+++ b/kommander/examples/tutorial/calc.kmdr
@@ -32,7 +32,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1">
             <property name="name">
                 <cstring>Layout7</cstring>
             </property>
@@ -46,7 +46,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -66,13 +66,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>250</width>
                             <height>32767</height>
@@ -91,7 +91,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>250</width>
                             <height>32767</height>
@@ -124,7 +124,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -138,7 +138,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="2" column="0">
+                <widget class=TQLABEL_OBJECT_NAME_STRING row="2" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -146,7 +146,7 @@
                         <string>Expression:</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="4" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="4" column="0">
                     <property name="name">
                         <cstring>Layout1</cstring>
                     </property>
@@ -170,7 +170,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -194,7 +194,7 @@
                                 <stringlist>
                                     <string>@ListBox1.insertItem(@expr(@LineEdit1.text), -1)
 @LineEdit1.clear
-@LineEdit2.setText("Sum: @expr(@String.replace(@ListBox1.text, "\n", "+"))")
+@LineEdit2.setText("Sum: @expr(@String.tqreplace(@ListBox1.text, "\n", "+"))")
 </string>
                                 </stringlist>
                             </property>
@@ -209,7 +209,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -233,7 +233,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>0</width>
                             <height>91</height>
@@ -250,7 +250,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>0</width>
                             <height>91</height>
@@ -267,5 +267,5 @@
     <tabstop>ExecButton2</tabstop>
     <tabstop>ListBox1</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/cmdline.kmdr b/kommander/examples/tutorial/cmdline.kmdr
index 0db801d2..6d0cbbe1 100644
--- a/kommander/examples/tutorial/cmdline.kmdr
+++ b/kommander/examples/tutorial/cmdline.kmdr
@@ -50,7 +50,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>149</width>
                     <height>0</height>
@@ -95,7 +95,7 @@ fi</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>148</width>
                     <height>0</height>
@@ -104,5 +104,5 @@ fi</string>
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/dcop.kmdr b/kommander/examples/tutorial/dcop.kmdr
index 9ceae259..739bdae6 100644
--- a/kommander/examples/tutorial/dcop.kmdr
+++ b/kommander/examples/tutorial/dcop.kmdr
@@ -35,7 +35,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -59,7 +59,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -124,7 +124,7 @@ dcop kmail KMailIface checkAccount @AccountListBox</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -135,5 +135,5 @@ dcop kmail KMailIface checkAccount @AccountListBox</string>
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/dialogs.kmdr b/kommander/examples/tutorial/dialogs.kmdr
index 62c97bc0..421f0607 100644
--- a/kommander/examples/tutorial/dialogs.kmdr
+++ b/kommander/examples/tutorial/dialogs.kmdr
@@ -85,7 +85,7 @@ ListBox1.setText(a)
                 </stringlist>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -194,5 +194,5 @@ ListBox1.setText(a)
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/globals.kmdr b/kommander/examples/tutorial/globals.kmdr
index 71cfad17..131c3a2a 100644
--- a/kommander/examples/tutorial/globals.kmdr
+++ b/kommander/examples/tutorial/globals.kmdr
@@ -32,7 +32,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -92,5 +92,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/initialize.kmdr b/kommander/examples/tutorial/initialize.kmdr
index 16ed360d..5ca6bbc9 100644
--- a/kommander/examples/tutorial/initialize.kmdr
+++ b/kommander/examples/tutorial/initialize.kmdr
@@ -35,7 +35,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE"
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -59,7 +59,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE"
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -89,7 +89,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE"
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -98,7 +98,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE"
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0">
             <property name="name">
                 <cstring>OpenLabel</cstring>
             </property>
@@ -106,7 +106,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE"
                 <string>Opened:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>CloseLabel</cstring>
             </property>
@@ -116,5 +116,5 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE"
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/loop.kmdr b/kommander/examples/tutorial/loop.kmdr
index 4aa799f1..998fe1d0 100644
--- a/kommander/examples/tutorial/loop.kmdr
+++ b/kommander/examples/tutorial/loop.kmdr
@@ -79,7 +79,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -93,7 +93,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -110,5 +110,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/picview.kmdr b/kommander/examples/tutorial/picview.kmdr
index be75af7b..bc1f923a 100644
--- a/kommander/examples/tutorial/picview.kmdr
+++ b/kommander/examples/tutorial/picview.kmdr
@@ -52,7 +52,7 @@
                 <enum>Directory</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -78,20 +78,20 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>200</width>
                             <height>32767</height>
                         </size>
                     </property>
                     <property name="populationText">
-                        <string>@exec(cd @FileSelector1.text &amp;&amp; find * -name "*.jpg" -o -name "*.png" -o -name "*.gif" -o -name "*.bmp")</string>
+                        <string>@exec(cd @FileSelector1.text &amp;&amp; tqfind * -name "*.jpg" -o -name "*.png" -o -name "*.gif" -o -name "*.bmp")</string>
                     </property>
                     <property name="associations" stdset="0">
                         <stringlist>
@@ -144,5 +144,5 @@
         <slot>populate()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/progressbar.kmdr b/kommander/examples/tutorial/progressbar.kmdr
index 397410cb..9e624b78 100644
--- a/kommander/examples/tutorial/progressbar.kmdr
+++ b/kommander/examples/tutorial/progressbar.kmdr
@@ -106,7 +106,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>191</width>
                     <height>0</height>
@@ -123,7 +123,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>191</width>
                     <height>0</height>
@@ -137,12 +137,12 @@
             <property name="associations" stdset="0">
                 <stringlist>
                     <string>@# set up a loop using loop variable named "file"
-@forEach(file, @exec(cd @FileSelector1.text &amp;&amp; find * -maxdepth 0))
+@forEach(file, @exec(cd @FileSelector1.text &amp;&amp; tqfind * -maxdepth 0))
   @# set the scale using the generated @[loopvar]_count
   @ProgressBar1.setMaximum(@file_count)
   @# show file name in statusbar
   @StatusBar1.setText(@file)
-  @TreeWidget1.insertItems(@exec(cd @FileSelector1.text &amp;&amp; find @file -name "*"), -1)
+  @TreeWidget1.insertItems(@exec(cd @FileSelector1.text &amp;&amp; tqfind @file -name "*"), -1)
   @# use the generated @[loopvar]_index to update progressbar
   @ProgressBar1.setText(@file_index)
 @end
@@ -188,5 +188,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/settings.kmdr b/kommander/examples/tutorial/settings.kmdr
index 3079d6f9..a280dff2 100644
--- a/kommander/examples/tutorial/settings.kmdr
+++ b/kommander/examples/tutorial/settings.kmdr
@@ -32,7 +32,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -46,7 +46,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -69,7 +69,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
             <property name="name">
                 <cstring>Layout5</cstring>
             </property>
@@ -93,7 +93,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -104,7 +104,7 @@
                     <property name="name">
                         <cstring>ExecButton1</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>60</width>
                             <height>0</height>
@@ -129,7 +129,7 @@
                     <property name="name">
                         <cstring>CloseButton1</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>60</width>
                             <height>0</height>
@@ -154,7 +154,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -173,5 +173,5 @@
         <slot>populate()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/slots.kmdr b/kommander/examples/tutorial/slots.kmdr
index 23ab2d09..ce54a3ba 100644
--- a/kommander/examples/tutorial/slots.kmdr
+++ b/kommander/examples/tutorial/slots.kmdr
@@ -30,7 +30,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -44,7 +44,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -68,7 +68,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -82,7 +82,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -105,7 +105,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -129,7 +129,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -171,7 +171,7 @@ fi
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -196,5 +196,5 @@ fi
         <slot>startProcess()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/statusbar.kmdr b/kommander/examples/tutorial/statusbar.kmdr
index d4f96e05..8dd2b897 100644
--- a/kommander/examples/tutorial/statusbar.kmdr
+++ b/kommander/examples/tutorial/statusbar.kmdr
@@ -95,5 +95,5 @@
         <slot>populate()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/strings.kmdr b/kommander/examples/tutorial/strings.kmdr
index 1ef6a953..464f84ae 100644
--- a/kommander/examples/tutorial/strings.kmdr
+++ b/kommander/examples/tutorial/strings.kmdr
@@ -49,13 +49,13 @@
 &lt;b&gt;Last 5 chars:&lt;/b&gt; @String.right("@LineEdit1", 5)&lt;br&gt;
 &lt;b&gt;Chars from 6th to 10th:&lt;/b&gt; @String.mid("@LineEdit1", 6, 5)&lt;br&gt;
 &lt;b&gt;Remove spaces:&lt;/b&gt; @String.remove("@LineEdit1", " ")&lt;br&gt;
-&lt;b&gt;Replace spaces with *&lt;/b&gt;: @String.replace("@LineEdit1", " ", *)&lt;br&gt;
+&lt;b&gt;Replace spaces with *&lt;/b&gt;: @String.tqreplace("@LineEdit1", " ", *)&lt;br&gt;
 &lt;b&gt;Uppercase:&lt;/b&gt; @String.upper("@LineEdit1")&lt;br&gt;
 &lt;b&gt;Lowercase:&lt;/b&gt; @String.lower("@LineEdit1")&lt;br&gt;
 &lt;b&gt;Is a number?:&lt;/b&gt; @Array.value(Bool, @String.isNumber("@LineEdit1"))&lt;br&gt;
 &lt;b&gt;Is empty?&lt;/b&gt; @Array.value(Bool, @String.isEmpty("@LineEdit1"))&lt;br&gt;
-&lt;b&gt;Contains "Kommander"?:&lt;/b&gt; @String.contains("@LineEdit1", "Kommander")&lt;br&gt;
-&lt;b&gt;Position of "Kommander":&lt;/b&gt; @String.find("@LineEdit1", "Kommander")&lt;br&gt;
+&lt;b&gt;Contains "Kommander"?:&lt;/b&gt; @String.tqcontains("@LineEdit1", "Kommander")&lt;br&gt;
+&lt;b&gt;Position of "Kommander":&lt;/b&gt; @String.tqfind("@LineEdit1", "Kommander")&lt;br&gt;
 &lt;b&gt;Compare with "Kommander":&lt;/b&gt;
 @execBegin
 if [ @String.compare("@LineEdit1", "Kommander") -lt 0 ];then
@@ -81,7 +81,7 @@ fi
                 </stringlist>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -95,7 +95,7 @@ fi
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -121,7 +121,7 @@ fi
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -145,7 +145,7 @@ fi
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -178,7 +178,7 @@ fi
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -202,5 +202,5 @@ fi
     <tabstop>ExecButton1</tabstop>
     <tabstop>TextEdit1</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/table.kmdr b/kommander/examples/tutorial/table.kmdr
index a2c5986b..d7ed3461 100644
--- a/kommander/examples/tutorial/table.kmdr
+++ b/kommander/examples/tutorial/table.kmdr
@@ -77,7 +77,7 @@
             </stringlist>
         </property>
     </widget>
-    <widget class="QLayoutWidget">
+    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>Layout3</cstring>
         </property>
@@ -161,7 +161,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>0</width>
                         <height>30</height>
@@ -170,7 +170,7 @@
             </spacer>
         </vbox>
     </widget>
-    <widget class="QLayoutWidget">
+    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>Layout4</cstring>
         </property>
@@ -254,5 +254,5 @@
         </hbox>
     </widget>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/tree.kmdr b/kommander/examples/tutorial/tree.kmdr
index bed87709..fcde8a28 100644
--- a/kommander/examples/tutorial/tree.kmdr
+++ b/kommander/examples/tutorial/tree.kmdr
@@ -33,7 +33,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -60,7 +60,7 @@
                     <property name="associations" stdset="0">
                         <stringlist>
                             <string>@TreeWidget1.clear
-@TreeWidget1.insertItems(@exec(cd @FileSelector1.text &amp;&amp; find * -name "*.kmdr"), -1)</string>
+@TreeWidget1.insertItems(@exec(cd @FileSelector1.text &amp;&amp; tqfind * -name "*.kmdr"), -1)</string>
                         </stringlist>
                     </property>
                 </widget>
@@ -109,7 +109,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -130,7 +130,7 @@
                 <enum>Directory</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -166,5 +166,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/tutorial/widgets.kmdr b/kommander/examples/tutorial/widgets.kmdr
index 9e6781c6..912cded0 100644
--- a/kommander/examples/tutorial/widgets.kmdr
+++ b/kommander/examples/tutorial/widgets.kmdr
@@ -68,7 +68,7 @@
             </property>
             <property name="associations" stdset="0">
                 <stringlist>
-                    <string>@WidgetList.setText(@Form1.children(true))</string>
+                    <string>@WidgetList.setText(@Form1.tqchildren(true))</string>
                 </stringlist>
             </property>
         </widget>
@@ -82,7 +82,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -96,7 +96,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class=TQLABEL_OBJECT_NAME_STRING>
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -129,5 +129,5 @@
         <slot>populate()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/executor/dcopkommanderif.h b/kommander/executor/dcopkommanderif.h
index 1ba67cbb..c756b059 100644
--- a/kommander/executor/dcopkommanderif.h
+++ b/kommander/executor/dcopkommanderif.h
@@ -58,7 +58,7 @@ virtual void setChecked(const TQString &widgetName, bool checked) = 0;
 virtual void setAssociatedText(const TQString &widgetName, const TQString &text) = 0;
 virtual TQStringList associatedText(const TQString &widgetName) = 0;
 virtual TQString type(const TQString& widget) = 0;
-virtual TQStringList children(const TQString& parent, bool recursive) = 0;
+virtual TQStringList tqchildren(const TQString& tqparent, bool recursive) = 0;
 virtual TQString global(const TQString& variableName) = 0;
 virtual void setGlobal(const TQString& variableName, const TQString& value) = 0;
 virtual void setMaximum(const TQString &widgetName, int value) = 0;
diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp
index a8ff3400..d24e856a 100644
--- a/kommander/executor/instance.cpp
+++ b/kommander/executor/instance.cpp
@@ -67,7 +67,7 @@ void Instance::addCmdlineArguments(const TQStringList& args)
   TQStringList stdArgs;
   for (TQStringList::ConstIterator it = args.begin(); it != args.end(); ++it)
   {
-    int pos = (*it).find('=');
+    int pos = (*it).tqfind('=');
     if (pos != -1)
        m_textInstance->setGlobal((*it).left(pos), (*it).mid(pos+1));
     else
@@ -75,7 +75,7 @@ void Instance::addCmdlineArguments(const TQStringList& args)
   }
   int i = 0;
   for (TQStringList::ConstIterator it = stdArgs.begin(); it != stdArgs.end(); ++it)
-    m_textInstance->setGlobal(TQString("_ARG%1").arg(++i), *it);
+    m_textInstance->setGlobal(TQString("_ARG%1").tqarg(++i), *it);
   m_textInstance->setGlobal("_ARGS", stdArgs.join(" "));
   m_textInstance->setGlobal("_ARGCOUNT", TQString::number(stdArgs.count()));
 }
@@ -97,16 +97,16 @@ bool Instance::build(const KURL& fname)
   if (!fname.isValid() || !isFileValid(fname))
     return false; // Check if file is correct
 
-  // create the main instance, must inherit QDialog
+  // create the main instance, must inherit TQDialog
   KommanderFactory::loadPlugins();
 
   if (fname.isValid())
-    m_instance = KommanderFactory::create(fname.path(), 0L, dynamic_cast<TQWidget*>(parent()));
+    m_instance = KommanderFactory::create(fname.path(), 0L, dynamic_cast<TQWidget*>(tqparent()));
   else
   {
     TQFile inputFile;
     inputFile.open(IO_ReadOnly, stdin);
-    m_instance = KommanderFactory::create(&inputFile);
+    m_instance = KommanderFactory::create(TQT_TQIODEVICE(&inputFile));
   }
 
   // check if build was successful
@@ -121,7 +121,7 @@ bool Instance::build(const KURL& fname)
     window->setFileName(fname.path().local8Bit());
 
   // FIXME : Should verify that all of the widgets in the dialog derive from KommanderWidget
-  m_textInstance = kommanderWidget(m_instance);
+  m_textInstance = kommanderWidget(TQT_TQOBJECT(m_instance));
 
   if (!m_textInstance)  // Main dialog/window is not a Kommander widget - look for one
   {
@@ -185,7 +185,7 @@ bool Instance::isFileValid(const KURL& fname) const
   if (!TQFileInfo(fname.path()).exists())
   {
     KMessageBox::sorry(0, i18n("<qt>Kommander file<br><b>%1</b><br>does not "
-      "exist.</qt>").arg(fname.path()));
+      "exist.</qt>").tqarg(fname.path()));
     return false;
   }
 
@@ -220,7 +220,7 @@ bool Instance::isFileValid(const KURL& fname) const
   }
   if (!TQFileInfo(fname.path()).isExecutable())
   {
-     if (KMessageBox::warningContinueCancel(0, i18n("<qt>The Kommander file <i>%1</i> does not have the <b>executable attribute</b> set and could possibly contain dangerous exploits.<p>If you trust the scripting (viewable in kmdr-editor) in this program, make it executable to get rid of this warning.<p>Are you sure you want to continue?</qt>").arg(fname.pathOrURL()), TQString(), i18n("Run Nevertheless")) == KMessageBox::Cancel)
+     if (KMessageBox::warningContinueCancel(0, i18n("<qt>The Kommander file <i>%1</i> does not have the <b>executable attribute</b> set and could possibly contain dangerous exploits.<p>If you trust the scripting (viewable in kmdr-editor) in this program, make it executable to get rid of this warning.<p>Are you sure you want to continue?</qt>").tqarg(fname.pathOrURL()), TQString(), i18n("Run Nevertheless")) == KMessageBox::Cancel)
        return false;
   }
   return true;
@@ -431,13 +431,13 @@ TQString Instance::type(const TQString& widget)
   return TQString();
 }
 
-TQStringList Instance::children(const TQString& parent, bool recursive)
+TQStringList Instance::tqchildren(const TQString& tqparent, bool recursive)
 {
   TQStringList matching;
-  TQObject* child = stringToWidget(parent);
+  TQObject* child = stringToWidget(tqparent);
   TQObjectList* widgets;
   if (!child)
-     child = m_instance; 
+     child = TQT_TQOBJECT(m_instance);
   if (child->inherits(TQWIDGET_OBJECT_NAME_STRING))
   {
     widgets = child->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, recursive);
@@ -674,9 +674,9 @@ int Instance::getWinID()
 void Instance::setBusyCursor(bool busy)
 {
   if (busy)
-    m_instance->setCursor(TQCursor(Qt::WaitCursor));
+    m_instance->setCursor(TQCursor(TQt::WaitCursor));
  else
-    m_instance->setCursor(TQCursor(Qt::ArrowCursor));
+    m_instance->setCursor(TQCursor(TQt::ArrowCursor));
 }
 
 
diff --git a/kommander/executor/instance.h b/kommander/executor/instance.h
index 95b52ead..469d7202 100644
--- a/kommander/executor/instance.h
+++ b/kommander/executor/instance.h
@@ -43,6 +43,7 @@ class KommanderWidget;
 class Instance : public TQObject, virtual public DCOPKommanderIf
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public: 
   Instance();
@@ -89,7 +90,7 @@ public:
   virtual void setAssociatedText(const TQString &widgetName, const TQString &text);
   virtual TQStringList associatedText(const TQString &widgetName);
   virtual TQString type(const TQString& widget);
-  virtual TQStringList children(const TQString& parent, bool recursive);
+  virtual TQStringList tqchildren(const TQString& tqparent, bool recursive);
   virtual TQString global(const TQString& variableName);
   virtual void setGlobal(const TQString& variableName, const TQString& value);
   virtual void setMaximum(const TQString &widgetName, int value);
@@ -111,7 +112,7 @@ public:
   TQWidget *widget() { return m_instance;}  
 
 public slots:
-  /** Sets the instance's parent */
+  /** Sets the instance's tqparent */
   void setParent(TQWidget*);
   /** Returns whether the instance is built */
   bool isBuilt() const;
@@ -126,7 +127,7 @@ private:
   TQGuardedPtr<TQWidget> m_instance;
   /* Associated Text Instance */
   KommanderWidget *m_textInstance;
-  /** The parent widget */
+  /** The tqparent widget */
   TQWidget *m_parent;
   /* Get object by name */
   TQObject* stringToWidget(const TQString& name);
diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp
index 00d7e509..d49dd373 100644
--- a/kommander/executor/main.cpp
+++ b/kommander/executor/main.cpp
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
   {
     char buf[200];
     TQString baseFile = args->url(0).fileName();
-    int ext = baseFile.findRev('.');
+    int ext = baseFile.tqfindRev('.');
     if (ext != -1)
       baseFile = baseFile.left(ext);
     strcpy(buf, baseFile.latin1());
diff --git a/kommander/executor/register.cpp b/kommander/executor/register.cpp
index db794e25..f3d33799 100644
--- a/kommander/executor/register.cpp
+++ b/kommander/executor/register.cpp
@@ -49,7 +49,7 @@ void Instance::registerSpecials()
   SpecialInformation::insert("null", 0, 0);
   SpecialInformation::insert("pid", 0, 0);
   SpecialInformation::insert("dcopid", 0, 0);
-  SpecialInformation::insert("parentPid", 0, 0);
+  SpecialInformation::insert("tqparentPid", 0, 0);
   SpecialInformation::insert("execBegin", 0, 1);
   SpecialInformation::insert("env", 1, 1);
   SpecialInformation::insert("exec", 1, 1);
@@ -80,15 +80,15 @@ void Instance::registerSpecials()
 
   SpecialInformation::setCurrentObject("String");
   SpecialInformation::insert("length", 1, 1, i18n( "Return number of chars in the string.") );
-  SpecialInformation::insert("contains", 2, 2, i18n( "Check if the string contains given substring.") );
-  SpecialInformation::insert("find", 2, 2, i18n( "Return position of a substring in the string, "
+  SpecialInformation::insert("tqcontains", 2, 2, i18n( "Check if the string contains given substring.") );
+  SpecialInformation::insert("tqfind", 2, 2, i18n( "Return position of a substring in the string, "
     "or -1 if it isn't found.") );
   SpecialInformation::insert("left", 2, 2, i18n( "Return first n chars of the string.") );
   SpecialInformation::insert("right", 2, 2, i18n( "Return last n chars of the string.") );
   SpecialInformation::insert("mid", 3, 3, i18n( "Return substring of the string, starting from "
     "given position.") );
   SpecialInformation::insert("remove", 2, 2, i18n( "Replace all occurencies of given substring.") );
-  SpecialInformation::insert("replace", 3, 3, i18n( "Replace all occurencies of given substring "
+  SpecialInformation::insert("tqreplace", 3, 3, i18n( "Replace all occurencies of given substring "
     "with given replacement.") );
   SpecialInformation::insert("upper", 1, 1, i18n( "Convert the string to uppercase.") );
   SpecialInformation::insert("lower", 1, 1, i18n( "Convert the string to lowercase.") );
diff --git a/kommander/factory/domtool.cpp b/kommander/factory/domtool.cpp
index 0bd7088c..e532dc10 100644
--- a/kommander/factory/domtool.cpp
+++ b/kommander/factory/domtool.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -328,7 +328,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 )
 {
@@ -360,9 +360,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/kommander/factory/domtool.h b/kommander/factory/domtool.h
index 034cb98e..30f26b51 100644
--- a/kommander/factory/domtool.h
+++ b/kommander/factory/domtool.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -27,7 +27,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/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp
index ecfcb8cd..d5713bd0 100644
--- a/kommander/factory/kommanderfactory.cpp
+++ b/kommander/factory/kommanderfactory.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -25,10 +25,13 @@
 #include "kommanderfactory.h"
 #include <kommanderplugin.h>
 
+#ifdef QT_NO_SQL
+#define TQT_NO_SQL
+#endif // QT_NO_SQL
 
 #include <tqfeatures.h>
 #include "config.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "database2.h"
 #endif
 #include <tqdom.h>
@@ -40,18 +43,18 @@
 #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>
 #include <zlib.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 +63,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>
@@ -123,7 +126,7 @@ KommanderFactory::~KommanderFactory()
   qwf_currFileName = 0L;
 }
 
-TQWidget *KommanderFactory::create( const TQString &uiFile, TQObject *connector, TQWidget *parent, const char *name )
+TQWidget *KommanderFactory::create( const TQString &uiFile, TQObject *connector, TQWidget *tqparent, const char *name )
 {
     TQFile f( uiFile );
     if ( !f.open( IO_ReadOnly ) )
@@ -132,14 +135,14 @@ TQWidget *KommanderFactory::create( const TQString &uiFile, TQObject *connector,
     if (!qwf_currFileName)
       qwf_currFileName = new TQString();
     *qwf_currFileName = uiFile;
-    TQWidget *w = KommanderFactory::create( &f, connector, parent, name );
+    TQWidget *w = KommanderFactory::create( TQT_TQIODEVICE(&f), connector, tqparent, name );
     if ( !qwf_forms )
 	qwf_forms = new TQMap<TQWidget*, TQString>;
     qwf_forms->insert( w, uiFile );
     return w;
 }
 
-TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *parent, const char *name )
+TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidget *tqparent, const char *name )
 {
     TQDomDocument doc;
     TQString errMsg;
@@ -147,7 +150,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
     TQTextStream stream(dev);
     TQString content = stream.read();
     if (content.startsWith("#!"))
-      content = content.mid(content.find('\n'));
+      content = content.mid(content.tqfind('\n'));
     if ( !doc.setContent( content ) ) {
 // 	qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine );
 	return 0;
@@ -204,7 +207,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
 	    widgetFactory->variables << e.firstChild().toText().data();
 	} else if ( e.tagName() == "pixmapinproject" ) {
 	    widgetFactory->usePixmapCollection = true;
-	} else if ( e.tagName() == "layoutdefaults" ) {
+	} else if ( e.tagName() == "tqlayoutdefaults" ) {
 	    widgetFactory->defSpacing = e.attribute( "spacing", TQString::number( widgetFactory->defSpacing ) ).toInt();
 	    widgetFactory->defMargin = e.attribute( "margin", TQString::number( widgetFactory->defMargin ) ).toInt();
 	}
@@ -214,7 +217,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
     if ( !imageCollection.isNull() )
 	widgetFactory->loadImageCollection( imageCollection );
 
-    widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) );
+    widgetFactory->createWidgetInternal( widget, tqparent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) );
     TQWidget *w = widgetFactory->toplevel;
     if ( !w ) {
 	delete widgetFactory;
@@ -230,7 +233,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
 	for ( TQDomElement n = eltSlots.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() )
 	    if ( n.tagName() == "slot" ) {
 		TQString s = n.firstChild().toText().data();
-		widgetFactory->languageSlots.insert( s.left( s.find( "(" ) ) , n.attribute( "language", "C++" ) );
+		widgetFactory->languageSlots.insert( s.left( s.tqfind( "(" ) ) , n.attribute( "language", "C++" ) );
 	    }
     }
 
@@ -243,7 +246,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
 
     if ( !connections.isNull() )
 	widgetFactory->loadConnections( connections, connector );
-    if ( w && name && qstrlen( name ) > 0 )
+    if ( w && name && tqstrlen( name ) > 0 )
 	w->setName( name );
 
     if ( !tabOrder.isNull() )
@@ -251,24 +254,24 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
 
 
     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() ) != widgetFactory->noDatabaseWidgets.end() )
+	    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, cit.key(), *(*cit).dbControls );
+	    else if ( cit.key()->inherits( "TQDesignerDataView2" ) )
+		( (TQDesignerDataView2*)cit.key() )->initPreview( (*cit).conn, (*cit).table, cit.key(), *(*cit).dbControls );
 	}
 
 	for ( TQMap<TQString, TQStringList>::Iterator it = widgetFactory->dbTables.begin(); it != widgetFactory->dbTables.end(); ++it ) {
 	    TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), TQDATATABLE_OBJECT_NAME_STRING );
 	    if ( !table )
 		continue;
-	    if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != widgetFactory->noDatabaseWidgets.end() )
+	    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;
@@ -307,129 +310,129 @@ void KommanderFactory::addPlugin( KommanderPlugin *plugin )
     widgetPlugins.append( plugin );
 }
 
-TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWidget *parent, const char *name )
+TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWidget *tqparent, const char *name )
 {
   TQString className = literalClassName;
 
   // 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)
-    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 == TQMAINWINDOW_OBJECT_NAME_STRING)
   {
     TQMainWindow *mw = 0;
     if (!qwf_stays_on_top)
-      mw = new KmdrMainWindow(parent, name);
+      mw = new KmdrMainWindow(tqparent, name);
     else
-      mw = new KmdrMainWindow(parent, name, Qt::WType_TopLevel | Qt::WStyle_StaysOnTop);
+      mw = new KmdrMainWindow(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
 
   // try to create it using the loaded kommander widget plugins
   //find the widget plugin which can create className
   for (KommanderPlugin * p = widgetPlugins.first(); p; p = widgetPlugins.next())
   {
-    TQWidget *w = p->create(className, parent, name);
+    TQWidget *w = p->create(className, tqparent, name);
     if (w)
       return w;
   }
@@ -494,7 +497,7 @@ FeatureList KommanderFactory::featureList()
     //iterate through widgetPlugins, appending KommanderPlugin::widgets() to features
 }
 
-TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg )
+TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg )
 {
     lastItem = 0;
     TQDomElement n = e.firstChild().toElement();
@@ -512,13 +515,13 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
     if ( colspan < 1 )
 	colspan = 1;
     if ( !className.isEmpty() ) {
-	if ( !layout && className  == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
+	if ( !tqlayout && className  == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
 	    className = TQWIDGET_OBJECT_NAME_STRING;
-	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 = KommanderFactory::createWidget( className, parent, 0 );
+	    obj = TQT_TQOBJECT(KommanderFactory::createWidget( className, tqparent, 0 ));
 	    if ( !obj )
 	    {
 		return 0;
@@ -528,16 +531,16 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
 		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:
@@ -545,7 +548,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
 		}
 	    }
 
-	    layout = 0;
+	    tqlayout = 0;
 	}
     }
     if (className == "Dialog")
@@ -553,59 +556,59 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
 
     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, KommanderFactory::HBox );
+	    TQLayout *tqparentLayout = tqlayout;
+	    if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		tqlayout = createLayout( 0, 0, KommanderFactory::HBox );
 	    else
-		layout = createLayout( w, layout, KommanderFactory::HBox );
-	    obj = layout;
+		tqlayout = createLayout( w, tqlayout, KommanderFactory::HBox );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
-	    if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 );
+	    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, KommanderFactory::Grid );
+	    TQLayout *tqparentLayout = tqlayout;
+	    if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		tqlayout = createLayout( 0, 0, KommanderFactory::Grid );
 	    else
-		layout = createLayout( w, layout, KommanderFactory::Grid );
-	    obj = layout;
+		tqlayout = createLayout( w, tqlayout, KommanderFactory::Grid );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
-	    if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 );
+	    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, KommanderFactory::VBox );
+	    TQLayout *tqparentLayout = tqlayout;
+	    if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		tqlayout = createLayout( 0, 0, KommanderFactory::VBox );
 	    else
-		layout = createLayout( w, layout, KommanderFactory::VBox );
-	    obj = layout;
+		tqlayout = createLayout( w, tqlayout, KommanderFactory::VBox );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
-	    if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 );
+	    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 ) {
 	    setProperty( obj, n.attribute( "name" ), n.firstChild().toElement() );
 	} else if ( n.tagName() == "attribute" && w ) {
 	    TQString attrib = n.attribute( "name" );
 	    TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() );
-	    if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
+	    if ( tqparent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
 		if ( attrib == "title" )
-		    ( (TQTabWidget*)parent )->insertTab( w, translate(v.toString()) );
+		    ( (TQTabWidget*)tqparent )->insertTab( w, translate(v.toString()) );
 	    } else
-        if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) {
+        if ( tqparent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) {
         if ( attrib == "label" )
-            ( (TQToolBox*)parent )->addItem( w, translate(v.toString()) );
-        }else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
+            ( (TQToolBox*)tqparent )->addItem( w, translate(v.toString()) );
+        }else if ( tqparent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
 		if ( attrib == "title" )
-		    ( (TQWizard*)parent )->addPage( w, translate(v.toString()) );
+		    ( (TQWizard*)tqparent )->addPage( w, translate(v.toString()) );
 	    }
 	} else if ( n.tagName() == "item" ) {
 	    createItem( n, w );
@@ -619,60 +622,60 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
     return w;
 }
 
-TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout*  layout, LayoutType type )
+TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout*  tqlayout, LayoutType type )
 {
     int spacing = defSpacing;
     int margin = defMargin;
 
-    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( TQTOOLBOX_OBJECT_NAME_STRING ) )
+    if ( !tqlayout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
     widget = ((TQToolBox*)widget)->currentItem();
 
-    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( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
+    if ( !tqlayout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
 	TQGroupBox *gb = (TQGroupBox*)widget;
 	gb->setColumnLayout( 0, Qt::Vertical );
-	gb->layout()->setMargin( 0 );
-	gb->layout()->setSpacing( 0 );
+	gb->tqlayout()->setMargin( 0 );
+	gb->tqlayout()->setSpacing( 0 );
 	TQLayout *l;
 	switch ( type ) {
 	case HBox:
-	    l = new TQHBoxLayout( gb->layout() );
-	    l->setAlignment( Qt::AlignTop );
+	    l = new TQHBoxLayout( gb->tqlayout() );
+	    l->tqsetAlignment( TQt::AlignTop );
 	    return l;
 	case VBox:
-	    l = new TQVBoxLayout( gb->layout(), spacing );
-	    l->setAlignment( Qt::AlignTop );
+	    l = new TQVBoxLayout( gb->tqlayout(), spacing );
+	    l->tqsetAlignment( TQt::AlignTop );
 	    return l;
 	case Grid:
-	    l = new TQGridLayout( gb->layout() );
-	    l->setAlignment( Qt::AlignTop );
+	    l = new TQGridLayout( gb->tqlayout() );
+	    l->tqsetAlignment( TQt::AlignTop );
 	    return l;
 	default:
 	    return 0;
 	}
     } else {
-	if ( layout ) {
+	if ( tqlayout ) {
 	    TQLayout *l;
 	    switch ( type ) {
 	    case HBox:
-		l = new TQHBoxLayout( layout );
+		l = new TQHBoxLayout( tqlayout );
 		l->setSpacing( spacing );
 		l->setMargin( margin );
 		return l;
 	    case VBox:
-		l = new TQVBoxLayout( layout );
+		l = new TQVBoxLayout( tqlayout );
 		l->setSpacing( spacing );
 		l->setMargin( margin );
 		return l;
 	    case Grid: {
-		l = new TQGridLayout( layout );
+		l = new TQGridLayout( tqlayout );
 		l->setSpacing( spacing );
 		l->setMargin( margin );
 		return l;
@@ -712,26 +715,26 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout*  layout, L
     }
 }
 
-KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *layout ) const
+KommanderFactory::LayoutType KommanderFactory::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;
 }
 
 void KommanderFactory::setProperty( 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 );
 
     TQVariant defVariant;
     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();
 	defVariant = TQVariant( f );
     }
 
@@ -763,7 +766,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T
 		if ( !v.toString().isEmpty() )
 		    TQWhatsThis::add( (TQWidget*)obj, translate(v.toString()) );
 	    }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	    if ( prop == "database" && !obj->inherits( TQDATAVIEW_OBJECT_NAME_STRING )
 		 && !obj->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) ) {
 		TQStringList lst = DomTool::elementToVariant( e, TQVariant( TQStringList() ) ).toStringList();
@@ -789,8 +792,8 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T
 		    noDatabaseWidgets << obj->name();
 		}
 	    } else if ( prop == "buttonGroupId" ) {
-		if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) )
-		    ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, v.toInt() );
+		if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->tqparent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) )
+		    ( (TQButtonGroup*)obj->tqparent() )->insert( (TQButton*)obj, v.toInt() );
 	    }
 
 	    return;
@@ -828,7 +831,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T
     }
 
     if ( prop == "geometry" ) {
-	if ( obj == toplevel ) {
+	if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) {
 	    toplevel->resize( v.toRect().size() );
 	    return;
 	}
@@ -837,7 +840,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T
     obj->setProperty( prop, v );
 }
 
-void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
+void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
 {
     TQDomElement n = e.firstChild().toElement();
     int row = e.attribute( "row" ).toInt();
@@ -869,7 +872,7 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
 		    sizeType = TQSizePolicy::MinimumExpanding;
 		else if ( n.firstChild().firstChild().toText().data() == "Expanding" )
 		    sizeType = TQSizePolicy::Expanding;
-	    } 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();
 	    }
@@ -883,12 +886,12 @@ void KommanderFactory::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 );
     }
 }
 
@@ -1004,7 +1007,7 @@ struct Connection
     }
 };
 
-class NormalizeObject : public QObject
+class NormalizeObject : public TQObject
 {
 public:
     NormalizeObject() : TQObject() {}
@@ -1023,7 +1026,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
 		if ( n2.tagName() == "sender" ) {
 		    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();
@@ -1041,7 +1044,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
 		} else if ( n2.tagName() == "receiver" ) {
 		    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 ) {
@@ -1062,7 +1065,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
 	    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;
@@ -1076,7 +1079,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
 		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() ) {
@@ -1090,22 +1093,22 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
 
 	    if ( lang == "C++" ) {
 		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;
 		}
@@ -1114,11 +1117,11 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
 		EventFunction ef = eventMap[ conn.sender ];
 		ef.events.append( conn.signal );
 		ef.functions.append( TQStringList::split( ',', conn.slot ) );
-		eventMap.replace( conn.sender, ef );
+		eventMap.tqreplace( conn.sender, ef );
 	    }
 	} else if ( n.tagName() == "slot" ) {
 	    TQString s = n.firstChild().toText().data();
-	    languageSlots.insert( s.left( s.find( "(" ) ) , n.attribute( "language" ) );
+	    languageSlots.insert( s.left( s.tqfind( "(" ) ) , n.attribute( "language" ) );
 	}
 	n = n.nextSibling().toElement();
     }
@@ -1181,17 +1184,17 @@ void KommanderFactory::createColumn( const TQDomElement &e, TQWidget *widget )
 	if ( !resizeable )
 	    lv->header()->setResizeEnabled( resizeable, i );
     }
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     else if ( widget->inherits( TQTABLE_OBJECT_NAME_STRING ) ) {
 	TQTable *table = (TQTable*)widget;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	bool isSql = (widget->inherits( TQDATATABLE_OBJECT_NAME_STRING ));
 #endif
 	bool isRow;
 	if ( ( isRow = e.tagName() == "row" ) )
 	    table->setNumRows( table->numRows() + 1 );
 	else {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	    if ( !isSql )
 #endif
 		table->setNumCols( table->numCols() + 1 );
@@ -1203,8 +1206,8 @@ void KommanderFactory::createColumn( const TQDomElement &e, TQWidget *widget )
 	TQString txt;
 	TQString field;
 	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 );
 	}
 	while ( !n.isNull() ) {
@@ -1226,14 +1229,14 @@ void KommanderFactory::createColumn( const TQDomElement &e, TQWidget *widget )
 	int i = isRow ? table->numRows() - 1 : table->numCols() - 1;
 	TQHeader *h = !isRow ? table->horizontalHeader() : table->verticalHeader();
 	if ( hasPixmap ) {
-#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 );
 	    }
@@ -1286,7 +1289,7 @@ void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLi
 	} 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;
@@ -1341,13 +1344,13 @@ void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLi
 
 
 
-void KommanderFactory::loadChildAction( TQObject *parent, const TQDomElement &e )
+void KommanderFactory::loadChildAction( TQObject *tqparent, const TQDomElement &e )
 {
     TQDomElement n = e;
     TQAction *a = 0;
     EventFunction ef;
     if ( n.tagName() == "action" ) {
-	a = new TQAction( parent );
+	a = new TQAction( tqparent );
 	TQDomElement n2 = n.firstChild().toElement();
 	while ( !n2.isNull() ) {
 	    if ( n2.tagName() == "property" ) {
@@ -1358,10 +1361,10 @@ void KommanderFactory::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" ) {
@@ -1375,7 +1378,7 @@ void KommanderFactory::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 );
     }
     if ( a )
@@ -1387,9 +1390,9 @@ void KommanderFactory::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();
     }
@@ -1402,8 +1405,8 @@ void KommanderFactory::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" ) );
 	    TQDomElement n2 = n.firstChild().toElement();
@@ -1417,7 +1420,7 @@ void KommanderFactory::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();
 	    }
@@ -1448,7 +1451,7 @@ void KommanderFactory::loadMenuBar( const TQDomElement &e )
 	    }
 	    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() );
 	}
 	n = n.nextSibling().toElement();
     }
diff --git a/kommander/factory/kommanderfactory.h b/kommander/factory/kommanderfactory.h
index ba3d7744..147749c2 100644
--- a/kommander/factory/kommanderfactory.h
+++ b/kommander/factory/kommanderfactory.h
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** 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
@@ -42,7 +42,7 @@ class KommanderPlugin;
 struct KommanderWidgetInfo
 {
     KommanderWidgetInfo() {}
-    KommanderWidgetInfo( const TQString &g, const TQString &t, TQIconSet *i, const TQString &w = TQString::null, bool c = FALSE )
+    KommanderWidgetInfo( const TQString &g, const TQString &t, TQIconSet *i, const TQString &w = TQString(), bool c = FALSE )
 	: group( g ), toolTip( t ), iconSet(i), whatsThis( w ), isContainer( c )
     {
     }
@@ -60,13 +60,13 @@ public:
     KommanderFactory();
     virtual ~KommanderFactory();
 
-    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 int loadPlugins( bool force = FALSE );
     static void addPlugin( KommanderPlugin *plugin );
     static void loadImages( const TQString &dir );
 
-    static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name );
+    static TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name );
 
     static FeatureList featureList();
 private:
@@ -74,18 +74,18 @@ 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 );
-    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 );
+    LayoutType tqlayoutType( TQLayout *l ) const;
     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 TQDomElement &e );
     TQColorGroup loadColorGroup( const TQDomElement &e );
     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 );
@@ -109,7 +109,7 @@ private:
 	TQString name;
 	TQPixmap pix;
 	TQString field;
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 	bool operator==( const Field& ) const { return FALSE; }
 #endif
     };
diff --git a/kommander/kmdrtools/dcoptool-oldparser.kmdr b/kommander/kmdrtools/dcoptool-oldparser.kmdr
index e6a8ec54..0cbf0f5d 100755
--- a/kommander/kmdrtools/dcoptool-oldparser.kmdr
+++ b/kommander/kmdrtools/dcoptool-oldparser.kmdr
@@ -61,7 +61,7 @@ openfiles(QString,QString,QString)")
 associatedText(QString)
 cellText(QString,int,int)
 checked(QString)
-children(QString,bool)
+tqchildren(QString,bool)
 clear(QString)
 count(QString)
 currentColumn(QString)
@@ -105,14 +105,14 @@ append(QString,QString)")
 @setGlobal(KommanderMessage,"")
 
 @setGlobal(String,"length(QString)
-contains(QString,QString)
-find(QString,QString,int)
-findRev(QString,QString,int)
+tqcontains(QString,QString)
+tqfind(QString,QString,int)
+tqfindRev(QString,QString,int)
 left(QString,int)
 right(QString,int)
 mid(QString,int,int)
 remove(QString,QString)
-replace(QString,QString,QString)
+tqreplace(QString,QString,QString)
 upper(QString)
 lower(QString)
 compare(QString,QString)
@@ -131,7 +131,7 @@ args(QString,QString,QString,QString)")
             <string></string>
         </stringlist>
     </property>
-    <widget class="QLayoutWidget">
+    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>Layout9</cstring>
         </property>
@@ -224,7 +224,7 @@ args(QString,QString,QString,QString)")
                     </stringlist>
                 </property>
             </widget>
-            <widget class="QLabel">
+            <widget class=TQLABEL_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>TextLabel4</cstring>
                 </property>
@@ -247,7 +247,7 @@ args(QString,QString,QString,QString)")
             </widget>
         </vbox>
     </widget>
-    <widget class="QLayoutWidget">
+    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>Layout10</cstring>
         </property>
@@ -269,7 +269,7 @@ args(QString,QString,QString,QString)")
             <property name="spacing">
                 <number>6</number>
             </property>
-            <widget class="QLabel">
+            <widget class=TQLABEL_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>TextLabel3</cstring>
                 </property>
@@ -326,7 +326,7 @@ args(QString,QString,QString,QString)")
             </widget>
         </vbox>
     </widget>
-    <widget class="QLayoutWidget">
+    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>Layout11</cstring>
         </property>
@@ -382,7 +382,7 @@ args(QString,QString,QString,QString)")
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>80</width>
                         <height>0</height>
@@ -400,9 +400,9 @@ args(QString,QString,QString,QString)")
                     <stringlist>
                         <string>@switch(@String.mid(@dcopstr.selection, 1, 4))
 @case(dcop)
-  @setGlobal("outstring","@dcopstr.selection @window.selection, @branch.selection, "@proto.selection", @String.mid(@wname.selection, 0, @String.find(@wname.selection, " ", ))@param1@param2@param3@param4)")
+  @setGlobal("outstring","@dcopstr.selection @window.selection, @branch.selection, "@proto.selection", @String.mid(@wname.selection, 0, @String.tqfind(@wname.selection, " ", ))@param1@param2@param3@param4)")
 @case(cop)
-  @setGlobal("outstring","@dcopstr.selection @window.selection @branch.selection @global(short) @String.mid(@wname.selection, 0, @String.find(@wname.selection, " ", ))@param1@param2@param3@param4")
+  @setGlobal("outstring","@dcopstr.selection @window.selection @branch.selection @global(short) @String.mid(@wname.selection, 0, @String.tqfind(@wname.selection, " ", ))@param1@param2@param3@param4")
 @case(*)
   @setGlobal("outstring","@dcopstr.selection - not found")
 @end
@@ -443,7 +443,7 @@ args(QString,QString,QString,QString)")
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>120</width>
                         <height>0</height>
@@ -578,7 +578,7 @@ fi
                     </stringlist>
                 </property>
             </widget>
-            <widget class="QLabel" row="0" column="0">
+            <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
                 <property name="name">
                     <cstring>TextLabel2</cstring>
                 </property>
@@ -594,7 +594,7 @@ fi
                 </item>
                 <item>
                     <property name="text">
-                        <string>"kmdr-executor-"+parentPid</string>
+                        <string>"kmdr-executor-"+tqparentPid</string>
                     </property>
                 </item>
                 <property name="name">
@@ -645,9 +645,9 @@ fi
 @end
 @setGlobal(pdlg,@exec(kdialog --menu "Select a dialog other than pid @pid to parse" @global(kdlg)))
 @#@exec(kdialog --msgbox "@global(_KDDIR)\n")
-@# dcop kmdr-executor-32730 KommanderIf children kmdr-executor-32730 1
+@# dcop kmdr-executor-32730 KommanderIf tqchildren kmdr-executor-32730 1
 @wname.clear
-@setGlobal(items,@dcop(@global(pdlg), KommanderIf, "children(QString,bool)", @global(pdlg), 1 ))
+@setGlobal(items,@dcop(@global(pdlg), KommanderIf, "tqchildren(QString,bool)", @global(pdlg), 1 ))
 @setGlobal(iwd,"")
 @forEach(i, @global(items))
  @setGlobal(iwd, "@global(iwd)@i (@dcop(@global(pdlg), KommanderIf, "type(QString)", @i))\n")
@@ -731,7 +731,7 @@ fi
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>111</width>
                         <height>0</height>
@@ -789,14 +789,14 @@ fi
   @setGlobal(PARM4,"")
   @setGlobal(short,checked)
   @setGlobal(DESC,"Returns 1 for checked boxes, 0 for unchecked.")
-@case(DCOP::children(QString,bool))
+@case(DCOP::tqchildren(QString,bool))
   @setGlobal(enWidget,1)
   @setGlobal(PARM1,"recursive")
   @setGlobal(PARM2,"")
   @setGlobal(PARM3,"")
   @setGlobal(PARM4,"")
-  @setGlobal(short,children)
-  @setGlobal(DESC,"Returns the list of child widgets contained in the parent widget. Set the &lt;i&gt;recursive&lt;/i&gt; parameter to &lt;i&gt;true&lt;/i&gt; to include widgets contained by child widgets.")
+  @setGlobal(short,tqchildren)
+  @setGlobal(DESC,"Returns the list of child widgets contained in the tqparent widget. Set the &lt;i&gt;recursive&lt;/i&gt; parameter to &lt;i&gt;true&lt;/i&gt; to include widgets contained by child widgets.")
 @case(DCOP::clear(QString))
   @setGlobal(enWidget,1)
   @setGlobal(PARM1,"")
@@ -1117,14 +1117,14 @@ fi
   @setGlobal(PARM4,"")
   @setGlobal(short,dcopid)
   @setGlobal(DESC,"Returns DCOP identifier of current process. This is shorthand for &lt;i&gt;kmdr-executor-&amp;#064;pid&lt;/i&gt;.")
-@case(Kommander::parentPid(QString,bool))
+@case(Kommander::tqparentPid(QString,bool))
   @setGlobal(enWidget,1)
   @setGlobal(PARM1,"editable")
   @setGlobal(PARM2,"")
   @setGlobal(PARM3,"")
   @setGlobal(PARM4,"")
-  @setGlobal(short,parentPid)
-  @setGlobal(DESC,"Returns the pid of the parent Kommander window.")
+  @setGlobal(short,tqparentPid)
+  @setGlobal(DESC,"Returns the pid of the tqparent Kommander window.")
 @case(Kommander::debug(QString))
   @setGlobal(enWidget,0)
   @setGlobal(PARM1,"text")
@@ -1276,7 +1276,7 @@ fi
   @setGlobal(PARM3,"function")
   @setGlobal(PARM4,"args")
   @setGlobal(short,dcop)
-  @setGlobal(DESC,"Creates a new widget with the specified type and as the child of parent.")
+  @setGlobal(DESC,"Creates a new widget with the specified type and as the child of tqparent.")
 @case(Kommander::dcop(QString,QString,QString,QString))
   @setGlobal(enWidget,0)
   @setGlobal(PARM1,"id")
@@ -1445,29 +1445,29 @@ fi
   @setGlobal(PARM4,"")
   @setGlobal(short,length)
   @setGlobal(DESC,"Returns number of chars in the string.")
-@case(String::contains(QString,QString))
+@case(String::tqcontains(QString,QString))
   @setGlobal(enWidget,0)
   @setGlobal(PARM1,"string")
   @setGlobal(PARM2,"substring")
   @setGlobal(PARM3,"")
   @setGlobal(PARM4,"")
-  @setGlobal(short,contains)
+  @setGlobal(short,tqcontains)
   @setGlobal(DESC,"Checks if the the string contains the given substring.")
-@case(String::find(QString,QString,int))
+@case(String::tqfind(QString,QString,int))
   @setGlobal(enWidget,0)
   @setGlobal(PARM1,"string")
   @setGlobal(PARM2,"sought")
   @setGlobal(PARM3,"index")
   @setGlobal(PARM4,"")
-  @setGlobal(short,find)
+  @setGlobal(short,tqfind)
   @setGlobal(DESC,"Returns the position of a substring in the string, or -1 if it is not found.")
-@case(String::findRev(QString,QString,int))
+@case(String::tqfindRev(QString,QString,int))
   @setGlobal(enWidget,0)
   @setGlobal(PARM1,"string")
   @setGlobal(PARM2,"sought")
   @setGlobal(PARM3,"index")
   @setGlobal(PARM4,"")
-  @setGlobal(short,findRev)
+  @setGlobal(short,tqfindRev)
   @setGlobal(DESC,"Returns the position of a substring in the string, or -1 if it is not found. String is searched backwards")
 @case(String::left(QString,int))
   @setGlobal(enWidget,0)
@@ -1501,13 +1501,13 @@ fi
   @setGlobal(PARM4,"")
   @setGlobal(short,remove)
   @setGlobal(DESC,"Removes all occurrences of given substring.")
-@case(String::replace(QString,QString,QString))
+@case(String::tqreplace(QString,QString,QString))
   @setGlobal(enWidget,0)
   @setGlobal(PARM1,"string")
   @setGlobal(PARM2,"substring")
   @setGlobal(PARM3,"replacement")
   @setGlobal(PARM4,"")
-  @setGlobal(short,replace)
+  @setGlobal(short,tqreplace)
   @setGlobal(DESC,"Replaces all occurrences of the given substring with the given replacement.")
 @case(String::upper(QString))
   @setGlobal(enWidget,0)
@@ -1820,7 +1820,7 @@ fi
 associatedText(QString)
 cellText(QString,int,int)
 checked(QString)
-children(QString,bool)
+tqchildren(QString,bool)
 clear(QString)
 count(QString)
 currentColumn(QString)
@@ -1879,7 +1879,7 @@ setEditable(QString,bool)")
         <property name="associations" stdset="0">
             <stringlist>
                 <string>@##### put the following in @wfilter checked #########
-@setGlobal(start,@expr(@String.find("@wname.selection", " ")+2))
+@setGlobal(start,@expr(@String.tqfind("@wname.selection", " ")+2))
 @setGlobal(stop,@expr(@String.length("@wname.selection")-1))
 @setGlobal(length,@expr(@global(stop)-@global(start)))
 @setGlobal(teststr, @String.lower(@String.mid("@wname.selection", @global(start), @global(length))))
@@ -2121,5 +2121,5 @@ setColumnCaption(QString,int,QString)")
     <tabstop>window</tabstop>
     <tabstop>widgetName</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/kmdrtools/examples.kmdr b/kommander/kmdrtools/examples.kmdr
index 4e63e80f..5d32d858 100755
--- a/kommander/kmdrtools/examples.kmdr
+++ b/kommander/kmdrtools/examples.kmdr
@@ -75,7 +75,7 @@ end
                 <number>0</number>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
             <property name="name">
                 <cstring>Layout90</cstring>
             </property>
@@ -99,7 +99,7 @@ end
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>71</width>
                             <height>0</height>
@@ -134,7 +134,7 @@ endif</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>71</width>
                             <height>0</height>
@@ -150,5 +150,5 @@ endif</string>
         <data format="XPM.GZ" length="6350">789ca598d94f1fc911c7dff7af40db6faba877a667baa747511e8c01e3030c06cc11e5a1aa7a86cbdc603051fef734f5ad9fed5d2952a4f521fba3beeaae1a7eff6de9606b63e9b7df7fb9bba7fb53599213ba5dfaad3c5c5c7cfbe7bffef1ef5f7e0d61a9fee9425e0abffeed975fb7ef976469f3ea727a013f56708dfe7a61597069b372068729f6cabbe0dcc8acbc622c4599c1a10dad72f1ca5d1370bfc77d5dcb01e70770176252de51eebb1c21df96720c6d87f51edcd3202fec5e29a7c01dee3b541e43dfa9b2ee4699dbd88e2a0f2997861a5d97040ed441dfa83c776d8ff5a3176e9b466cff6be5b6ded7aabe07ca5d37f6f4c2f400ee1bc84f1f95fb2859d7654f39a6766495c729a7b66d3a5dc77d431fa2ca2b9f9573ecb2ae975999dafa80ae5f1a0f0df6ef83fb79507bf927701e65d0f39372b507cef3837102fb2be3a1d1fd1efb4b65f87f193c3454f4fcaaf294a3e8ba6b5e3834ed88f3a528b72d352a0fef1b33e4f5df9443655d776aefd02d582e94fb568c3be3b9813ddf2a577b6695df6d1bf3a8f662514eed64fa7c521e6a38ea79867c39b48dfa9f8e95c705fb1f0c79d55f8142d7a8feee1a9cbaacfafb013c24d8c7df29f398912fee8db2c431e17d562ea137ff41be52eda9f2ca15784c05f10e7da7ba5fe5e3afc6b1d1789333f0200cff6e2acf21415f4fc643837cd5f8ace99971de6bfe756d65bc770aee52d0f8e77be550d7555efe0c4e09f1e95ae52e8c382fe7e0ae4680aeef832345e4eb2a788cd08f351fbb18b8d1fc70deb858bee1be983bc67b9aef55ba453c6d1b4b8b7a73094e7d823d37c15944f575b7ca43985ae4f7163813d6f98b71417c7bd82b6766c8ff9d8bbe479a9fdd1826e8ef173c9bfc199c02e4f167e09c08f1fb4e9916e749c0718c6a0f817e9ce70279b5fe75656c0bce6bfdeea6b1401e79569ec750903fa7c65dd1f749fdd7b75d84bd68cf3899bc1d38ce51f7b3c64f1f6a81837f37c0fdd4e9fb45e3b9efbb01f6a457c6638bf7efc07966c4eb9a721c09fef7e0347403de3b048f52501fd51ffdd091f94beb479fc75c50bfb5fef463c7886f5f8ca5457d5a07f78dc973021e479ca76cccd6dfde1897a2f92cd7df19f9f200e66e02639d3a8b57ff15cc11eb1c94b9ea83fc1fc1d4a27ffa4730e709f9a9fda697b117f873dd7886bd44fb5b5f16e759e3a79faa01105ff7604eb8af683cf573df427fd27c8c4ddfc05ea2fe8b6dead0cfbcde17bb61863fc4836998d05fb53ebdb4e309f5f69371467cb1d6c318fb8c7940b41fc594ad3e8bda230ebdc59fc3f9816982fce7606967f85bf329e6aa2fcedf1a0f93dadbad19cf13f255e3258e6326f81ffa513fb6e89fc7600a45f38b5be3cee23119cf13ea9dc67be47a5edff747e034637e21cdafda0c09eb0c798426d88b36c1dc9a7c9067ea6dde7207e03a5ea01fdc1bd714d3f31a4f351bfb80fe7e011ed3a8f672cf606a102facf1949a7ec67d740fe61efef26aff3a8d7419f553e33d853a70a1bf6b7ca5eaff84fa7c09e63a10eafe689c2dbe351f534fc4e87f9b6066cb8ff7c613e291d4be29d6fc80fe97c684fda4fd28a52a0fe6870b70951ff1a5f99e061a11ffe2c0dfe5db302e33fa81ceaf29c7087bf30c1e53863c03b8ca83fa087dc6d8e37dbf0c669970df0765926646bdd478484c05eb0c7b72f537e261c738435fdf8317e77d671c26d85ffb7d7a891f5d27e823d59ee8075a8f53a9fae2fd2be31efa5334a609fd17f217e9cc7eda4fd2944a07be06d7fbd0efcf8c05e7a9372e789fb51ea5991bab072acfd04446fcc83b6369e1ff67e3a9457e9d825313109f5bc66d40fdd1fe31b4291beb7b43a8e7f57eeac0d2c05e148c5bc48fcbc619f6259d67872ece013c82ebf8827ab307ce92d45fa4fd63e853ead01fb51e0fb1be8f7e7108ce39a1be607fa49170ff07f0c29feec27898314f6bbd1952b4fc746aef614813be47dc399832a17edc81a5b7fcb9361e511f59fd33e4dabe21df93710c88e7b7e0fa3ee4d37a338ca9833dbc185bbde1c9389abd9e8d5340fdb835ce01f322de1f47ca8807cdf781d380fa4f2b0b0e88cf2fe03aeec1deb65fac5f11e247aaffd01fb4df0ea59e473eed826b3d417d867da6349a7c37c6847ac94fc605eb04f9a76a3fdc8ff89917e769d7d8ced3155826f88f35bf7293d8d64f8ca780786fc143d3a17e1b2fdea31b63863f44e325b7f53eb59fc77dede2bc4ce04c09f6d57a9043ae21a8f2ec81ab3de0ff75b0c80c7be1fe2e31fce1ee8d05f9e4eec0436bf1cee05a2f50ff347e725fc73bc4db7be301f2b947b044f467a7f37dfd9a317b91379e218f837e491af45fa7f3681eaaff11af3a0fe43c04c4179f82c5fa0d69bdafd3fae23eed8f99eb38827eb40c9638213ebf804b67fb35de6b3a0c01f543f3af0e2f09f586b51ee56960e4a3877c53e94d9fcbef8cefd7c138ce9897609f3a3d05f8e7192cd6df58e51fdb41ccde6b6059f40fad7f6390d1ea19f6f7b9ef313fbc06978cf748eb6ffd5a0ce66f9d6fea746cf313a93feab8dbf69837b57fd66c8df6f31331ce3df245fd33723d8ff96ad378b07eba62cc33ea95c6d72839a19ed2b231c11f74042ec9eedb3266c8ef57bf33ecadf5b54ebb56df48e38b9a2c3de637adb7d48e8dfdfca50117abaf7edf58709f68fda0900bf4753be0ba8efea7f580fa3ce1e73f746e3cf78897042ec5f455fd292e5834fe285579b05ffb130d63077fc9a371847d49e7833abd14bcef3e1acf33fa81e63351b507f24feb35f1d4d8bafabf7eac36789f35bfa88cf58341d7b57ed15426bb7f024f2dce93f6a33add2e58e781fa315d2750dd1fc153b0f7745eaa5f3b61c63ca1f5f4659a34d678abd3d382757eaa5f1fc6dbf7ffffefbfb6df3b4ffa2f7bf1c54ff57fb33ffe5ffbfdb13ff1a7fecc9ffb2ffec25ffa2b7fed6ffcadbff3f7fec17ff58ffee90ffbbff967ffca2ffbd77ec5affa35ffc6affbb7fe9d7fef3ff80dbfe93ffaadc57ebfed3ff91dbfebf7fc67bfef0ffca13ff28d6f7df09def7df4c90f3efb11fb9d77ce916327aeb8c9cdeed89db85377e6cedd1777e12edd95bb76377e5cc8ef6edd9dbb770feeab7b744fee5bfdfbec5eb965f7daadb855b7e6deb875f7f6677ddd3bf7de7d701b6eb3defed16db96df7c9edb85db7e73ebb7d77e00eddd18ffdae71ad0bae73bd8b2eb9c1e55a1e3cd5982426a15207cb998e7feca7133aa5333aa72f7441977445d77443b77447f7f4405fe9919ee81b3dd3abeffb97e935add02aadd11b5aa7b7f48eded307daa04dfa485bb44d9f68877669effbfecfb44f07744847d4504b813aea2952a297196964cf8e8999e587beb5384d3cf3319ff0299ff1397fe10bbee42bbee61bbee53bbee7871ff2f3577ee427fec6cffc8a97f935aff02aaff11b5ee7b7fc8edff307dee0cd9ff67fe42ddee64fbcc3bbbcc79f799f0ff8908fea44d372e08e7bae9f873fdb9f07ae9fbfe2c509098b4891496639961339953339972f72f1f37eb9942bb9961bb9953bb99707f92a8ff224dfe4595ed513cbf2fa8ff12c2bb22a6bf246d6e52d277927efe5836cc8a67c942dd9964fb2f3a7fdbbb2279f655f0ee4508ea491568274527bb8241924cbf8e77cf1a31f8b2faed40c2b5c84e652eaffa632ffa5fcfdcfdf7ff92f64b3cec5</data>
     </image>
 </images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/part/kommander_part.cpp b/kommander/part/kommander_part.cpp
index d8645bc9..58912dd9 100644
--- a/kommander/part/kommander_part.cpp
+++ b/kommander/part/kommander_part.cpp
@@ -33,13 +33,13 @@ typedef KParts::GenericFactory<KommanderPart> KommanderPartFactory;
 
 K_EXPORT_COMPONENT_FACTORY( libkommander_part, KommanderPartFactory )
 
-KommanderPart::KommanderPart( TQWidget *parentWidget, const char * /*widgetName*/,
-                              TQObject *parent, const char *name, const TQStringList & /*args*/ )
-    : KParts::ReadOnlyPart(parent, name)
+KommanderPart::KommanderPart( TQWidget *tqparentWidget, const char * /*widgetName*/,
+                              TQObject *tqparent, const char *name, const TQStringList & /*args*/ )
+    : KParts::ReadOnlyPart(tqparent, name)
 {
   setInstance( KommanderPartFactory::instance() );
   m_instance = 0L; 
-  m_widget = new TQWidget(parentWidget);
+  m_widget = new TQWidget(tqparentWidget);
   setWidget(m_widget);
   m_layout = new TQGridLayout(m_widget);
 }
@@ -79,7 +79,7 @@ void KommanderPart::slotRun()
   {
     w->reparent(m_widget, 0, TQPoint(0,0));
     m_layout->addWidget(w, 0, 0);
-    w->show(); //show, not execute, so it doesn't block the parent
+    w->show(); //show, not execute, so it doesn't block the tqparent
   }
 }
 
diff --git a/kommander/part/kommander_part.h b/kommander/part/kommander_part.h
index 1519f6c3..5e9fc4f5 100644
--- a/kommander/part/kommander_part.h
+++ b/kommander/part/kommander_part.h
@@ -24,9 +24,10 @@ class TQGridLayout;
 class KommanderPart : public KParts::ReadOnlyPart
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KommanderPart(TQWidget *parentWidget, const char *widgetName,
-                  TQObject *parent, const char *name, const TQStringList &args);
+    KommanderPart(TQWidget *tqparentWidget, const char *widgetName,
+                  TQObject *tqparent, const char *name, const TQStringList &args);
 
     virtual ~KommanderPart();
 
diff --git a/kommander/plugin/kommanderplugin.h b/kommander/plugin/kommanderplugin.h
index d74abaa4..ae06fdc0 100644
--- a/kommander/plugin/kommanderplugin.h
+++ b/kommander/plugin/kommanderplugin.h
@@ -1,29 +1,29 @@
 /****************************************************************************
-  ** kommanderplugin.h - KommanderPlugin class definition created from QWidgetPlugin
+  ** kommanderplugin.h - KommanderPlugin class definition created from TQWidgetPlugin
   ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
   ** Copyright (C) 2003 Marc Britton
   **
-  ** This file is part of the widgets module of the Qt GUI Toolkit.
+  ** This file is part of the widgets module of the TQt GUI Toolkit.
   **
   ** This file may be distributed under the terms of the Q Public License
   ** as defined by Trolltech AS of Norway and appearing in the file
-  ** LICENSE.QPL included in the packaging of this file.
+  ** LICENSE.TQPL included in the packaging of this file.
   **
   ** 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
   ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   **
   ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-  **   information about Qt Commercial License Agreements.
-  ** See http://www.trolltech.com/qpl/ for QPL licensing information.
+  **   information about TQt Commercial License Agreements.
+  ** See http://www.trolltech.com/qpl/ for TQPL licensing information.
   ** See http://www.trolltech.com/gpl/ for GPL licensing information.
   **
   ** Contact info@trolltech.com if any conditions of this licensing are
@@ -45,15 +45,16 @@ class TQIconSet;
 class KOMMANDER_EXPORT KommanderPlugin : public TQObject 
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
     KommanderPlugin();
     ~KommanderPlugin();
 
-    virtual void addWidget( const TQString &name, const TQString &group, const TQString &toolTip, TQIconSet *iconSet, const TQString &whatsThis = TQString::null, bool isContainer = false);
+    virtual void addWidget( const TQString &name, const TQString &group, const TQString &toolTip, TQIconSet *iconSet, const TQString &whatsThis = TQString(), bool isContainer = false);
     virtual void removeWidget( const TQString &name );
     virtual TQStringList widgets() const;
 
-    virtual TQWidget *create( const TQString &key, TQWidget *parent = 0, const char *name = 0 ) = 0;
+    virtual TQWidget *create( const TQString &key, TQWidget *tqparent = 0, const char *name = 0 ) = 0;
     virtual TQString group( const TQString &key ) const;
     virtual TQString toolTip( const TQString &key ) const;
     virtual TQString whatsThis( const TQString &key ) const;
@@ -75,7 +76,7 @@ class KOMMANDER_EXPORT KommanderPlugin : public TQObject
      * @param maxArgs maximum number of accepted arguments
      * @return true if registration was successful
      */
-    static bool registerFunction(int id, const TQString& function, const TQString description = TQString::null,
+    static bool registerFunction(int id, const TQString& function, const TQString description = TQString(),
     int minArgs = -1, int maxArgs = -1);
 
     
@@ -84,7 +85,7 @@ private:
     struct WidgetInfo
     {
       WidgetInfo() { }
-      WidgetInfo( const TQString &g, const TQString &t, TQIconSet *i, const TQString &w = TQString::null, bool c = false)
+      WidgetInfo( const TQString &g, const TQString &t, TQIconSet *i, const TQString &w = TQString(), bool c = false)
           : group( g ), toolTip( t ), iconSet(i), whatsThis( w ), isContainer( c )
       {}
 
diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp
index d6ed318b..bbfe308e 100644
--- a/kommander/plugin/specialinformation.cpp
+++ b/kommander/plugin/specialinformation.cpp
@@ -22,8 +22,8 @@ SpecialFunction::SpecialFunction(const TQString& name, const TQString& descripti
     int minArgs, int maxArgs)
 {
   m_parserTypes = AllParsers;
-  int lbracket = name.find('(');
-  int rbracket = name.find(')');
+  int lbracket = name.tqfind('(');
+  int rbracket = name.tqfind(')');
   m_function = (lbracket != -1) ? name.left(lbracket) : name;
   m_description = description;
   if (lbracket != -1 && rbracket != -1)
@@ -44,8 +44,8 @@ SpecialFunction::SpecialFunction(ParserType p, const TQString& name, const TQStr
     int minArgs, int maxArgs)
 {
   m_parserTypes = p;
-  int lbracket = name.find('(');
-  int rbracket = name.find(')');
+  int lbracket = name.tqfind('(');
+  int rbracket = name.tqfind(')');
   m_function = (lbracket != -1) ? name.left(lbracket) : name;
   m_description = description;
   if (lbracket != -1 && rbracket != -1)
@@ -71,15 +71,15 @@ TQString SpecialFunction::prototype(uint prototypeFlags) const
   TQStringList params;
   for (uint i=start; i<m_types.count(); i++)
     if (prototypeFlags & ShowArgumentNames)
-      params.append(TQString("%1 %2").arg(m_types[i]).arg(m_args[i]));
+      params.append(TQString("%1 %2").tqarg(m_types[i]).tqarg(m_args[i]));
     else
       params.append(m_types[i]);
   if (!params.count())
     return m_function;
   else if (prototypeFlags & NoSpaces)
-    return TQString("%1(%2)").arg(m_function).arg(params.join(","));
+    return TQString("%1(%2)").tqarg(m_function).tqarg(params.join(","));
   else
-    return TQString("%1(%2)").arg(m_function).arg(params.join(", "));
+    return TQString("%1(%2)").tqarg(m_function).tqarg(params.join(", "));
 }
 
 TQString SpecialFunction::argumentName(uint i) const
@@ -107,9 +107,9 @@ int SpecialFunction::argumentCount() const
 int SpecialInformation::function(int group, const TQString& fname) 
 {
   TQString f = fname.lower();
-  if (m_functions.contains(group) && m_functions[group].contains(f))
+  if (m_functions.tqcontains(group) && m_functions[group].tqcontains(f))
     return m_functions[group][f];
-  else if (m_aliases.contains(group) && m_aliases[group].contains(f))
+  else if (m_aliases.tqcontains(group) && m_aliases[group].tqcontains(f))
     return m_aliases[group][f];
   return -1;
 }
@@ -122,14 +122,14 @@ SpecialFunction SpecialInformation::functionObject(const TQString& gname, const
 
 int SpecialInformation::group(const TQString& gname) 
 {
- if (m_groups.contains(gname))
+ if (m_groups.tqcontains(gname))
     return m_groups[gname];
   return -1;  
 }
 
 bool SpecialInformation::isValid(int gname, int fname) 
 {
-  return m_specials.contains(gname) && m_specials[gname].contains(fname);
+  return m_specials.tqcontains(gname) && m_specials[gname].tqcontains(fname);
 }
 
 bool SpecialInformation::isValid(const TQString& gname, const TQString& fname) 
@@ -139,7 +139,7 @@ bool SpecialInformation::isValid(const TQString& gname, const TQString& fname)
 
 bool SpecialInformation::isValid(int gname, int fname, SpecialFunction::ParserType p)
 {
-  return m_specials.contains(gname) && m_specials[gname].contains(fname)
+  return m_specials.tqcontains(gname) && m_specials[gname].tqcontains(fname)
     && m_specials[gname][fname].isSupported(p);
 }
 
@@ -198,9 +198,9 @@ bool SpecialInformation::insert(int id, const TQString& function, const TQString
 {
   if (isValid(m_defaultGroup, id))  /* function already defined */
     return false;
-  if (m_functions[m_defaultGroup].contains(function.lower()))
+  if (m_functions[m_defaultGroup].tqcontains(function.lower()))
     return false;                   /* function name already in use */
-  if (m_aliases[m_defaultGroup].contains(function.lower()))
+  if (m_aliases[m_defaultGroup].tqcontains(function.lower()))
     return false;                   /* function name already in use */
   SpecialFunction sf(pType, function, description, minArgs, maxArgs);
   m_specials[m_defaultGroup][id] = sf;
@@ -224,9 +224,9 @@ bool SpecialInformation::insertAlias(int id, const TQString& alias)
 {
   if (!isValid(m_defaultGroup, id))  /* function doesn't exists */
     return false;
-  if (m_functions[m_defaultGroup].contains(alias.lower()))
+  if (m_functions[m_defaultGroup].tqcontains(alias.lower()))
     return false;
-  if (m_aliases[m_defaultGroup].contains(alias.lower()))
+  if (m_aliases[m_defaultGroup].tqcontains(alias.lower()))
     return false;
   m_aliases[m_defaultGroup][alias] = id;
   return true;
@@ -248,7 +248,7 @@ void SpecialInformation::insertGroup(int id, const TQString& name, const TQStrin
 
 TQString SpecialInformation::parserGroupName(const TQString& name)
 {
-  if (m_parserGroups.contains(name))
+  if (m_parserGroups.tqcontains(name))
     return m_parserGroups[name];
   else
     return name;
@@ -291,8 +291,8 @@ void SpecialInformation::registerSpecials()
          i18n("Returns text of a cell in a table."), 3);
   insert(DCOP::checked, "checked(TQString widget)",
          i18n("Returns 1 for checked boxes, 0 for unchecked."), 1);
-  insert(DCOP::children, "children(TQString widget, bool recursive)",
-         i18n("Returns the list of child widgets contained in the parent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets."), 2);
+  insert(DCOP::tqchildren, "tqchildren(TQString widget, bool recursive)",
+         i18n("Returns the list of child widgets contained in the tqparent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets."), 2);
   insert(DCOP::clear, "clear(TQString widget)",
          i18n("Removes all content from the widget."), 1);
   insertAlias(DCOP::clear, "clearList");
@@ -375,8 +375,8 @@ void SpecialInformation::registerSpecials()
      i18n("Returns type(class) of widget."), 1);
   insert(DCOP::setEditable, "setEditable(TQString widget, bool editable)", 
      i18n("Makes the widget editable or read only, depending on the editable argument."), 2);
-  insertInternal(DCOP::geometry, "geometry(TQString widget)", 
-     i18n("Return the widget's geometry as <i>x y w h</i>. This is useful for positioning a created widget."), 1);
+  insertInternal(DCOP::tqgeometry, "tqgeometry(TQString widget)", 
+     i18n("Return the widget's tqgeometry as <i>x y w h</i>. This is useful for positioning a created widget."), 1);
   insertInternal(DCOP::hasFocus, "hasFocus(TQString widget)", 
      i18n("Returns true if the widget has focus."), 1);
   insertInternal(DCOP::getBackgroundColor, "getBackgroundColor(TQString widget)", 
@@ -400,8 +400,8 @@ void SpecialInformation::registerSpecials()
   insert(Kommander::dcopid, "dcopid", 
      i18n("Returns DCOP identifier of current process. This is shorthand for <i>kmdr-executor-@pid</i>."), 
      0);
-  insert(Kommander::parentPid, "parentPid", 
-     i18n("Returns the pid of the parent Kommander window."), 0);
+  insert(Kommander::tqparentPid, "tqparentPid", 
+     i18n("Returns the pid of the tqparent Kommander window."), 0);
   insert(Kommander::debug, "debug(TQString text)",
          i18n("Writes <i>text</i> on stderr."), 1);
   insert(Kommander::echo, "echo(TQString text)",
@@ -440,8 +440,8 @@ void SpecialInformation::registerSpecials()
      i18n("Executes an external DCOP call."), 3, 9);
   insertMacro(Kommander::comment, "#",
      i18n("Adds a comment to EOL that Kommander will not parse"), 0);
-  insertInternal(Kommander::createWidget, "createWidget(TQString widgetName, TQString widgetType, TQString parent)",
-     i18n("Creates a new widget with the specified type and as the child of parent."), 3);
+  insertInternal(Kommander::createWidget, "createWidget(TQString widgetName, TQString widgetType, TQString tqparent)",
+     i18n("Creates a new widget with the specified type and as the child of tqparent."), 3);
   insertInternal(Kommander::widgetExists, "widgetExists(TQString widgetName)",
      i18n("Returns true if there is a widget with the passed name, false otherwise."), 1);
   insertInternal(Kommander::connect, "connect(TQString sender, TQString signal, TQString receiver, TQString slot)",
@@ -524,11 +524,11 @@ void SpecialInformation::registerSpecials()
   insertGroup(Group::String, "String", "str");
   insert(String::length, "length(TQString string)", 
     i18n("Returns number of chars in the string."), 1);
-  insert(String::contains, "contains(TQString string, TQString substring)", 
+  insert(String::tqcontains, "tqcontains(TQString string, TQString substring)", 
     i18n("Checks if the the string contains the given substring."), 2);
-  insert(String::find, "find(TQString string, TQString sought, int index)", 
+  insert(String::tqfind, "tqfind(TQString string, TQString sought, int index)", 
     i18n("Returns the position of a substring in the string, or -1 if it is not found."), 2);
-  insert(String::findRev, "findRev(TQString string, TQString sought, int index)", 
+  insert(String::tqfindRev, "tqfindRev(TQString string, TQString sought, int index)", 
     i18n("Returns the position of a substring in the string, or -1 if it is not found. String is searched backwards"), 2);
   insertInternal(String::count, "count(TQString String, TQString substring)",
     i18n("Returns the count of a given substring in the given string."), 2);
@@ -540,7 +540,7 @@ void SpecialInformation::registerSpecials()
     i18n("Returns <i>n</i> chars of the string, starting from <i>start</i>."), 3);
   insert(String::remove, "remove(TQString string, TQString substring)", 
     i18n("Removes all occurrences of given substring."), 2);
-  insert(String::replace, "replace(TQString string, TQString substring, TQString replacement)", 
+  insert(String::tqreplace, "tqreplace(TQString string, TQString substring, TQString replacement)", 
     i18n("Replaces all occurrences of the given substring with the given replacement."), 3);
   insert(String::upper, "upper(TQString string)", 
     i18n("Converts the string to uppercase."), 1);
diff --git a/kommander/plugin/specialinformation.h b/kommander/plugin/specialinformation.h
index fa898620..1ff00a6c 100644
--- a/kommander/plugin/specialinformation.h
+++ b/kommander/plugin/specialinformation.h
@@ -36,9 +36,9 @@ public:
    /* Flags describing which parser supports the function */
    enum ParserType {MacroParser = 1, InternalParser = 2, AllParsers = 3};
    SpecialFunction(const TQString& function, const TQString& description
-     = TQString::null, int minArgs = -1, int maxArgs = -1);
+     = TQString(), int minArgs = -1, int maxArgs = -1);
    SpecialFunction(ParserType p, const TQString& function, const TQString& description
-     = TQString::null, int minArgs = -1, int maxArgs = -1);
+     = TQString(), int minArgs = -1, int maxArgs = -1);
    SpecialFunction()   {m_minArgs = m_maxArgs = 0;}
    /* minimum number of arguments */
    int minArg() const    {return m_minArgs;}
@@ -90,13 +90,13 @@ public:
   static TQString description(int gname, int fname);
   static TQString prototype(int gname, int fname, uint prototypeFlags = 0);
   /* Insert function supported by all parsers */
-  static bool insert(int id, const TQString& function, const TQString description = TQString::null,
+  static bool insert(int id, const TQString& function, const TQString description = TQString(),
     int minArgs = -1, int maxArgs = -1, SpecialFunction::ParserType = SpecialFunction::AllParsers);
   /* Insert function supported by (old) macro parser */
-  static bool insertMacro(int id, const TQString& function, const TQString description = TQString::null,
+  static bool insertMacro(int id, const TQString& function, const TQString description = TQString(),
     int minArgs = -1, int maxArgs = -1);
   /* Insert function supported by (new) internal parser */
-  static bool insertInternal(int id, const TQString& function, const TQString description = TQString::null,
+  static bool insertInternal(int id, const TQString& function, const TQString description = TQString(),
     int minArgs = -1, int maxArgs = -1);
   static bool insertAlias(int id, const TQString& alias);
   static void insertGroup(int id, const TQString& name, const TQString& parserName);
diff --git a/kommander/plugin/specials.h b/kommander/plugin/specials.h
index 2d46200a..f7db7b6d 100644
--- a/kommander/plugin/specials.h
+++ b/kommander/plugin/specials.h
@@ -28,19 +28,19 @@ namespace Group
 
 namespace DCOP
 {
-  enum {addUniqueItem, associatedText, cancel, cellText, clear, checked, children, columnCount, count, currentColumn,
+  enum {addUniqueItem, associatedText, cancel, cellText, clear, checked, tqchildren, columnCount, count, currentColumn,
     currentItem, currentRow, execute, findItem, global, insertColumn, insertItem, insertItems, insertRow, 
     item, itemDepth, itemPath, removeColumn, removeItem, removeRow, selection, setAssociatedText, setChecked, 
     setCellText, setCurrentItem, insertTab, setColumnCaption, setEnabled, setGlobal, setMaximum, setPixmap, 
     setRowCaption, setSelection, setText, getBackgroundColor, setBackgroundColor,
-    setVisible, text, type, setCellWidget, cellWidget, setEditable, geometry, hasFocus, isModified};
+    setVisible, text, type, setCellWidget, cellWidget, setEditable, tqgeometry, hasFocus, isModified};
 }
 
 namespace Kommander
 {
-  enum {widgetText, selectedWidgetText, null, pid, dcopid, parentPid, debug,
+  enum {widgetText, selectedWidgetText, null, pid, dcopid, tqparentPid, debug,
   echo, env, exec, expr, global, i18n, dialog, readSetting, setGlobal, writeSetting, dcop,
-  switchBlock, execBegin, forBlock, forEachBlock, ifBlock, comment, createWidget, connect, disconnect, widgetExists, exit, Break, Continue, Return, execBackground, switchInternal}; //, focusWidget};
+  switchBlock, execBegin, forBlock, forEachBlock, ifBlock, comment, createWidget, connect, disconnect, widgetExists, exit, Break, Continue, Return, execBackground, switchInternal}; //, tqfocusWidget};
 }
 
 namespace Array
@@ -55,7 +55,7 @@ namespace Matrix
 
 namespace String
 {
-  enum {length, contains, find, findRev, left, right, mid, remove, replace, upper, lower,
+  enum {length, tqcontains, tqfind, tqfindRev, left, right, mid, remove, tqreplace, upper, lower,
   compare, isEmpty, isNumber, section, args, toInt, toDouble, round, sort, trim, padLeft, padRight, count};
 }
 
diff --git a/kommander/pluginmanager/main.cpp b/kommander/pluginmanager/main.cpp
index 74561925..0e663476 100644
--- a/kommander/pluginmanager/main.cpp
+++ b/kommander/pluginmanager/main.cpp
@@ -77,18 +77,18 @@ int main(int argc, char *argv[])
     QCStringList items = args->getOptionList("add");
     for (QCStringList::ConstIterator it = items.begin(); it != items.end(); ++it)
       if (!P.add(*it))
-        cerr << i18n("Error adding plugin '%1'").arg(*it).local8Bit();
+        cerr << i18n("Error adding plugin '%1'").tqarg((*it).data()).local8Bit().data();
     
     items = args->getOptionList("remove");
     for (QCStringList::ConstIterator it = items.begin(); it != items.end(); ++it)
       if (!P.remove(*it))
-        cerr << i18n("Error removing plugin '%1'").arg(*it).local8Bit();
+        cerr << i18n("Error removing plugin '%1'").tqarg((*it).data()).local8Bit().data();
     
     if (args->isSet("list"))
     {
       TQStringList plugins = P.items();
       for (TQStringList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
-        cout << (*it).local8Bit() << "\n";
+        cout << (*it).local8Bit().data() << "\n";
     }
   }
   else 
diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp
index 94d365f5..c2947c5b 100644
--- a/kommander/pluginmanager/mainwindow.cpp
+++ b/kommander/pluginmanager/mainwindow.cpp
@@ -28,8 +28,8 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 
-MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f )
-    : KMainWindow( parent, name, f )
+MainWindow::MainWindow( TQWidget* tqparent, const char *name, WFlags f )
+    : KMainWindow( tqparent, name, f )
 {
   KToolBar *toolBar = new KToolBar( this );
   toolBar->insertButton("fileopen", Add, true, i18n("Add") );
@@ -77,7 +77,7 @@ void MainWindow::add(const TQString &plugin)
 {
   if (!m_pluginManager->add(plugin))
   {
-    TQString errMsg = i18n("<qt>Unable to load Kommander plugin<br><b>%1</b></qt>").arg(plugin);
+    TQString errMsg = i18n("<qt>Unable to load Kommander plugin<br><b>%1</b></qt>").tqarg(plugin);
     KMessageBox::error(this, errMsg, i18n("Cannot add plugin"));
   }
   else
diff --git a/kommander/pluginmanager/mainwindow.h b/kommander/pluginmanager/mainwindow.h
index c774832f..ffc59ace 100644
--- a/kommander/pluginmanager/mainwindow.h
+++ b/kommander/pluginmanager/mainwindow.h
@@ -26,8 +26,9 @@ class PluginManager;
 class MainWindow : public KMainWindow
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  MainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose );
+  MainWindow( TQWidget* tqparent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose );
   ~MainWindow();
 
 protected slots:
diff --git a/kommander/pluginmanager/pluginmanager.cpp b/kommander/pluginmanager/pluginmanager.cpp
index 79da4d81..2bfbab89 100644
--- a/kommander/pluginmanager/pluginmanager.cpp
+++ b/kommander/pluginmanager/pluginmanager.cpp
@@ -47,7 +47,7 @@ bool PluginManager::add(const TQString& plugin, bool)
   TQString plugName= libraryName(plugin);
   if (plugName.isNull())
     return false;
-  if (m_list->contains(plugName))
+  if (m_list->tqcontains(plugName))
     return false;
   m_list->append(plugName);
   return true;
@@ -55,7 +55,7 @@ bool PluginManager::add(const TQString& plugin, bool)
 
 bool PluginManager::remove(const TQString& plugin)
 {
-  if (!m_list->contains(plugin))
+  if (!m_list->tqcontains(plugin))
     return false;
   m_list->remove(plugin);
   return true;
diff --git a/kommander/widget/expression.cpp b/kommander/widget/expression.cpp
index d29d94e8..350646e1 100644
--- a/kommander/widget/expression.cpp
+++ b/kommander/widget/expression.cpp
@@ -57,7 +57,7 @@ Expression& Expression::operator=(const TQString& s)
         m_parts.append(TQVariant(s.mid(start, i - start).toDouble()));
       else
         m_parts.append(TQVariant(s.mid(start, i - start).toInt()));
-    } else if (single.contains(s[i]))
+    } else if (single.tqcontains(s[i]))
       m_parts.append(TQVariant(TQString(s[i++])));
     else if (s[i] == '\"')
     {
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index 416207b7..81613785 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -52,7 +52,7 @@ static ParseNode f_stringLength(Parser*, const ParameterList& params)
 
 static ParseNode f_stringContains(Parser*, const ParameterList& params)
 {
-  return params[0].toString().contains(params[1].toString());
+  return params[0].toString().tqcontains(params[1].toString());
 }
 
 static ParseNode f_stringCompare(Parser*, const ParameterList& params)
@@ -71,12 +71,12 @@ static ParseNode f_stringCompare(Parser*, const ParameterList& params)
 
 static ParseNode f_stringFind(Parser*, const ParameterList& params)
 {
-  return params[0].toString().find(params[1].toString(), params.count() == 3 ? params[2].toInt() : 0);
+  return params[0].toString().tqfind(params[1].toString(), params.count() == 3 ? params[2].toInt() : 0);
 }
 
 static ParseNode f_stringFindRev(Parser*, const ParameterList& params)
 {
-  return params[0].toString().findRev(params[1].toString(), 
+  return params[0].toString().tqfindRev(params[1].toString(), 
     params.count() == 3 ? params[2].toInt() : params[0].toString().length());
 }
 
@@ -102,7 +102,7 @@ static ParseNode f_stringRemove(Parser*, const ParameterList& params)
 
 static ParseNode f_stringReplace(Parser*, const ParameterList& params)
 {
-  return params[0].toString().replace(params[1].toString(), params[2].toString());
+  return params[0].toString().tqreplace(params[1].toString(), params[2].toString());
 }
 
 static ParseNode f_stringLower(Parser*, const ParameterList& params)
@@ -129,11 +129,11 @@ static ParseNode f_stringSection(Parser*, const ParameterList& params)
 static ParseNode f_stringArgs(Parser*, const ParameterList& params)
 {
   if (params.count() == 2)
-    return params[0].toString().arg(params[1].toString());
+    return params[0].toString().tqarg(params[1].toString());
   else if (params.count() == 3)
-    return params[0].toString().arg(params[1].toString()).arg(params[2].toString());
+    return params[0].toString().tqarg(params[1].toString()).tqarg(params[2].toString());
   else 
-    return params[0].toString().arg(params[1].toString()).arg(params[2].toString()).arg(params[3].toString());
+    return params[0].toString().tqarg(params[1].toString()).tqarg(params[2].toString()).tqarg(params[3].toString());
 }
 
 static ParseNode f_stringIsNumber(Parser*, const ParameterList& params)    
@@ -250,7 +250,7 @@ static ParseNode f_executeSlot(Parser* parser, const ParameterList& params)
   TQObject *object = widget->object();
   if (!object)
     return ParseNode::error("unknown widget");
-  TQStrList slotSignatures = object->metaObject()->slotNames(true);
+  TQStrList slotSignatures = object->tqmetaObject()->slotNames(true);
   TQStringList slotNames = TQStringList::fromStrList(slotSignatures);
   int slotNum = -1;
   uint i = 0;
@@ -353,15 +353,15 @@ static ParseNode f_dcop(Parser*, const ParameterList& params)
       byteDataStream << params[i++].toDouble();
     else if (*it == "bool")
       byteDataStream << (bool)params[i++].toInt();
-    else if (*it == "TQStringList")
-      if (params[i].toString().find('\n') != -1)
+    else if (*it == TQSTRINGLIST_OBJECT_NAME_STRING)
+      if (params[i].toString().tqfind('\n') != -1)
         byteDataStream << TQStringList::split("\n", params[i++].toString(), true);
       else
         byteDataStream << TQStringList::split("\\n", params[i++].toString(), true);
     else 
       byteDataStream << params[i++].toString();
   }
-  function.append(TQString("(%1)").arg(items.join(",")));
+  function.append(TQString("(%1)").tqarg(items.join(",")));
   TQCString replyType, byteReply;
   DCOPClient* cl = KApplication::dcopClient();
   if (!cl || !cl->call(appId, object, function.latin1(),
@@ -371,7 +371,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params)
     return ParseNode();
   }
   TQDataStream byteReplyStream(byteReply, IO_ReadOnly);
-  if (replyType == "TQString")
+  if (replyType == TQSTRING_OBJECT_NAME_STRING)
   {
     TQString text;
     byteReplyStream >> text;
@@ -389,7 +389,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params)
     byteReplyStream >> b;
     return b;
   }
-  else if (replyType == "TQStringList")
+  else if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING)
   {
     TQStringList text;
     byteReplyStream >> text;
@@ -397,7 +397,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params)
   }
   else if(replyType != "void")
   {
-     qDebug("%s", TQString("DCOP return type %1 is not yet implemented.").arg(replyType.data()).latin1());
+     qDebug("%s", TQString("DCOP return type %1 is not yet implemented.").tqarg(replyType.data()).latin1());
   }
 
   return ParseNode();
@@ -407,12 +407,12 @@ static ParseNode f_createWidget(Parser* p, const ParameterList& params)
 {
   TQString widgetName = params[0].toString();
   TQString widgetType = params[1].toString();
-  TQString parentName = params[2].toString();
-  KommanderWidget *widget = p->currentWidget()->widgetByName(parentName);
+  TQString tqparentName = params[2].toString();
+  KommanderWidget *widget = p->currentWidget()->widgetByName(tqparentName);
   if (!widget)
     return ParseNode::error("unknown widget");
-  TQWidget *parent = dynamic_cast<TQWidget*>(widget->object());
-  TQWidget *w = KommanderFactory::createWidget(widgetType, parent, widgetName.latin1());
+  TQWidget *tqparent = dynamic_cast<TQWidget*>(widget->object());
+  TQWidget *w = KommanderFactory::createWidget(widgetType, tqparent, widgetName.latin1());
   if (w)
     w->adjustSize();
   return ParseNode();
@@ -429,9 +429,9 @@ static ParseNode f_widgetExists(Parser* p, const ParameterList& params)
 static ParseNode f_connect(Parser* p, const ParameterList& params)
 {
   TQString sender = params[0].toString();
-  TQString signal = TQString::number(QSIGNAL_CODE) + params[1].toString();
+  TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString();
   TQString receiver = params[2].toString();
-  TQString slot = TQString::number(QSLOT_CODE) + params[3].toString();
+  TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString();
   KommanderWidget *senderW = p->currentWidget()->widgetByName(sender);
   if (!senderW)
     return ParseNode::error("unknown widget");
@@ -445,9 +445,9 @@ static ParseNode f_connect(Parser* p, const ParameterList& params)
 static ParseNode f_disconnect(Parser* p, const ParameterList& params)
 {
   TQString sender = params[0].toString();
-  TQString signal = TQString::number(QSIGNAL_CODE) + params[1].toString();
+  TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString();
   TQString receiver = params[2].toString();
-  TQString slot = TQString::number(QSLOT_CODE) + params[3].toString();
+  TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString();
   KommanderWidget *senderW = p->currentWidget()->widgetByName(sender);
   if (!senderW)
     return ParseNode::error("unknown widget");
@@ -499,7 +499,7 @@ static ParseNode f_dialog(Parser* P, const ParameterList& params)
       return TQString();
   }
   TQString cmd = TQString("kmdr-executor %1 %2 _PARENTPID=%3 _PARENTDCOPID=kmdr-executor-%4")
-    .arg(pFileName).arg(a_params).arg(getpid()).arg(getpid());
+    .tqarg(pFileName).tqarg(a_params).tqarg(getpid()).tqarg(getpid());
 
   MyProcess proc(P->currentWidget());
   TQString text;
@@ -571,7 +571,7 @@ static ParseNode f_arrayToString(Parser* P, const ParameterList& params)
   TQValueList<ParseNode>::Iterator itval = values.begin();
   while (*it)
   {
-    array += TQString("%1\t%2\n").arg(*it).arg((*itval).toString());
+    array += TQString("%1\t%2\n").tqarg(*it).tqarg((*itval).toString());
     ++it;
     ++itval;
   }
@@ -648,7 +648,7 @@ static ParseNode f_arrayIndexedRemoveElements(Parser* P, const ParameterList& pa
     return ParseNode(); //out of index range
   for (int i = 0; i < count; i++)
   {
-    if (keys.contains(TQString::number(i)) != 1)
+    if (keys.tqcontains(TQString::number(i)) != 1)
       return ParseNode(); //array is not indexed
   }
   for (int i = key; i <= key + num; i++)
@@ -704,7 +704,7 @@ static ParseNode f_inputColor(Parser*, const ParameterList& params)
   if (params.count())
     color.setNamedColor(params[0].toString());
   KColorDialog::getColor(color);
-  return color.name();
+  return TQString(color.name());
 }
 
 static ParseNode f_inputText(Parser*, const ParameterList& params)
@@ -721,7 +721,7 @@ static ParseNode f_inputPassword(Parser*, const ParameterList& params)
   if (params.count() > 1)
     value = params[1].toString().local8Bit();
   KPasswordDialog::getPassword(value, params[0].toString());
-  return TQString::fromLocal8Bit(value);
+  return TQString(TQString::fromLocal8Bit(value));
 }
 
 static ParseNode f_inputValue(Parser*, const ParameterList& params)
@@ -910,15 +910,15 @@ static ParseNode f_write_setting(Parser* parser, const ParameterList& params)
 void ParserData::registerStandardFunctions()
 {
   registerFunction("str_length", Function(&f_stringLength, ValueInt, ValueString));
-  registerFunction("str_contains", Function(&f_stringContains, ValueInt, ValueString, ValueString));
+  registerFunction("str_tqcontains", Function(&f_stringContains, ValueInt, ValueString, ValueString));
   registerFunction("str_compare", Function(&f_stringCompare, ValueInt, ValueString, ValueString));
-  registerFunction("str_find", Function(&f_stringFind, ValueInt, ValueString, ValueString, ValueInt, 2));
+  registerFunction("str_tqfind", Function(&f_stringFind, ValueInt, ValueString, ValueString, ValueInt, 2));
   registerFunction("str_findrev", Function(&f_stringFindRev, ValueInt, ValueString, ValueString, ValueInt, 2));
   registerFunction("str_left", Function(&f_stringLeft, ValueString, ValueString, ValueInt));
   registerFunction("str_right", Function(&f_stringRight, ValueString, ValueString, ValueInt));
   registerFunction("str_mid", Function(&f_stringMid, ValueString, ValueString, ValueInt, ValueInt, 2));
   registerFunction("str_remove", Function(&f_stringRemove, ValueString, ValueString, ValueString));
-  registerFunction("str_replace", Function(&f_stringReplace, ValueString, ValueString, ValueString, ValueString));
+  registerFunction("str_tqreplace", Function(&f_stringReplace, ValueString, ValueString, ValueString, ValueString));
   registerFunction("str_lower", Function(&f_stringLower, ValueString, ValueString));
   registerFunction("str_upper", Function(&f_stringUpper, ValueString, ValueString));
   registerFunction("str_section", Function(&f_stringSection, ValueString, ValueString, ValueString, ValueInt, ValueInt, 3));
@@ -944,7 +944,7 @@ void ParserData::registerStandardFunctions()
   registerFunction("dcop", Function(&f_dcop, ValueString, ValueString, ValueString, 3, 100));
   registerFunction("dcopid", Function(&f_dcopid, ValueString, ValueNone, 0, 0));
   registerFunction("pid", Function(&f_pid, ValueString, ValueNone, 0, 0));
-  registerFunction("parentPid", Function(&f_parentPid, ValueString, ValueNone, 0, 0));
+  registerFunction("tqparentPid", Function(&f_parentPid, ValueString, ValueNone, 0, 0));
   registerFunction("dialog", Function(&f_dialog, ValueString, ValueString, ValueString, 1, 2));
   registerFunction("exec", Function(&f_exec, ValueString, ValueString, ValueString, 1, 2));
   registerFunction("execBackground", Function(&f_execBackground, ValueString, ValueString, ValueString, 1, 2));
diff --git a/kommander/widget/invokeclass.cpp b/kommander/widget/invokeclass.cpp
index 866f629b..ec08dfff 100644
--- a/kommander/widget/invokeclass.cpp
+++ b/kommander/widget/invokeclass.cpp
@@ -15,7 +15,7 @@
 #include <tqcolor.h>
 #include <tqregexp.h>
 
-InvokeClass::InvokeClass(TQObject *parent):TQObject(parent)
+InvokeClass::InvokeClass(TQObject *tqparent):TQObject(tqparent)
 {
   m_acceptedSlots = acceptedSlots();
 }
@@ -23,9 +23,9 @@ InvokeClass::InvokeClass(TQObject *parent):TQObject(parent)
 void InvokeClass::invokeSlot(TQObject *object, const TQString& slot, TQStringList args)
 {
   TQString invokeName = slot;
-  invokeName = invokeName.mid(invokeName.find('('));
-  invokeName.prepend(TQString::number(QSIGNAL_CODE) + "invoke");
-  TQString slotName = TQString::number(QSLOT_CODE) + slot;  
+  invokeName = invokeName.mid(invokeName.tqfind('('));
+  invokeName.prepend(TQString::number(TQSIGNAL_CODE) + "invoke");
+  TQString slotName = TQString::number(TQSLOT_CODE) + slot;  
   connect(this, invokeName.ascii(), object, slotName.ascii());
 
   if (args.count() == 0)  
@@ -33,7 +33,7 @@ void InvokeClass::invokeSlot(TQObject *object, const TQString& slot, TQStringLis
   else
   {
     TQString slotArgStr = slot.section(TQRegExp("\\(|\\)"), 1);
-    uint argNum = slotArgStr.contains(',') + 1;
+    uint argNum = slotArgStr.tqcontains(',') + 1;
     for (uint i = args.count(); i < argNum; i++)
       args << "";
   //poor man's invokeMetaObject
diff --git a/kommander/widget/invokeclass.h b/kommander/widget/invokeclass.h
index 4b1a8c0b..043ba73b 100644
--- a/kommander/widget/invokeclass.h
+++ b/kommander/widget/invokeclass.h
@@ -18,8 +18,9 @@
 
 class InvokeClass : public TQObject {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  InvokeClass(TQObject *parent);
+  InvokeClass(TQObject *tqparent);
   void invokeSlot(TQObject *object,  const TQString& slot, TQStringList args);
 
   static TQStringList acceptedSlots() 
diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp
index e123a035..603c1326 100644
--- a/kommander/widget/kmdrmainwindow.cpp
+++ b/kommander/widget/kmdrmainwindow.cpp
@@ -13,8 +13,8 @@
 
 #include <tqtimer.h>
 
-KmdrMainWindow::KmdrMainWindow(TQWidget *parent, const char *name, WFlags f)
- : KMainWindow(parent, name, f)
+KmdrMainWindow::KmdrMainWindow(TQWidget *tqparent, const char *name, WFlags f)
+ : KMainWindow(tqparent, name, f)
 {
   TQTimer::singleShot(10, this, TQT_SIGNAL(initialize()));
 }
diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h
index 6637ffc8..4896db2b 100644
--- a/kommander/widget/kmdrmainwindow.h
+++ b/kommander/widget/kmdrmainwindow.h
@@ -20,8 +20,9 @@
 class KmdrMainWindow : public KMainWindow
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    KmdrMainWindow(TQWidget *parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose);
+    KmdrMainWindow(TQWidget *tqparent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose);
 
     ~KmdrMainWindow();
 
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index 6ef6e6f0..7efe5b27 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -52,7 +52,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL
       return execCommand(args[0]);
     case Kommander::dcop:
       return DCOPQuery(args);
-    case Kommander::parentPid:
+    case Kommander::tqparentPid:
       return global("_PARENTPID").isEmpty() ? TQString().setNum(getppid()) : global("_PARENTPID");
     case Kommander::env:
       return TQString(getenv(args[0].latin1())); 
@@ -66,12 +66,12 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL
     case Kommander::debug:
       qDebug("%s", args[0].latin1());
       fflush(stderr);
-      return TQString::null;
+      return TQString();
     case Kommander::echo:
       for (uint i=0; i<args.count(); i++)
          std::cout << args[i].latin1();
       fflush(stdout);
-      return TQString::null;
+      return TQString();
     case Kommander::readSetting:
     {
       TQString fname = fileName();
@@ -81,7 +81,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL
         cfg.setGroup(fname);
         return cfg.readEntry(args[0], args[1]);
       }
-      return TQString::null;
+      return TQString();
     }
     case Kommander::writeSetting:
     {
@@ -92,7 +92,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL
         cfg.setGroup(fname);
         cfg.writeEntry(args[0], args[1]);
       }
-      return TQString::null;
+      return TQString();
     }
     case Kommander::dialog:
       if (args.count() > 1)
@@ -114,7 +114,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL
 
 TQString KommanderWidget::evalExecBlock(const TQStringList& args, const TQString& s, int& pos) 
 {
-  int f = s.find("@execEnd", pos);  
+  int f = s.tqfind("@execEnd", pos);  
   if (f == -1)
   {
     printError(i18n("Unterminated @execBegin ... @execEnd block."));
@@ -131,7 +131,7 @@ TQString KommanderWidget::evalExecBlock(const TQStringList& args, const TQString
  
 TQString KommanderWidget::evalForEachBlock(const TQStringList& args, const TQString& s, int& pos) 
 {
-  int f = s.find("@end", pos);  
+  int f = s.tqfind("@end", pos);  
 //FIXME: better detection of block boundaries  
   if (f == -1)
   {
@@ -145,9 +145,9 @@ TQString KommanderWidget::evalForEachBlock(const TQStringList& args, const TQStr
     TQString var = args[0];
     TQStringList loop = TQStringList::split("\n", args[1]);
     TQString output;
-    TQString block = substituteVariable(s.mid(start, f - start), TQString("%1_count").arg(var),
+    TQString block = substituteVariable(s.mid(start, f - start), TQString("%1_count").tqarg(var),
       TQString::number(loop.count()));
-    TQString varidx = TQString("%1_index").arg(var);
+    TQString varidx = TQString("%1_index").tqarg(var);
     for (uint i=0; i<loop.count(); i++)
       output += evalAssociatedText(substituteVariable(substituteVariable(block, varidx, TQString::number(i+1)),
         var, loop[i]));
@@ -157,7 +157,7 @@ TQString KommanderWidget::evalForEachBlock(const TQStringList& args, const TQStr
 
 TQString KommanderWidget::evalForBlock(const TQStringList& args, const TQString& s, int& pos) 
 {
-  int f = s.find("@end", pos);  
+  int f = s.tqfind("@end", pos);  
 //FIXME: better detection of block boundaries  
   if (f == -1)
   {
@@ -193,7 +193,7 @@ TQString KommanderWidget::evalForBlock(const TQStringList& args, const TQString&
 
 TQString KommanderWidget::evalIfBlock(const TQStringList& args, const TQString& s, int& pos) 
 {
-  int f = s.find("@endif", pos);
+  int f = s.tqfind("@endif", pos);
 //FIXME: better detection of block boundaries; add error message
   if (f == -1)
   {
@@ -214,7 +214,7 @@ TQString KommanderWidget::evalIfBlock(const TQStringList& args, const TQString&
 
 TQString KommanderWidget::evalSwitchBlock(const TQStringList& args, const TQString& s, int& pos) 
 {
-  int f = s.find("@end", pos);
+  int f = s.tqfind("@end", pos);
 //FIXME: better detection of block boundaries; add error message
   if (f == -1)
   {
@@ -302,7 +302,7 @@ TQString KommanderWidget::evalArrayFunction(const TQString& function, const TQSt
       const TQMap<TQString, ParseNode> map = parser.array(array);
       TQString arraystring;
       for (TQMap<TQString, ParseNode>::ConstIterator it = map.begin(); it != map.end(); ++it)
-        arraystring += TQString("%1\t%2\n").arg(it.key()).arg(it.data().toString());
+        arraystring += TQString("%1\t%2\n").tqarg(it.key()).tqarg(it.data().toString());
       return arraystring;
     }
     default:
@@ -317,7 +317,7 @@ TQString KommanderWidget::evalWidgetFunction(const TQString& identifier, const T
   KommanderWidget* pWidget = parseWidget(identifier);
   if (!pWidget) 
   {
-    printError(i18n("Unknown widget: @%1.").arg(identifier));
+    printError(i18n("Unknown widget: @%1.").tqarg(identifier));
     return TQString();
   }
   if (s[pos] == '.')
@@ -335,13 +335,13 @@ TQString KommanderWidget::evalWidgetFunction(const TQString& identifier, const T
   }
   else if (pWidget == this)
   {
-    printError(i18n("Infinite loop: @%1 called inside @%2.").arg(pWidget->widgetName())
-        .arg(pWidget->widgetName()));
+    printError(i18n("Infinite loop: @%1 called inside @%2.").tqarg(pWidget->widgetName())
+        .tqarg(pWidget->widgetName()));
     return TQString();
   }
   else if (!pWidget->hasAssociatedText())
   {
-    printError(i18n("Script for @%1 is empty.").arg(pWidget->widgetName()));
+    printError(i18n("Script for @%1 is empty.").tqarg(pWidget->widgetName()));
     return TQString();
   }
   return pWidget->evalAssociatedText();
diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp
index 8f880c40..2fc867f7 100644
--- a/kommander/widget/kommanderwidget.cpp
+++ b/kommander/widget/kommanderwidget.cpp
@@ -74,7 +74,7 @@ TQStringList KommanderWidget::associatedText() const
 
 bool KommanderWidget::hasAssociatedText()
 {
-  int index = states().findIndex(currentState());
+  int index = states().tqfindIndex(currentState());
   if (index == -1 || m_associatedText[index].isEmpty())
     return false;
   return true;
@@ -113,7 +113,7 @@ void KommanderWidget::setDisplayStates(const TQStringList& a_displayStates)
 
 TQString KommanderWidget::evalAssociatedText() // expands and returns associated text as a string
 {
-  int index = ( states().findIndex( currentState()) );
+  int index = ( states().tqfindIndex( currentState()) );
   if (index == -1)
   {
     printError(i18n("Invalid state for associated text."));
@@ -131,7 +131,7 @@ TQString KommanderWidget::evalAssociatedText(const TQString& a_text)
     p.setWidget(this);
     p.setString(a_text);
     if (!p.setString(a_text) || !p.parse())
-      printError(i18n("Line %1: %2.\n").arg(p.errorLine()+1).arg(p.errorMessage()));
+      printError(i18n("Line %1: %2.\n").tqarg(p.errorLine()+1).tqarg(p.errorMessage()));
     return TQString();
   }
   /* Old macro-only parser is implemented below  */
@@ -143,7 +143,7 @@ TQString KommanderWidget::evalAssociatedText(const TQString& a_text)
   int pos = 0, baseTextLength = a_text.length();
   while (pos < baseTextLength)
   {
-    int ident = a_text.find(ESCCHAR, pos);
+    int ident = a_text.tqfind(ESCCHAR, pos);
     if (ident == -1) {
       evalText += a_text.mid(pos);
       break;
@@ -164,7 +164,7 @@ TQString KommanderWidget::evalAssociatedText(const TQString& a_text)
     if (identifier.isEmpty()) 
     {
       if (pos < baseTextLength && a_text[pos] == '#') {   // comment 
-        int newpos = a_text.find('\n', pos+1);
+        int newpos = a_text.tqfind('\n', pos+1);
         if (newpos == -1) 
           newpos = a_text.length();
         if (pos > 1 && a_text[pos-2] == '\n')
@@ -241,7 +241,7 @@ TQString KommanderWidget::evalAssociatedText(const TQString& a_text)
     }
     else
     {
-      printError(i18n("Unknown special: \'%1\'.").arg(identifier));
+      printError(i18n("Unknown special: \'%1\'.").tqarg(identifier));
       return TQString();
     }
   }
@@ -260,7 +260,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
   // parse function arguments
   TQString function = a_query[2], pTypes;
   function.remove(' ');
-  int start = function.find('(');
+  int start = function.tqfind('(');
   bool ok = false;
   if (start != -1)
     pTypes = parseBrackets(function, start, ok);
@@ -271,13 +271,13 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
   }
   if (!ok)
   {
-    printError(i18n("Unmatched parenthesis in DCOP call \'%1\'.").arg(a_query[2]));
+    printError(i18n("Unmatched tqparenthesis in DCOP call \'%1\'.").tqarg(a_query[2]));
     return TQString();
   }
   const TQStringList argTypes = parseArgs(pTypes, ok);
   if (!ok || argTypes.count() != a_query.count() - 3)
   {
-    printError(i18n("Incorrect arguments in DCOP call \'%1\'.").arg(a_query[2]));
+    printError(i18n("Incorrect arguments in DCOP call \'%1\'.").tqarg(a_query[2]));
     return TQString();
   }
 
@@ -295,8 +295,8 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
       byteDataStream << a_query[i+3].toDouble();
     else if (argTypes[i] == "bool")
       byteDataStream << (bool)(a_query[i+3] != "false" && a_query[i+3] != "false" && a_query[i+3] != "0");
-    else if (argTypes[i] == "TQStringList")
-      if (a_query[i+3].find('\n') != -1)
+    else if (argTypes[i] == TQSTRINGLIST_OBJECT_NAME_STRING)
+      if (a_query[i+3].tqfind('\n') != -1)
         byteDataStream << TQStringList::split("\n", a_query[i+3], true);
       else
         byteDataStream << TQStringList::split("\\n", a_query[i+3], true);
@@ -312,7 +312,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
   }
 
   TQDataStream byteReplyStream(byteReply, IO_ReadOnly);
-  if (replyType == "TQString")
+  if (replyType == TQSTRING_OBJECT_NAME_STRING)
   {
     TQString text;
     byteReplyStream >> text;
@@ -330,7 +330,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
     byteReplyStream >> b;
     return TQString::number(b);
   }
-  else if (replyType == "TQStringList")
+  else if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING)
   {
     TQStringList text;
     byteReplyStream >> text;
@@ -338,7 +338,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
   }
   else if(replyType != "void")
   {
-    printError(i18n("DCOP return type %1 is not yet implemented.").arg(replyType.data()));
+    printError(i18n("DCOP return type %1 is not yet implemented.").tqarg(replyType.data()));
   }
 
   return TQString();
@@ -392,7 +392,7 @@ TQString KommanderWidget::runDialog(const TQString& a_dialog, const TQString& a_
       return TQString();
   }
   TQString cmd = TQString("kmdr-executor %1 %2 _PARENTPID=%3 _PARENTDCOPID=kmdr-executor-%4")
-    .arg(pFileName).arg(a_params).arg(getpid()).arg(getpid());
+    .tqarg(pFileName).tqarg(a_params).tqarg(getpid()).tqarg(getpid());
   return execCommand(cmd);
 }
 
@@ -405,26 +405,26 @@ void KommanderWidget::printError(const TQString& a_error) const
                 KDialogBase::Yes, KDialogBase::No, 0, 0, true, false, 
                 i18n("Continue"), i18n("Continue && Ignore Next Errors"), i18n("Stop"));
     switch (KMessageBox::createKMessageBox(dialog, TQMessageBox::Warning, 
-                i18n("<qt>Error in widget <b>%1</b>:<p><i>%2</i></qt>").arg(TQString(m_thisObject->name()))
-                    .arg(a_error), TQStringList(), TQString(), 0, 0))
+                i18n("<qt>Error in widget <b>%1</b>:<p><i>%2</i></qt>").tqarg(TQString(m_thisObject->name()))
+                    .tqarg(a_error), TQStringList(), TQString(), 0, 0))
     {
       case KDialogBase::No:
         showErrors = false;
       case KDialogBase::Yes:
         break;
       case KDialogBase::Cancel:
-        if (parentDialog()->inherits(TQDIALOG_OBJECT_NAME_STRING))
+        if (tqparentDialog()->inherits(TQDIALOG_OBJECT_NAME_STRING))
         {
-          parentDialog()->close();
+          tqparentDialog()->close();
           exit(-1);
         }
-        else if (parentDialog()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))
+        else if (tqparentDialog()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))
           kapp->quit();
     }
   }
   else 
   {
-    kdError() << i18n("Error in widget %1:\n  %2\n").arg(m_thisObject->name()).arg(a_error);
+    kdError() << i18n("Error in widget %1:\n  %2\n").tqarg(m_thisObject->name()).tqarg(a_error);
   }
 }
 
@@ -557,16 +557,16 @@ KommanderWidget* KommanderWidget::widgetByName(const TQString& a_name) const
 
 KommanderWidget* KommanderWidget::parseWidget(const TQString& widgetName) const
 {
-  if (TQString(parentDialog()->name()) == widgetName)
-    return dynamic_cast <KommanderWidget*>(parentDialog());
+  if (TQString(tqparentDialog()->name()) == widgetName)
+    return dynamic_cast <KommanderWidget*>(tqparentDialog());
   TQCString s = widgetName.lower() == "self" ? m_thisObject->name() : widgetName.latin1();
-  TQObject* childObj = parentDialog()->child(s);
+  TQObject* childObj = tqparentDialog()->child(s);
 /*  if (!childObj)
   {
      Parser parser(internalParserData());
      TQString variableValue = parser.variable(widgetName).toString();
      s = variableValue.lower() == "self" ? m_thisObject->name() : variableValue.latin1();
-     childObj = parentDialog()->child(s);  
+     childObj = tqparentDialog()->child(s);  
   }*/
   return dynamic_cast <KommanderWidget*>(childObj);
 }
@@ -579,7 +579,7 @@ TQStringList KommanderWidget::parseFunction(const TQString& group, const TQStrin
   TQString arg = parseBrackets(s, from, ok);
   if (!ok)
   {
-    printError(i18n("Unmatched parenthesis after \'%1\'.").arg(function));
+    printError(i18n("Unmatched tqparenthesis after \'%1\'.").tqarg(function));
     return TQString();
   }
   const TQStringList args = parseArgs(arg, ok);
@@ -588,23 +588,23 @@ TQStringList KommanderWidget::parseFunction(const TQString& group, const TQStrin
   bool extraArg = gname == Group::DCOP;
 
   if (!ok)
-    printError(i18n("Unmatched quotes in argument of \'%1\'.").arg(function));
+    printError(i18n("Unmatched quotes in argument of \'%1\'.").tqarg(function));
   else if (gname == -1)
-    printError(i18n("Unknown function group: \'%1\'.").arg(group));
+    printError(i18n("Unknown function group: \'%1\'.").tqarg(group));
   else if (fname == -1 && !extraArg)
-    printError(i18n("Unknown function: \'%1\' in group '%2'.").arg(function).arg(group));
+    printError(i18n("Unknown function: \'%1\' in group '%2'.").tqarg(function).tqarg(group));
   else if (fname == -1 && extraArg)
-    printError(i18n("Unknown widget function: \'%1\'.").arg(function));
+    printError(i18n("Unknown widget function: \'%1\'.").tqarg(function));
   else if ((int)args.count() + extraArg < SpecialInformation::minArg(gname, fname))
     printError(i18n("Not enough arguments for \'%1\' (%2 instead of %3).<p>"
        "Correct syntax is: %4")
-        .arg(function).arg(args.count() + extraArg).arg(SpecialInformation::minArg(gname, fname))
-        .arg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames)));
+        .tqarg(function).tqarg(args.count() + extraArg).tqarg(SpecialInformation::minArg(gname, fname))
+        .tqarg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames)));
   else if ((int)args.count() + extraArg > SpecialInformation::maxArg(gname, fname))
     printError(i18n("Too many arguments for \'%1\' (%2 instead of %3).<p>"
        "Correct syntax is: %4")
-      .arg(function).arg(args.count() + extraArg).arg(SpecialInformation::maxArg(gname, fname))
-      .arg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames)));
+      .tqarg(function).tqarg(args.count() + extraArg).tqarg(SpecialInformation::maxArg(gname, fname))
+      .tqarg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames)));
   else 
     success = true;
   ok = success;
@@ -616,7 +616,7 @@ int KommanderWidget::parseBlockBoundary(const TQString& s, int from, const TQStr
   int shortest = -1;
   for (uint i=0; i<args.count(); i++)
   {
-    int match = s.find(args[i], from);
+    int match = s.tqfind(args[i], from);
     if (shortest > match || shortest == -1) 
       shortest = match;
   }
@@ -627,12 +627,12 @@ int KommanderWidget::parseBlockBoundary(const TQString& s, int from, const TQStr
 
 TQString KommanderWidget::substituteVariable(TQString text, TQString variable, TQString value) const
 {
-  TQString var = TQString("@%1").arg(variable);
+  TQString var = TQString("@%1").tqarg(variable);
   TQString newtext;
   int newpos, pos = 0;
   while (true)
   {
-    newpos = text.find(var, pos);
+    newpos = text.tqfind(var, pos);
     if (newpos != -1)
     {
       newtext += text.mid(pos, newpos-pos);
@@ -649,12 +649,12 @@ TQString KommanderWidget::substituteVariable(TQString text, TQString variable, T
 
 
 
-TQWidget* KommanderWidget::parentDialog() const
+TQWidget* KommanderWidget::tqparentDialog() const
 {
   TQObject *superParent = m_thisObject;
-  while (superParent->parent())
+  while (superParent->tqparent())
   {
-    superParent = superParent->parent();
+    superParent = superParent->tqparent();
     if (superParent->inherits(TQDIALOG_OBJECT_NAME_STRING) || superParent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))
       break;
   }
@@ -692,7 +692,7 @@ TQString KommanderWidget::handleDCOP(const int function, const TQStringList& arg
       break;
     case DCOP::type:
       return current->className();
-    case DCOP::children:
+    case DCOP::tqchildren:
     {
       TQStringList matching;
       TQObjectList* widgets = current->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, args.count() == 0 || args[0] != "false");
@@ -707,12 +707,12 @@ TQString KommanderWidget::handleDCOP(const int function, const TQStringList& arg
 
 bool KommanderWidget::isFunctionSupported(int f)
 {
-  return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::children || f == DCOP::type;
+  return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::tqchildren || f == DCOP::type;
 }
 
 bool KommanderWidget::isCommonFunction(int f)
 {
-  return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::children || f == DCOP::type;
+  return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::tqchildren || f == DCOP::type;
 }
 
 ParserData* KommanderWidget::internalParserData() const
@@ -722,7 +722,7 @@ ParserData* KommanderWidget::internalParserData() const
 
 TQString KommanderWidget::fileName()
 {
-  KommanderWindow* window = dynamic_cast<KommanderWindow*>(parentDialog());
+  KommanderWindow* window = dynamic_cast<KommanderWindow*>(tqparentDialog());
   if (window)
     return TQString(window->fileName());
   else
@@ -732,7 +732,7 @@ TQString KommanderWidget::fileName()
 TQString KommanderWidget::widgetName() const
 {
   if (m_thisObject)
-    return TQString::fromLatin1(m_thisObject->name());
+    return TQString::tqfromLatin1(m_thisObject->name());
   else
     return TQString();
 }
diff --git a/kommander/widget/kommanderwidget.h b/kommander/widget/kommanderwidget.h
index c9576010..2087d086 100644
--- a/kommander/widget/kommanderwidget.h
+++ b/kommander/widget/kommanderwidget.h
@@ -115,12 +115,12 @@ protected:
   TQString DCOPQuery(const TQStringList& args);
   TQString localDCOPQuery(const TQString function, const TQStringList& args = TQStringList());
   TQString localDCOPQuery(const TQString function, const TQString& arg1, 
-     const TQString& arg2, const TQString& arg3 = TQString::null,
-     const TQString& arg4 = TQString::null);
+     const TQString& arg2, const TQString& arg3 = TQString(),
+     const TQString& arg4 = TQString());
   // Execute given command, return its result
-  TQString execCommand(const TQString& a_command, const TQString& a_shell = TQString::null) const;
+  TQString execCommand(const TQString& a_command, const TQString& a_shell = TQString()) const;
   // Find and run dialog (with optional parameters)
-  TQString runDialog(const TQString& a_dialog, const TQString& a_params = TQString::null);
+  TQString runDialog(const TQString& a_dialog, const TQString& a_params = TQString());
   // Display error message a_error; display current class name if no other is given
   void printError(const TQString& a_error) const;
   // Auxiliary functions for parser
@@ -140,8 +140,8 @@ protected:
 
   // Parse given identifier as widget name
   KommanderWidget* parseWidget(const TQString& name) const;
-  // Return parent dialog of this widget
-  TQWidget* parentDialog() const;
+  // Return tqparent dialog of this widget
+  TQWidget* tqparentDialog() const;
   TQString substituteVariable(TQString text, TQString variable, TQString value) const;
 
   ParserData* internalParserData() const;
diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp
index 59eb67fb..4914a95a 100644
--- a/kommander/widget/myprocess.cpp
+++ b/kommander/widget/myprocess.cpp
@@ -74,7 +74,7 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell)
 
   // Look for shell
   if (at.startsWith("#!")) {
-    int eol = at.find("\n");
+    int eol = at.tqfind("\n");
     if (eol == -1)
       eol = at.length();
     shellName = at.mid(2, eol-1).stripWhiteSpace();
@@ -91,7 +91,7 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell)
 
   if(!mProcess->start(KProcess::NotifyOnExit, KProcess::All))
   {
-    m_atw->printError(i18n("<qt>Failed to start shell process<br><b>%1</b></qt>").arg(shellName));
+    m_atw->printError(i18n("<qt>Failed to start shell process<br><b>%1</b></qt>").tqarg(shellName));
     return TQString();
   }
   mProcess->writeStdin(m_input, m_input.length());
@@ -102,10 +102,10 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell)
   else 
   {
     TQWidget dummy(0, 0, WType_Dialog | WShowModal);
-    dummy.setFocusPolicy(TQWidget::NoFocus);
+    dummy.setFocusPolicy(TQ_NoFocus);
     m_loopStarted = true;
     qt_enter_modal(&dummy);
-    qApp->enter_loop();
+    tqApp->enter_loop();
     qt_leave_modal(&dummy);
   
     if (!m_output.isEmpty() && m_output[m_output.length()-1] == '\n')
@@ -125,7 +125,7 @@ void MyProcess::slotProcessExited(KProcess* process)
 {
   if (m_loopStarted)
   {
-    qApp->exit_loop();
+    tqApp->exit_loop();
     m_loopStarted = false;
   }
   delete process;
diff --git a/kommander/widget/myprocess.h b/kommander/widget/myprocess.h
index 36af1b48..c22aa810 100644
--- a/kommander/widget/myprocess.h
+++ b/kommander/widget/myprocess.h
@@ -26,9 +26,10 @@
 
 class KommanderWidget;
 
-class KOMMANDER_EXPORT MyProcess : public QObject
+class KOMMANDER_EXPORT MyProcess : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   MyProcess(const KommanderWidget *);
   // Run given command, using a_shell as a shell (this can be overridden by shebang in the first line)
diff --git a/kommander/widget/parsenode.cpp b/kommander/widget/parsenode.cpp
index 492c00fb..407e0987 100644
--- a/kommander/widget/parsenode.cpp
+++ b/kommander/widget/parsenode.cpp
@@ -38,13 +38,13 @@ ParseNode::ParseNode(double d) : m_type(ValueDouble), m_double(d), m_context(-1)
 {  
 }
 
-ParseNode::ParseNode(Keyword k) : m_type(ValueKeyword), m_keyword(k), m_string(TQString::null), m_context(-1)
+ParseNode::ParseNode(Keyword k) : m_type(ValueKeyword), m_keyword(k), m_string(TQString()), m_context(-1)
 {
 }
   
 ParseNode::ParseNode(Keyword k, const TQString& name) : m_type(ValueKeyword), m_keyword(k), m_context(-1)
 {
-  m_string = (k == Variable) ? name : TQString::null;
+  m_string = (k == Variable) ? name : TQString();
 }
 
 ParseNode ParseNode::error(const TQString& s)
diff --git a/kommander/widget/parser.cpp b/kommander/widget/parser.cpp
index 04748e45..07ffb88c 100644
--- a/kommander/widget/parser.cpp
+++ b/kommander/widget/parser.cpp
@@ -24,16 +24,16 @@ using namespace Parse;
 
 TQString unescape(TQString s)
 {
-  return s.replace("\\\"", "\"").replace("\\t", "\t").replace("\\n", "\n").replace("\\\\", "\\");
+  return s.tqreplace("\\\"", "\"").tqreplace("\\t", "\t").tqreplace("\\n", "\n").tqreplace("\\\\", "\\");
 }
 
-Parser::Parser(ParserData* pData) : m_data(pData), m_start(0), m_error(TQString::null), m_errorPosition(0), 
+Parser::Parser(ParserData* pData) : m_data(pData), m_start(0), m_error(TQString()), m_errorPosition(0), 
   m_widget(0)
 {
 }
 
 Parser::Parser(ParserData* pData, const TQString& expr) : m_data(pData), m_start(0), 
-  m_error(TQString::null), m_errorPosition(0), m_widget(0)
+  m_error(TQString()), m_errorPosition(0), m_widget(0)
 {
   setString(expr);
 }
@@ -113,7 +113,7 @@ bool Parser::setString(const TQString& s)
     else                          // Bad character
     {
       insertNode(s.mid(start, 1), lines);
-      setError(i18n("Invalid character: '%1'").arg(s[start]), m_parts.count()-1);
+      setError(i18n("Invalid character: '%1'").tqarg(s[start]), m_parts.count()-1);
       return false;
     }
   }
@@ -220,7 +220,7 @@ ParseNode Parser::parseValue(Mode mode)
         return parseWidget(mode, value);
       }else if (mode == Execute)
       {
-        setError(i18n("'%1' (%2) is not a widget").arg(p.variableName()).arg(variable(p.variableName()).toString()));
+        setError(i18n("'%1' (%2) is not a widget").tqarg(p.variableName()).tqarg(variable(p.variableName()).toString()));
         return ParseNode();
       } else
       {
@@ -232,7 +232,7 @@ ParseNode Parser::parseValue(Mode mode)
     }
     else if (tryKeyword(LeftParenthesis, CheckOnly))
     {
-       setError(i18n("'%1' is not a function").arg(p.variableName()));
+       setError(i18n("'%1' is not a function").tqarg(p.variableName()));
        return ParseNode();
     }
     else
@@ -423,15 +423,15 @@ ParseNode Parser::parseFunction(Mode mode)
     tryKeyword(RightParenthesis);
   }
   if (f.minArgs() > params.count())
-    setError(i18n("in function '%1': %2").arg(name).arg(i18n("too few parameters")), pos);
+    setError(i18n("in function '%1': %2").tqarg(name).tqarg(i18n("too few parameters")), pos);
   else if (f.maxArgs() < params.count())
-    setError(i18n("in function '%1': %2").arg(name).arg(i18n("too many parameters")), pos);
+    setError(i18n("in function '%1': %2").tqarg(name).tqarg(i18n("too many parameters")), pos);
   else if (mode == Execute)
   {
     ParseNode p = f.execute(this, params);
     if (!p.isValid())
     {
-      setError(i18n("in function '%1': %2").arg(name).arg(p.errorMessage()), pos);
+      setError(i18n("in function '%1': %2").tqarg(name).tqarg(p.errorMessage()), pos);
       return ParseNode();
     }
     else
@@ -471,7 +471,7 @@ ParseNode Parser::parseWidget(Mode mode, const TQString &widgetName)
     ParseNode p = f.execute(this, params);
     if (!p.isValid())
     {
-      setError(i18n("in widget function '%1.%2': %3").arg(widget).arg(var).arg(p.errorMessage()), pos);
+      setError(i18n("in widget function '%1.%2': %3").tqarg(widget).tqarg(var).tqarg(p.errorMessage()), pos);
       return ParseNode();
     }
     else
@@ -514,12 +514,12 @@ ParseNode Parser::parseAssignment(Mode mode)
       m_start = m_start - 2;
       return parseWidget(mode); 
     } else
-      setError(i18n("'%1' is not a widget").arg(var));
+      setError(i18n("'%1' is not a widget").tqarg(var));
   }
   else if (tryKeyword(LeftParenthesis, CheckOnly))
-    setError(i18n("'%1' is not a function").arg(var));
+    setError(i18n("'%1' is not a function").tqarg(var));
   else 
-    setError(i18n("Unexpected symbol after variable '%1'").arg(var));
+    setError(i18n("Unexpected symbol after variable '%1'").tqarg(var));
 
   return ParseNode();
 }
@@ -738,9 +738,9 @@ bool Parser::tryKeyword(Keyword k, Mode mode)
   if (mode == Execute)
   {
     if (k == Dot)
-      setError(i18n("Expected '%1'<br><br>Possible cause of the error is having a variable with the same name as a widget").arg(m_data->keywordToString(k)));
+      setError(i18n("Expected '%1'<br><br>Possible cause of the error is having a variable with the same name as a widget").tqarg(m_data->keywordToString(k)));
     else
-     setError(i18n("Expected '%1'").arg(m_data->keywordToString(k)));
+     setError(i18n("Expected '%1'").tqarg(m_data->keywordToString(k)));
   }
   return false;
 }
@@ -785,7 +785,7 @@ bool Parser::isWidget() const
 void Parser::reset()
 {
   m_start = 0;
-  m_error = TQString::null;
+  m_error = TQString();
   m_errorPosition = 0;
 }
 
@@ -814,9 +814,9 @@ void Parser::setVariable(const TQString& name, ParseNode value)
 ParseNode Parser::variable(const TQString& name) const
 {
   if (isGlobal(name))
-    return m_globalVariables.contains(name) ? m_globalVariables[name] : ParseNode();  
+    return m_globalVariables.tqcontains(name) ? m_globalVariables[name] : ParseNode();  
   else
-    return m_variables.contains(name) ? m_variables[name] : ParseNode();  
+    return m_variables.tqcontains(name) ? m_variables[name] : ParseNode();  
 }
 
 bool Parser::isGlobal(const TQString& name) const
@@ -826,7 +826,7 @@ bool Parser::isGlobal(const TQString& name) const
 
 bool Parser::isVariable(const TQString& name) const
 {
-  return m_variables.contains(name) || m_globalVariables.contains(name);
+  return m_variables.tqcontains(name) || m_globalVariables.tqcontains(name);
 }
 
 void Parser::unsetVariable(const TQString& key)
@@ -847,7 +847,7 @@ const TQMap<TQString, ParseNode>& Parser::array(const TQString& name) const
 
 bool Parser::isArray(const TQString& name) const
 {
-  return m_arrays.contains(name) || m_globalArrays.contains(name);
+  return m_arrays.tqcontains(name) || m_globalArrays.tqcontains(name);
 }
 
 void Parser::setArray(const TQString& name, const TQString& key, ParseNode value)
@@ -881,9 +881,9 @@ ParseNode Parser::arrayValue(const TQString& name, const TQString& key) const
   if (!isArray(name))
     return ParseNode();
   if (isGlobal(name))
-    return m_globalArrays[name].contains(key) ? m_globalArrays[name][key] : ParseNode();
+    return m_globalArrays[name].tqcontains(key) ? m_globalArrays[name][key] : ParseNode();
   else
-    return m_arrays[name].contains(key) ? m_arrays[name][key] : ParseNode();
+    return m_arrays[name].tqcontains(key) ? m_arrays[name][key] : ParseNode();
 }
 
 
diff --git a/kommander/widget/parser.h b/kommander/widget/parser.h
index 3ad7d59c..b82188d2 100644
--- a/kommander/widget/parser.h
+++ b/kommander/widget/parser.h
@@ -65,7 +65,7 @@ public:
   // set array key
   void setArray(const TQString& name, const TQString& key, ParseNode value);
   // unset array key or whole array
-  void unsetArray(const TQString& name, const TQString& key = TQString::null);
+  void unsetArray(const TQString& name, const TQString& key = TQString());
   // array value 
   ParseNode arrayValue(const TQString& name, const TQString& key) const;
   // get associated widget
@@ -110,7 +110,7 @@ private:
   // parse parameters
   ParseNode parseFunction(Parse::Mode mode = Parse::Execute);
   // parse widget function
-  ParseNode parseWidget(Parse::Mode mode = Parse::Execute, const TQString &widgetName = TQString::null);
+  ParseNode parseWidget(Parse::Mode mode = Parse::Execute, const TQString &widgetName = TQString());
 
   // parse assignment
   ParseNode parseAssignment(Parse::Mode mode = Parse::Execute);
diff --git a/kommander/widget/parserdata.cpp b/kommander/widget/parserdata.cpp
index 274d7220..b5346fd4 100644
--- a/kommander/widget/parserdata.cpp
+++ b/kommander/widget/parserdata.cpp
@@ -19,7 +19,7 @@ using namespace Parse;
 
 KeywordGroup ParserData::keywordGroup(Keyword k) const
 {
-  if (m_groups.contains(k))
+  if (m_groups.tqcontains(k))
     return m_groups[k];
   else
     return GroupMisc;
@@ -28,7 +28,7 @@ KeywordGroup ParserData::keywordGroup(Keyword k) const
 Keyword ParserData::stringToKeyword(const TQString& s) const
 {
   TQString k = s.lower();
-  if (m_keywords.contains(k))
+  if (m_keywords.tqcontains(k))
     return m_keywords[k];
   else 
     return Variable;
@@ -116,7 +116,7 @@ ParserData::ParserData()
 
 bool ParserData::isFunction(const TQString& name) const
 {
-  return m_functions.contains(name.lower());
+  return m_functions.tqcontains(name.lower());
 }
 
 const Function& ParserData::function(const TQString& name) const
diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index 9377b377..4425412c 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -36,8 +36,8 @@ enum Functions {
   LastFunction
 };
 
-AboutDialog::AboutDialog(TQWidget *parent, const char *name)
- : TQLabel(parent, name), KommanderWidget(this)
+AboutDialog::AboutDialog(TQWidget *tqparent, const char *name)
+ : TQLabel(tqparent, name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h
index 64d6c9ab..5837f355 100644
--- a/kommander/widgets/aboutdialog.h
+++ b/kommander/widgets/aboutdialog.h
@@ -24,11 +24,12 @@ class KAboutData;
 class AboutDialog : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_OBJECT
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
 public:
-    AboutDialog(TQWidget *parent = 0, const char *name = 0);
+    AboutDialog(TQWidget *tqparent = 0, const char *name = 0);
 
     ~AboutDialog();
 
diff --git a/kommander/widgets/buttongroup.cpp b/kommander/widgets/buttongroup.cpp
index 751c8e5c..6b0feef3 100644
--- a/kommander/widgets/buttongroup.cpp
+++ b/kommander/widgets/buttongroup.cpp
@@ -39,7 +39,7 @@ enum Functions {
 };
 
 ButtonGroup::ButtonGroup(TQWidget *a_parent, const char *a_name)
-	: TQButtonGroup(a_parent, a_name), KommanderWidget(this)
+	: TQButtonGroup(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "checked";
@@ -109,7 +109,7 @@ void ButtonGroup::contextMenuEvent( TQContextMenuEvent * e )
 
 bool ButtonGroup::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
+  return f == DCOP::text || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
 }
     
 
@@ -120,8 +120,8 @@ TQString ButtonGroup::handleDCOP(int function, const TQStringList& args)
     {
       TQString text;
       for (int i = 0; i < count(); i++)
-        if (dynamic_cast<KommanderWidget*>(find(i)))
-          text += (dynamic_cast<KommanderWidget*>(find(i)))->evalAssociatedText();
+        if (dynamic_cast<KommanderWidget*>(tqfind(i)))
+          text += (dynamic_cast<KommanderWidget*>(tqfind(i)))->evalAssociatedText();
       return text;
     }
     case DCOP::checked:
@@ -133,7 +133,7 @@ TQString ButtonGroup::handleDCOP(int function, const TQStringList& args)
     case BG_selectedId:
       return TQString::number(this->selectedId() );
       break;
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/buttongroup.h b/kommander/widgets/buttongroup.h
index 67252a5c..ff7d5edb 100644
--- a/kommander/widgets/buttongroup.h
+++ b/kommander/widgets/buttongroup.h
@@ -34,10 +34,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT ButtonGroup : public TQButtonGroup, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget DESIGNABLE false)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget DESIGNABLE false)
 public:
   ButtonGroup(TQWidget *a_parent, const char *a_name);
   ~ButtonGroup();
diff --git a/kommander/widgets/checkbox.cpp b/kommander/widgets/checkbox.cpp
index f7fe20be..696a9b2b 100644
--- a/kommander/widgets/checkbox.cpp
+++ b/kommander/widgets/checkbox.cpp
@@ -29,7 +29,7 @@
 #include "checkbox.h"
 
 CheckBox::CheckBox(TQWidget *a_parent, const char *a_name)
-  : TQCheckBox(a_parent, a_name), KommanderWidget(this)
+  : TQCheckBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "unchecked";
@@ -102,7 +102,7 @@ void CheckBox::showEvent(TQShowEvent* e)
 
 bool CheckBox::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
 }
 
 void CheckBox::contextMenuEvent( TQContextMenuEvent * e )
@@ -125,7 +125,7 @@ TQString CheckBox::handleDCOP(int function, const TQStringList& args)
     case DCOP::setChecked:
       setChecked(args[0] != "false" && args[0] != "0");
       break;
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/checkbox.h b/kommander/widgets/checkbox.h
index 4dde80de..acd2144f 100644
--- a/kommander/widgets/checkbox.h
+++ b/kommander/widgets/checkbox.h
@@ -34,10 +34,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT CheckBox : public TQCheckBox, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
   CheckBox(TQWidget *a_parent, const char *a_name);
   ~CheckBox();
diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp
index 9a9aa4f8..a8892d13 100644
--- a/kommander/widgets/closebutton.cpp
+++ b/kommander/widgets/closebutton.cpp
@@ -31,7 +31,7 @@
 #include "closebutton.h"
 
 CloseButton::CloseButton(TQWidget* a_parent, const char* a_name)
-  : KPushButton(a_parent, a_name), KommanderWidget(this)
+  : KPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -41,14 +41,14 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name)
 
   connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess()));
 
-  TQObject *parent = this;
-  while (parent->parent() != 0)
+  TQObject *tqparent = TQT_TQOBJECT(this);
+  while (tqparent->tqparent() != 0)
   {
-    parent = parent->parent();
-    if (parent->inherits(TQDIALOG_OBJECT_NAME_STRING))
+    tqparent = tqparent->tqparent();
+    if (tqparent->inherits(TQDIALOG_OBJECT_NAME_STRING))
       break;
   }
-  connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(reject()));
+  connect(this, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(reject()));
 }
 
 CloseButton::~CloseButton()
diff --git a/kommander/widgets/closebutton.h b/kommander/widgets/closebutton.h
index 42ff3627..c1971588 100644
--- a/kommander/widgets/closebutton.h
+++ b/kommander/widgets/closebutton.h
@@ -33,11 +33,12 @@ class TQShowEvent;
 class KOMMANDER_EXPORT CloseButton : public KPushButton, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
-  Q_PROPERTY(bool writeStdout READ writeStdout WRITE setWriteStdout)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(bool writeStdout READ writeStdout WRITE setWriteStdout)
 public:
   CloseButton(TQWidget* a_parent, const char* a_name);
   ~CloseButton();
diff --git a/kommander/widgets/combobox.cpp b/kommander/widgets/combobox.cpp
index cab29337..4efa3a2c 100644
--- a/kommander/widgets/combobox.cpp
+++ b/kommander/widgets/combobox.cpp
@@ -30,14 +30,14 @@
 #include "combobox.h"
 
 enum Functions {
-  FirstFunction = 353, //CHANGE THIS NUMBER TO AN UNIQUE ONE!!!
+  FirstFunction = 353, //CHANGE THIS NUMBER TO AN UNITQUE ONE!!!
   popupList,
   LastFunction
 };
 
 
 ComboBox::ComboBox(TQWidget *a_parent, const char *a_name)
-  : KComboBox(a_parent, a_name), KommanderWidget(this)
+  : KComboBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -121,7 +121,7 @@ bool ComboBox::isFunctionSupported(int f)
   return f == DCOP::text || f == DCOP::selection || f == DCOP::setSelection ||
       f == DCOP::currentItem || f == DCOP::setCurrentItem || f == DCOP::item || 
       f == DCOP::removeItem || f == DCOP::insertItem || f == DCOP::insertItems ||
-      f == DCOP::addUniqueItem || f == DCOP::clear || f == DCOP::count || f == DCOP::setEditable || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
+      f == DCOP::addUniqueItem || f == DCOP::clear || f == DCOP::count || f == DCOP::setEditable || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
 }
 
 TQString ComboBox::handleDCOP(int function, const TQStringList& args)
@@ -192,7 +192,7 @@ TQString ComboBox::handleDCOP(int function, const TQStringList& args)
     case popupList:
       TQComboBox::popup();
       break;
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/combobox.h b/kommander/widgets/combobox.h
index 5fb5306d..4ba5393b 100644
--- a/kommander/widgets/combobox.h
+++ b/kommander/widgets/combobox.h
@@ -34,10 +34,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT ComboBox : public KComboBox, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
   
 public:
   ComboBox(TQWidget *a_parent, const char *a_name);
diff --git a/kommander/widgets/datepicker.cpp b/kommander/widgets/datepicker.cpp
index 928e1b81..1e321ed5 100644
--- a/kommander/widgets/datepicker.cpp
+++ b/kommander/widgets/datepicker.cpp
@@ -27,7 +27,7 @@
 #include "datepicker.h"
 
 DatePicker::DatePicker(TQWidget *a_parent, const char *a_name)
-  : KDatePicker(a_parent, a_name), KommanderWidget(this)
+  : KDatePicker(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -101,7 +101,7 @@ void DatePicker::contextMenuEvent( TQContextMenuEvent * e )
 
 bool DatePicker::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || f == DCOP::hasFocus ;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::tqgeometry || f == DCOP::hasFocus ;
 }
 
 TQString DatePicker::handleDCOP(int function, const TQStringList& args)
@@ -112,7 +112,7 @@ TQString DatePicker::handleDCOP(int function, const TQStringList& args)
     case DCOP::setText:
       setDate(TQDate::fromString(args[0], Qt::ISODate));
       break;    
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/datepicker.h b/kommander/widgets/datepicker.h
index 61644f92..ebf3a7da 100644
--- a/kommander/widgets/datepicker.h
+++ b/kommander/widgets/datepicker.h
@@ -34,10 +34,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT DatePicker : public KDatePicker, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
   
 public:
   DatePicker(TQWidget *a_parent, const char *a_name);
diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp
index fd3b0b27..15dd7e30 100644
--- a/kommander/widgets/dialog.cpp
+++ b/kommander/widgets/dialog.cpp
@@ -34,14 +34,14 @@
 
 enum Functions {
   FirstFunction = 185,
-  D_focusWidget,
+  D_tqfocusWidget,
   D_waitCursor,
   D_restoreCursor,
   LastFunction
 };
 
 Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags)
-  : TQDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(this)
+  : TQDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -53,7 +53,7 @@ Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags
   m_shebang = "#!/usr/bin/kmdr-executor";
   m_firstShow = true;
   KommanderPlugin::setDefaultGroup(Group::DCOP);
-  KommanderPlugin::registerFunction(D_focusWidget, "focusWidget(TQString widget)",  i18n("The name of the widget having focus"), 1);
+  KommanderPlugin::registerFunction(D_tqfocusWidget, "tqfocusWidget(TQString widget)",  i18n("The name of the widget having focus"), 1);
   KommanderPlugin::registerFunction(D_waitCursor, "waitCursor(TQString widget)",  i18n("Set a wait cursor. CAUTION: if set more than once an equal number of calls to restore must be made to clear it."), 1);
   KommanderPlugin::registerFunction(D_restoreCursor, "restoreCursor(TQString widget)",  i18n("Restore normal curser. NOTE: must be called as many times as wait was."), 1);
 }
@@ -148,7 +148,7 @@ void Dialog::show()
 {
 //if the dialog is embedded in a KPart, the show can be called many times.
 //to avoid re-init and sending signals we don't want, in that case call only the
-//QWidget's show method to show the widgets, but don't do any TQDialog specific 
+//TQWidget's show method to show the widgets, but don't do any TQDialog specific 
 //task
   if (!m_firstShow) 
   {
@@ -193,7 +193,7 @@ void Dialog::contextMenuEvent( TQContextMenuEvent * e )
 
 bool Dialog::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || (f > FirstFunction && f < LastFunction);
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::tqgeometry || (f > FirstFunction && f < LastFunction);
 }
 
 TQString Dialog::handleDCOP(int function, const TQStringList& args)
@@ -204,14 +204,14 @@ TQString Dialog::handleDCOP(int function, const TQStringList& args)
     case DCOP::setText:
       setWidgetText(args[0]);
       break;
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
       return TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       break;
-    case D_focusWidget:
-      return focusWidget()->name();
+    case D_tqfocusWidget:
+      return tqfocusWidget()->name();
       break;
     case D_waitCursor:
-      TQApplication::setOverrideCursor(TQCursor(Qt::WaitCursor));
+      TQApplication::setOverrideCursor(TQCursor(TQt::WaitCursor));
       break;
     case D_restoreCursor:
       TQApplication::restoreOverrideCursor();
diff --git a/kommander/widgets/dialog.h b/kommander/widgets/dialog.h
index 90fa11c1..1c8cf5d6 100644
--- a/kommander/widgets/dialog.h
+++ b/kommander/widgets/dialog.h
@@ -29,14 +29,15 @@ class TQShowEvent;
 class KOMMANDER_EXPORT Dialog : public TQDialog, public KommanderWindow
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
-  Q_PROPERTY(bool useInternalParser READ useInternalParser WRITE setUseInternalParser)
-  Q_PROPERTY(bool useShebang READ useShebang WRITE setUseShebang DESIGNABLE true)
-  Q_PROPERTY(TQString shebang READ Shebang WRITE setShebang DESIGNABLE true)
-  Q_OVERRIDE(bool modal DESIGNABLE false)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(bool useInternalParser READ useInternalParser WRITE setUseInternalParser)
+  TQ_PROPERTY(bool useShebang READ useShebang WRITE setUseShebang DESIGNABLE true)
+  TQ_PROPERTY(TQString shebang READ Shebang WRITE setShebang DESIGNABLE true)
+  TQ_OVERRIDE(bool modal DESIGNABLE false)
   
 public:
   Dialog(TQWidget *, const char *, bool = true, int=0);
diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp
index eccfe306..be8f109d 100644
--- a/kommander/widgets/execbutton.cpp
+++ b/kommander/widgets/execbutton.cpp
@@ -40,7 +40,7 @@
 using namespace std;
 
 enum Functions {
-  FirstFunction = 260, //CHANGE THIS NUMBER TO AN UNIQUE ONE!!!
+  FirstFunction = 260, //CHANGE THIS NUMBER TO AN UNITQUE ONE!!!
   EB_isOn,
   EB_setPopup,
   EB_setButtonText,
@@ -48,7 +48,7 @@ enum Functions {
 };
 
 ExecButton::ExecButton(TQWidget* a_parent, const char* a_name)
-  : KPushButton(a_parent, a_name), KommanderWidget(this)
+  : KPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -113,11 +113,11 @@ void ExecButton::setWidgetText(const TQString& a_text)
 void ExecButton::startProcess()
 {
   TQString at = evalAssociatedText().stripWhiteSpace();
-  bool enabledStatus = isEnabled();
+  bool enabledtqStatus = isEnabled();
   if (m_blockGUI != None)
     setEnabled(false);
   if (m_blockGUI == GUI)
-    KApplication::setOverrideCursor(TQCursor(Qt::WaitCursor));
+    KApplication::setOverrideCursor(TQCursor(TQt::WaitCursor));
   MyProcess* process = new MyProcess(this);
   process->setBlocking(m_blockGUI == GUI);
   connect(process, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*)));
@@ -128,7 +128,7 @@ void ExecButton::startProcess()
     if (writeStdout())
       cout << m_output << flush;
   }
-  setEnabled(enabledStatus);
+  setEnabled(enabledtqStatus);
 }
 
 
@@ -180,7 +180,7 @@ void ExecButton::contextMenuEvent( TQContextMenuEvent * e )
 
 bool ExecButton::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::execute || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::execute || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
 }
 
 TQString ExecButton::handleDCOP(int function, const TQStringList& args)
@@ -202,7 +202,7 @@ TQString ExecButton::handleDCOP(int function, const TQStringList& args)
       break;
     case EB_setPopup:
     {
-      TQWidgetList  *list = TQApplication::allWidgets();
+      TQWidgetList  *list = TQApplication::tqallWidgets();
       TQWidgetListIt it( *list );
       TQWidget * w;
       while ( (w=it.current()) != 0 ) {  // for each widget...
@@ -215,7 +215,7 @@ TQString ExecButton::handleDCOP(int function, const TQStringList& args)
       }
       break;
     }
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/execbutton.h b/kommander/widgets/execbutton.h
index b646e5e7..6e8c478f 100644
--- a/kommander/widgets/execbutton.h
+++ b/kommander/widgets/execbutton.h
@@ -36,13 +36,14 @@ class TQShowEvent;
 class KOMMANDER_EXPORT ExecButton : public KPushButton, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   Q_ENUMS(Blocking)
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
-  Q_PROPERTY(bool writeStdout READ writeStdout WRITE setWriteStdout)
-  Q_PROPERTY(Blocking blockGUI READ blockGUI WRITE setBlockGUI)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(bool writeStdout READ writeStdout WRITE setWriteStdout)
+  TQ_PROPERTY(Blocking blockGUI READ blockGUI WRITE setBlockGUI)
 
 public:
   ExecButton(TQWidget *a_parent, const char *a_name);
diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp
index a7c29673..f6806e5b 100644
--- a/kommander/widgets/fileselector.cpp
+++ b/kommander/widgets/fileselector.cpp
@@ -35,7 +35,7 @@
 #include "fileselector.h"
 
 FileSelector::FileSelector(TQWidget * a_parent, const char *a_name)
-   : TQWidget(a_parent, a_name), KommanderWidget(this)
+   : TQWidget(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -50,9 +50,9 @@ FileSelector::FileSelector(TQWidget * a_parent, const char *a_name)
   m_boxLayout->addWidget(m_lineEdit);
   m_boxLayout->addWidget(m_selectButton);
 
-  setSizePolicy(m_lineEdit->sizePolicy());
-  m_lineEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
-  m_selectButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+  tqsetSizePolicy(m_lineEdit->sizePolicy());
+  m_lineEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+  m_selectButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 
   connect(m_selectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(makeSelection()));
 
@@ -222,13 +222,13 @@ TQString FileSelector::handleDCOP(int function, const TQStringList& args)
       return m_lineEdit->selectedText();
     case DCOP::setSelection:
     { 
-      int f = m_lineEdit->text().find(args[0]);
+      int f = m_lineEdit->text().tqfind(args[0]);
       if (f != -1)
         m_lineEdit->setSelection(f, args[0].length());
       break;
     }
     case DCOP::clear:
-      setWidgetText(TQString::null);
+      setWidgetText(TQString());
       break;
     default:
       return KommanderWidget::handleDCOP(function, args);
diff --git a/kommander/widgets/fileselector.h b/kommander/widgets/fileselector.h
index 44758131..fd254fd6 100644
--- a/kommander/widgets/fileselector.h
+++ b/kommander/widgets/fileselector.h
@@ -36,17 +36,18 @@ class TQShowEvent;
 class KOMMANDER_EXPORT FileSelector : public TQWidget, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
-  Q_PROPERTY(bool showEditor READ showEditor WRITE setShowEditor)
-  Q_PROPERTY(TQString buttonCaption READ caption WRITE setCaption)
-  Q_PROPERTY(TQString selectionFilter READ selectionFilter WRITE setSelectionFilter)
-  Q_PROPERTY(TQString selectionCaption READ selectionCaption WRITE setSelectionCaption)
-  Q_PROPERTY(SelectionType selectionType READ selectionType WRITE setSelectionType)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(bool showEditor READ showEditor WRITE setShowEditor)
+  TQ_PROPERTY(TQString buttonCaption READ caption WRITE setCaption)
+  TQ_PROPERTY(TQString selectionFilter READ selectionFilter WRITE setSelectionFilter)
+  TQ_PROPERTY(TQString selectionCaption READ selectionCaption WRITE setSelectionCaption)
+  TQ_PROPERTY(SelectionType selectionType READ selectionType WRITE setSelectionType)
   Q_ENUMS(SelectionType)
-  Q_PROPERTY(bool selectionOpenMultiple READ selectionOpenMultiple WRITE setSelectionOpenMultiple)
+  TQ_PROPERTY(bool selectionOpenMultiple READ selectionOpenMultiple WRITE setSelectionOpenMultiple)
   
 public:
   FileSelector(TQWidget *a_parent, const char *a_name);
diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp
index 5fc17edc..3efde0f4 100644
--- a/kommander/widgets/fontdialog.cpp
+++ b/kommander/widgets/fontdialog.cpp
@@ -28,8 +28,8 @@ enum Functions {
   LastFunction
 };
 
-FontDialog::FontDialog(TQWidget *parent, const char *name)
- : TQLabel(parent, name), KommanderWidget(this)
+FontDialog::FontDialog(TQWidget *tqparent, const char *name)
+ : TQLabel(tqparent, name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/fontdialog.h b/kommander/widgets/fontdialog.h
index f7ccdf0f..46c828e2 100644
--- a/kommander/widgets/fontdialog.h
+++ b/kommander/widgets/fontdialog.h
@@ -23,11 +23,12 @@
 class FontDialog : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_OBJECT
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
-    FontDialog(TQWidget *parent = 0, const char *name = 0);
+    FontDialog(TQWidget *tqparent = 0, const char *name = 0);
 
     ~FontDialog();
 
@@ -44,6 +45,7 @@ public slots:
   virtual void setWidgetText(const TQString &);
   virtual void populate();
 
+public:
   TQFont m_font;
 };
 
diff --git a/kommander/widgets/groupbox.cpp b/kommander/widgets/groupbox.cpp
index 7ca1c199..aef8042d 100644
--- a/kommander/widgets/groupbox.cpp
+++ b/kommander/widgets/groupbox.cpp
@@ -32,7 +32,7 @@
 
 
 GroupBox::GroupBox(TQWidget *a_parent, const char *a_name)
-  : TQGroupBox(a_parent, a_name), KommanderWidget(this)
+  : TQGroupBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -84,13 +84,13 @@ void GroupBox::populate()
 void GroupBox::insertChild(TQObject *a_child)
 {
   m_childList.append(a_child);
-  TQObject::insertChild(a_child);
+  TQT_TQOBJECT(this)->TQObject::insertChild(a_child);
 }
  
 void GroupBox::removeChild(TQObject *a_child)
 {
   m_childList.remove(a_child);
-  TQObject::removeChild(a_child);
+  TQT_TQOBJECT(this)->TQObject::removeChild(a_child);
 }
 
 void GroupBox::showEvent( TQShowEvent *e )
@@ -108,7 +108,7 @@ void GroupBox::contextMenuEvent( TQContextMenuEvent * e )
 
 bool GroupBox::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
 // || (f >= FirstFunction && f <= LastFunction);
 }
 
@@ -126,7 +126,7 @@ TQString GroupBox::handleDCOP(int function, const TQStringList& args)
     case DCOP::setText:
       setTitle(args[0]);
       break;
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/groupbox.h b/kommander/widgets/groupbox.h
index b624cd15..ebfd9a74 100644
--- a/kommander/widgets/groupbox.h
+++ b/kommander/widgets/groupbox.h
@@ -34,10 +34,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT GroupBox : public TQGroupBox, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
   GroupBox(TQWidget *a_parent, const char *a_name);
   ~GroupBox();
diff --git a/kommander/widgets/konsole.cpp b/kommander/widgets/konsole.cpp
index c27cb8fe..728d9b1f 100644
--- a/kommander/widgets/konsole.cpp
+++ b/kommander/widgets/konsole.cpp
@@ -26,7 +26,7 @@
 #include <myprocess.h>
 
 Konsole::Konsole(TQWidget* a_parent, const char* a_name)
-  : KTextEdit(a_parent, a_name), KommanderWidget(this), mSeenEOL(false), mProcess(false)
+  : KTextEdit(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)), mSeenEOL(false), mProcess(false)
 {
   TQStringList states;
   states << "default";
@@ -89,7 +89,7 @@ void Konsole::execute()
   mProcess->setBlocking(false);
   connect(mProcess, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*)));
   connect(mProcess, TQT_SIGNAL(processReceivedStdout(MyProcess*, char*, int)), TQT_SLOT(processReceivedStdout(MyProcess*, char*, int)));
-  setCursor(TQCursor(Qt::WaitCursor));
+  setCursor(TQCursor(TQt::WaitCursor));
   mProcess->run(at);
 }
 
diff --git a/kommander/widgets/konsole.h b/kommander/widgets/konsole.h
index 894060f9..efd34042 100644
--- a/kommander/widgets/konsole.h
+++ b/kommander/widgets/konsole.h
@@ -32,11 +32,12 @@ class MyProcess;
 class KOMMANDER_EXPORT Konsole : public KTextEdit, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_OVERRIDE(bool readOnly DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_OVERRIDE(bool readOnly DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 
   public:
     Konsole(TQWidget *a_parent, const char *a_name);
diff --git a/kommander/widgets/label.cpp b/kommander/widgets/label.cpp
index ee422325..ce56b3c4 100644
--- a/kommander/widgets/label.cpp
+++ b/kommander/widgets/label.cpp
@@ -26,7 +26,7 @@
 #include "label.h"
 
 Label::Label(TQWidget *a_parent, const char *a_name)
-  : TQLabel(a_parent, a_name), KommanderWidget(this)
+  : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -88,7 +88,7 @@ void Label::showEvent(TQShowEvent *e)
 
 bool Label::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
 }
 
 TQString Label::handleDCOP(int function, const TQStringList& args)
@@ -102,7 +102,7 @@ TQString Label::handleDCOP(int function, const TQStringList& args)
     case DCOP::clear:
       setWidgetText("");
       break;
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/label.h b/kommander/widgets/label.h
index 70b8b248..31a25198 100644
--- a/kommander/widgets/label.h
+++ b/kommander/widgets/label.h
@@ -33,10 +33,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT Label : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
   Label(TQWidget *a_parent, const char *a_name);
   ~Label();
diff --git a/kommander/widgets/lineedit.cpp b/kommander/widgets/lineedit.cpp
index 08913b4e..2f4f9de6 100644
--- a/kommander/widgets/lineedit.cpp
+++ b/kommander/widgets/lineedit.cpp
@@ -31,7 +31,7 @@ enum functions {
 };
 
 LineEdit::LineEdit(TQWidget *a_parent, const char *a_name)
-	: KLineEdit(a_parent, a_name), KommanderWidget((TQObject *)this)
+	: KLineEdit(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -124,7 +124,7 @@ void LineEdit::contextMenuEvent( TQContextMenuEvent * e )
 bool LineEdit::isFunctionSupported(int f)
 {
   return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::setSelection ||
-    f == DCOP::clear || f == DCOP::setEditable || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction) ;
+    f == DCOP::clear || f == DCOP::setEditable || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction) ;
 }
 
 TQString LineEdit::handleDCOP(int function, const TQStringList& args)
@@ -146,7 +146,7 @@ TQString LineEdit::handleDCOP(int function, const TQStringList& args)
     case DCOP::setEditable:
       setReadOnly(args[0] == "false" || args[0] == "0");
       break;
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/lineedit.h b/kommander/widgets/lineedit.h
index d0ee32f5..654ff4dc 100644
--- a/kommander/widgets/lineedit.h
+++ b/kommander/widgets/lineedit.h
@@ -34,10 +34,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT LineEdit : public KLineEdit, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
   LineEdit(TQWidget *, const char *);
   virtual ~LineEdit();
diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp
index 3dd36357..1135a540 100644
--- a/kommander/widgets/listbox.cpp
+++ b/kommander/widgets/listbox.cpp
@@ -30,7 +30,7 @@
 #include "listbox.h"
 
 ListBox::ListBox(TQWidget *a_parent, const char *a_name)
-  : KListBox(a_parent, a_name), KommanderWidget(this)
+  : KListBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -96,7 +96,7 @@ bool ListBox::isFunctionSupported(int f)
   return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::setSelection ||
     f == DCOP::insertItems || f == DCOP::insertItem || f == DCOP::removeItem || f == DCOP::clear ||
     f == DCOP::currentItem || f == DCOP::setCurrentItem || f == DCOP::item || f == DCOP::addUniqueItem ||
-      f == DCOP::findItem || f == DCOP::setPixmap || f == DCOP::count || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+      f == DCOP::findItem || f == DCOP::setPixmap || f == DCOP::count || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
 }
 
 void ListBox::contextMenuEvent( TQContextMenuEvent * e )
@@ -125,7 +125,7 @@ TQString ListBox::handleDCOP(int function, const TQStringList& args)
     }
     case DCOP::setSelection:
     {
-      TQListBoxItem* found = findItem(args[0], Qt::ExactMatch);
+      TQListBoxItem* found = tqfindItem(args[0], TQt::ExactMatch);
       if (found)
         setCurrentItem(index(found));
       break;
@@ -162,14 +162,14 @@ TQString ListBox::handleDCOP(int function, const TQStringList& args)
         return TQString();
     }
     case DCOP::addUniqueItem:
-      if (!findItem(args[0], Qt::ExactMatch))
+      if (!tqfindItem(args[0], TQt::ExactMatch))
         insertItem(args[0]);
       break;
     case DCOP::findItem:
     {
-      TQListBoxItem* found = findItem(args[0], Qt::ExactMatch);
-      if (!found) found = findItem(args[0], Qt::BeginsWith);
-      if (!found) found = findItem(args[0], Qt::Contains);
+      TQListBoxItem* found = tqfindItem(args[0], TQt::ExactMatch);
+      if (!found) found = tqfindItem(args[0], TQt::BeginsWith);
+      if (!found) found = tqfindItem(args[0], TQt::Contains);
       if (found)
         return TQString::number(index(found));
       else return TQString::number(-1);
@@ -197,7 +197,7 @@ TQString ListBox::handleDCOP(int function, const TQStringList& args)
         strings += item(i)->text();
       return strings.join("\n");
     }
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/listbox.h b/kommander/widgets/listbox.h
index dd59bc3b..84fff290 100644
--- a/kommander/widgets/listbox.h
+++ b/kommander/widgets/listbox.h
@@ -34,10 +34,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT ListBox : public KListBox, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
   ListBox(TQWidget *a_parent, const char *a_name);
   ~ListBox();
diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp
index 78077c5c..e8b013db 100644
--- a/kommander/widgets/pixmaplabel.cpp
+++ b/kommander/widgets/pixmaplabel.cpp
@@ -31,7 +31,7 @@
 #include "pixmaplabel.h"
 
 PixmapLabel::PixmapLabel(TQWidget *a_parent, const char *a_name)
-  : TQLabel(a_parent, a_name), KommanderWidget(this)
+  : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -103,7 +103,7 @@ void PixmapLabel::contextMenuEvent( TQContextMenuEvent * e )
 
 bool PixmapLabel::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::geometry;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::tqgeometry;
 }
 
 TQString PixmapLabel::handleDCOP(int function, const TQStringList& args)
@@ -117,7 +117,7 @@ TQString PixmapLabel::handleDCOP(int function, const TQStringList& args)
       break;
     case DCOP::text:
       return text();
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/pixmaplabel.h b/kommander/widgets/pixmaplabel.h
index dbc3e113..72f66077 100644
--- a/kommander/widgets/pixmaplabel.h
+++ b/kommander/widgets/pixmaplabel.h
@@ -34,9 +34,10 @@ class TQShowEvent;
 class KOMMANDER_EXPORT PixmapLabel : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_OBJECT
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
   PixmapLabel(TQWidget *a_parent, const char *a_name);
   ~PixmapLabel();
diff --git a/kommander/widgets/plugin.cpp b/kommander/widgets/plugin.cpp
index 020ae6da..009da398 100644
--- a/kommander/widgets/plugin.cpp
+++ b/kommander/widgets/plugin.cpp
@@ -57,7 +57,7 @@ class KomStdPlugin : public KommanderPlugin
 {
 public:
     KomStdPlugin();
-    virtual TQWidget *create( const TQString &key, TQWidget *parent = 0, const char *name = 0 );
+    virtual TQWidget *create( const TQString &key, TQWidget *tqparent = 0, const char *name = 0 );
 };
 
 KomStdPlugin::KomStdPlugin()
@@ -97,41 +97,41 @@ KomStdPlugin::KomStdPlugin()
   addWidget("AboutDialog", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium)));
 }
 
-TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *parent, const char *name )
+TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *tqparent, const char *name )
 {
-  if (key == "ButtonGroup") return new ButtonGroup(parent, name);
-  else if (key == "CheckBox") return new CheckBox(parent, name);
-  else if (key == "CloseButton") return new CloseButton(parent, name);
-  else if (key == "ComboBox") return new ComboBox(parent, name);
-  else if (key == "Dialog") return new Dialog(parent, name);
-  else if (key == "ExecButton") return new ExecButton(parent, name);
-  else if (key == "FileSelector") return new FileSelector(parent, name);
-  else if (key == "GroupBox") return new GroupBox(parent, name);
-  else if (key == "Konsole") return new Konsole(parent, name);
-  else if (key == "Label") return new Label(parent, name);
-  else if (key == "LineEdit") return new LineEdit(parent, name);
-  else if (key == "ListBox") return new ListBox(parent, name);
-  else if (key == "PixmapLabel") return new PixmapLabel(parent, name);
-  else if (key == "ProgressBar") return new ProgressBar(parent, name);
-  else if (key == "RadioButton") return new RadioButton(parent, name);
-  else if (key == "RichTextEditor") return new RichTextEditor(parent, name);
-  else if (key == "ScriptObject") return new ScriptObject(parent, name);
-  else if (key == "Slider") return new Slider(parent, name);
-  else if (key == "SpinBoxInt") return new SpinBoxInt(parent, name);
-  else if (key == "StatusBar") return new StatusBar(parent, name);
-  else if (key == "SubDialog") return new SubDialog(parent, name);
-  else if (key == "Table") return new Table(parent, name);
-  else if (key == "TabWidget") return new TabWidget(parent, name);
-  else if (key == "ToolBox") return new ToolBox(parent, name);
-  else if (key == "TextBrowser") return new TextBrowser(parent, name);
-  else if (key == "TextEdit") return new TextEdit(parent, name);
-  else if (key == "Timer") return new Timer(parent, name);
-  else if (key == "TreeWidget") return new TreeWidget(parent, name);
-  else if (key == "Wizard") return new Wizard(parent, name);
-  else if (key == "DatePicker") return new DatePicker(parent, name);
-  else if (key == "PopupMenu") return new PopupMenu(parent, name);
-  else if (key == "FontDialog") return new FontDialog(parent, name);
-  else if (key == "AboutDialog") return new AboutDialog(parent, name);
+  if (key == "ButtonGroup") return new ButtonGroup(tqparent, name);
+  else if (key == "CheckBox") return new CheckBox(tqparent, name);
+  else if (key == "CloseButton") return new CloseButton(tqparent, name);
+  else if (key == "ComboBox") return new ComboBox(tqparent, name);
+  else if (key == "Dialog") return new Dialog(tqparent, name);
+  else if (key == "ExecButton") return new ExecButton(tqparent, name);
+  else if (key == "FileSelector") return new FileSelector(tqparent, name);
+  else if (key == "GroupBox") return new GroupBox(tqparent, name);
+  else if (key == "Konsole") return new Konsole(tqparent, name);
+  else if (key == "Label") return new Label(tqparent, name);
+  else if (key == "LineEdit") return new LineEdit(tqparent, name);
+  else if (key == "ListBox") return new ListBox(tqparent, name);
+  else if (key == "PixmapLabel") return new PixmapLabel(tqparent, name);
+  else if (key == "ProgressBar") return new ProgressBar(tqparent, name);
+  else if (key == "RadioButton") return new RadioButton(tqparent, name);
+  else if (key == "RichTextEditor") return new RichTextEditor(tqparent, name);
+  else if (key == "ScriptObject") return new ScriptObject(tqparent, name);
+  else if (key == "Slider") return new Slider(tqparent, name);
+  else if (key == "SpinBoxInt") return new SpinBoxInt(tqparent, name);
+  else if (key == "StatusBar") return new StatusBar(tqparent, name);
+  else if (key == "SubDialog") return new SubDialog(tqparent, name);
+  else if (key == "Table") return new Table(tqparent, name);
+  else if (key == "TabWidget") return new TabWidget(tqparent, name);
+  else if (key == "ToolBox") return new ToolBox(tqparent, name);
+  else if (key == "TextBrowser") return new TextBrowser(tqparent, name);
+  else if (key == "TextEdit") return new TextEdit(tqparent, name);
+  else if (key == "Timer") return new Timer(tqparent, name);
+  else if (key == "TreeWidget") return new TreeWidget(tqparent, name);
+  else if (key == "Wizard") return new Wizard(tqparent, name);
+  else if (key == "DatePicker") return new DatePicker(tqparent, name);
+  else if (key == "PopupMenu") return new PopupMenu(tqparent, name);
+  else if (key == "FontDialog") return new FontDialog(tqparent, name);
+  else if (key == "AboutDialog") return new AboutDialog(tqparent, name);
   else return 0;
 }
 
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index 48bb4474..e00ee485 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -32,8 +32,8 @@
 #define INSERTSUBMENU 109
 #define LAST_FUNCTION INSERTSUBMENU 
 
-PopupMenu::PopupMenu(TQWidget *parent, const char *name)
- : TQLabel(parent, name), KommanderWidget(this)
+PopupMenu::PopupMenu(TQWidget *tqparent, const char *name)
+ : TQLabel(tqparent, name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -114,7 +114,7 @@ void PopupMenu::popup(int x, int y)
 void PopupMenu::slotMenuItemActivated(int id)
 {
   TQString widget = m_associations[id];
-  KommanderWidget::evalAssociatedText(TQString("#!kommander\n%1.execute(%2)").arg(widget).arg(id)); 
+  KommanderWidget::evalAssociatedText(TQString("#!kommander\n%1.execute(%2)").tqarg(widget).tqarg(id)); 
 }
 
 void PopupMenu::populate()
@@ -138,7 +138,7 @@ TQString PopupMenu::insertSubmenu(const TQString& title, const TQString &menuWid
 
 bool PopupMenu::isFunctionSupported(int f)
 {
-  return f == DCOP::clear || f == DCOP::execute || f == DCOP::item || (f >= INSERTMENUITEM && f <= LAST_FUNCTION) || f == DCOP::count || f == DCOP::geometry;
+  return f == DCOP::clear || f == DCOP::execute || f == DCOP::item || (f >= INSERTMENUITEM && f <= LAST_FUNCTION) || f == DCOP::count || f == DCOP::tqgeometry;
 }
 
 TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
@@ -223,13 +223,13 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
     case DCOP::item:
     {
       uint index = args[0].toInt();
-      return index < m_params.count() ? m_params[index] : TQString::null;
+      return index < m_params.count() ? m_params[index] : TQString();
       break;
     }
     case DCOP::count:
       return TQString::number(m_menu->count());
       break;
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h
index dff28a86..9a0dc925 100644
--- a/kommander/widgets/popupmenu.h
+++ b/kommander/widgets/popupmenu.h
@@ -25,11 +25,12 @@ class KPopupMenu;
 class PopupMenu : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_OBJECT
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
-  PopupMenu(TQWidget *parent = 0, const char *name = 0);
+  PopupMenu(TQWidget *tqparent = 0, const char *name = 0);
   ~PopupMenu();
 
   virtual bool isKommanderWidget() const;
diff --git a/kommander/widgets/progressbar.cpp b/kommander/widgets/progressbar.cpp
index 30d4f329..b010af91 100644
--- a/kommander/widgets/progressbar.cpp
+++ b/kommander/widgets/progressbar.cpp
@@ -36,7 +36,7 @@ enum Functions {
 };
 
 ProgressBar::ProgressBar(TQWidget *a_parent, const char *a_name)
-  : KProgress(a_parent, a_name), KommanderWidget(this)
+  : KProgress(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -94,7 +94,7 @@ void ProgressBar::showEvent(TQShowEvent *e)
 
 bool ProgressBar::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::setMaximum || f == DCOP::geometry || (f > FirstFunction && f < LastFunction);
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::setMaximum || f == DCOP::tqgeometry || (f > FirstFunction && f < LastFunction);
 }
 
 TQString ProgressBar::handleDCOP(int function, const TQStringList& args)
@@ -111,7 +111,7 @@ TQString ProgressBar::handleDCOP(int function, const TQStringList& args)
     case DCOP::setMaximum:
       setTotalSteps(args[0].toUInt());
       break;
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
@@ -123,7 +123,7 @@ TQString ProgressBar::handleDCOP(int function, const TQStringList& args)
       color.setNamedColor(args[0]);
       TQPalette p = this->palette();
       p.setColor(TQPalette::Active, TQColorGroup::Highlight, color);
-      this->setPalette( p, TRUE );
+      this->tqsetPalette( p, TRUE );
       break;
     }
     case PB_setHightlightTextColor:
@@ -132,7 +132,7 @@ TQString ProgressBar::handleDCOP(int function, const TQStringList& args)
       color.setNamedColor(args[0]);
       TQPalette p = this->palette();
       p.setColor(TQPalette::Active, TQColorGroup::HighlightedText, color);
-      this->setPalette( p, TRUE );
+      this->tqsetPalette( p, TRUE );
       break;
     }
     default:
diff --git a/kommander/widgets/progressbar.h b/kommander/widgets/progressbar.h
index ca5daf8c..182a2faa 100644
--- a/kommander/widgets/progressbar.h
+++ b/kommander/widgets/progressbar.h
@@ -33,10 +33,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT ProgressBar: public KProgress, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
   
 public:
   ProgressBar(TQWidget *a_parent, const char *a_name);
diff --git a/kommander/widgets/radiobutton.cpp b/kommander/widgets/radiobutton.cpp
index ba46248d..317263e4 100644
--- a/kommander/widgets/radiobutton.cpp
+++ b/kommander/widgets/radiobutton.cpp
@@ -28,7 +28,7 @@
 #include "radiobutton.h"
 
 RadioButton::RadioButton(TQWidget *a_parent, const char *a_name)
-  : TQRadioButton(a_parent, a_name), KommanderWidget(this)
+  : TQRadioButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "unchecked";
@@ -101,7 +101,7 @@ void RadioButton::contextMenuEvent( TQContextMenuEvent * e )
 
 bool RadioButton::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::setChecked || f == DCOP::checked || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::setChecked || f == DCOP::checked || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
 }
 
 TQString RadioButton::handleDCOP(int function, const TQStringList& args)
@@ -117,7 +117,7 @@ TQString RadioButton::handleDCOP(int function, const TQStringList& args)
       break;
     case DCOP::checked:
       return TQString::number(isOn());
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/radiobutton.h b/kommander/widgets/radiobutton.h
index e93a96af..328cb853 100644
--- a/kommander/widgets/radiobutton.h
+++ b/kommander/widgets/radiobutton.h
@@ -33,10 +33,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT RadioButton : public TQRadioButton, public KommanderWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
-	Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-	Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-	Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+	TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+	TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+	TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
   RadioButton(TQWidget *a_parent, const char *a_name);
   ~RadioButton();
diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp
index 9e54f07c..e5de817b 100644
--- a/kommander/widgets/richtexteditor.cpp
+++ b/kommander/widgets/richtexteditor.cpp
@@ -43,7 +43,7 @@
 #include "pixmaps/textright.xpm"
 
 RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name)
-	: TQWidget(a_parent, a_name), KommanderWidget((TQObject *)this)
+	: TQWidget(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
 
 	TQStringList states;
@@ -61,11 +61,11 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name)
 	m_textedit = new TQTextEdit(this, "editor");
 	m_textedit->setTextFormat(RichText);
 
-	// layout the widgets
-	TQVBoxLayout *layout = new TQVBoxLayout(this);
-	layout->addWidget(m_toolbar);
-	layout->addWidget(m_textedit);
-	layout->setSpacing(1);
+	// tqlayout the widgets
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	tqlayout->addWidget(m_toolbar);
+	tqlayout->addWidget(m_textedit);
+	tqlayout->setSpacing(1);
 
 	// setup buttons
 	TQHBoxLayout *tbLayout = new TQHBoxLayout(m_toolbar);
@@ -106,7 +106,7 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name)
 
 	connect(m_alignGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(textAlign(int)));
 	connect(m_textedit, TQT_SIGNAL(currentFontChanged(const TQFont &)), this, TQT_SLOT(fontChanged(const TQFont &)));
-	connect(m_textedit, TQT_SIGNAL(currentAlignmentChanged(int)), this, TQT_SLOT(alignmentChanged(int)));
+	connect(m_textedit, TQT_SIGNAL(currentAlignmentChanged(int)), this, TQT_SLOT(tqalignmentChanged(int)));
 	
 	connect(m_textedit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged()));
 
@@ -180,13 +180,13 @@ void RichTextEditor::textItalic(bool a_isOn)
 
 void RichTextEditor::textAlign(int a_id)
 {
-  TQToolButton *b = (TQToolButton *)m_alignGroup->find(a_id);
+  TQToolButton *b = (TQToolButton *)m_alignGroup->tqfind(a_id);
   if(b == m_buttonTextLeft)
-    m_textedit->setAlignment(Qt::AlignLeft);
+    m_textedit->tqsetAlignment(TQt::AlignLeft);
   else if(b == m_buttonTextCenter)
-    m_textedit->setAlignment(Qt::AlignCenter);
+    m_textedit->tqsetAlignment(TQt::AlignCenter);
   else if(b == m_buttonTextRight)
-    m_textedit->setAlignment(Qt::AlignRight);
+    m_textedit->tqsetAlignment(TQt::AlignRight);
 }
 
 void RichTextEditor::fontChanged(const TQFont &a_font)
@@ -196,13 +196,13 @@ void RichTextEditor::fontChanged(const TQFont &a_font)
   m_buttonTextUnder->setOn(a_font.underline());
 }
 
-void RichTextEditor::alignmentChanged(int a_alignment)
+void RichTextEditor::tqalignmentChanged(int a_tqalignment)
 {
-  if((a_alignment == AlignAuto) || (a_alignment & AlignLeft)) 
+  if((a_tqalignment == AlignAuto) || (a_tqalignment & AlignLeft)) 
     m_buttonTextLeft->setOn(true);
-  else if(a_alignment & AlignHCenter) 
+  else if(a_tqalignment & AlignHCenter) 
     m_buttonTextCenter->setOn(true);
-  else if(a_alignment & AlignRight) 
+  else if(a_tqalignment & AlignRight) 
     m_buttonTextRight->setOn(true);
 }
 
diff --git a/kommander/widgets/richtexteditor.h b/kommander/widgets/richtexteditor.h
index 17faf6b5..31347e96 100644
--- a/kommander/widgets/richtexteditor.h
+++ b/kommander/widgets/richtexteditor.h
@@ -37,10 +37,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT RichTextEditor : public TQWidget, public KommanderWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
-	Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-	Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-	Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+	TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+	TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+	TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
   RichTextEditor(TQWidget *, const char *);
   virtual ~RichTextEditor();
@@ -62,7 +63,7 @@ public slots:
   void textUnder(bool);
   void textItalic(bool);
   void fontChanged(const TQFont &);
-  void alignmentChanged(int);
+  void tqalignmentChanged(int);
   virtual void populate();
 signals:
   void widgetOpened();
diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp
index 2824d81f..472bb98c 100644
--- a/kommander/widgets/scriptobject.cpp
+++ b/kommander/widgets/scriptobject.cpp
@@ -30,7 +30,7 @@
 #include <specials.h>
 
 ScriptObject::ScriptObject(TQWidget *a_parent, const char *a_name)
-  : TQLabel(a_parent, a_name), KommanderWidget(this)
+  : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -93,7 +93,7 @@ void ScriptObject::populate()
 
 TQString ScriptObject::executeProcess(bool blocking)
 {
-  int index = ( states().findIndex( currentState()) );
+  int index = ( states().tqfindIndex( currentState()) );
   if (index == -1)
   {
     printError(i18n("Invalid state for associated text."));
@@ -169,7 +169,7 @@ TQString ScriptObject::handleDCOP(int function, const TQStringList& args)
       setAssociatedText(args[0]);
       break;
     case DCOP::clear:
-      setAssociatedText(TQString::null);
+      setAssociatedText(TQString());
       break;
     case DCOP::execute:
       m_params = args;
@@ -178,7 +178,7 @@ TQString ScriptObject::handleDCOP(int function, const TQStringList& args)
     case DCOP::item:
     {
       uint index = args[0].toInt();
-      return index < m_params.count() ? m_params[index] : TQString::null;
+      return index < m_params.count() ? m_params[index] : TQString();
     }
     case DCOP::count:
       return TQString::number(m_params.count());
diff --git a/kommander/widgets/scriptobject.h b/kommander/widgets/scriptobject.h
index 325903cc..8a50f97e 100644
--- a/kommander/widgets/scriptobject.h
+++ b/kommander/widgets/scriptobject.h
@@ -29,10 +29,11 @@
 class KOMMANDER_EXPORT ScriptObject : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
       
 public:
   ScriptObject(TQWidget *a_parent, const char *a_name);
diff --git a/kommander/widgets/slider.cpp b/kommander/widgets/slider.cpp
index b3bef6fc..b8068ede 100644
--- a/kommander/widgets/slider.cpp
+++ b/kommander/widgets/slider.cpp
@@ -23,7 +23,7 @@
 #include "slider.h"
 
 Slider::Slider(TQWidget * a_parent, const char *a_name)
-  : TQSlider(a_parent, a_name), KommanderWidget((TQObject *) this)
+  : TQSlider(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/slider.h b/kommander/widgets/slider.h
index 1ed39a8b..e6324d50 100644
--- a/kommander/widgets/slider.h
+++ b/kommander/widgets/slider.h
@@ -29,9 +29,11 @@
 class TQShowEvent;
 class KOMMANDER_EXPORT Slider: public TQSlider, public KommanderWidget
 {
-  Q_OBJECT Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) 
+  Q_OBJECT
+  TQ_OBJECT
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) 
 public:
   Slider(TQWidget*, const char*);
   virtual ~Slider();
diff --git a/kommander/widgets/spinboxint.cpp b/kommander/widgets/spinboxint.cpp
index a2b9af6a..cc264f34 100644
--- a/kommander/widgets/spinboxint.cpp
+++ b/kommander/widgets/spinboxint.cpp
@@ -28,7 +28,7 @@
 #include "spinboxint.h"
 
 SpinBoxInt::SpinBoxInt(TQWidget *a_parent, const char *a_name)
-  : TQSpinBox(a_parent, a_name), KommanderWidget(this)
+  : TQSpinBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -101,7 +101,7 @@ void SpinBoxInt::focusInEvent( TQFocusEvent * e)
 
 bool SpinBoxInt::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::setMaximum  || f == DCOP::geometry|| f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::setMaximum  || f == DCOP::tqgeometry|| f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
 }
 
 TQString SpinBoxInt::handleDCOP(int function, const TQStringList& args)
@@ -115,7 +115,7 @@ TQString SpinBoxInt::handleDCOP(int function, const TQStringList& args)
     case DCOP::setMaximum:
       setMaxValue(args[0].toUInt());
       break;
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/spinboxint.h b/kommander/widgets/spinboxint.h
index 214692fe..c92489c3 100644
--- a/kommander/widgets/spinboxint.h
+++ b/kommander/widgets/spinboxint.h
@@ -33,10 +33,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT SpinBoxInt : public TQSpinBox, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
   SpinBoxInt(TQWidget *a_parent, const char *a_name);
   ~SpinBoxInt();
diff --git a/kommander/widgets/statusbar.cpp b/kommander/widgets/statusbar.cpp
index 59070884..3c5e76f5 100644
--- a/kommander/widgets/statusbar.cpp
+++ b/kommander/widgets/statusbar.cpp
@@ -27,14 +27,14 @@
 #include "statusbar.h"
 
 StatusBar::StatusBar(TQWidget *a_parent, const char *a_name)
-  : KStatusBar(a_parent, a_name), KommanderWidget(this)
+  : KStatusBar(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
   setStates(states);
   setDisplayStates(states);
-  insertItem(TQString::null, 0, 1);
-  setItemAlignment(0, Qt::AlignLeft);
+  insertItem(TQString(), 0, 1);
+  setItemAlignment(0, TQt::AlignLeft);
 }
 
 StatusBar::~StatusBar()
diff --git a/kommander/widgets/statusbar.h b/kommander/widgets/statusbar.h
index 0971b1ce..616283fd 100644
--- a/kommander/widgets/statusbar.h
+++ b/kommander/widgets/statusbar.h
@@ -33,10 +33,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT StatusBar : public KStatusBar, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
   
 public:
   StatusBar(TQWidget *a_parent, const char *a_name);
diff --git a/kommander/widgets/subdialog.cpp b/kommander/widgets/subdialog.cpp
index 292ac541..47e4ec69 100644
--- a/kommander/widgets/subdialog.cpp
+++ b/kommander/widgets/subdialog.cpp
@@ -32,7 +32,7 @@
 #include "subdialog.h"
 
 SubDialog::SubDialog(TQWidget *a_parent, const char *a_name)
-  : TQPushButton(a_parent, a_name), KommanderWidget(this), m_dialog(0)
+  : TQPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)), m_dialog(0)
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/subdialog.h b/kommander/widgets/subdialog.h
index c61eda15..2e1120a3 100644
--- a/kommander/widgets/subdialog.h
+++ b/kommander/widgets/subdialog.h
@@ -34,11 +34,12 @@ class TQShowEvent;
 class KOMMANDER_EXPORT SubDialog : public TQPushButton, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQString kmdrFile READ kmdrFile WRITE setKmdrFile)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQString kmdrFile READ kmdrFile WRITE setKmdrFile)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
   SubDialog(TQWidget *a_parent, const char *a_name);
   ~SubDialog();
diff --git a/kommander/widgets/table.cpp b/kommander/widgets/table.cpp
index b7e2d68a..4056431e 100644
--- a/kommander/widgets/table.cpp
+++ b/kommander/widgets/table.cpp
@@ -48,7 +48,7 @@ enum Functions {
 
 
 Table::Table(TQWidget *a_parent, const char *a_name)
-  : TQTable(a_parent, a_name), KommanderWidget(this)
+  : TQTable(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -114,7 +114,7 @@ void Table::setWidgetText(const TQString&)
 TQString Table::selectedArea()
 {
   TQTableSelection sel = selection(currentSelection());
-  return TQString("%1,%2,%3,%4").arg(sel.topRow()).arg(sel.leftCol()).arg(sel.bottomRow()).arg(sel.rightCol());
+  return TQString("%1,%2,%3,%4").tqarg(sel.topRow()).tqarg(sel.leftCol()).tqarg(sel.bottomRow()).tqarg(sel.rightCol());
 }
 
 
@@ -123,7 +123,7 @@ bool Table::isFunctionSupported(int f)
   return f == DCOP::currentColumn || f == DCOP::currentRow || f == DCOP::insertColumn || 
       f == DCOP::insertRow || f == DCOP::cellText || f == DCOP::setCellText || f == DCOP::setCellWidget || f == DCOP::cellWidget || f == DCOP::columnCount ||
       f == DCOP::removeRow || f == DCOP::removeColumn || f == DCOP::setColumnCaption ||
-      f == DCOP::setRowCaption || f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor  || (f >= FirstFunction && f <= LastFunction);
+      f == DCOP::setRowCaption || f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor  || (f >= FirstFunction && f <= LastFunction);
 }
 
 void Table::setCellWidget(int row, int col, const TQString & _widgetName)
@@ -131,7 +131,7 @@ void Table::setCellWidget(int row, int col, const TQString & _widgetName)
   KommanderWidget *w = widgetByName(_widgetName);
   if (w)
   {
-    TQWidget *widget = static_cast<TQWidget*>(w->object());
+    TQWidget *widget = TQT_TQWIDGET(w->object());
     if (TQTable::cellWidget(row, col) != widget)
     { 
       setCurrentCell(-1, -1); //hack to not delete the cellwidget after clicking away to another cell. 
@@ -167,7 +167,7 @@ void Table::setCellText(int row, int col, const TQString& text)
   {
     KommanderWidget *w = widgetByName(widget->name());
     if (w)
-      widget->reparent(parentDialog(), TQPoint(0,0));
+      widget->reparent(tqparentDialog(), TQPoint(0,0));
   }  
   setText(row, col, text);
   endEdit(row, col, false, false);
@@ -354,7 +354,7 @@ TQString Table::handleDCOP(int function, const TQStringList& args)
         return "No row at index "+args[0];
       break;
     }
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/table.h b/kommander/widgets/table.h
index 1539597d..38cb9a33 100644
--- a/kommander/widgets/table.h
+++ b/kommander/widgets/table.h
@@ -31,11 +31,12 @@ class TQWidget;
 class KOMMANDER_EXPORT Table : public TQTable, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-      Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-      Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-      Q_OVERRIDE(bool readOnly DESIGNABLE false)
-      Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+      TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+      TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+      TQ_OVERRIDE(bool readOnly DESIGNABLE false)
+      TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 
   public:
     Table(TQWidget *a_parent, const char *a_name);
diff --git a/kommander/widgets/tabwidget.cpp b/kommander/widgets/tabwidget.cpp
index 8ffc95b1..1574ba9e 100644
--- a/kommander/widgets/tabwidget.cpp
+++ b/kommander/widgets/tabwidget.cpp
@@ -44,7 +44,7 @@ enum Functions {
 };
 
 TabWidget::TabWidget(TQWidget *a_parent, const char *a_name, int a_flags)
-	: TQTabWidget(a_parent, a_name, a_flags), KommanderWidget(this)
+	: TQTabWidget(a_parent, a_name, a_flags), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/tabwidget.h b/kommander/widgets/tabwidget.h
index 3bae4d0a..e848f402 100644
--- a/kommander/widgets/tabwidget.h
+++ b/kommander/widgets/tabwidget.h
@@ -28,10 +28,11 @@ class TQShowEvent;
 class KOMMANDER_EXPORT TabWidget : public TQTabWidget, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
   TabWidget(TQWidget *, const char *, int=0);
   ~TabWidget();
diff --git a/kommander/widgets/textbrowser.cpp b/kommander/widgets/textbrowser.cpp
index a2f9e744..f6b1330e 100644
--- a/kommander/widgets/textbrowser.cpp
+++ b/kommander/widgets/textbrowser.cpp
@@ -35,7 +35,7 @@ enum Functions {
 };
 
 TextBrowser::TextBrowser(TQWidget * a_parent, const char *a_name)
-  : KTextBrowser(a_parent, a_name), KommanderWidget((TQObject *) this)
+  : KTextBrowser(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/textbrowser.h b/kommander/widgets/textbrowser.h
index 3a106fcf..27a5b1e2 100644
--- a/kommander/widgets/textbrowser.h
+++ b/kommander/widgets/textbrowser.h
@@ -30,9 +30,10 @@ class TQShowEvent;
 class KOMMANDER_EXPORT TextBrowser: public KTextBrowser, public KommanderWidget
 {
   Q_OBJECT
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) 
+  TQ_OBJECT
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) 
 public:
   TextBrowser(TQWidget*, const char*);
   virtual ~TextBrowser();
diff --git a/kommander/widgets/textedit.cpp b/kommander/widgets/textedit.cpp
index 72f8c754..1ca2e167 100644
--- a/kommander/widgets/textedit.cpp
+++ b/kommander/widgets/textedit.cpp
@@ -28,7 +28,7 @@
 #include <kommanderplugin.h>
 
 enum Functions {
-  FirstFunction = 450, //CHANGE THIS NUMBER TO AN UNIQUE ONE!!!
+  FirstFunction = 450, //CHANGE THIS NUMBER TO AN UNITQUE ONE!!!
   TE_setModified,
   TE_selectText,
   TE_paragraphs,
@@ -43,7 +43,7 @@ enum Functions {
 };
 
 TextEdit::TextEdit(TQWidget * a_parent, const char *a_name):KTextEdit(a_parent, a_name),
-KommanderWidget((TQObject *) this)
+KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -143,7 +143,7 @@ void TextEdit::contextMenuEvent( TQContextMenuEvent * e )
 
 bool TextEdit::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::setSelection || f == DCOP::clear || f == DCOP::setEditable || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction);
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::setSelection || f == DCOP::clear || f == DCOP::setEditable || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction);
 }
 
 TQString TextEdit::handleDCOP(int function, const TQStringList& args)
@@ -200,8 +200,8 @@ TQString TextEdit::handleDCOP(int function, const TQStringList& args)
     {
 //      int para = args[3].toInt();
 //      int idx = args[4].toInt();
-//      return TQString::number(TQTextEdit::find(args[0], args[1].toUInt(), false, args[2].toUInt(), para, idx ));
-      return TQString::number(TQTextEdit::find(args[0], args[1].toUInt(), false ));
+//      return TQString::number(TQTextEdit::tqfind(args[0], args[1].toUInt(), false, args[2].toUInt(), para, idx ));
+      return TQString::number(TQTextEdit::tqfind(args[0], args[1].toUInt(), false ));
       break;
     }
     case TE_VAsuperScript:
@@ -210,7 +210,7 @@ TQString TextEdit::handleDCOP(int function, const TQStringList& args)
     case TE_VAnormalScript:
       TQTextEdit::setVerticalAlignment(AlignNormal);
       break;
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/textedit.h b/kommander/widgets/textedit.h
index 3132e315..de040391 100644
--- a/kommander/widgets/textedit.h
+++ b/kommander/widgets/textedit.h
@@ -31,9 +31,11 @@
 class TQShowEvent;
 class KOMMANDER_EXPORT TextEdit: public KTextEdit, public KommanderWidget
 {
-  Q_OBJECT Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) 
+  Q_OBJECT
+  TQ_OBJECT
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) 
 public:
   TextEdit(TQWidget *, const char *);
   virtual ~TextEdit();
diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp
index 5a7251f1..2bc934b0 100644
--- a/kommander/widgets/timer.cpp
+++ b/kommander/widgets/timer.cpp
@@ -38,7 +38,7 @@ enum Functions {
 };
 
 Timer::Timer(TQWidget *a_parent, const char *a_name)
-  : TQLabel(a_parent, a_name), KommanderWidget(this)
+  : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/timer.h b/kommander/widgets/timer.h
index 095c7dac..6d14452d 100644
--- a/kommander/widgets/timer.h
+++ b/kommander/widgets/timer.h
@@ -27,12 +27,13 @@ class TQTimer;
 class KOMMANDER_EXPORT Timer : public TQLabel, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
-  Q_PROPERTY(int interval READ interval WRITE setInterval)
-  Q_PROPERTY(bool singleShot READ singleShot WRITE setSingleShot)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(int interval READ interval WRITE setInterval)
+  TQ_PROPERTY(bool singleShot READ singleShot WRITE setSingleShot)
 
   public:
     Timer(TQWidget *a_parent, const char *a_name);
diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp
index a6340098..b2b57748 100644
--- a/kommander/widgets/toolbox.cpp
+++ b/kommander/widgets/toolbox.cpp
@@ -27,8 +27,8 @@
 #define FIRST_FUNCTION ADDWIDGET
 #define LAST_FUNCTION INDEXOF 
 
-ToolBox::ToolBox(TQWidget *parent, const char *name)
- : TQToolBox(parent, name), KommanderWidget(this)
+ToolBox::ToolBox(TQWidget *tqparent, const char *name)
+ : TQToolBox(tqparent, name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -121,7 +121,7 @@ void ToolBox::contextMenuEvent( TQContextMenuEvent * e )
 
 bool ToolBox::isFunctionSupported(int f)
 {
-  return f == DCOP::count || f == DCOP::geometry || (f >= FIRST_FUNCTION && f <=  LAST_FUNCTION) ;
+  return f == DCOP::count || f == DCOP::tqgeometry || (f >= FIRST_FUNCTION && f <=  LAST_FUNCTION) ;
 }
 
 TQString ToolBox::handleDCOP(int function, const TQStringList& args)
@@ -176,7 +176,7 @@ TQString ToolBox::handleDCOP(int function, const TQStringList& args)
     }
     case DCOP::count:
       return TQString::number(count());
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/toolbox.h b/kommander/widgets/toolbox.h
index 12761df0..ab5375b0 100644
--- a/kommander/widgets/toolbox.h
+++ b/kommander/widgets/toolbox.h
@@ -21,11 +21,12 @@
 class ToolBox : public TQToolBox, public KommanderWidget
 {
   Q_OBJECT
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_OBJECT
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 public:
-  ToolBox(TQWidget *parent = 0, const char *name = 0);
+  ToolBox(TQWidget *tqparent = 0, const char *name = 0);
 
   ~ToolBox();
 
diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp
index ef3b7e65..e04fe41d 100644
--- a/kommander/widgets/treewidget.cpp
+++ b/kommander/widgets/treewidget.cpp
@@ -55,7 +55,7 @@ enum Functions {
 };
 
 TreeWidget::TreeWidget(TQWidget *a_parent, const char *a_name)
-  : KListView(a_parent, a_name), KommanderWidget(this)
+  : KListView(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -95,7 +95,7 @@ void TreeWidget::addItemFromString(const TQString& s)
   TQStringList elements = TQStringList::split(m_pathSeparator, s, true);
   if (elements.count() > 1)
     setRootIsDecorated(true);
-  TQListViewItem* parent = 0;
+  TQListViewItem* tqparent = 0;
   if (m_lastPath.size() < elements.count())
     m_lastPath.resize(elements.count());
   uint i = 0;
@@ -103,13 +103,13 @@ void TreeWidget::addItemFromString(const TQString& s)
   {
     if (m_lastPath[i] && m_lastPath[i]->text(0) == elements[i])
     {
-      parent = m_lastPath[i];
+      tqparent = m_lastPath[i];
       i++;
       continue;
     }
     else 
     {
-      TQListViewItem* item = (i>0) ? parent->firstChild() : firstChild();
+      TQListViewItem* item = (i>0) ? tqparent->firstChild() : firstChild();
       while (item)
       {
         if (item->text(0) == *it)
@@ -117,19 +117,19 @@ void TreeWidget::addItemFromString(const TQString& s)
         item = item->nextSibling(); 
       }
       if (item)
-        parent = item;
+        tqparent = item;
       else 
-        parent = itemFromString(parent, *it);
-      m_lastPath.insert(i, parent); 
+        tqparent = itemFromString(tqparent, *it);
+      m_lastPath.insert(i, tqparent); 
       i++;
     }
   }
 }
 
-TQListViewItem* TreeWidget::itemFromString(TQListViewItem* parent, const TQString& s)
+TQListViewItem* TreeWidget::itemFromString(TQListViewItem* tqparent, const TQString& s)
 {
   TQStringList elements;
-  if (s.contains("\t"))
+  if (s.tqcontains("\t"))
     elements = TQStringList::split("\t", s, true);
   else
     elements = TQStringList::split("\\t", s, true);
@@ -137,8 +137,8 @@ TQListViewItem* TreeWidget::itemFromString(TQListViewItem* parent, const TQStrin
   if (cols >= columns())
     cols = columns();
   TQListViewItem* item;
-  if (parent)
-    item = new TQListViewItem(parent);
+  if (tqparent)
+    item = new TQListViewItem(tqparent);
   else
     item = new TQListViewItem(this);
   int i = 0;
@@ -208,8 +208,8 @@ TQString TreeWidget::itemsText()
     if (path.isEmpty())
       items.append(itemText(it.current()));
     else 
-      items.append(TQString("%1%2%3").arg(path).arg(m_pathSeparator)
-        .arg(itemText(it.current())));
+      items.append(TQString("%1%2%3").tqarg(path).tqarg(m_pathSeparator)
+        .tqarg(itemText(it.current())));
     ++it;
   }
   return items.join("\n");
@@ -219,14 +219,14 @@ TQString TreeWidget::itemPath(TQListViewItem* item) const
 {
   if (!item)
     return TQString();
-  item = item->parent();
+  item = item->tqparent();
   if (!item)
     return TQString();
   TQStringList path;
   while (item)
   {
     path.prepend(item->text(0));
-    item = item->parent();
+    item = item->tqparent();
   }
   return path.join(m_pathSeparator);
 }
@@ -295,11 +295,11 @@ void TreeWidget::contextMenuEvent( TQContextMenuEvent * e )
 void TreeWidget::setColAlign(int column, const TQString& align)
 {
   if (align.lower() == "left")
-    setColumnAlignment (column, Qt::AlignLeft);
+    setColumnAlignment (column, TQt::AlignLeft);
   else if (align.lower() == "right")
-    setColumnAlignment (column, Qt::AlignRight);
+    setColumnAlignment (column, TQt::AlignRight);
   else if (align.lower() == "center")
-    setColumnAlignment (column, Qt::AlignCenter);
+    setColumnAlignment (column, TQt::AlignCenter);
 }
 
 bool TreeWidget::isFunctionSupported(int f)
@@ -307,7 +307,7 @@ bool TreeWidget::isFunctionSupported(int f)
   return f == DCOP::insertItem || f == DCOP::text || f == DCOP::setText || f == DCOP::insertItems ||
     f == DCOP::selection || f == DCOP::setSelection || f == DCOP::clear || f == DCOP::removeItem || 
     f == DCOP::currentItem || f == DCOP::setCurrentItem || f == DCOP::findItem || f == DCOP::item || 
-      f == DCOP::itemPath || f == DCOP::itemDepth || f == DCOP::setPixmap || f == DCOP::setColumnCaption || f == DCOP::removeColumn || f == DCOP::columnCount || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor  || (f > FirstFunction && f < LastFunction) || (f >= TW_FUNCTION && f <= TW_LAST_FUNCTION);
+      f == DCOP::itemPath || f == DCOP::itemDepth || f == DCOP::setPixmap || f == DCOP::setColumnCaption || f == DCOP::removeColumn || f == DCOP::columnCount || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor  || (f > FirstFunction && f < LastFunction) || (f >= TW_FUNCTION && f <= TW_LAST_FUNCTION);
 }
 
 TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
@@ -342,7 +342,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
       {
         if (it.current()->isSelected())
         {        
-          selection.append(TQString("%1\n").arg(itemToIndexSafe(it.current())));
+          selection.append(TQString("%1\n").tqarg(itemToIndexSafe(it.current())));
         }
         ++it;
       }
@@ -368,14 +368,14 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
     }
     case DCOP::setSelection:
       if (selectionModeExt() == Single || selectionModeExt() == NoSelection)
-        setCurrentItem(findItem(args[0], 0));
+        setCurrentItem(tqfindItem(args[0], 0));
       else
       {
         clearSelection();
         TQStringList items(TQStringList::split("\n", args[0]));
         for (TQStringList::ConstIterator it = items.begin(); it != items.end(); ++it)
         {
-          TQListViewItem* item = findItem(*it, 0);
+          TQListViewItem* item = tqfindItem(*it, 0);
           if (item)
           {
             item->setSelected(true);
@@ -405,17 +405,17 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
       break;
     case DCOP::findItem:
       if (!args[1])
-        return TQString::number(itemToIndexSafe(findItem(args[0], 0)));
+        return TQString::number(itemToIndexSafe(tqfindItem(args[0], 0)));
       else
       {
         if (args[2].toUInt() && args[3].toUInt())
-          return TQString::number(itemToIndexSafe(findItem(args[0], args[1].toInt())));
+          return TQString::number(itemToIndexSafe(tqfindItem(args[0], args[1].toInt())));
         else if (args[2].toUInt())
-          return TQString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), Qt::CaseSensitive | Qt::Contains)));
+          return TQString::number(itemToIndexSafe(tqfindItem(args[0], args[1].toInt(), TQt::CaseSensitive | TQt::Contains)));
         else if (args[3].toUInt())
-          return TQString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), Qt::ExactMatch)));
+          return TQString::number(itemToIndexSafe(tqfindItem(args[0], args[1].toInt(), TQt::ExactMatch)));
         else
-          return TQString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), Qt::Contains)));
+          return TQString::number(itemToIndexSafe(tqfindItem(args[0], args[1].toInt(), TQt::Contains)));
       }
       break;
     case DCOP::item:
@@ -494,7 +494,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
     case TW_childCount:
       return TQString::number(childCount());
       break;
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h
index 3988c9a8..df7440b1 100644
--- a/kommander/widgets/treewidget.h
+++ b/kommander/widgets/treewidget.h
@@ -35,11 +35,12 @@ class TQShowEvent;
 class KOMMANDER_EXPORT TreeWidget : public KListView, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
   
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
-  Q_PROPERTY(TQString pathSeparator READ pathSeparator WRITE setPathSeparator)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString pathSeparator READ pathSeparator WRITE setPathSeparator)
   
 public:
   TreeWidget(TQWidget *a_parent, const char *a_name);
@@ -75,7 +76,7 @@ protected:
   TQString itemPath(TQListViewItem* item) const;
 private:
   void addItemFromString(const TQString& s);
-  TQListViewItem* itemFromString(TQListViewItem* parent, const TQString& s);
+  TQListViewItem* itemFromString(TQListViewItem* tqparent, const TQString& s);
   TQPtrVector<TQListViewItem> m_lastPath;
   TQString m_pathSeparator;
   int addColumnTree(const TQString & label, int width = -1 );
diff --git a/kommander/widgets/wizard.cpp b/kommander/widgets/wizard.cpp
index 8cc16933..b5fabc20 100644
--- a/kommander/widgets/wizard.cpp
+++ b/kommander/widgets/wizard.cpp
@@ -32,7 +32,7 @@
 
 
 Wizard::Wizard(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags)
-  : TQWizard(a_parent, a_name, a_modal, a_flags), KommanderWidget(this)
+  : TQWizard(a_parent, a_name, a_modal, a_flags), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/wizard.h b/kommander/widgets/wizard.h
index 6852fc77..5104af9a 100644
--- a/kommander/widgets/wizard.h
+++ b/kommander/widgets/wizard.h
@@ -30,13 +30,14 @@ class TQShowEvent;
 class KOMMANDER_EXPORT Wizard : public TQWizard, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
-  Q_PROPERTY(HelpAction helpAction READ helpAction WRITE setHelpAction)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(HelpAction helpAction READ helpAction WRITE setHelpAction)
   Q_ENUMS(HelpAction)
-  Q_PROPERTY(TQString helpActionText READ helpActionText WRITE setHelpActionText)
+  TQ_PROPERTY(TQString helpActionText READ helpActionText WRITE setHelpActionText)
 
 public:
   Wizard(TQWidget *, const char *, bool = true, int = 0);
diff --git a/kommander/working/plugintemplate/plugin.cpp b/kommander/working/plugintemplate/plugin.cpp
index b6e1a0a0..bad414aa 100644
--- a/kommander/working/plugintemplate/plugin.cpp
+++ b/kommander/working/plugintemplate/plugin.cpp
@@ -11,7 +11,7 @@ class %{APPNAME}Plugin : public KommanderPlugin
 {
 public:
     %{APPNAME}Plugin();
-    virtual TQWidget *create( const TQString &className, TQWidget *parent = 0, const char *name = 0);
+    virtual TQWidget *create( const TQString &className, TQWidget *tqparent = 0, const char *name = 0);
 };
 
 %{APPNAME}Plugin::%{APPNAME}Plugin()
@@ -19,10 +19,10 @@ public:
     addWidget( "%{APPNAME}", "Custom", i18n("Kommander %{APPNAME} plugin."), new TQIconSet(KGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium)) );
 }
 
-TQWidget *%{APPNAME}Plugin::create( const TQString &className, TQWidget *parent, const char *name)
+TQWidget *%{APPNAME}Plugin::create( const TQString &className, TQWidget *tqparent, const char *name)
 {
   if (className == "%{APPNAME}")
-    return new %{APPNAME}(parent, name);
+    return new %{APPNAME}(tqparent, name);
   return 0;
 }
 
diff --git a/kommander/working/plugintemplate/src-Makefile.am b/kommander/working/plugintemplate/src-Makefile.am
index eb7dbe9d..a7b2ee01 100644
--- a/kommander/working/plugintemplate/src-Makefile.am
+++ b/kommander/working/plugintemplate/src-Makefile.am
@@ -13,7 +13,7 @@ libkmdr%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp %{APPNAMELC}plugin.cpp
 
 # these are the headers for your project that won't be installed
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 AM_CXXFLAGS= -DHAVE_SSTREAM
 AM_CPPFLAGS= $(all_includes)
diff --git a/kommander/working/plugintemplate/widget.cpp b/kommander/working/plugintemplate/widget.cpp
index 2378e87a..7efd8526 100644
--- a/kommander/working/plugintemplate/widget.cpp
+++ b/kommander/working/plugintemplate/widget.cpp
@@ -10,14 +10,14 @@
 
 
 enum Functions {
-  FirstFunction = 11001, //CHANGE THIS NUMBE TO AN UNIQUE ONE!!!
+  FirstFunction = 11001, //CHANGE THIS NUMBE TO AN UNITQUE ONE!!!
   Function1,
   Function2,
   LastFunction
 };
 
-%{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name)
-  : TQWidget(parent, name), KommanderWidget(this)
+%{APPNAME}::%{APPNAME}(TQWidget *tqparent, const char *name)
+  : TQWidget(tqparent, name), KommanderWidget(this)
 {
   TQStringList states;
   states << "default";
@@ -31,7 +31,7 @@ enum Functions {
     setPixmap(KGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
-    setAlignment(Qt::AlignCenter);
+    tqsetAlignment(TQt::AlignCenter);
   }
   else
     setHidden(true);
@@ -110,7 +110,7 @@ TQString %{APPNAME}::handleDCOP(int function, const TQStringList& args)
     default:
       return KommanderWidget::handleDCOP(function, args);
   }
-  return TQString::null;
+  return TQString();
 }
 
 #include "%{APPNAMELC}.moc"
diff --git a/kommander/working/plugintemplate/widget.h b/kommander/working/plugintemplate/widget.h
index 22638875..ab6f042f 100644
--- a/kommander/working/plugintemplate/widget.h
+++ b/kommander/working/plugintemplate/widget.h
@@ -15,13 +15,14 @@ class TQStringList;
 class %{APPNAME}: public TQWidget, public KommanderWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
-  Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
-  Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
-  Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+  TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+  TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+  TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget)
 
 public:  
-  %{APPNAME}(TQWidget *parent, const char* name);
+  %{APPNAME}(TQWidget *tqparent, const char* name);
   ~%{APPNAME}();
 
   virtual bool isKommanderWidget() const;
diff --git a/kxsldbg/data/testdoc.xsl b/kxsldbg/data/testdoc.xsl
index da6447f3..a25a14d2 100644
--- a/kxsldbg/data/testdoc.xsl
+++ b/kxsldbg/data/testdoc.xsl
@@ -23,9 +23,9 @@ version="1.0">
 	</xsl:call-template>
 
 	<xsl:variable name="localvariable" select="'bar'"/>
-	<xsl:text>Global variable contains </xsl:text><xsl:value-of select="$globalvariable"/><xsl:text>
+	<xsl:text>Global variable tqcontains </xsl:text><xsl:value-of select="$globalvariable"/><xsl:text>
 </xsl:text>
-	<xsl:text>Local variable contains </xsl:text><xsl:value-of select="$localvariable"/><xsl:text>
+	<xsl:text>Local variable tqcontains </xsl:text><xsl:value-of select="$localvariable"/><xsl:text>
 </xsl:text>    
 
 	<!-- test import of xsl file -->
diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp
index e8982fed..d7298591 100644
--- a/kxsldbg/kxsldbg.cpp
+++ b/kxsldbg/kxsldbg.cpp
@@ -29,7 +29,7 @@ KXsldbg::KXsldbg()
 
     // and a status bar
     statusBar()->show();
-    statusBar()->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
+    statusBar()->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
 
     // this routine will find and load our Part.  it finds the Part by
     // name which is a bad idea usually.. but it's alright in this
@@ -39,7 +39,7 @@ KXsldbg::KXsldbg()
     {
         // now that the Part is loaded, we cast it to a Part to get
         // our hands on it
-        m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this,
+        m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this),
                                 "kxsldbg_part", "KParts::ReadOnlyPart" ));
 
         if (m_part)
@@ -90,14 +90,14 @@ bool KXsldbg::closeURL()
 
 void KXsldbg::setupActions()
 {
-    KAction *act = KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+    KAction *act = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
     connect(act, TQT_SIGNAL(activated()), this, TQT_SLOT(quit()));
 
-    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 KXsldbg::saveProperties(KConfig* /*config*/)
@@ -161,7 +161,7 @@ void KXsldbg::applyNewToolbarConfig()
 void KXsldbg::newCursorPosition(const TQString &file, int lineNumber, int columnNumber)
 {
     statusBar()->clear();
-    statusBar()->message( i18n("File: %1  Line: %2  Col: %3").arg(file).arg(lineNumber).arg(columnNumber));
+    statusBar()->message( i18n("File: %1  Line: %2  Col: %3").tqarg(file).tqarg(lineNumber).tqarg(columnNumber));
 }
 
 void KXsldbg::newDebuggerPosition(const TQString &file, int lineNumber)
diff --git a/kxsldbg/kxsldbg.h b/kxsldbg/kxsldbg.h
index 2380cb63..aadb9b01 100644
--- a/kxsldbg/kxsldbg.h
+++ b/kxsldbg/kxsldbg.h
@@ -24,6 +24,7 @@ class KToggleAction;
 class KXsldbg : public KParts::MainWindow, public KXsldbgIf
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
index c9023d07..7ee2e26c 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
@@ -67,10 +67,10 @@
 typedef KParts::GenericFactory<KXsldbgPart> KXsldbgPartFactory;
 K_EXPORT_COMPONENT_FACTORY( libkxsldbgpart, KXsldbgPartFactory )
 
-KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/,
-                                  TQObject *parent, const char *name,
+KXsldbgPart::KXsldbgPart( TQWidget *tqparentWidget, const char * /*widgetName*/,
+                                  TQObject *tqparent, const char *name,
                                   const TQStringList & /*args*/ )
-  : DCOPObject("KXsldbgPart"), KParts::ReadOnlyPart(parent, name)
+  : DCOPObject("KXsldbgPart"), KParts::ReadOnlyPart(tqparent, name)
 {
     currentLineNo = 0;
     currentColumnNo = 0;
@@ -81,7 +81,7 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/,
 
     // we need an instance
     setInstance( KXsldbgPartFactory::instance() );
-    TQVBox *frame = new TQVBox(parentWidget);
+    TQVBox *frame = new TQVBox(tqparentWidget);
     TQHBox *h = new TQHBox(frame);
     newXPath = new TQLineEdit(h);
     xPathBtn = new TQPushButton(i18n("Goto XPath"), h);
@@ -94,7 +94,7 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/,
     newEvaluate = new TQLineEdit(h);
     evaluateBtn = new TQPushButton(i18n("Evaluate"), h);
 
-    TQSplitter *splitter = new TQSplitter(TQSplitter::Vertical, frame);
+    TQSplitter *splitter = new TQSplitter(Qt::Vertical, frame);
     mainView = new TQWidgetStack(splitter);
     mainView->setMinimumHeight(400); //## TODO don't use a magic number 
     outputview = new XsldbgOutputView(splitter);
@@ -116,7 +116,7 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/,
                         actionCollection(), "configureCmd" );
    
     (void) new KAction( i18n("Inspect..."),
-                        "find", Key_I,
+                        "tqfind", Key_I,
                         this, TQT_SLOT(inspectorCmd_activated()),
                         actionCollection(), "inspectCmd" );
 
@@ -284,7 +284,7 @@ bool  KXsldbgPart::openURL(const KURL &url)
 {
     bool result = fetchURL(url);
     if (result){
-	QXsldbgDoc *docPtr = docDictionary[url.prettyURL()];
+	TQXsldbgDoc *docPtr = docDictionary[url.prettyURL()];
 	if (docPtr && docPtr->kateView()){
 	    if (docPtr != currentDoc){
 		currentDoc = docPtr;
@@ -305,9 +305,9 @@ bool  KXsldbgPart::openURL(const KURL &url)
 bool  KXsldbgPart::fetchURL(const KURL &url)
 {
     TQString docID = url.prettyURL();
-    QXsldbgDoc *docPtr = docDictionary[docID]; 
+    TQXsldbgDoc *docPtr = docDictionary[docID]; 
     if (!docPtr){
-	docPtr = new QXsldbgDoc(mainView, url);
+	docPtr = new TQXsldbgDoc(mainView, url);
 	docDictionary.insert(docID, docPtr);
 	if (docPtr->kateView()){
 		mainView->addWidget(docPtr->kateView());
@@ -374,14 +374,14 @@ void KXsldbgPart::lookupSystemID( TQString systemID)
 #if KDE_IS_VERSION(3, 1, 90)
      systemID = KInputDialog::getText(
 			      i18n( "Lookup SystemID" ),
-			      i18n( "Please enter SystemID to find:" ),
-			      TQString::null, &ok,
+			      i18n( "Please enter SystemID to tqfind:" ),
+			      TQString(), &ok,
 			      mainView);
 #else
-     systemID = QInputDialog::getText(
+     systemID = TQInputDialog::getText(
 			      i18n( "Lookup SystemID" ),
-			      i18n( "Please enter SystemID to find:" ),
-			      TQLineEdit::Normal, TQString::null, &ok,
+			      i18n( "Please enter SystemID to tqfind:" ),
+			      TQLineEdit::Normal, TQString(), &ok,
 			      mainView);
 #endif
    }else{
@@ -389,7 +389,7 @@ void KXsldbgPart::lookupSystemID( TQString systemID)
    }
   if ( ok && !systemID.isEmpty() ){
       // user entered something and pressed ok
-	TQString msg(TQString("system %1").arg(systemID));  // noTr
+	TQString msg(TQString("system %1").tqarg(systemID));  // noTr
 	debugger->fakeInput(msg, true);
   }
 
@@ -406,20 +406,20 @@ void KXsldbgPart::lookupPublicID(TQString publicID)
 #if KDE_IS_VERSION(3, 1, 90)
      publicID = KInputDialog::getText(
 			      i18n( "Lookup PublicID" ),
-			      i18n( "Please enter PublicID to find:" ),
-			      TQString::null, &ok, mainView );
+			      i18n( "Please enter PublicID to tqfind:" ),
+			      TQString(), &ok, mainView );
 #else
-     publicID = QInputDialog::getText(
+     publicID = TQInputDialog::getText(
 			      i18n( "Lookup PublicID" ),
-			      i18n( "Please enter PublicID to find:" ),
-			      TQLineEdit::Normal, TQString::null, &ok, mainView );
+			      i18n( "Please enter PublicID to tqfind:" ),
+			      TQLineEdit::Normal, TQString(), &ok, mainView );
 #endif
    }else{
      ok = true;
    }
    if ( ok && !publicID.isEmpty()){
      // user entered something and pressed ok
-	TQString msg(TQString("public %1").arg(publicID));  // noTr
+	TQString msg(TQString("public %1").tqarg(publicID));  // noTr
 	debugger->fakeInput(msg, true);
   }
 }
@@ -582,8 +582,8 @@ void KXsldbgPart::refreshCmd_activated()
 {
 
   if ( !currentFileName.isEmpty() ){
-    TQDictIterator<QXsldbgDoc> it(docDictionary);
-    QXsldbgDoc *docPtr;
+    TQDictIterator<TQXsldbgDoc> it(docDictionary);
+    TQXsldbgDoc *docPtr;
     while (it.current()){
       docPtr = it.current();
       docPtr->refresh();
@@ -650,8 +650,8 @@ KXsldbgPart::lineNoChanged(TQString fileName, int lineNumber, bool breakpoint)
 
   openURL(fileName);
 
-  QXsldbgDoc *docPtr;
-  TQDictIterator<QXsldbgDoc> it(docDictionary);
+  TQXsldbgDoc *docPtr;
+  TQDictIterator<TQXsldbgDoc> it(docDictionary);
   while (it.current()){
       docPtr = it.current();
       // cause all Execution and BreakpointReached marks to be cleared
@@ -774,7 +774,7 @@ void  KXsldbgPart::deleteBreakPoint(int lineNumber)
 void KXsldbgPart::slotSearch()
 {
   if ((newSearch != 0L)  && checkDebugger() ) {
-    TQString msg(TQString("search \"%1\"").arg(newSearch->text()));  // noTr
+    TQString msg(TQString("search \"%1\"").tqarg(newSearch->text()));  // noTr
  		debugger->fakeInput(msg, false);
   }
 }
@@ -800,7 +800,7 @@ void KXsldbgPart::slotProcResolveItem(TQString URI)
 {
   if (!URI.isEmpty()){
     TQMessageBox::information(mainView, i18n("SystemID or PublicID Resolution Result"),
-        i18n("SystemID or PublicID has been resolved to\n.%1").arg(URI),
+        i18n("SystemID or PublicID has been resolved to\n.%1").tqarg(URI),
 	TQMessageBox::Ok);
   }
 }
@@ -812,8 +812,8 @@ void  KXsldbgPart::breakpointItem(TQString fileName, int lineNumber ,
 
   if (fileName == 0L){
     /* Go through all documents and remove all breakpoints */
-    TQDictIterator<QXsldbgDoc> it(docDictionary);
-    QXsldbgDoc *docPtr;
+    TQDictIterator<TQXsldbgDoc> it(docDictionary);
+    TQXsldbgDoc *docPtr;
     while (it.current()){
       docPtr = it.current();
       docPtr->clearMarks(true);
@@ -821,7 +821,7 @@ void  KXsldbgPart::breakpointItem(TQString fileName, int lineNumber ,
     }
   }else{
 /*
-    if (!fileName.contains("://")){
+    if (!fileName.tqcontains("://")){
 	// relative path ? must handle this special case
 	KURL url;
 	url.setFileName(fileName);
@@ -834,7 +834,7 @@ void  KXsldbgPart::breakpointItem(TQString fileName, int lineNumber ,
     KURL temp(fileName);
     fileName = temp.prettyURL();
     fetchURL(fileName);
-    QXsldbgDoc *docPtr = docDictionary[fileName] ;
+    TQXsldbgDoc *docPtr = docDictionary[fileName] ;
    if (docPtr){
         docPtr->addBreakPoint(lineNumber - 1, enabled);
    }else {
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.h b/kxsldbg/kxsldbgpart/kxsldbg_part.h
index 0b57ee75..f33ae05f 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.h
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.h
@@ -25,7 +25,7 @@ class TQDockWindow;
 class TQWidgetStack;
 
 class XsldbgBrkStatusView;
-class QXsldbgDoc;
+class TQXsldbgDoc;
 class XsldbgOutputView;
 class XsldbgConfigImpl;
 
@@ -35,7 +35,7 @@ class KURL;
 class TQMultiLineEdit;
 class KAboutData;
 
-typedef TQDict<QXsldbgDoc> XsldbgDocDict;
+typedef TQDict<TQXsldbgDoc> XsldbgDocDict;
 
 /**
  * This is a "Part".  It that does all the real work in a KPart
@@ -48,13 +48,14 @@ typedef TQDict<QXsldbgDoc> XsldbgDocDict;
 class KXsldbgPart : public KParts::ReadOnlyPart, public KXsldbgPartIf 
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
      * Default constructor
      */
-    KXsldbgPart(TQWidget *parentWidget, const char *widgetName,
-                    TQObject *parent, const char *name, const TQStringList &args);
+    KXsldbgPart(TQWidget *tqparentWidget, const char *widgetName,
+                    TQObject *tqparent, const char *name, const TQStringList &args);
 
     /**
      * Destructor
@@ -150,7 +151,7 @@ protected slots:
     void fileOpen();
 
 private:
-    QXsldbgDoc *currentDoc;
+    TQXsldbgDoc *currentDoc;
     TQWidgetStack *mainView;
 
     TQPushButton *xPathBtn, *searchBtn, *evaluateBtn;
diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp
index 0db9d1f0..98c4ea95 100644
--- a/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp
+++ b/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp
@@ -27,12 +27,12 @@ XsldbgDebuggerBase *_debugger = 0L;
 int qtNotifyXsldbgApp(XsldbgMessageEnum type, const void *data)
 {
     int result = 0;
-    if (::getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED){
+    if (::getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED){
       return 1;
     }
 
     /* clear the input ready flag as quickly as possible*/
-     if ( ::getInputStatus() == XSLDBG_MSG_READ_INPUT)
+     if ( ::getInputtqStatus() == XSLDBG_MSG_READ_INPUT)
      	  ::setInputReady(0);
 
      /* state of the thread */
@@ -45,7 +45,7 @@ int qtNotifyXsldbgApp(XsldbgMessageEnum type, const void *data)
        }
      }
 
-    if (::getThreadStatus() == XSLDBG_MSG_THREAD_STOP)
+    if (::getThreadtqStatus() == XSLDBG_MSG_THREAD_STOP)
         ::xsldbgThreadCleanup();        /* thread has died so cleanup after it */
 
     result++; /* at the moment this function will always work */
diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h
index df4f17fa..5f07d0bb 100644
--- a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h
+++ b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgdebuggerbase.h
@@ -42,9 +42,10 @@ class TQStringList;
     We delegate the task of emitting our signals to XsldbgEvent , so 
     Xsldbg must become our friend
 */
-class XsldbgDebuggerBase : public QObject
+class XsldbgDebuggerBase : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class XsldbgEvent;
 
@@ -87,55 +88,55 @@ protected:
    /** Show a message in debugger window */
    void showMessage(TQString /* msg*/);
 
-   /** Add breakpoint to view, First parameter is TQString::null
+   /** Add breakpoint to view, First parameter is TQString()
        to indicate start of breakpoint list notfication */
    void breakpointItem(TQString /* fileName*/, int /* lineNumber */, 
 		       TQString /*templateName*/, TQString /* modeName */,
  		      bool /* enabled */, int /* id */);
 
-  /** Add global variable to view, First parameter is TQString::null
+  /** Add global variable to view, First parameter is TQString()
       to indicate start of global variable list notfication */
   void globalVariableItem(TQString /* name */, TQString /* fileName */, int /* lineNumber */);
 
-  /** Add local variable to view, First parameter is TQString::null
+  /** Add local variable to view, First parameter is TQString()
       to indicate start of local variable list notfication */
   void localVariableItem(TQString /*name */, TQString /* templateContext*/,
 			 TQString /* fileName */, int /*lineNumber */);	
   
-    /** Add a variable to view, First parameter is TQString::null
+    /** Add a variable to view, First parameter is TQString()
       to indicate start of local variable list notfication */
   void variableItem(TQString /*name */, TQString /* templateContext*/,
 			 TQString /* fileName */, int /*lineNumber */, 
 			 TQString /* select XPath */, int /* is it a local variable */);	
 
-  /** Add template to view, First parameter is TQString::null
+  /** Add template to view, First parameter is TQString()
       to indicate start of template list notfication */
   void templateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */);
 
-  /** Add source to view, First parameter is TQString::null
+  /** Add source to view, First parameter is TQString()
       to indicate start of source list notfication */
-  void sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */);
+  void sourceItem(TQString /* fileName */, TQString /* tqparentFileName */, int /*lineNumber */);
 
-  /** Add parameter to view, First parameter is TQString::null
+  /** Add parameter to view, First parameter is TQString()
       to indicate start of parameter list notfication */
   void parameterItem(TQString /* name*/, TQString /* value */);
 
-  /** Add callStack to view, First parameter is TQString::null
+  /** Add callStack to view, First parameter is TQString()
       to indicate start of callstack list notfication */
   void callStackItem(TQString /* tempalteName*/, TQString /* fileName */, int /* lineNumber */);
 	
-  /** Add entity to view, First parameter is TQString::null
+  /** Add entity to view, First parameter is TQString()
       to indicate start of entity list notfication */
   void entityItem(TQString /*SystemID*/,  TQString /*PublicID*/);	
 	
   /* Show the URI for SystemID or PublicID requested */
   void resolveItem(TQString /*URI*/);
   
-  /* Display a integer option value First parameter is TQString::null
+  /* Display a integer option value First parameter is TQString()
      to indicate start of option list notification */
   void intOptionItem(TQString /* name*/, int /* value */);
 
-  /* Display a string option value. First parameter is TQString::null
+  /* Display a string option value. First parameter is TQString()
      to indicate start of option list notification */
   void stringOptionItem(TQString /* name*/, TQString /* value */);
 
diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp
index 35878929..857848c3 100644
--- a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp
+++ b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp
@@ -41,7 +41,7 @@ XsldbgEventData::XsldbgEventData()
   int column;
 
   for (column = 0; column < XSLDBGEVENT_COLUMNS; column++){
-    textValues[column] = TQString::null;
+    textValues[column] = TQString();
   }
 
  for (column = 0; column < XSLDBGEVENT_COLUMNS; column++){
@@ -66,7 +66,7 @@ TQString XsldbgEventData::getText(int column)
   if ((column >= 0) && (column < XSLDBGEVENT_COLUMNS))
     return textValues[column];
   else
-    return TQString::null;
+    return TQString();
 }
 
 
@@ -678,8 +678,8 @@ void XsldbgEvent::handleIncludedSourceItem(XsldbgEventData *eventData, const  vo
     }else{
       /* emit the event data via debugger*/
       emit debugger->sourceItem(eventData->getText(0), /* file name*/
-				eventData->getText(1), /* parent file name*/
-				eventData->getInt(0) /* parent line number*/);
+				eventData->getText(1), /* tqparent file name*/
+				eventData->getInt(0) /* tqparent line number*/);
     }
   }
 }
@@ -709,8 +709,8 @@ void XsldbgEvent::handleSourceItem(XsldbgEventData *eventData, const  void *msgD
     }else{
       /* emit the event data via debugger*/
       emit debugger->sourceItem(eventData->getText(0), /* name*/
-				eventData->getText(1), /* parent file name*/
-				eventData->getInt(0) /* parent line number*/);
+				eventData->getText(1), /* tqparent file name*/
+				eventData->getInt(0) /* tqparent line number*/);
     }
   }
 }
diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
index 1f428bb5..1f997919 100644
--- a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
+++ b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
@@ -83,7 +83,7 @@ xsldbgThreadInit(void)
     int result = 0;
     fprintf(stderr, "mainInit()\n");
     xsltSetGenericErrorFunc(0, xsldbgGenericErrorFunc);
-    setThreadStatus(XSLDBG_MSG_THREAD_INIT);
+    setThreadtqStatus(XSLDBG_MSG_THREAD_INIT);
     xsldbgSetAppFunc(qtNotifyXsldbgApp);
     xsldbgSetAppStateFunc(qtNotifyStateXsldbgApp); 
     xsldbgSetTextFunc(qtNotifyTextXsldbgApp);
@@ -94,12 +94,12 @@ xsldbgThreadInit(void)
     if (pthread_create(&mythread, NULL, xsldbgThreadMain, NULL) != EAGAIN) {
       int counter;
       for (counter = 0; counter < 11; counter++){
-	if (getThreadStatus() != XSLDBG_MSG_THREAD_INIT)
+	if (getThreadtqStatus() != XSLDBG_MSG_THREAD_INIT)
 	  break;
 	usleep(250000); /*guess that it will take at most 2.5 seconds to startup */
       }
       /* xsldbg should have started by now if it can */
-      if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN){
+      if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN){
         fprintf(stderr, "Created thread\n");
 	result++;
       }else
@@ -117,13 +117,13 @@ void
 xsldbgThreadFree(void)
 {
   fprintf(stderr, "xsldbgThreadFree()\n");
-    if (getThreadStatus() != XSLDBG_MSG_THREAD_DEAD)
+    if (getThreadtqStatus() != XSLDBG_MSG_THREAD_DEAD)
     {
       int counter;
       fprintf(stderr, "Killing xsldbg thread\n");
-      setThreadStatus(XSLDBG_MSG_THREAD_STOP);
+      setThreadtqStatus(XSLDBG_MSG_THREAD_STOP);
       for (counter = 0; counter < 11; counter++){
-	if (getThreadStatus() == XSLDBG_MSG_THREAD_DEAD)
+	if (getThreadtqStatus() == XSLDBG_MSG_THREAD_DEAD)
 	  break;
 	usleep(250000); /*guess that it will take at most 2.5 seconds to stop */
       }
@@ -143,7 +143,7 @@ fakeInput(const char *text)
 {
     int result = 0;
 
-    if (!text || (getInputReady() == 1) || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN))
+    if (!text || (getInputReady() == 1) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN))
         return result;
 
     //    fprintf(stderr, "\nFaking input of \"%s\"\n", text);
@@ -172,7 +172,7 @@ qtXslDbgShellReadline(xmlChar * prompt)
 
   static char last_read[DEBUG_BUFFER_SIZE] = { '\0' };
 
-  if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN)
+  if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN)
     {
 #ifdef HAVE_READLINE
       xmlChar *line_read;
@@ -209,20 +209,20 @@ qtXslDbgShellReadline(xmlChar * prompt)
     }
   else{
 
-    setInputStatus(XSLDBG_MSG_AWAITING_INPUT);
+    setInputtqStatus(XSLDBG_MSG_AWAITING_INPUT);
     notifyXsldbgApp(XSLDBG_MSG_AWAITING_INPUT, NULL);
 
     while (getInputReady() == 0){
       usleep(10000);
       /* have we been told to die */
-      if (getThreadStatus() ==  XSLDBG_MSG_THREAD_STOP){
+      if (getThreadtqStatus() ==  XSLDBG_MSG_THREAD_STOP){
 	fprintf(stderr, "About to stop thread\n");
-	xslDebugStatus = DEBUG_QUIT;
+	xslDebugStatus = DEBUG_TQUIT;
 	return NULL;
       }
     }
 
-    setInputStatus(XSLDBG_MSG_READ_INPUT);
+    setInputtqStatus(XSLDBG_MSG_READ_INPUT);
     inputReadBuff =  getFakeInput();
     if(inputReadBuff){
       notifyXsldbgApp(XSLDBG_MSG_READ_INPUT, inputReadBuff);
@@ -272,7 +272,7 @@ int qtNotifyTextXsldbgApp(XsldbgMessageEnum type, const char *text)
 }
 
 char mainBuffer[DEBUG_BUFFER_SIZE];
-static void xsldbgThreadCleanupQt(void);
+static void xsldbgThreadCleanupTQt(void);
 
 
 /* this is where the thread get to do all its work */
@@ -283,7 +283,7 @@ xsldbgThreadMain(void *)
  // char *defaultArgv[2];
  // int i;
 
-  if (getThreadStatus() != XSLDBG_MSG_THREAD_INIT){
+  if (getThreadtqStatus() != XSLDBG_MSG_THREAD_INIT){
     fprintf(stderr, "xsldbg thread is not ready to be started. Or one is already running.\n");
     return NULL; /* we can't start more than one thread of xsldbg */
   }
@@ -301,9 +301,9 @@ xsldbgThreadMain(void *)
     }
   }
 */
-    xsldbgSetThreadCleanupFunc(xsldbgThreadCleanupQt);
-    setThreadStatus(XSLDBG_MSG_THREAD_RUN);
-    setInputStatus(XSLDBG_MSG_AWAITING_INPUT);
+    xsldbgSetThreadCleanupFunc(xsldbgThreadCleanupTQt);
+    setThreadtqStatus(XSLDBG_MSG_THREAD_RUN);
+    setInputtqStatus(XSLDBG_MSG_AWAITING_INPUT);
     fprintf(stderr, "Starting thread\n");
 
     /* call the "main of xsldbg" found in debugXSL.c */
@@ -316,8 +316,8 @@ xsldbgThreadMain(void *)
   }
 */
 
-    setThreadStatus(XSLDBG_MSG_THREAD_DEAD);
-    setInputStatus(XSLDBG_MSG_PROCESSING_INPUT);
+    setThreadtqStatus(XSLDBG_MSG_THREAD_DEAD);
+    setInputtqStatus(XSLDBG_MSG_PROCESSING_INPUT);
     notifyXsldbgApp(XSLDBG_MSG_THREAD_DEAD, NULL);
     return NULL;
 }
@@ -327,15 +327,15 @@ xsldbgThreadMain(void *)
 /* thread has died so cleanup after it not called directly but via
  notifyXsldbgApp*/
 void
-xsldbgThreadCleanupQt(void)
+xsldbgThreadCleanupTQt(void)
 {
     fprintf(stderr, "Thread has finished\n");
-    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN)
+    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN)
       {
 	xsldbgThreadFree();
       }
-    /* its safe to modify threadStatus as the thread is now dead */
-    setThreadStatus(XSLDBG_MSG_THREAD_DEAD);
+    /* its safe to modify threadtqStatus as the thread is now dead */
+    setThreadtqStatus(XSLDBG_MSG_THREAD_DEAD);
 }
 
 
@@ -346,7 +346,7 @@ xsldbgThreadStdoutReader(void *data)
   if (!stdoutIO)
     return data;
 
-  while (getThreadStatus() == XSLDBG_MSG_THREAD_RUN){
+  while (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN){
     if (fgets(outputBuffer, sizeof(outputBuffer -1), stdoutIO)){
       usleep(10000);
       strcat(outputBuffer, "\n");
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp
index 270ce82d..1e403aa6 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.cpp
@@ -621,7 +621,7 @@ breakPointPrint(breakPointPtr breakPtr)
 	};
     const char *breakTemplate="";
     const char *breakMode = "";
-    const char *breakStatus;
+    const char *breaktqStatus;
 
 
     if (!breakPtr)
@@ -634,11 +634,11 @@ breakPointPrint(breakPointPtr breakPtr)
     }
     
 
-    breakStatus = breakStatusText[breakPtr->flags & BREAKPOINT_ENABLED];
+    breaktqStatus = breakStatusText[breakPtr->flags & BREAKPOINT_ENABLED];
     if (breakPtr->url)
-	xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6").arg(breakPtr->id).arg(i18n(breakStatus)).arg(xsldbgText(breakTemplate)).arg(xsldbgText(breakMode)).arg(xsldbgUrl(breakPtr->url)).arg(breakPtr->lineNo));
+	xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6").tqarg(breakPtr->id).tqarg(i18n(breaktqStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode)).tqarg(xsldbgUrl(breakPtr->url)).tqarg(breakPtr->lineNo));
     else
-	xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\"").arg(breakPtr->id).arg(i18n(breakStatus)).arg(xsldbgText(breakTemplate)).arg(xsldbgText(breakMode)));
+	xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\"").tqarg(breakPtr->id).tqarg(i18n(breaktqStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode)));
     return ++result;
 }
 
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h
index 83f2e712..040af24e 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint.h
@@ -61,7 +61,7 @@ extern "C" {
         DEBUG_CONT,
         DEBUG_RUN,
         DEBUG_RUN_RESTART,
-        DEBUG_QUIT,
+        DEBUG_TQUIT,
         DEBUG_TRACE,
         DEBUG_WALK
     } DebugStatusEnum;
@@ -107,7 +107,7 @@ extern "C" {
         DEBUG_CONT,
         DEBUG_RUN,
         DEBUG_RUN_RESTART,
-        DEBUG_QUIT,
+        DEBUG_TQUIT,
         DEBUG_TRACE,
         DEBUG_WALK
     };
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp
index 0bab6585..ff3fd47c 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp
@@ -23,7 +23,7 @@
 #include <libxml/valid.h>       /* needed for xmlSplitQName2 */
 #include <libxml/xpathInternals.h> /* needed for xmlNSLookup */
 #include <libxml/uri.h>    /* needed for  xmlURIEscapeStr */
-#include "xsldbgthread.h"       /* for getThreadStatus() */
+#include "xsldbgthread.h"       /* for getThreadtqStatus() */
 #include "xsldbgmsg.h"
 #include "options.h"
 
@@ -95,7 +95,7 @@ xslDbgShellFrameBreak(xmlChar * arg, int stepup)
 
     if (!filesGetStylesheet() || !filesGetMainDoc()) {
         xsldbgGenericErrorFunc(i18n("Error: Debugger has no files loaded. Try reloading files.\n"));
-        xsldbgGenericErrorFunc(TQString("Error: %1.\n").arg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1.\n").tqarg(i18n(errorPrompt)));
         return result;
     }
 
@@ -104,13 +104,13 @@ xslDbgShellFrameBreak(xmlChar * arg, int stepup)
         xsltGenericError(xsltGenericErrorContext,
                          "Error: NULL argument provided\n");
 #endif
-        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
         return result;
     }
 
     if (xmlStrLen(arg) > 0) {
         if (!sscanf((char *) arg, "%d", &noOfFrames)) {
-            xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a number of frames.\n").arg((char*)arg));
+            xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a number of frames.\n").tqarg((char*)arg));
 	    noOfFrames = -1;
         }
     } else {
@@ -126,7 +126,7 @@ xslDbgShellFrameBreak(xmlChar * arg, int stepup)
     }
 
     if (!result)
-        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
     return result;
 }
 
@@ -188,7 +188,7 @@ validateSource(xmlChar ** url, long *lineNo)
                     walkChildNodes((xmlHashScanner) scanForNode, searchInf,
                                    searchData->node);
                     if (!searchInf->found) {
-                        xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").arg(xsldbgUrl(*url)).arg(*lineNo));
+                        xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").tqarg(xsldbgUrl(*url)).tqarg(*lineNo));
                     }
 
                     *lineNo = searchData->lineNo;
@@ -210,9 +210,9 @@ validateSource(xmlChar ** url, long *lineNo)
                 result = 1;
             }
         } else{
-            xsldbgGenericErrorFunc(i18n("Error: Unable to find a stylesheet file whose name contains %1.\n").arg(xsldbgUrl(*url)));
+            xsldbgGenericErrorFunc(i18n("Error: Unable to find a stylesheet file whose name tqcontains %1.\n").tqarg(xsldbgUrl(*url)));
 	    if (lineNo){
-	      xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").arg(xsldbgUrl(*url)).arg(*lineNo));
+	      xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").tqarg(xsldbgUrl(*url)).tqarg(*lineNo));
 	    }
 	}
     }
@@ -299,9 +299,9 @@ validateData(xmlChar ** url, long *lineNo)
 
         if (!searchInf->found) {
 	  if (lineNo){
-             xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").arg(xsldbgUrl(*url)).arg(*lineNo));
+             xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").tqarg(xsldbgUrl(*url)).tqarg(*lineNo));
 	  } else{
-             xsldbgGenericErrorFunc(i18n("Error: Unable to find a data file whose name contains %1.\n").arg(xsldbgUrl(*url)));
+             xsldbgGenericErrorFunc(i18n("Error: Unable to find a data file whose name tqcontains %1.\n").tqarg(xsldbgUrl(*url)));
 	  }
             result = 1;
         } else {
@@ -350,7 +350,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
     if (!style || !filesGetMainDoc()) {
        if (!optionsGetIntOption(OPTIONS_GDB)){
 	    xsldbgGenericErrorFunc(i18n("Error: Debugger has no files loaded. Try reloading files.\n"));
-	    xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
+	    xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
 	    return result;
 	}else{
 	    orphanedBreakPoint = 1;
@@ -372,8 +372,8 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
             if (splitString(&arg[2], 2, opts) == 2) {
                 if ((xmlStrlen(opts[1]) == 0) || 
 		       !sscanf((char *) opts[1], "%ld", &lineNo)) {
-                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg((char*)opts[1]));
-		    xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
+                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").tqarg((char*)opts[1]));
+		    xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
                     return result;
                 } else {
                     /* try to guess whether we are looking for source or data 
@@ -422,7 +422,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
 		    }
                 }
             } else
-                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("break"));
+                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").tqarg("break"));
         }
     } else {
         /* add breakpoint at specified template names */
@@ -524,7 +524,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
 	  break;
 
 	default:	  
-	  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").arg("break"));
+	  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").tqarg("break"));
 	  return 0;
 	}
 
@@ -542,7 +542,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
 		if (templ->match)
 		    templateName = xmlStrdup(templ->match);
 		else
-	            templateName = fullQName(templ->nameURI, templ->name);
+	            templateName = fullTQName(templ->nameURI, templ->name);
 		    
 		if (allTemplates)
 		  found = 1;
@@ -571,7 +571,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
 
 		    if (templ->mode)
 		       modeName = 
-			 fullQName(templ->modeURI, templ->mode);
+			 fullTQName(templ->modeURI, templ->mode);
 		    
 		    
 		    if (!searchPtr){
@@ -593,14 +593,14 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
 					searchPtr->id = lastId;
 					result = 1;
 					breakPointCounter = lastCounter;
-					xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").arg(searchPtr->id));
+					xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").tqarg(searchPtr->id));
 					validatedBreakPoints++;
 				    }
 				}
 			    }
 			}else{
 			    if (xsldbgValidateBreakpoints != BREAKPOINTS_BEING_VALIDATED){
-				xsldbgGenericErrorFunc(i18n("Warning: Breakpoint exits for file \"%1\" at line %2.\n").arg(xsldbgUrl(tempUrl)).arg(templateLineNo));
+				xsldbgGenericErrorFunc(i18n("Warning: Breakpoint exits for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(tempUrl)).tqarg(templateLineNo));
 			    }
 			    validatedBreakPoints++;
 			}
@@ -648,7 +648,7 @@ xslDbgShellBreak(xmlChar * arg, xsltStylesheetPtr style,
 
     if (!result) {
         if (url)
-            xsldbgGenericErrorFunc(i18n("Error: Failed to add breakpoint for file \"%1\" at line %2.\n").arg(xsldbgUrl(url)).arg(lineNo));
+            xsldbgGenericErrorFunc(i18n("Error: Failed to add breakpoint for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(url)).tqarg(lineNo));
         else
             xsldbgGenericErrorFunc(i18n("Error: Failed to add breakpoint.\n"));
     }
@@ -681,7 +681,7 @@ xslDbgShellDelete(xmlChar * arg)
         xsltGenericError(xsltGenericErrorContext,
                          "Error: NULL argument provided\n");
 #endif
-	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
         return result;
     }
 
@@ -692,7 +692,7 @@ xslDbgShellDelete(xmlChar * arg)
             if (splitString(&arg[2], 2, opts) == 2) {
                 if ((xmlStrlen(opts[1]) == 0) ||
 		    !sscanf((char *) opts[1], "%ld", &lineNo)) {
-                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg((char*)opts[1]));
+                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").tqarg((char*)opts[1]));
                 } else {
                     xmlChar *escapedURI;
                     trimString(opts[0]);
@@ -711,7 +711,7 @@ xslDbgShellDelete(xmlChar * arg)
                         } else if (validateData(&url, &lineNo))
                             breakPtr = breakPointGet(url, lineNo);
                         if (!breakPtr || !breakPointDelete(breakPtr)){
-                            xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").arg(xsldbgUrl(url)).arg(lineNo));
+                            xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(url)).tqarg(lineNo));
                         }else{
                             result = 1;
 			}
@@ -719,7 +719,7 @@ xslDbgShellDelete(xmlChar * arg)
                     }
                 }
             } else{
-		xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").arg("delete"));
+		xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").tqarg("delete"));
 	    }
         }
     } else if (xmlStrEqual((xmlChar*)"*", arg)) {
@@ -732,24 +732,24 @@ xslDbgShellDelete(xmlChar * arg)
         if (breakPtr) {
             result = breakPointDelete(breakPtr);
             if (!result) {
-                xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint %1.\n").arg(breakPointId));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint %1.\n").tqarg(breakPointId));
             }
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").arg(breakPointId));
+            xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").tqarg(breakPointId));
         }
     } else {
         breakPtr = findBreakPointByName(arg);
         if (breakPtr) {
             result = breakPointDelete(breakPtr);
             if (!result) {
-                xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint at template %1.\n").arg(xsldbgText(arg)));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint at template %1.\n").tqarg(xsldbgText(arg)));
             }
         } else{
-            xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").arg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").tqarg(xsldbgText(arg)));
 	}
     }
     if (!result) 
-	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
     return result;
 }
 
@@ -798,7 +798,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType)
 
     if (!filesGetStylesheet() || !filesGetMainDoc()) {
         xsldbgGenericErrorFunc(i18n("Error: Debugger has no files loaded. Try reloading files.\n"));
-	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
         return result;
     }
 
@@ -807,7 +807,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType)
         xsltGenericError(xsltGenericErrorContext,
                          "Error: NULL argument provided\n");
 #endif
-	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
         return result;
     }
 
@@ -818,7 +818,7 @@ xslDbgShellEnable(xmlChar * arg, int enableType)
             if (splitString(&arg[2], 2, opts) == 2) {
                 if ((xmlStrlen(opts[1]) == 0) ||
 		    !sscanf((char *) opts[1], "%ld", &lineNo)) {
-                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg((char*)opts[1]));
+                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").tqarg((char*)opts[1]));
                 } else {
                     xmlChar *escapedURI;
                     trimString(opts[0]);
@@ -839,13 +839,13 @@ xslDbgShellEnable(xmlChar * arg, int enableType)
                         if (breakPtr){
                             result = breakPointEnable(breakPtr, enableType);
                         }else{
-                            xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").arg(xsldbgUrl(url)).arg(lineNo));
+                            xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(url)).tqarg(lineNo));
 			}
                         xmlFree(url);
                     }
                 }
             } else
-                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").arg("enable"));
+                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").tqarg("enable"));
         }
     } else if (xmlStrEqual((xmlChar*)"*", arg)) {
         result = 1;
@@ -858,21 +858,21 @@ xslDbgShellEnable(xmlChar * arg, int enableType)
         if (breakPtr) {
             result = breakPointEnable(breakPtr, enableType);
             if (!result) {
-                xsldbgGenericErrorFunc(i18n("Error: Unable to enable/disable breakpoint %1.\n").arg(breakPointId));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to enable/disable breakpoint %1.\n").tqarg(breakPointId));
             }
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").arg(breakPointId));
+            xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").tqarg(breakPointId));
         }
     } else {
         breakPtr = findBreakPointByName(arg);
         if (breakPtr) {
             result = breakPointEnable(breakPtr, enableType);
         } else
-            xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").arg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").tqarg(xsldbgText(arg)));
     }
 
     if (!result)
-	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
     return result;
 }
 
@@ -893,7 +893,7 @@ xslDbgShellPrintBreakPoint(void *payload, void *data,
     Q_UNUSED(name);
 
     if (payload) {
-        if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+        if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
             notifyListQueue(payload);
         } else {
             printCount++;
@@ -931,7 +931,7 @@ static int validateBreakPoint(breakPointPtr breakPtr, breakPointPtr copy)
 	breakPtr->flags |= BREAKPOINT_ORPHANED;
 
     if ( breakPtr->flags & BREAKPOINT_ORPHANED){
-	xsldbgGenericErrorFunc(TQString("Warning: Breakpoint %1 is orphaned. Result: %2. Old flags: %3. New flags: %4.\n").arg(breakPtr->id).arg(result).arg(copy->flags).arg(breakPtr->flags));
+	xsldbgGenericErrorFunc(TQString("Warning: Breakpoint %1 is orphaned. Result: %2. Old flags: %3. New flags: %4.\n").tqarg(breakPtr->id).tqarg(result).tqarg(copy->flags).tqarg(breakPtr->flags));
     }
 
     if (!(breakPtr->flags & BREAKPOINT_ORPHANED) && ((copy->lineNo != breakPtr->lineNo ) || 
@@ -949,11 +949,11 @@ static int validateBreakPoint(breakPointPtr breakPtr, breakPointPtr copy)
 		    breakPointCounter = lastCounter; /* compensate for breakPointAdd which always 
 							increments the breakPoint counter */
 		    result = 1;
-		    xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").arg(breakPtr->id));
+		    xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").tqarg(breakPtr->id));
 		}
 	    }
 	    if (!result){
-		xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").arg(copy->id));
+		xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").tqarg(copy->id));
 	    }
 	}
     }
@@ -992,7 +992,7 @@ static int validateTemplateBreakPoint(breakPointPtr breakPtr, breakPointPtr copy
     }
     xmlFree(copy->templateName);
     if (!result){
-	xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").arg(copy->id));
+	xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").tqarg(copy->id));
     }
     return result;
 }
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/callstack.cpp b/kxsldbg/kxsldbgpart/libxsldbg/callstack.cpp
index 585a70d1..cd9e320a 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/callstack.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/callstack.cpp
@@ -22,9 +22,9 @@
 /**
  * addCallInfo:
  * @templateName: Template name to add 
- * @templateURI: QName part of template name to add
+ * @templateURI: TQName part of template name to add
  * @modeName: Mode of template
- * @modeURI: QName part of node of template
+ * @modeURI: TQName part of node of template
  * @url: The url for the template
  *
  * Add template "call" to call stack
@@ -137,9 +137,9 @@ callStackFree(void)
 /**
  * addCallInfo:
  * @templateName: Template name to add 
- * @templateURI: QName part of template name to add
+ * @templateURI: TQName part of template name to add
  * @modeName: Mode of template
- * @modeURI: QName part of node of template
+ * @modeURI: TQName part of node of template
  * @url: The url for the template
  *
  * Add template "call" to call stack
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/cmds.h b/kxsldbg/kxsldbgpart/libxsldbg/cmds.h
index f12648c7..08a7635b 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/cmds.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/cmds.h
@@ -26,7 +26,7 @@ typedef enum {                  /* id's for commands of xslDbgShell */
     DEBUG_HELP_CMD = 100,
     DEBUG_BYE_CMD,
     DEBUG_EXIT_CMD,
-    DEBUG_QUIT_CMD,
+    DEBUG_TQUIT_CMD,
 
     DEBUG_STEP_CMD,
     DEBUG_STEPUP_CMD,
@@ -113,7 +113,7 @@ enum CommandsEnum {             /* id's for commands of xslDbgShell */
     DEBUG_HELP_CMD = 100,
     DEBUG_BYE_CMD,
     DEBUG_EXIT_CMD,
-    DEBUG_QUIT_CMD,
+    DEBUG_TQUIT_CMD,
 
     DEBUG_STEP_CMD,
     DEBUG_STEPUP_CMD,
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp
index 7088cf36..c758ceb1 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp
@@ -529,10 +529,10 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
                     templateNode =
                         findTemplateNode(styleCtxt->style, &arg[offset]);
                     if (!templateNode) {
-                        xsldbgGenericErrorFunc(i18n("Error: The XSLT template named \"%1\" was not found.\n").arg(xsldbgText(&arg[offset])));
+                        xsldbgGenericErrorFunc(i18n("Error: The XSLT template named \"%1\" was not found.\n").tqarg(xsldbgText(&arg[offset])));
                         return result;
                     } else {
-                        xsldbgGenericErrorFunc(i18n(" template: \"%1\"\n").arg(xsldbgText(&arg[offset])));
+                        xsldbgGenericErrorFunc(i18n(" template: \"%1\"\n").tqarg(xsldbgText(&arg[offset])));
                         ctxt->node = templateNode;
                         result = 1;
                         return result;
@@ -545,7 +545,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
                         pctxt = xmlXPathNewContext(source->doc);
                         if (pctxt == NULL) {
                             xmlFree(ctxt);
-                            /* xslDebugStatus = DEBUG_QUIT; */
+                            /* xslDebugStatus = DEBUG_TQUIT; */
                             return result;
                         }
                         if (!xmlXPathNsLookup(pctxt, (xmlChar *) "xsl"))
@@ -560,7 +560,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
                         xsldbgGenericErrorFunc(i18n("Error: Unable to cd. No stylesheet loaded.\n"));
                     }
                 } else {
-                    xsldbgGenericErrorFunc(i18n("Error: Unknown arguments to the command %1.\n").arg("cd"));
+                    xsldbgGenericErrorFunc(i18n("Error: Unknown arguments to the command %1.\n").tqarg("cd"));
                 }
             } else
                 xsldbgGenericErrorFunc(i18n("Error: Unable to cd. No stylesheet loaded.\n"));
@@ -582,7 +582,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
                                        XSLT_NAMESPACE);
                 list = xmlXPathEval((xmlChar *) arg, ctxt->pctxt);
             } else {
-                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to the command %1.\n").arg("cd"));
+                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to the command %1.\n").tqarg("cd"));
             }
         }
 
@@ -594,7 +594,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
                             ctxt->node = list->nodesetval->nodeTab[0];
                             /* tell the application about the new line
                              * number we are looking at */
-                            if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+                            if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
                                 int breakpoint = 0;
 
                                 xsldbgUpdateFileDetails(ctxt->node);
@@ -603,9 +603,9 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
                             }
                             result = 1;
                         } else
-                            xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is a Node Set with %n child.", "Warning: XPath %1 is a Node Set with %n children.", list->nodesetval->nodeNr).arg(xsldbgText(arg)) + TQString("\n"));
+                            xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is a Node Set with %n child.", "Warning: XPath %1 is a Node Set with %n tqchildren.", list->nodesetval->nodeNr).tqarg(xsldbgText(arg)) + TQString("\n"));
                     } else {
-                        xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is an empty Node Set.\n").arg(xsldbgText(arg)));
+                        xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is an empty Node Set.\n").tqarg(xsldbgText(arg)));
                     }
                     break;
 
@@ -614,7 +614,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
             }
             xmlXPathFreeObject(list);
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: XPath %1 was not found.\n").arg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("Error: XPath %1 was not found.\n").tqarg(xsldbgText(arg)));
         }
         if (ctxt->pctxt)
           ctxt->pctxt->node = NULL;
@@ -640,7 +640,7 @@ xslDbgPrintCallStack(const xmlChar * arg)
     callPointPtr callPointItem;
 
     if (arg == NULL) {
-        if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+        if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
             notifyListStart(XSLDBG_MSG_CALLSTACK_CHANGED);
             /* we send the oldest frame stack first */
             for (depth = 1; depth <= callStackGetDepth(); depth++) {
@@ -664,17 +664,17 @@ xslDbgPrintCallStack(const xmlChar * arg)
                         if (rootCopy && (rootCopy->match || rootCopy->name)
                             && curUrl) {			    
 			    xmlChar *rootNameTemp, *rootModeTemp;
-			    rootNameTemp = fullQName(rootCopy->nameURI, rootCopy->name);
-			    rootModeTemp = fullQName(rootCopy->modeURI, rootCopy->mode);
+			    rootNameTemp = fullTQName(rootCopy->nameURI, rootCopy->name);
+			    rootModeTemp = fullTQName(rootCopy->modeURI, rootCopy->mode);
 			    if (rootNameTemp && rootModeTemp){
 			      if (rootCopy->match)
 			        /* display information about the current XSLT template */
-                                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").arg(depth).arg(xsldbgText(rootCopy->match)).arg(xsldbgText(rootModeTemp)));
+                                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").tqarg(depth).tqarg(xsldbgText(rootCopy->match)).tqarg(xsldbgText(rootModeTemp)));
 			      else
 			        /* display information about the current XSLT template */
-                                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").arg(depth).arg(xsldbgText(rootNameTemp)).arg(xsldbgText(rootModeTemp)));
+                                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").tqarg(depth).tqarg(xsldbgText(rootNameTemp)).tqarg(xsldbgText(rootModeTemp)));
 			      /* display where we are in the source/document file */	
-			      xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(curUrl)).arg(curLine));
+			      xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(curUrl)).tqarg(curLine));
 			    }else{
 			      xsldbgGenericErrorFunc(i18n("Error: Out of memory.\n"));
 			      result = 0;
@@ -689,24 +689,24 @@ xslDbgPrintCallStack(const xmlChar * arg)
 			    }
                         } else if (curUrl) {
 			    /* display information about the current XSLT template */
-                            xsldbgGenericErrorFunc(i18n("#%1 template: \"LIBXSLT_DEFAULT\" mode: \"\"").arg(depth));
+                            xsldbgGenericErrorFunc(i18n("#%1 template: \"LIBXSLT_DEFAULT\" mode: \"\"").tqarg(depth));
 			    /* display where we are in the source/document file */	
-                            xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(curUrl)).arg(curLine));
+                            xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(curUrl)).tqarg(curLine));
                         }
                         if (curUrl)
                             xmlFree(curUrl);
 
                     }
-		    nameTemp = fullQName(callPointItem->info->templateURI,
+		    nameTemp = fullTQName(callPointItem->info->templateURI,
 					 callPointItem->info->templateName);
-		    modeTemp = fullQName(callPointItem->info->modeURI,
+		    modeTemp = fullTQName(callPointItem->info->modeURI,
 					 callPointItem->info->modeName);
 		    if (nameTemp && modeTemp){
 		      /* display information about the current XSLT template */
-		      xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").arg(depth - 1).arg(xsldbgText(nameTemp)).arg(xsldbgText(modeTemp)));
+		      xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").tqarg(depth - 1).tqarg(xsldbgText(nameTemp)).tqarg(xsldbgText(modeTemp)));
 		      if (callPointItem->info->url)
 			/* display where we are in the source/document file */	
-                        xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(callPointItem->info->url)).arg(callPointItem->lineNo));
+                        xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(callPointItem->info->url)).tqarg(callPointItem->lineNo));
 		      else
                         xsldbgGenericErrorFunc("\n");
 		    }else{
@@ -740,7 +740,7 @@ xslDbgPrintCallStack(const xmlChar * arg)
         long templateDepth = atol((char *) arg);
 
 
-        if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+        if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
             /* should never happen but just in case, when running as a 
              * thread always provide NO params to the where command */
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
@@ -755,11 +755,11 @@ xslDbgPrintCallStack(const xmlChar * arg)
             callPointItem = callStackGet(templateDepth + 1);
             if (callPointItem && callPointItem->info) {
 		/* display information about the current XSLT template */
-                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\"").arg(templateDepth).arg(xsldbgText(callPointItem->info->templateName)));
+                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\"").tqarg(templateDepth).tqarg(xsldbgText(callPointItem->info->templateName)));
                 /* should alays be present but .. */
                 if (callPointItem->info->url)
 		    /* display where we are in the source/document file */	
-                    xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(callPointItem->info->url)).arg(callPointItem->lineNo));
+                    xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(callPointItem->info->url)).tqarg(callPointItem->lineNo));
                 else
                     xsldbgGenericErrorFunc("\n");
             } else {
@@ -1097,15 +1097,15 @@ debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root,
     }
     if (root) {
         xmlChar *nameTemp = NULL, *modeTemp = NULL;
-	nameTemp = fullQName(root->nameURI, root->name);
-	modeTemp = fullQName(root->modeURI, root->mode);
+	nameTemp = fullTQName(root->nameURI, root->name);
+	modeTemp = fullTQName(root->modeURI, root->mode);
 	if (!nextCommandActive){
 	  /* we only want messages if we are not
 	    in the process of completing the next command */
 	  if (terminalIO == NULL) {
 
             if (root->match){
-                xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(root->match)).arg(xsldbgText(modeTemp)));
+                xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(root->match)).tqarg(xsldbgText(modeTemp)));
 		if (lastTemplate != root->match && buffer){
 		    xmlBufferCCat(buffer, "\nreached matched template:");
 		    xmlBufferCat(buffer, root->match); 
@@ -1115,7 +1115,7 @@ debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root,
 		    lastTemplate = root->match;
 		}
             }else{
-                xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(nameTemp)).arg(xsldbgText(modeTemp)));
+                xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(nameTemp)).tqarg(xsldbgText(modeTemp)));
 		if (lastTemplate != root->name && buffer){
 		    xmlBufferCCat(buffer, "\nreached named template:");
 		    xmlBufferCat(buffer,root->match); 
@@ -1133,9 +1133,9 @@ debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root,
                 (xslDebugStatus == DEBUG_WALK)) {
 		TQString message;
                 if (root->match)
-		  message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(root->match)).arg(xsldbgText(modeTemp));
+		  message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(root->match)).tqarg(xsldbgText(modeTemp));
                 else
-		  message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(nameTemp)).arg(xsldbgText(modeTemp));
+		  message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(nameTemp)).tqarg(xsldbgText(modeTemp));
 		fprintf(terminalIO, "%s", message.local8Bit().data());
             }
 	  }
@@ -1277,7 +1277,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 
     /* If using a thread and the thread is running then we don't need to 
      * send this as the application will see the XSLDBG_MSG_LINE_CHANGED message */
-    if ((getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED) ||
+    if ((getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED) ||
         (xslDebugStatus == DEBUG_TRACE)) {
 	TQString messageTxt;
         if (!nextCommandActive && ctxt->node && ctxt->node && ctxt->node->doc
@@ -1292,9 +1292,9 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                 breakUri = ctxt->node->doc->URL;
 
             if (xmlGetLineNo(ctxt->node) != -1)
-		messageTxt = i18n("Breakpoint for file \"%1\" at line %2.\n").arg(xsldbgUrl(breakUri)).arg(xmlGetLineNo(ctxt->node));
+		messageTxt = i18n("Breakpoint for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(breakUri)).tqarg(xmlGetLineNo(ctxt->node));
             else
-                messageTxt = i18n("Breakpoint at text node in file \"%1\".\n").arg(xsldbgUrl(breakUri));
+                messageTxt = i18n("Breakpoint at text node in file \"%1\".\n").tqarg(xsldbgUrl(breakUri));
             if (baseUri != NULL) {
                 xmlFree(baseUri);
                 baseUri = NULL;
@@ -1346,8 +1346,8 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
       xsldbgGenericErrorFunc("\n");
     }
 
-    while (!exitShell && (xslDebugStatus != DEBUG_QUIT)) {
-        if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
+    while (!exitShell && (xslDebugStatus != DEBUG_TQUIT)) {
+        if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
             if (ctxt->node == (xmlNodePtr) ctxt->doc)
                 snprintf((char *) prompt, DEBUG_BUFFER_SIZE - 1,
                          "(xsldbg) %s > ", "/");
@@ -1464,9 +1464,9 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                 /* --- Running related commands --- */
             case DEBUG_BYE_CMD:
             case DEBUG_EXIT_CMD:
-            case DEBUG_QUIT_CMD:
+            case DEBUG_TQUIT_CMD:
                 /* allow the stylesheet to exit */
-                xslDebugStatus = DEBUG_QUIT;
+                xslDebugStatus = DEBUG_TQUIT;
                 exitShell++;
                 cmdResult = 1;
                 break;
@@ -1548,7 +1548,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
             case DEBUG_WHERE_CMD:
                 /* Print the current working directory as well */
                 xslDbgPrintCallStack(NULL);
-                if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
+                if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
                     if (!xmlShellPwd(ctxt, (char *) dir, ctxt->node, NULL)){
                         xsldbgGenericErrorFunc((const char*)dir);
                         xsldbgGenericErrorFunc("\n");
@@ -1597,7 +1597,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                 break;
 
             case DEBUG_SHOWBREAK_CMD:
-                if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+                if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
                     notifyListStart(XSLDBG_MSG_BREAKPOINT_CHANGED);
                     walkBreakPoints((xmlHashScanner)
                                     xslDbgShellPrintBreakPoint, NULL);
@@ -1706,7 +1706,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 		  if(tempBaseName){
 		    xsldbgGenericErrorFunc("\n");
 		    xsldbgGenericErrorFunc((char*)dir);
-		    xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2").arg(xsldbgUrl(tempBaseName)).arg(xmlGetLineNo(ctxt->node)));
+		    xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2").tqarg(xsldbgUrl(tempBaseName)).tqarg(xmlGetLineNo(ctxt->node)));
 		    xmlFree(tempBaseName);
 		    cmdResult = 1;
 		  }
@@ -1782,7 +1782,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                     notifyXsldbgApp(XSLDBG_MSG_LINE_CHANGED, NULL);
                     if (ctxt->pctxt == NULL) {
                         xmlFree(ctxt);
-                        xslDebugStatus = DEBUG_QUIT;
+                        xslDebugStatus = DEBUG_TQUIT;
                         return;
                     } else
                         break;
@@ -1822,7 +1822,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                     notifyXsldbgApp(XSLDBG_MSG_LINE_CHANGED, NULL);
                     if (ctxt->pctxt == NULL) {
                         xmlFree(ctxt);
-                        xslDebugStatus = DEBUG_QUIT;
+                        xslDebugStatus = DEBUG_TQUIT;
                         return;
                     } else
                         break;
@@ -1885,7 +1885,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 		if (splitString(arg, 1, &systemID) == 1){
 		  cmdResult = xslDbgSystem(systemID);
 		}else{
-		  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("system"));
+		  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("system"));
 		}
 	       }
                 break;
@@ -1898,7 +1898,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 		if (splitString(arg, 1, &publicID) == 1){
 		  cmdResult = xslDbgPublic(publicID);
 		}else{
-		  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("public"));
+		  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("public"));
 		}
 	       }
                 break;
@@ -1908,7 +1908,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                 break;
 
             case DEBUG_VALIDATE_CMD:
-                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").arg("validate"));
+                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").tqarg("validate"));
                 cmdResult = 0;
                 /*
                  * xmlShellValidate(ctxt, arg, NULL, NULL);
@@ -1929,7 +1929,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                 break;
 
             case DEBUG_WRITE_CMD:
-                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").arg("write"));
+                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").tqarg("write"));
                 cmdResult = 0;
                 /*
                  * xmlShellWrite(ctxt, arg, NULL, NULL);
@@ -1937,7 +1937,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                 break;
 
             case DEBUG_FREE_CMD:
-                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").arg("free"));
+                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").tqarg("free"));
                 cmdResult = 0;
                 /*
                  * if (arg[0] == 0) {
@@ -1993,7 +1993,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 		  /* gdb does to say anything after redirecting its 
 		     output */
 		  if (optionsGetIntOption(OPTIONS_GDB) < 2)
-                    xsldbgGenericErrorFunc(i18n("Opening terminal %1.\n").arg(xsldbgText(arg)));
+                    xsldbgGenericErrorFunc(i18n("Opening terminal %1.\n").tqarg(xsldbgText(arg)));
                     cmdResult = 1;
                 } else
                     cmdResult = 0;
@@ -2009,11 +2009,11 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 		    bindtextdomain("kdewebdev/xsldbg", LOCALE_PREFIX);
 		    cmdResult = 1;
 		}else{
-		    xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("lang"));
+		    xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("lang"));
 		    cmdResult = 0;
 		}
 #else
-	        xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled\n").arg("lang"));
+	        xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled\n").tqarg("lang"));
 		cmdResult = 1;
 #endif
 		break;
@@ -2058,7 +2058,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 	       break;
 
 	     default:
-	        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("showmatch")); 
+	        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("showmatch")); 
 	     }
            break;
  
@@ -2077,7 +2077,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                 break;
 
             default:
-                xsldbgGenericErrorFunc(i18n("Error: Unknown command %1. Try help.\n").arg(xsldbgText(command)));
+                xsldbgGenericErrorFunc(i18n("Error: Unknown command %1. Try help.\n").tqarg(xsldbgText(command)));
                 cmdResult = 0;
         }
 
@@ -2088,9 +2088,9 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 		ctxt->node->doc && ctxt->node->doc->URL) {
 
                 if (xmlGetLineNo(ctxt->node) != -1)
-                    xsldbgGenericErrorFunc(i18n("Breakpoint for file \"%1\" at line %2.\n").arg(xsldbgUrl(ctxt->node->doc->URL)).arg(xmlGetLineNo(ctxt->node)));
+                    xsldbgGenericErrorFunc(i18n("Breakpoint for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(ctxt->node->doc->URL)).tqarg(xmlGetLineNo(ctxt->node)));
                 else
-                    xsldbgGenericErrorFunc(i18n("Breakpoint at text node in file \"%1\".\n").arg(xsldbgUrl(ctxt->node->doc->URL)));
+                    xsldbgGenericErrorFunc(i18n("Breakpoint at text node in file \"%1\".\n").tqarg(xsldbgUrl(ctxt->node->doc->URL)));
             }
         }
 
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp
index 10abbaf7..a58d0168 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp
@@ -46,7 +46,7 @@ xslDbgEntities(void)
         int entityIndex;
         entityInfoPtr entInfo;
 
-        if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+        if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
             /* notify that we are starting new list of entity names */
             notifyListStart(XSLDBG_MSG_ENTITIY_CHANGED);
             for (entityIndex = 0;
@@ -68,7 +68,7 @@ xslDbgEntities(void)
                                                        entityIndex);
                 if (entInfo) {
 		    /* display identifier of an XML entity */
-                    xsldbgGenericErrorFunc(i18n("Entity %1 ").arg(xsldbgText(entInfo->SystemID)));
+                    xsldbgGenericErrorFunc(i18n("Entity %1 ").tqarg(xsldbgText(entInfo->SystemID)));
                     if (entInfo->PublicID)
 			xsldbgGenericErrorFunc(xsldbgText(entInfo->PublicID));
 		    xsldbgGenericErrorFunc("\n");
@@ -111,22 +111,22 @@ xslDbgSystem(const xmlChar * arg)
     }
 
     name = xmlCatalogResolveSystem(arg);
-    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
         if (name) {
             notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, name);
             result = 1;
             xmlFree(name);
         } else {
             notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, "");
-            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg)));
         }
     } else {
         if (name) {
-            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" maps to: \"%2\"\n").arg(xsldbgText(arg)).arg(xsldbgText(name)));
+            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" maps to: \"%2\"\n").tqarg(xsldbgText(arg)).tqarg(xsldbgText(name)));
             xmlFree(name);
             result = 1;
         } else {
-            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg)));
         }
     }
 
@@ -158,22 +158,22 @@ xslDbgPublic(const xmlChar * arg)
     }
 
     name = xmlCatalogResolvePublic(arg);
-    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
         if (name) {
             notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, name);
             result = 1;
             xmlFree(name);
         } else {
             notifyXsldbgApp(XSLDBG_MSG_RESOLVE_CHANGE, "");
-	    xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg)));
+	    xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg)));
         }
     } else {
         if (name) {
-            xsldbgGenericErrorFunc(i18n("PublicID \"%1\" maps to: \"%2\"\n").arg(xsldbgText(arg)).arg(xsldbgText(name)));
+            xsldbgGenericErrorFunc(i18n("PublicID \"%1\" maps to: \"%2\"\n").tqarg(xsldbgText(arg)).tqarg(xsldbgText(name)));
             xmlFree(name);
             result = 1;
         } else {
-	    xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg)));
+	    xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg)));
         }
         xsltGenericError(xsltGenericErrorContext, "%s", buffer);
     }
@@ -210,7 +210,7 @@ xslDbgEncoding(xmlChar * arg)
             result = 1;
         }
     } else
-        xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("encoding"));
+        xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("encoding"));
     return result;
 }
 
@@ -245,7 +245,7 @@ int xslDbgShellOutput(const xmlChar *arg)
       notifyXsldbgApp(XSLDBG_MSG_FILE_CHANGED, 0L);
       result = 1;
     } else if (!xmlStrnCmp(arg, "ftp://", 6) || !xmlStrnCmp(arg, "http://", 7)){
-	xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("output"));
+	xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("output"));
 	return 0;
     } else {
       /* assume that we were provided a local file name
@@ -262,11 +262,11 @@ int xslDbgShellOutput(const xmlChar *arg)
 	   xmlFree(expandedName);
 	   result = 1;
       }else{
-	   xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("output"));
+	   xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("output"));
       }
     }
    } else {
-    xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("output"));
+    xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("output"));
   }
 
   return result;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp
index 73d3713b..df764b0b 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp
@@ -189,7 +189,7 @@ openTerminal(xmlChar * device)
                     termName = xmlMemStrdup((char *) device);
                     result = 1;
                 } else {
-                    xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").arg(xsldbgText(termName)));
+                    xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").tqarg(xsldbgText(termName)));
                 }
             } else {
                 xsldbgGenericErrorFunc(i18n("Error: Did not previously open terminal.\n"));
@@ -212,7 +212,7 @@ openTerminal(xmlChar * device)
                 termName = xmlMemStrdup((char *) device);
                 result = 1;
             } else {
-                xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").arg(xsldbgText(device)));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").tqarg(xsldbgText(device)));
             }
 
     }
@@ -494,7 +494,7 @@ changeDir(const xmlChar * path)
         return result;          /* out of memory ? */
 
     if (xmlStrLen(expandedName) + 1 > sizeof(filesBuffer)) {
-        xsldbgGenericErrorFunc(i18n("Error: The file name \"%1\" is too long.\n").arg(xsldbgText(path)));
+        xsldbgGenericErrorFunc(i18n("Error: The file name \"%1\" is too long.\n").tqarg(xsldbgText(path)));
         return result;
     }
 
@@ -518,10 +518,10 @@ changeDir(const xmlChar * path)
     }
     xmlFree(expandedName);      /* this will always be valid time */
     if (!result) {
-        xsldbgGenericErrorFunc(i18n("Error: Unable to change to directory %1.\n").arg(xsldbgText(path)));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to change to directory %1.\n").tqarg(xsldbgText(path)));
     } else {
 	if (xslDebugStatus != DEBUG_NONE)
-	    xsldbgGenericErrorFunc(i18n("Changed to directory %1.\n").arg(xsldbgText(path)));
+	    xsldbgGenericErrorFunc(i18n("Changed to directory %1.\n").tqarg(xsldbgText(path)));
     }
     return result;
 }
@@ -549,7 +549,7 @@ filesLoadXmlFile(const xmlChar * path, FileTypeEnum fileType)
         case FILES_XMLFILE_TYPE:
             if (path && xmlStrLen(path)) {
                 if (optionsGetIntOption(OPTIONS_SHELL)) {
-                    xsldbgGenericErrorFunc(i18n("Setting XML Data file name to %1.\n").arg(xsldbgText(path)));
+                    xsldbgGenericErrorFunc(i18n("Setting XML Data file name to %1.\n").tqarg(xsldbgText(path)));
                 }
                 optionsSetStringOption(OPTIONS_DATA_FILE_NAME, path);
             }
@@ -561,7 +561,7 @@ filesLoadXmlFile(const xmlChar * path, FileTypeEnum fileType)
         case FILES_SOURCEFILE_TYPE:
             if (path && xmlStrLen(path)) {
                 if (optionsGetIntOption(OPTIONS_SHELL)) {
-                    xsldbgGenericErrorFunc(i18n("Setting stylesheet file name to %1.\n").arg(xsldbgText(path)));
+                    xsldbgGenericErrorFunc(i18n("Setting stylesheet file name to %1.\n").tqarg(xsldbgText(path)));
                 }
                 optionsSetStringOption(OPTIONS_SOURCE_FILE_NAME, path);
             }
@@ -578,7 +578,7 @@ filesLoadXmlFile(const xmlChar * path, FileTypeEnum fileType)
                     stylePathName = (xmlChar *) xmlMemStrdup(docUrl);
                     stylePathName[lastSlash - docUrl + 1] = '\0';
                     if (optionsGetIntOption(OPTIONS_SHELL)) {
-                        xsldbgGenericErrorFunc(i18n("Setting stylesheet base path to %1.\n").arg(xsldbgText(stylePathName)));
+                        xsldbgGenericErrorFunc(i18n("Setting stylesheet base path to %1.\n").tqarg(xsldbgText(stylePathName)));
                     }
                 } else {
                     const char cwd[4] = { '.', PATHCHAR, '\0' };
@@ -939,7 +939,7 @@ filesEntityRef(xmlEntityPtr ent, xmlNodePtr firstNode, xmlNodePtr lastNode)
 
  /**
    * filesSetBaseUri:
-   * @node : Is valid and has a doc parent
+   * @node : Is valid and has a doc tqparent
    * @uri : Is Valid
    * 
    * Set the base uri for this node. Function is used when xml file
@@ -972,7 +972,7 @@ filesSetBaseUri(xmlNodePtr node, const xmlChar * uri)
 
   /**
    * filesGetBaseUri:
-   * @node : Is valid and has a doc parent
+   * @node : Is valid and has a doc tqparent
    * 
    * Get a copy of the base uri for this node. Function is most usefull 
    *  used when xml file  has external entities in its DTD
@@ -1176,12 +1176,12 @@ filesSetEncoding(const char *encoding)
             if (!result) {
                 xmlCharEncCloseFunc(stdoutEncoding);
                 stdoutEncoding = NULL;
-                xsldbgGenericErrorFunc(i18n("Unable to initialize encoding %1.").arg(xsldbgText(encoding)));
+                xsldbgGenericErrorFunc(i18n("Unable to initialize encoding %1.").tqarg(xsldbgText(encoding)));
             } else
                 optionsSetStringOption(OPTIONS_ENCODING,
                                        (xmlChar *) encoding);
         } else {
-            xsldbgGenericErrorFunc(i18n("Invalid encoding %1.\n").arg(xsldbgText(encoding)));
+            xsldbgGenericErrorFunc(i18n("Invalid encoding %1.\n").tqarg(xsldbgText(encoding)));
         }
     } else {
         /* close encoding and use UTF-8 */
@@ -1360,7 +1360,7 @@ xmlChar *filesURItoFileName(const xmlChar* uri)
 	result = NULL;
       }
     }else{
-        xsldbgGenericErrorFunc(i18n("Error: Unable to convert %1 to local file name.\n").arg(xsldbgText(uri)));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to convert %1 to local file name.\n").tqarg(xsldbgText(uri)));
     }
 
 
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files.h b/kxsldbg/kxsldbgpart/libxsldbg/files.h
index 05e49828..0dd9a3e1 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/files.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/files.h
@@ -138,7 +138,7 @@ extern "C" {
 
   /**
    * filesSetBaseUri:
-   * @node : Is valid and has a doc parent
+   * @node : Is valid and has a doc tqparent
    * @uri : Is Valid
    * 
    * Set the base uri for this node. Function is used when xml file
@@ -154,7 +154,7 @@ extern "C" {
    * Set the base uri for this node. Function is used when xml file
    *    has external entities in its DTD
    * 
-   * @param node Is valid and has a doc parent
+   * @param node Is valid and has a doc tqparent
    * @param uri Is Valid
    * 
    * @returns 1 if successful,
@@ -169,7 +169,7 @@ extern "C" {
 
   /**
    * filesGetBaseUri:
-   * @node : Is valid and has a doc parent
+   * @node : Is valid and has a doc tqparent
    * 
    * Get a copy of the base uri for this node. Function is most usefull 
    *  used when xml file  has external entities in its DTD
@@ -184,7 +184,7 @@ extern "C" {
    * Get a copy of the base uri for this node. Function is most usefull 
    *  used when xml file  has external entities in its DTD
    * 
-   * @param node : Is valid and has a doc parent
+   * @param node : Is valid and has a doc tqparent
    * 
    * @returns The a copy of the base uri for this node,
    *          NULL otherwise
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
index db06ad2f..ec49e7e9 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
@@ -65,8 +65,8 @@ helpTop(const xmlChar * args)
     int result = 0;
 
     if (xmlStrLen(args) > 0) {
-        snprintf(helpParam, 100, "--param help:%c'%s'%c", QUOTECHAR, args,
-                 QUOTECHAR);
+        snprintf(helpParam, 100, "--param help:%c'%s'%c", TQUOTECHAR, args,
+                 TQUOTECHAR);
     } else
         xmlStrCpy(helpParam, "");
     if (docsDirPath && filesTempFileName(0)) {
@@ -79,15 +79,15 @@ helpTop(const xmlChar * args)
                  " --cd %s "
                  "xsldbghelp.xsl xsldbghelp.xml",
                  XSLDBG_BIN, helpParam,
-                 QUOTECHAR, VERSION, QUOTECHAR,
-                 QUOTECHAR, xsldbgVerTxt.utf8().data(), QUOTECHAR,
-                 QUOTECHAR, helpDocVerTxt.utf8().data(), QUOTECHAR,
-                 QUOTECHAR, helpErrorTxt.utf8().data(), QUOTECHAR,
+                 TQUOTECHAR, VERSION, TQUOTECHAR,
+                 TQUOTECHAR, xsldbgVerTxt.utf8().data(), TQUOTECHAR,
+                 TQUOTECHAR, helpDocVerTxt.utf8().data(), TQUOTECHAR,
+                 TQUOTECHAR, helpErrorTxt.utf8().data(), TQUOTECHAR,
                  filesTempFileName(0),
 		 docsDirPath);
         if (xslDbgShellExecute((xmlChar *) buff, optionsGetIntOption(OPTIONS_VERBOSE)) == 0) {
             if (docsDirPath)
-                xsldbgGenericErrorFunc(i18n("Error: Unable to display help. Help files not found in %1 or xsldbg not found in path.\n").arg(docsDirPath)); /* FIXME: Comments not correct - the command is that invoked  */
+                xsldbgGenericErrorFunc(i18n("Error: Unable to display help. Help files not found in %1 or xsldbg not found in path.\n").tqarg(docsDirPath)); /* FIXME: Comments not correct - the command is that invoked  */
             else
                 xsldbgGenericErrorFunc(i18n("Error: Unable to find xsldbg or help files.\n"));
         } else {
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp
index 5fcbef00..67dbcbe8 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/nodeview_cmds.cpp
@@ -25,7 +25,7 @@
 #include "arraylist.h"
 #include "breakpoint.h"
 #include "xsldbgmsg.h"
-#include "xsldbgthread.h"       /* for getThreadStatus */
+#include "xsldbgthread.h"       /* for getThreadtqStatus */
 #include "files.h"
 #include "options.h"
 
@@ -137,7 +137,7 @@ xslDbgShellPrintList(xmlShellCtxtPtr ctxt, xmlChar * arg, int dir)
             }
             xmlXPathFreeObject(list);
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").tqarg(xsldbgText(arg)));
         }
         ctxt->pctxt->node = NULL;
     }
@@ -172,7 +172,7 @@ xslDbgCatToFile(xmlNodePtr node, FILE * file)
         const xmlChar *encoding = doc->encoding;
 
         if (encoding) {
-            xsldbgGenericErrorFunc(i18n("Information: Temporarily setting document's encoding to UTF-8. Previously was %1.\n").arg(xsldbgText(encoding)));
+            xsldbgGenericErrorFunc(i18n("Information: Temporarily setting document's encoding to UTF-8. Previously was %1.\n").tqarg(xsldbgText(encoding)));
         }
         doc->encoding = (xmlChar *) "UTF-8";
         xmlDocDump(file, (xmlDocPtr) node);
@@ -226,7 +226,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){
 	  break;
 	file = fopen(fileName, "w+");
 	if (!file) {
-	   xsldbgGenericErrorFunc(i18n("Error: Unable to save temporary results to %1.\n").arg(xsldbgText(fileName)));
+	   xsldbgGenericErrorFunc(i18n("Error: Unable to save temporary results to %1.\n").tqarg(xsldbgText(fileName)));
 	  break;
 	} else {
 	  fprintf(file, "= %s\n", xPath);
@@ -240,7 +240,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){
 						nodeTab[indx], file);
 	      }
 	    } else {
-	      xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(xsldbgText(xPath)));
+	      xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").tqarg(xsldbgText(xPath)));
 	    }
 	    break;
 			     
@@ -268,7 +268,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){
 	    fprintf(file,"\n");	    
 
 	  } /* inner switch statement  */
-	  if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+	  if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
 	    fclose(file);
 	    file = NULL;
 	    /* send the data to application */
@@ -338,16 +338,16 @@ xslDbgShellCat(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
 {
     xmlXPathObjectPtr list;
     int result = 0;
-    static const char * QUIET_STR = "-q";
+    static const char * TQUIET_STR = "-q";
     bool silenceCtxtErrors = false;
 
     if ((arg == NULL) || (xmlStrLen(arg) == 0))
         arg = (xmlChar *) ".";
 
     /* Do we quietly ingore style context errors */
-    if (strncasecmp((char*)arg, QUIET_STR, strlen(QUIET_STR))== 0){
+    if (strncasecmp((char*)arg, TQUIET_STR, strlen(TQUIET_STR))== 0){
       silenceCtxtErrors = true;	
-      arg = arg + strlen(QUIET_STR);
+      arg = arg + strlen(TQUIET_STR);
       while (isspace(*arg)){
 	arg++;
       }
@@ -380,7 +380,7 @@ xslDbgShellCat(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
         result = printXPathObject(list, arg);
         xmlXPathFreeObject(list);
     } else {
-        xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(xsldbgText(arg)));
+        xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").tqarg(xsldbgText(arg)));
     }
     ctxt->pctxt->node = NULL;
     return result;
@@ -403,7 +403,7 @@ xslDbgShellPrintNames(void *payload,
 {
     Q_UNUSED(payload);
     Q_UNUSED(data);
-    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
         notifyListQueue(payload);
     } else if (payload && name) {
         xmlChar * fullQualifiedName = nodeViewBuffer;
@@ -415,19 +415,19 @@ xslDbgShellPrintNames(void *payload,
 		     item->nameURI, item->name);
 	}
         if (printVariableValue == 0){
-	    xsldbgGenericErrorFunc(i18n(" Global %1\n").arg(xsldbgText(fullQualifiedName)));
+	    xsldbgGenericErrorFunc(i18n(" Global %1\n").tqarg(xsldbgText(fullQualifiedName)));
         }else{
 	      if (item->computed == 1){
 	         xsldbgGenericErrorFunc(i18n(" Global "));
 		 printXPathObject(item->value, fullQualifiedName);
 	      }else if (item->tree){
-	         xsldbgGenericErrorFunc(i18n(" Global = %1\n").arg(xsldbgText(fullQualifiedName)));
+	         xsldbgGenericErrorFunc(i18n(" Global = %1\n").tqarg(xsldbgText(fullQualifiedName)));
 		 xslDbgCatToFile(item->tree, stderr);
 	      }else if (item->select){
-	         xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(xsldbgText(item->select)));
+	         xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(xsldbgText(item->select)));
 	      }else{
 		/* can't find a value give only a variable name an error message */
-		xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(i18n("Warning: No value assigned to variable.\n")));
+		xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(i18n("Warning: No value assigned to variable.\n")));
 	      }
 	    xsltGenericError(xsltGenericErrorContext, "\n\032\032\n");
         }
@@ -457,7 +457,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
     /* command argument to include both name and its value */
     static const char * FULLNAME_STR = "-f";
     /* Quietly exit if an invalid stylesheet is provided */
-    static const char * QUIET_STR = "-q";
+    static const char * TQUIET_STR = "-q";
     bool silenceCtxtErrors = false;
 
     if (!arg) {
@@ -470,9 +470,9 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
 
     varCount = 0;
     /* Do we quietly ingore style context errors */
-    if (strncasecmp((char*)arg, QUIET_STR, strlen(QUIET_STR))== 0){
+    if (strncasecmp((char*)arg, TQUIET_STR, strlen(TQUIET_STR))== 0){
       silenceCtxtErrors = true;	
-      arg = arg + strlen(QUIET_STR);
+      arg = arg + strlen(TQUIET_STR);
       while (isspace(*arg)){
 	arg++;
       }
@@ -496,7 +496,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
         /* list variables of type requested */
         if (type == DEBUG_GLOBAL_VAR) {
             if (styleCtxt->globalVars) {
-                if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+                if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
                     notifyListStart(XSLDBG_MSG_GLOBALVAR_CHANGED);
                     /* list global variables */
                     xmlHashScan(styleCtxt->globalVars,
@@ -514,7 +514,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
                 if (optionsGetIntOption(OPTIONS_GDB) == 0)
                     xsltGenericError(xsltGenericErrorContext, "\n");
             } else {
-                if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
+                if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
                     /* Don't show this message when running as a thread as it 
                      * is annoying */
                     xsldbgGenericErrorFunc(i18n("Error: Libxslt has not initialized variables yet; try stepping to a template.\n"));
@@ -528,7 +528,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
         } else {
             /* list local variables */
             if (styleCtxt->varsNr &&  styleCtxt->varsTab) {
-		if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+		if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
 		    notifyListStart(XSLDBG_MSG_LOCALVAR_CHANGED);
 		    for (int i = styleCtxt->varsNr; i > styleCtxt->varsBase; i--) {
 			    xsltStackElemPtr item = styleCtxt->varsTab[i-1];
@@ -553,19 +553,19 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
 								    item->nameURI, item->name);
 					    }
 					    if (printVariableValue == 0){
-						    xsldbgGenericErrorFunc(i18n(" Local %1").arg(xsldbgText(fullQualifiedName)));
+						    xsldbgGenericErrorFunc(i18n(" Local %1").tqarg(xsldbgText(fullQualifiedName)));
 					    }else{
 						    if (item->computed == 1){
 							    xsldbgGenericErrorFunc(i18n(" Local "));
 							    printXPathObject(item->value, fullQualifiedName);
 						    }else if (item->tree){
-							    xsldbgGenericErrorFunc(i18n(" Local = %1\n").arg(xsldbgText(fullQualifiedName)));
+							    xsldbgGenericErrorFunc(i18n(" Local = %1\n").tqarg(xsldbgText(fullQualifiedName)));
 							    xslDbgCatToFile(item->tree, stderr);
 						    }else if (item->select){
-							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(xsldbgText(item->select)));
+							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(xsldbgText(item->select)));
 						    }else{
 							    /* can't find a value give only a variable name and an error */
-							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(i18n("Warning: No value assigned to variable.\n")));
+							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(i18n("Warning: No value assigned to variable.\n")));
 						    }
 					    }
 					    xsltGenericError(xsltGenericErrorContext, "\n\032\032\n");
@@ -577,7 +577,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
                 result = 1;
                 xsltGenericError(xsltGenericErrorContext, "\n");
             } else {
-                if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
+                if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
                     /* Don't show this message when running as a thread as it 
                      * is annoying */
                     xsldbgGenericErrorFunc(i18n("Error: Libxslt has not initialized variables yet; try stepping past the xsl:param elements in the template.\n"));
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp
index 0bc54364..05ca9a4c 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/option_cmds.cpp
@@ -70,7 +70,7 @@ xslDbgShellSetOption(xmlChar * arg)
                     /* handle setting integer option */
                     if ((xmlStrlen(opts[1]) == 0) ||
 			!sscanf((char *) opts[1], "%ld", &optValue)) {
-			 xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as an option value.\n").arg(xsldbgText(opts[1])));
+			 xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as an option value.\n").tqarg(xsldbgText(opts[1])));
                     } else {
 			if (invertOption)
 			    optValue = !optValue;
@@ -104,16 +104,16 @@ xslDbgShellSetOption(xmlChar * arg)
 			else
 			    xmlSetExternalEntityLoader(xmlNoNetExternalEntityLoader);
 		    }else{
-			 xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as an option value.\n").arg(xsldbgText(opts[1])));
+			 xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as an option value.\n").tqarg(xsldbgText(opts[1])));
 		    }
 		} else 
-                xsldbgGenericErrorFunc(i18n("Error: Unknown option name %1.\n").arg(xsldbgText(opts[0])));
+                xsldbgGenericErrorFunc(i18n("Error: Unknown option name %1.\n").tqarg(xsldbgText(opts[0])));
             }
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("setoption"));
+            xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("setoption"));
         }
     } else {
-	xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("setoption"));
+	xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("setoption"));
     }
 
     return result;
@@ -137,13 +137,13 @@ xslDbgShellOptions(void)
     const xmlChar *optionName, *optionValue;
 
     /* Print out the integer options and thier values */
-    if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
         for (optionIndex = OPTIONS_XINCLUDE;
              optionIndex <= OPTIONS_VERBOSE; optionIndex++) {
             /* skip any non-user options */
             optionName = optionsGetOptionName(OptionTypeEnum(optionIndex));
             if (optionName && (optionName[0] != '*')) {
-                xsldbgGenericErrorFunc(i18n("Option %1 = %2\n").arg(xsldbgText(optionName)).arg(optionsGetIntOption(OptionTypeEnum(optionIndex))));
+                xsldbgGenericErrorFunc(i18n("Option %1 = %2\n").tqarg(xsldbgText(optionName)).tqarg(optionsGetIntOption(OptionTypeEnum(optionIndex))));
 
             }
         }
@@ -154,9 +154,9 @@ xslDbgShellOptions(void)
             if (optionName && (optionName[0] != '*')) {
                 optionValue = optionsGetStringOption(OptionTypeEnum(optionIndex));
                 if (optionValue) {
-                    xsldbgGenericErrorFunc(i18n("Option %1 = \"%2\"\n").arg(xsldbgText(optionName)).arg((char*)optionValue));
+                    xsldbgGenericErrorFunc(i18n("Option %1 = \"%2\"\n").tqarg(xsldbgText(optionName)).tqarg((char*)optionValue));
                 } else {
-                    xsldbgGenericErrorFunc(i18n("Option %1 = \"\"\n").arg(xsldbgText(optionName)));
+                    xsldbgGenericErrorFunc(i18n("Option %1 = \"\"\n").tqarg(xsldbgText(optionName)));
 
                 }
             }
@@ -234,7 +234,7 @@ xslDbgShellOptions(void)
 	counter++){
     watchExpression = (xmlChar*)arrayListGet(optionsGetWatchList(), counter);
     if (watchExpression){
-      xsldbgGenericErrorFunc(i18n(" WatchExpression %1 ").arg(counter + 1));
+      xsldbgGenericErrorFunc(i18n(" WatchExpression %1 ").tqarg(counter + 1));
       result = xslDbgShellCat(styleCtxt, ctx, watchExpression);
     }else
       break;
@@ -260,7 +260,7 @@ xslDbgShellOptions(void)
     trimString(arg);
     result = optionsAddWatch(arg);
     if (!result)
-      xsldbgGenericErrorFunc(i18n("Error: Unable to add watch expression \"%1\". It already has been added or it cannot be watched.\n").arg(xsldbgText(arg)));
+      xsldbgGenericErrorFunc(i18n("Error: Unable to add watch expression \"%1\". It already has been added or it cannot be watched.\n").tqarg(xsldbgText(arg)));
   }
   return result;
 }
@@ -284,12 +284,12 @@ xslDbgShellOptions(void)
       arrayListEmpty(optionsGetWatchList());
     }else if ((xmlStrlen(arg) == 0) || 
 	      !sscanf((char *) arg, "%ld", &watchID)) {
-      xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a watchID.\n").arg(xsldbgText(arg)));
+      xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a watchID.\n").tqarg(xsldbgText(arg)));
       return result;
     } else {
       result = optionsRemoveWatch(watchID);
       if (!result)
-	xsldbgGenericErrorFunc(i18n("Error: Watch expression %1 does not exist.\n").arg(watchID));
+	xsldbgGenericErrorFunc(i18n("Error: Watch expression %1 does not exist.\n").tqarg(watchID));
     }
   }
   return result;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
index 28b8f44c..9d6bd217 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
@@ -112,20 +112,20 @@ static TQString langLookupDir( const TQString &fname )
         langs.remove( "C" );
         TQStringList::ConstIterator lang;
         for (lang = langs.begin(); lang != langs.end(); ++lang)
-            search.append(TQString("%1%2/%3/%4").arg(localDoc[id]).arg(*lang).arg("xsldbg").arg(fname));
+            search.append(TQString("%1%2/%3/%4").tqarg(localDoc[id]).tqarg(*lang).tqarg("xsldbg").tqarg(fname));
     }
 
     // try to locate the file
     TQStringList::Iterator it;
     for (it = search.begin(); it != search.end(); ++it)
     {
-	TQString baseDir = (*it).left((*it).findRev('/')) ;
+	TQString baseDir = (*it).left((*it).tqfindRev('/')) ;
 	TQFileInfo info(baseDir + "/"+ fname);
 	if (info.exists() && info.isFile() && info.isReadable())
 	  return baseDir;
     }
 
-    return TQString::null;
+    return TQString();
 }
 
 
@@ -293,10 +293,10 @@ optionsSetIntOption(OptionTypeEnum optionType, int value)
         }
     } else {
 	if ((type >= OPTIONS_FIRST_OPTIONID) && (type <= OPTIONS_LAST_OPTIONID)){
-	     xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
+	     xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").tqarg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
 	}else{
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
-	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("setoption"));
+	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("setoption"));
 #endif
 	}
         result = 0;
@@ -323,10 +323,10 @@ optionsGetIntOption(OptionTypeEnum optionType)
         result = intOptions[type - OPTIONS_FIRST_INT_OPTIONID];
     } else {
 	if ((type >= OPTIONS_FIRST_OPTIONID) && (type <= OPTIONS_LAST_OPTIONID)){
-	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
+	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").tqarg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
 	}else{
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
-	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("options"));
+	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("options"));
 #endif
 	}
     }
@@ -365,10 +365,10 @@ optionsSetStringOption(OptionTypeEnum optionType, const xmlChar * value)
         result = 1;
     } else{
 	if ((type >= OPTIONS_FIRST_OPTIONID) && (type <= OPTIONS_LAST_OPTIONID)){
-	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").arg(xsldbgText(optionNames[type - OPTIONS_LAST_OPTIONID])));
+	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").tqarg(xsldbgText(optionNames[type - OPTIONS_LAST_OPTIONID])));
 	}else{
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
-	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("setoption"));
+	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("setoption"));
 #endif
 	}
     }
@@ -396,10 +396,10 @@ optionsGetStringOption(OptionTypeEnum optionType)
         result = stringOptions[optionId];
     } else{
 	if ((type >= OPTIONS_FIRST_OPTIONID) && (type <= OPTIONS_LAST_OPTIONID)){
-	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
+	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").tqarg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
 	}else{
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
-	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("options"));
+	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("options"));
 #endif
 	}
     }
@@ -508,7 +508,7 @@ optionsPrintParam(int paramId)
                                         paramId);
 
     if (paramItem && paramItem->name && paramItem->value) {
-        xsldbgGenericErrorFunc(i18n(" Parameter %1 %2=\"%3\"\n").arg(paramId).arg(xsldbgText(paramItem->name)).arg(xsldbgText(paramItem->value)));
+        xsldbgGenericErrorFunc(i18n(" Parameter %1 %2=\"%3\"\n").tqarg(paramId).tqarg(xsldbgText(paramItem->name)).tqarg(xsldbgText(paramItem->value)));
         result = 1;
     }
     return result;
@@ -530,7 +530,7 @@ optionsPrintParamList(void)
     int paramIndex = 0;
     int itemCount = arrayListCount(optionsGetParamItemList());
 
-    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
         if (itemCount > 0) {
             while (result && (paramIndex < itemCount)) {
                 result = optionsPrintParam(paramIndex++);
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp
index dac5bb0f..16e1ccf6 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp
@@ -45,7 +45,7 @@ xslDbgShellChangeWd(xmlChar * path)
         /* call function in files.c to do the work */
         result = changeDir(path);
     } else
-        xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("chdir"));
+        xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("chdir"));
     return result;
 }
 
@@ -69,12 +69,12 @@ xslDbgShellExecute(xmlChar * name, int verbose)
     /* Quick check to see if we have a command processor; embedded systems
      * may not have such a thing */
     if (system(NULL) == 0) {
-        xsldbgGenericErrorFunc(i18n("Error: No command processor available for shell command \"%1\".\n").arg(xsldbgText(name)));
+        xsldbgGenericErrorFunc(i18n("Error: No command processor available for shell command \"%1\".\n").tqarg(xsldbgText(name)));
     } else {
         int return_code;
 
         if (verbose)
-            xsldbgGenericErrorFunc(i18n("Information: Starting shell command \"%1\".\n").arg(xsldbgText(name)));
+            xsldbgGenericErrorFunc(i18n("Information: Starting shell command \"%1\".\n").tqarg(xsldbgText(name)));
 
         return_code = system((char *) name);
         /* JRF: Strictly system returns an implementation defined value -
@@ -93,7 +93,7 @@ xslDbgShellExecute(xmlChar * name, int verbose)
             result = 1;
         } else {
             if (verbose)
-                xsldbgGenericErrorFunc(i18n("Error: Unable to run command. System error %1.\n").arg(return_code));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to run command. System error %1.\n").tqarg(return_code));
         }
     }
     return result;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp
index befa330d..52563725 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp
@@ -49,7 +49,7 @@ xslDbgShellAddParam(xmlChar * arg)
     xmlChar *opts[2];
 
     if (!arg) {
-        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("addparam"));
+        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("addparam"));
     }else{
 	if ((xmlStrLen(arg) > 1) && splitString(arg, 2, opts) == 2) {
 	    int count;
@@ -68,11 +68,11 @@ xslDbgShellAddParam(xmlChar * arg)
 	    paramItem = optionsParamItemNew(opts[0], opts[1]);
 	    result = arrayListAdd(optionsGetParamItemList(), paramItem);
 	} else {
-	    xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("addparam"));
+	    xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("addparam"));
 	}
     }
     if (!result)
-        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
     else {
 	xsldbgGenericErrorFunc("\n");
     }
@@ -98,21 +98,21 @@ xslDbgShellDelParam(xmlChar * arg)
     xmlChar *opts[2];
 
     if (!arg) {
-	xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("delparam"));
+	xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("delparam"));
     }else{
 	if (xmlStrLen(arg) > 0) {
 	    if (splitString(arg, 1, opts) == 1) {
 		if ((xmlStrlen(opts[0]) == 0) ||
 			!sscanf((char *) opts[0], "%ld", &paramId)) {
-		    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg(xsldbgText(opts[0])));
+		    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").tqarg(xsldbgText(opts[0])));
 		} else {
 		    result =
 			arrayListDelete(optionsGetParamItemList(), paramId);
 		    if (!result)
-			xsldbgGenericErrorFunc(i18n("Error: Unable to find parameter %1.\n").arg(paramId));
+			xsldbgGenericErrorFunc(i18n("Error: Unable to find parameter %1.\n").tqarg(paramId));
 		}
 	    } else {
-		xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("delparam"));
+		xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("delparam"));
 	    }
 	} else {
 	    /* Delete all parameters */
@@ -121,7 +121,7 @@ xslDbgShellDelParam(xmlChar * arg)
 	}
     }
     if (!result)
-        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
     else
          xsldbgGenericErrorFunc("\n");
 
@@ -145,7 +145,7 @@ xslDbgShellShowParam(xmlChar * arg)
     int result = 0;
     static const char *errorPrompt = I18N_NOOP("Unable to print parameters");
 
-    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
         int paramIndex = 0;
         int itemCount = arrayListCount(optionsGetParamItemList());
 
@@ -168,7 +168,7 @@ xslDbgShellShowParam(xmlChar * arg)
         if (optionsPrintParamList())
             result = 1;
         else
-        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
         xsldbgGenericErrorFunc("\n");
     }
     return result;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h b/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h
index dfe57f0c..6fd7a9f3 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/qtnotifier2.h
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QTNOTIFIER_H
-#define QTNOTIFIER_H
+#ifndef TQTNOTIFIER_H
+#define TQTNOTIFIER_H
 
 #if defined WIN32
 #include <libxsldbg/xsldbgwin32config.h>
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp
index 68fcd7e1..90cc9a10 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp
@@ -404,7 +404,7 @@ searchSave(const xmlChar * fileName)
     if (xmlSaveFormatFile((char *) searchInput, searchDataBase, 1) != -1){
         result = 1;
     }else{
-        xsldbgGenericErrorFunc(i18n("Error: Unable to write search Database to file %1. Try setting the \"searchresultspath\" option to a writable path.\n").arg(xsldbgText(searchInput)));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to write search Database to file %1. Try setting the \"searchresultspath\" option to a writable path.\n").tqarg(xsldbgText(searchInput)));
     }
 
     if (searchInput)
@@ -479,9 +479,9 @@ searchQuery(const xmlChar * tempFile, const xmlChar * outputFile,
             result = filesMoreFile(searchOutput, NULL);
         }
 
-        xsldbgGenericErrorFunc(i18n("Information: Transformed %1 using %2 and saved to %3.\n").arg(xsldbgText(searchInput)).arg(xsldbgText(searchXSL)).arg(xsldbgText(searchOutput)));
+        xsldbgGenericErrorFunc(i18n("Information: Transformed %1 using %2 and saved to %3.\n").tqarg(xsldbgText(searchInput)).tqarg(xsldbgText(searchXSL)).tqarg(xsldbgText(searchOutput)));
     } else {
-        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("search"));
+        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").tqarg("search"));
     }
 
     if (searchInput)
@@ -720,7 +720,7 @@ findTemplateNode(xsltStylesheetPtr style, const xmlChar * name)
     }
 
     if (!result)
-        xsldbgGenericErrorFunc(i18n("Error: XSLT template named \"%1\" was not found.\n").arg(xsldbgText(name)));
+        xsldbgGenericErrorFunc(i18n("Error: XSLT template named \"%1\" was not found.\n").tqarg(xsldbgText(name)));
     return result;
 }
 
@@ -1334,16 +1334,16 @@ searchLocalNode(xmlNodePtr variable)
     xmlNodePtr node = NULL;
     int result = 1;
     xmlChar *value;
-    xmlNodePtr parent;
+    xmlNodePtr tqparent;
 
     if (variable) {
         node = searchGlobalNode(variable);
         if (node) {
             /* if unable to create any property failed then result will be equal to 0 */
-            parent = variable->parent;
+            tqparent = variable->parent;
             /* try to find out what template this variable belongs to */
-            if (parent && IS_XSLT_NAME(parent, "template")) {
-                value = xmlGetProp(parent, (xmlChar *) "name");
+            if (tqparent && IS_XSLT_NAME(tqparent, "template")) {
+                value = xmlGetProp(tqparent, (xmlChar *) "name");
                 if (value) {
                     result = result
                         &&
@@ -1351,7 +1351,7 @@ searchLocalNode(xmlNodePtr variable)
                          != NULL);
                     xmlFree(value);
                 }
-                value = xmlGetProp(parent, (xmlChar *) "match");
+                value = xmlGetProp(tqparent, (xmlChar *) "match");
                 if (value) {
                     result = result
                         &&
@@ -1398,7 +1398,7 @@ searchSourceNode(xsltStylesheetPtr style)
                      != NULL);
                 if (style->parent && style->parent->doc) {
                     result = result &&
-                        (xmlNewProp(node, (xmlChar *) "parent",
+                        (xmlNewProp(node, (xmlChar *) "tqparent",
                                     style->parent->doc->URL) != NULL);
                 }
                 if (result) {
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp
index 1dc65190..d4bf51b1 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp
@@ -53,7 +53,7 @@ xslDbgShellSearch(xsltTransformContextPtr styleCtxt,
 #ifdef USE_DOCS_MACRO
 	xsldbgGenericErrorFunc(i18n("Error: Error in value of USE_DOCS_MACRO; look at Makefile.am.\n"));
 #else
-        xsldbgGenericErrorFunc(i18n("Error: Required environment variable %1 not set to the directory of xsldbg documentation.\n").arg((const char*)XSLDBG_DOCS_DIR_VARIABLE));
+        xsldbgGenericErrorFunc(i18n("Error: Required environment variable %1 not set to the directory of xsldbg documentation.\n").tqarg((const char*)XSLDBG_DOCS_DIR_VARIABLE));
 #endif
         return result;          /* failed */
     }
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp
index 261c0ebe..1f0a3663 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/template_cmds.cpp
@@ -21,7 +21,7 @@
 #include "files.h"
 #include "utils.h"
 #include "xsldbgmsg.h"
-#include "xsldbgthread.h"       /* for getThreadStatus */
+#include "xsldbgthread.h"       /* for getThreadtqStatus */
 
 static int printCounter;        /* Dangerous name think of a better one */
 
@@ -117,7 +117,7 @@ printTemplateHelper(xsltTemplatePtr templ, int verbose,
       if (templ->match)
 	name = xmlStrdup(templ->match);
       else
-	name = fullQName(templ->nameURI, templ->name);
+	name = fullTQName(templ->nameURI, templ->name);
 
       if (name) {
 	if (templateName &&
@@ -127,14 +127,14 @@ printTemplateHelper(xsltTemplatePtr templ, int verbose,
 	} else {
 	  xmlChar *modeTemp = NULL;
 	  *count = *count + 1;
-	  if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+	  if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
 	    notifyListQueue(templ);
 	  } else {
-	    modeTemp = fullQName(templ->modeURI, templ->mode);
+	    modeTemp = fullTQName(templ->modeURI, templ->mode);
 	    if (verbose)
-	      xsldbgGenericErrorFunc(i18n(" template: \"%1\" mode: \"%2\" in file \"%3\" at line %4\n").arg(xsldbgText(name)).arg(xsldbgText(modeTemp)).arg(xsldbgUrl(url)).arg(xmlGetLineNo(templ->elem)));
+	      xsldbgGenericErrorFunc(i18n(" template: \"%1\" mode: \"%2\" in file \"%3\" at line %4\n").tqarg(xsldbgText(name)).tqarg(xsldbgText(modeTemp)).tqarg(xsldbgUrl(url)).tqarg(xmlGetLineNo(templ->elem)));
 	    else
-	       xsldbgGenericErrorFunc(TQString("\"%s\" ").arg(xsldbgText(name)));
+	       xsldbgGenericErrorFunc(TQString("\"%s\" ").tqarg(xsldbgText(name)));
 	    if (modeTemp)
 	      xmlFree(modeTemp);
 	  }
@@ -196,7 +196,7 @@ xslDbgShellPrintTemplateNames(xsltTransformContextPtr styleCtxt,
             curStyle = NULL;
     }
 
-    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
         notifyListStart(XSLDBG_MSG_TEMPLATE_CHANGED);
         while (curStyle) {
             templ = curStyle->templates;
@@ -254,11 +254,11 @@ xslDbgShellPrintStylesheetsHelper(void *payload,
     xsltStylesheetPtr style = (xsltStylesheetPtr) payload;
 
     if (style && style->doc && style->doc->URL) {
-        if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN)
+        if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN)
             notifyListQueue(payload);
         else
 	    /* display the URL of stylesheet  */
-	    xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").arg(xsldbgUrl(style->doc->URL)));
+	    xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").tqarg(xsldbgUrl(style->doc->URL)));
         printCounter++;
     }
 }
@@ -283,11 +283,11 @@ xslDbgShellPrintStylesheetsHelper2(void *payload,
     xmlNodePtr node = (xmlNodePtr) payload;
 
     if (node && node->doc && node->doc->URL) {
-        if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN)
+        if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN)
             notifyListQueue(payload);
         else
 	    /* display the URL of stylesheet  */
-	     xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").arg(xsldbgUrl(node->doc->URL)));
+	     xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").tqarg(xsldbgUrl(node->doc->URL)));
         printCounter++;
     }
 }
@@ -307,7 +307,7 @@ xslDbgShellPrintStyleSheets(xmlChar * arg)
 {
     Q_UNUSED(arg);
     printCounter = 0;
-    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
         notifyListStart(XSLDBG_MSG_SOURCE_CHANGED);
         walkStylesheets((xmlHashScanner) xslDbgShellPrintStylesheetsHelper,
                         NULL, filesGetStylesheet());
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/trace_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/trace_cmds.cpp
index 3893be67..bfce530e 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/trace_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/trace_cmds.cpp
@@ -65,7 +65,7 @@ xslDbgShellWalk(xmlChar * arg)
 
     if (xmlStrLen(arg)
         && (!sscanf((char *) arg, "%ld", &speed) || ((speed < 0) || (speed > 9)))) {
-        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("walk"));
+        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").tqarg("walk"));
         xsldbgGenericErrorFunc(i18n("Warning: Assuming normal speed.\n"));
         speed = WALKSPEED_NORMAL;
     }
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/utils.cpp b/kxsldbg/kxsldbgpart/libxsldbg/utils.cpp
index c63c07fc..d1005fdd 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/utils.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/utils.cpp
@@ -156,8 +156,8 @@ lookupName(xmlChar * name, xmlChar ** matchList)
 }
 
 /**
- * fullQName:
- * @nameURI : QName part of name
+ * fullTQName:
+ * @nameURI : TQName part of name
  * @name : Local part of name 
  *
  * Join nameURI to name
@@ -166,7 +166,7 @@ lookupName(xmlChar * name, xmlChar ** matchList)
  *
  */
 
-xmlChar * fullQName(const xmlChar* nameURI, const xmlChar * name)
+xmlChar * fullTQName(const xmlChar* nameURI, const xmlChar * name)
 {
   xmlChar *result = NULL;
   if (!nameURI && !name)
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/utils.h b/kxsldbg/kxsldbgpart/libxsldbg/utils.h
index e5cd4bfc..7791923b 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/utils.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/utils.h
@@ -61,10 +61,10 @@ extern "C" {
     /* Handle the differences in path and quote character between
      * win32 and *nix systems */
 #ifdef WIN32
-#define  QUOTECHAR ' '
+#define  TQUOTECHAR ' '
 #define  PATHCHAR '\\'
 #else
-#define  QUOTECHAR '\"'
+#define  TQUOTECHAR '\"'
 #define  PATHCHAR  '/'
 #endif
 
@@ -182,8 +182,8 @@ extern "C" {
 #ifdef USE_GNOME_DOCS
 
 /**
- * fullQName:
- * @nameURI : QName part of name
+ * fullTQName:
+ * @nameURI : TQName part of name
  * @name : Local part of name 
  *
  * Join nameURI to name
@@ -200,8 +200,8 @@ extern "C" {
  *
  * @returns a copy of "nameURI:name"
 
- * fullQName:
- * @param nameURI : QName part of name
+ * fullTQName:
+ * @param nameURI : TQName part of name
  * @param name : Local part of name 
  *
  *
@@ -209,7 +209,7 @@ extern "C" {
 #endif
 #endif
 
-  xmlChar * fullQName(const xmlChar* nameURI, const xmlChar * name);
+  xmlChar * fullTQName(const xmlChar* nameURI, const xmlChar * name);
 
 #ifdef __cplusplus
 }
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp
index a00769f4..90987949 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp
@@ -19,7 +19,7 @@
 #include <libxml/xpath.h>
 #include <libxslt/xsltInternals.h>
 #include <libxslt/variables.h>  /* needed for xsltVariablesComp */
-#include <libxml/valid.h>       /* needed for xmlSplitQName2 */
+#include <libxml/valid.h>       /* needed for xmlSplitTQName2 */
 #include "xsldbg.h"
 #include "debugXSL.h"
 #include "search.h"
@@ -99,7 +99,7 @@ xslDbgShellSetVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg)
                         xsldbgGenericErrorFunc(i18n("Error: Cannot change a variable that does not use the select attribute.\n"));
                     }
                 } else
-                    xsldbgGenericErrorFunc(i18n("Error: Variable %1 was not found.\n").arg(xsldbgText(name)));
+                    xsldbgGenericErrorFunc(i18n("Error: Variable %1 was not found.\n").tqarg(xsldbgText(name)));
                 xmlFree(name);
             } else
                 xsldbgGenericErrorFunc(i18n("Error: Out of memory.\n"));
@@ -108,7 +108,7 @@ xslDbgShellSetVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg)
         }
 
         if (showUsage == 1)
-            xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("set"));
+            xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").tqarg("set"));
     }
     return result;
 }
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
index 52066acf..70a68570 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
@@ -42,7 +42,7 @@
 
 #include <libxml/xmlerror.h>
 #include "xsldbgmsg.h"
-#include "xsldbgthread.h"       /* for getThreadStatus */
+#include "xsldbgthread.h"       /* for getThreadtqStatus */
 #ifdef HAVE_READLINE
 #  include <readline/readline.h>
 #  ifdef HAVE_HISTORY
@@ -267,7 +267,7 @@ endTimer(const TQString& message)
 #error "endTimer required stdarg functions"
 #endif
     /* Display the time taken to complete this task */
-    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").arg(message).arg(msec));
+    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").tqarg(message).tqarg(msec));
 }
 #elif defined(HAVE_TIME_H)
 
@@ -295,7 +295,7 @@ endTimer(const TQString& message)
 #error "endTimer required stdarg functions"
 #endif
     /* Display the time taken to complete this task */
-    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").arg(message).arg(msec));
+    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").tqarg(message).tqarg(msec));
 }
 #else
 
@@ -317,7 +317,7 @@ endTimer(const TQString& message)
      */
 #ifdef HAVE_STDARG_H
     /* Display the time taken to complete this task */
-    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n"),arg(message).arg(msec));
+    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n"),arg(message).tqarg(msec));
 #else
     /* We don't have gettimeofday, time or stdarg.h, what crazy world is
      * this ?!
@@ -358,7 +358,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
         xmlXIncludeProcess(doc);
         if (optionsGetIntOption(OPTIONS_TIMING)) {
 	    /* Display the time taken to do XInclude processing */
-            endTimer(i18n("XInclude processing %1.").arg((const char*)optionsGetStringOption(OPTIONS_DATA_FILE_NAME)));
+            endTimer(i18n("XInclude processing %1.").tqarg((const char*)optionsGetStringOption(OPTIONS_DATA_FILE_NAME)));
         }
     }
 #endif
@@ -380,7 +380,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
             if (terminalIO != NULL)
                 res = xsltProfileStylesheet(cur, doc, params, terminalIO);
             else if ((optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) ==
-                      NULL) || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN)
+                      NULL) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN)
                      || (filesTempFileName(1) == NULL))
                 res = xsltProfileStylesheet(cur, doc, params, stderr);
             else {
@@ -396,7 +396,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
                     notifyXsldbgApp(XSLDBG_MSG_FILEOUT,
                                     filesTempFileName(1));
                 } else {
-		     xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").arg(filesTempFileName(1)));
+		     xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").tqarg(filesTempFileName(1)));
                     res = xsltProfileStylesheet(cur, doc, params, stderr);
                 }
             }
@@ -429,7 +429,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
 		if (terminalIO != NULL)
 		    xmlDebugDumpDocument(terminalIO, res);
 		else if ((optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME) ==
-			    NULL) || (getThreadStatus() != XSLDBG_MSG_THREAD_RUN)
+			    NULL) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN)
 			|| (filesTempFileName(1) == NULL))
 		    xmlDebugDumpDocument(stdout, res);
 		else {
@@ -443,7 +443,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
 			notifyXsldbgApp(XSLDBG_MSG_FILEOUT,
 				filesTempFileName(1));
 		    } else {
-			 xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").arg(filesTempFileName(1)));
+			 xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").tqarg(filesTempFileName(1)));
 			xmlDebugDumpDocument(stdout, res);
 		    }
 
@@ -455,7 +455,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
 		if (cur->methodURI == NULL) {
 		    if (optionsGetIntOption(OPTIONS_TIMING))
 			startTimer();
-		    if (xslDebugStatus != DEBUG_QUIT) {
+		    if (xslDebugStatus != DEBUG_TQUIT) {
 			if (terminalIO != NULL)
 			    bytesWritten = xsltSaveResultToFile(terminalIO, res, cur);
 			else if (optionsGetStringOption
@@ -490,7 +490,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
 			    /* Indicate how long it took to save to file */
 			    endTimer(i18n("Saving result"));
 		    } else {
-			xsldbgGenericErrorFunc(i18n("Warning: Unsupported, non-standard output method %1.\n").arg(xsldbgText(cur->method)));
+			xsldbgGenericErrorFunc(i18n("Warning: Unsupported, non-standard output method %1.\n").tqarg(xsldbgText(cur->method)));
 		    }
 		}
 	    }
@@ -513,7 +513,7 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur)
         }
     }
     if ((xslDebugStatus != DEBUG_RUN_RESTART) && (bytesWritten == -1))
-	xsldbgGenericErrorFunc(i18n("Error: Unable to save results of transformation to file %1.\n").arg(xsldbgText(optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)))); 
+	xsldbgGenericErrorFunc(i18n("Error: Unable to save results of transformation to file %1.\n").tqarg(xsldbgText(optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)))); 
 }
 
 int
@@ -532,7 +532,7 @@ xsldbgMain(int argc, char **argv)
     xmlDocPtr doc;
     
     KCmdLineArgs *args = 0;
-    if (getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED)
+    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED)
 	args = KCmdLineArgs::parsedArgs();
 
     errorFile = stderr;
@@ -619,7 +619,7 @@ xsldbgMain(int argc, char **argv)
 	}
     }
    
-    if (getThreadStatus() != XSLDBG_MSG_THREAD_NOTUSED){
+    if (getThreadtqStatus() != XSLDBG_MSG_THREAD_NOTUSED){
 	result = optionsSetIntOption(OPTIONS_SHELL, 1);
     }
     /* copy the volitile options over to xsldbg */
@@ -672,7 +672,7 @@ xsldbgMain(int argc, char **argv)
 	for ( it = xslParams.begin(); it != xslParams.end(); ++it){
 	    param = (*it);
 	    paramOK = true;
-	    separatorIdx = param.find(':');
+	    separatorIdx = param.tqfind(':');
 	    if (separatorIdx > 0){
 		paramName = param.left((uint)separatorIdx);
 		paramValue = param.mid((uint)separatorIdx + 1);
@@ -689,7 +689,7 @@ xsldbgMain(int argc, char **argv)
 		paramOK = false;
 	    }
 	    if (!paramOK)
-		xsldbgGenericErrorFunc(i18n("Error: Argument \"%1\" to --param is not in the format <name>:<value>.\n").arg(param.data()));
+		xsldbgGenericErrorFunc(i18n("Error: Argument \"%1\" to --param is not in the format <name>:<value>.\n").tqarg(param.data()));
 	}
 
 	TQCString cdPath = args->getOption("cd");
@@ -719,7 +719,7 @@ xsldbgMain(int argc, char **argv)
     
 
     debugGotControl(0);
-    while (xslDebugStatus != DEBUG_QUIT) {
+    while (xslDebugStatus != DEBUG_TQUIT) {
 	xsldbgReachedFirstTemplate = false;
 	/* don't force xsldbg to show command prompt */
 	showPrompt = 0;
@@ -765,7 +765,7 @@ xsldbgMain(int argc, char **argv)
 		/*goto a xsldbg command prompt */
 		showPrompt = 1;
 		if (xslDebugStatus == DEBUG_NONE) {
-		    xslDebugStatus = DEBUG_QUIT;        /* panic !! */
+		    xslDebugStatus = DEBUG_TQUIT;        /* panic !! */
 		    result = 0;
 		}
 	    }
@@ -776,21 +776,21 @@ xsldbgMain(int argc, char **argv)
 	    doc = filesGetMainDoc();
 	    if (doc == NULL) {
 		if (xslDebugStatus == DEBUG_NONE) {
-		    xslDebugStatus = DEBUG_QUIT;        /* panic !! */
+		    xslDebugStatus = DEBUG_TQUIT;        /* panic !! */
 		    result = 0;
 		} else {
 		    /*goto a xsldbg command prompt */
 		    showPrompt = 1;
 		}
 	    } else {
-		if (xslDebugStatus != DEBUG_QUIT) {
+		if (xslDebugStatus != DEBUG_TQUIT) {
 		    xsltProcess(doc, cur);
 		    result = 1;
 		}
 	    }
 
 	    if (optionsGetIntOption(OPTIONS_SHELL) && (showPrompt == 0)) {
-		if ((xslDebugStatus != DEBUG_QUIT)
+		if ((xslDebugStatus != DEBUG_TQUIT)
 			&& !debugGotControl(-1)) {
 		    xsldbgGenericErrorFunc(i18n("\nDebugger never received control.\n"));
 		    /*goto a xsldbg command prompt */
@@ -831,12 +831,12 @@ xsldbgMain(int argc, char **argv)
 		}
 	    } else {
 		/* request to execute stylesheet only  so we're done */
-		xslDebugStatus = DEBUG_QUIT;
+		xslDebugStatus = DEBUG_TQUIT;
 	    }
 	} else {
 	    /* Some sort of problem loading source file has occured. Quit? */
 	    if (xslDebugStatus == DEBUG_NONE) {
-		xslDebugStatus = DEBUG_QUIT;    /* Panic!! */
+		xslDebugStatus = DEBUG_TQUIT;    /* Panic!! */
 		result = 0;
 	    } else {
 		/*goto a xsldbg command prompt */
@@ -872,7 +872,7 @@ xsldbgMain(int argc, char **argv)
 	    }
 	    xmlFreeDoc(tempDoc);
 	} else if (showPrompt && !optionsGetIntOption(OPTIONS_SHELL)) {
-	    xslDebugStatus = DEBUG_QUIT;
+	    xslDebugStatus = DEBUG_TQUIT;
 	    result = 0;         /* panic */
 	}
 
@@ -911,13 +911,13 @@ xsldbgLoadStylesheet()
         startTimer();
     style = xmlParseFile((const char *) optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME));
     if (optionsGetIntOption(OPTIONS_TIMING))
-        endTimer(i18n("Parsing stylesheet %1").arg((const char*)optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)));
+        endTimer(i18n("Parsing stylesheet %1").tqarg((const char*)optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)));
     if (style == NULL) {
-        xsldbgGenericErrorFunc(i18n("Error: Cannot parse file %1.\n").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME))));
+        xsldbgGenericErrorFunc(i18n("Error: Cannot parse file %1.\n").tqarg(xsldbgUrl(optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME))));
         cur = NULL;
         if (!optionsGetIntOption(OPTIONS_SHELL)) {
             xsldbgGenericErrorFunc(i18n("Fatal error: Aborting debugger due to an unrecoverable error.\n"));
-            xslDebugStatus = DEBUG_QUIT;
+            xslDebugStatus = DEBUG_TQUIT;
         } else {
             xsltGenericError(xsltGenericErrorContext, "\n");
             xslDebugStatus = DEBUG_STOP;
@@ -988,16 +988,16 @@ xsldbgLoadXmlData(void)
         doc = xmlParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME));
 #endif
     if (doc == NULL) {
-        xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").tqarg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))));
         if (!optionsGetIntOption(OPTIONS_SHELL)) {
             xsldbgGenericErrorFunc(i18n("Fatal error: Aborting debugger due to an unrecoverable error.\n"));
-            xslDebugStatus = DEBUG_QUIT;
+            xslDebugStatus = DEBUG_TQUIT;
         } else {
             xsltGenericError(xsltGenericErrorContext, "\n");
             xslDebugStatus = DEBUG_STOP;
         }
     } else if (optionsGetIntOption(OPTIONS_TIMING))
-        endTimer(TQString("Parsing document %1").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))).utf8().data());
+        endTimer(TQString("Parsing document %1").tqarg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))).utf8().data());
 
     return doc;
 }
@@ -1032,12 +1032,12 @@ xsldbgLoadXmlTemporary(const xmlChar * path)
 #endif
         doc = xmlSAXParseFile(&mySAXhdlr, (char *) path, 0);
     if (doc == NULL) {
-        xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(path)));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").tqarg(xsldbgUrl(path)));
     }
 
     if (optionsGetIntOption(OPTIONS_TIMING)
-        && (xslDebugStatus != DEBUG_QUIT)) {
-        endTimer(TQString("Parsing document %1").arg(xsldbgUrl(path)));
+        && (xslDebugStatus != DEBUG_TQUIT)) {
+        endTimer(TQString("Parsing document %1").tqarg(xsldbgUrl(path)));
     }
     return doc;
 }
@@ -1097,7 +1097,7 @@ handler_routine(DWORD dwCtrlType)
 void xsldbgStructErrorHandler(void * userData, xmlErrorPtr error)
 {
     if (error && error->message && (error->level >= 0) && (error->level <= 4)){
-	if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN){
+	if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN){
 	    static const char *msgPrefix[4 + 1] = {"", "warning :", "error:", "fatal:"};
 	    if (error->file)
 		xsltGenericError(xsltGenericErrorContext, "%s%s in file \"%s\" line %d", msgPrefix[error->level], error->message, error->file, error->line);
@@ -1240,7 +1240,7 @@ xsldbgInit()
 	xmlDefaultSAXHandlerInit();
 	xmlDefaultSAXHandler.cdataBlock = NULL;
 
-        if (getThreadStatus() != XSLDBG_MSG_THREAD_NOTUSED) {
+        if (getThreadtqStatus() != XSLDBG_MSG_THREAD_NOTUSED) {
             initialized = 1;
             return 1;           /* this is all we need to do when running as a thread */
         }
@@ -1310,7 +1310,7 @@ xsldbgGenericErrorFunc(void *ctx, const char *msg, ...)
     Q_UNUSED(ctx);
 
     va_start(args, msg);
-    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
         vsnprintf(msgBuffer, sizeof(msgBuffer), msg, args);
 
         notifyTextXsldbgApp(XSLDBG_MSG_TEXTOUT, msgBuffer);
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h
index 86bd2e4f..57de00b8 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgevent.h
@@ -36,7 +36,7 @@
 class  XsldbgDebuggerBase;
 class  XsldbgEventData;
 
-class  XsldbgEventDataList : public QGList
+class  XsldbgEventDataList : public TQGList
 {
 public:
     XsldbgEventDataList(void)                             {}
@@ -64,13 +64,13 @@ public:
     XsldbgEventData *takeNode( TQLNode *n )         { return (XsldbgEventData *)TQGList::takeNode(n); }
     void  clear(void)                       { TQGList::clear(); }
     void  sort(void)                        { TQGList::sort(); }
-    int   find( const XsldbgEventData *d )         { return TQGList::find((TQPtrCollection::Item)d); }
-    int   findNext( const XsldbgEventData *d )     { return TQGList::find((TQPtrCollection::Item)d,FALSE); }
-    int   findRef( const XsldbgEventData *d )      { return TQGList::findRef((TQPtrCollection::Item)d); }
-    int   findNextRef( const XsldbgEventData *d ){ return TQGList::findRef((TQPtrCollection::Item)d,FALSE);}
-    uint  contains( const XsldbgEventData *d ) const { return TQGList::contains((TQPtrCollection::Item)d); }
+    int   tqfind( const XsldbgEventData *d )         { return TQGList::tqfind((TQPtrCollection::Item)d); }
+    int   findNext( const XsldbgEventData *d )     { return TQGList::tqfind((TQPtrCollection::Item)d,FALSE); }
+    int   tqfindRef( const XsldbgEventData *d )      { return TQGList::tqfindRef((TQPtrCollection::Item)d); }
+    int   findNextRef( const XsldbgEventData *d ){ return TQGList::tqfindRef((TQPtrCollection::Item)d,FALSE);}
+    uint  tqcontains( const XsldbgEventData *d ) const { return TQGList::tqcontains((TQPtrCollection::Item)d); }
     uint  containsRef( const XsldbgEventData *d ) const
-                                        { return TQGList::containsRef((TQPtrCollection::Item)d); }
+                                        { return TQGList::tqcontainsRef((TQPtrCollection::Item)d); }
     XsldbgEventData *at( uint i )                  { return (XsldbgEventData *)TQGList::at(i); }
     int   at(void) const                    { return TQGList::at(); }
     XsldbgEventData *current(void)  const              { return (XsldbgEventData *)TQGList::get(); }
@@ -117,7 +117,7 @@ class  XsldbgEventData {
   /**
    * Get the text from the column specified
    *
-   * @returns TQString::null if invalid column number
+   * @returns TQString() if invalid column number
    *
    * @param column 0 =< @p column < XSLDBGEVENT_COLUMNS
    *
@@ -167,54 +167,54 @@ class  XsldbgEventData {
   //   These data item is mapped to the text attribute
 
 
-  //	/** Add breakpoint to view, First parameter is TQString::null
+  //	/** Add breakpoint to view, First parameter is TQString()
   //			to indicate start of breakpoint list notfication */
   //	void breakpointItem(TQString /* fileName*/, int /* lineNumber */, TQString /*templateName*/,
   //                                        bool /* enabled */, int /* id */);
   // These data items are mapped to attributes of this class with the same name
 
 
-  //	/** Add global variable to view, First parameter is TQString::null
+  //	/** Add global variable to view, First parameter is TQString()
   //        to indicate start of global variable list notfication */
   //	void globalVariableItem(TQString /* name */, TQString /* fileName */, int /* lineNumber */);
   // These data items are mapped to attributes of this class with the same name
 
 
-  //	/** Add local variable to view, First parameter is TQString::null
+  //	/** Add local variable to view, First parameter is TQString()
   //			to indicate start of local variable list notfication */
   //	void localVariableItem(TQString /*name */, TQString /* templateContext*/,
   //								TQString /* fileName */, int /*lineNumber */);
   // These data items are mapped to attributes of this class with the same name
 
 
-  //	/** Add template to view, First parameter is TQString::null
+  //	/** Add template to view, First parameter is TQString()
   //			to indicate start of template list notfication */
   //	void templateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */);
 
-  //	/** Add source to view, First parameter is TQString::null
+  //	/** Add source to view, First parameter is TQString()
   //			to indicate start of source list notfication */
-  //	void sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */);
+  //	void sourceItem(TQString /* fileName */, TQString /* tqparentFileName */, int /*lineNumber */);
 
-  //	/** Add parameter to view, First parameter is TQString::null
+  //	/** Add parameter to view, First parameter is TQString()
   //			to indicate start of parameter list notfication */
   //	void parameterItem(TQString /* name*/, TQString /* value */);
 
-  //	/** Add callStack to view, First parameter is TQString::null
+  //	/** Add callStack to view, First parameter is TQString()
   //			to indicate start of callstack list notfication */
   //	void callStackItem(TQString /* tempalteName*/, TQString /* fileName */, int /* lineNumber */);
 
-  //	/** Add entity to view, First parameter is TQString::null
+  //	/** Add entity to view, First parameter is TQString()
   //			to indicate start of entity list notfication */
   //	void entityItem(TQString /*SystemID*/,  TQString /*PublicID*/);
 
   //	/* Show the URI for SystemID or PublicID requested */
   //	void resolveItem(TQString /*URI*/);
 
-  //    /* Display a integer option value First parameter is TQString::null
+  //    /* Display a integer option value First parameter is TQString()
   //			to indicate start of option list notification */
   //   void intOptionItem(TQString /* name*/, int /* value */);
 
-  //    /* Display a string option value. First parameter is TQString::null
+  //    /* Display a string option value. First parameter is TQString()
   //			to indicate start of option list notification */
   //   void stringOptionItem(TQString /* name*/, TQString /* value */);
 
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp
index ecb94052..4fb4a6c9 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp
@@ -25,8 +25,8 @@
 #include "xsldbgthread.h"
 
 static void (*cleanupFuncPtr)(void) = 0;
-static int threadStatus = XSLDBG_MSG_THREAD_NOTUSED;
-static int inputStatus = XSLDBG_MSG_AWAITING_INPUT;
+static int threadtqStatus = XSLDBG_MSG_THREAD_NOTUSED;
+static int inputtqStatus = XSLDBG_MSG_AWAITING_INPUT;
 
 /* is xsldbg ready for input from the application */
 static int inputReady = 0;
@@ -53,19 +53,19 @@ setAppReady(int ready)
 
 /* the compiler will optimize this function to inline and to keep variable private*/
 int
-getInputStatus(void)
+getInputtqStatus(void)
 {
-    return inputStatus;
+    return inputtqStatus;
 }
 
 void
-setInputStatus(XsldbgMessageEnum type)
+setInputtqStatus(XsldbgMessageEnum type)
 {
     switch (type) {
         case XSLDBG_MSG_AWAITING_INPUT:        /* Waiting for user input */
         case XSLDBG_MSG_READ_INPUT:    /* Read user input */
         case XSLDBG_MSG_PROCESSING_INPUT:      /* Processing user's request */
-            inputStatus = type;
+            inputtqStatus = type;
             break;
 
         default:
@@ -76,26 +76,26 @@ setInputStatus(XsldbgMessageEnum type)
 
 /* the compiler will optimize this function to inline and to keep variable private*/
 int
-getThreadStatus(void)
+getThreadtqStatus(void)
 {
-    return threadStatus;
+    return threadtqStatus;
 }
 
 /* reset the status to @p type */
 void
-setThreadStatus(XsldbgMessageEnum type)
+setThreadtqStatus(XsldbgMessageEnum type)
 {
     switch (type) {
         case XSLDBG_MSG_THREAD_NOTUSED:
         case XSLDBG_MSG_THREAD_INIT:
         case XSLDBG_MSG_THREAD_RUN:
-            threadStatus = type;
+            threadtqStatus = type;
             break;
 
         case XSLDBG_MSG_THREAD_STOP:
         case XSLDBG_MSG_THREAD_DEAD:
-            xslDebugStatus = DEBUG_QUIT;
-            threadStatus = type;
+            xslDebugStatus = DEBUG_TQUIT;
+            threadtqStatus = type;
             break;
 
         default:
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h
index d83e71f3..00802843 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h
@@ -40,13 +40,13 @@ extern "C" {
 
     void setAppReady(int ready);
 
-    int getInputStatus(void);
+    int getInputtqStatus(void);
 
-    void setInputStatus(XsldbgMessageEnum type);
+    void setInputtqStatus(XsldbgMessageEnum type);
 
-    int getThreadStatus(void);
+    int getThreadtqStatus(void);
 
-    void setThreadStatus(XsldbgMessageEnum type);
+    void setThreadtqStatus(XsldbgMessageEnum type);
 
     void *xsldbgThreadMain(void *data);
 
diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp
index 1b8d2df3..c57dd521 100644
--- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp
+++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp
@@ -14,18 +14,18 @@
 #include <tqptrlist.h>
 
 
-QXsldbgDoc::QXsldbgDoc(TQWidget *parent, KURL url)
-    : TQObject(0L, "QXsldbgDoc"), kDoc(0L),kView(0L), locked(false) 
+TQXsldbgDoc::TQXsldbgDoc(TQWidget *tqparent, KURL url)
+    : TQObject(0L, "TQXsldbgDoc"), kDoc(0L),kView(0L), locked(false) 
 {
     kDoc = KTextEditor::createDocument("libkatepart", 0L,"KTextEditor::Document");
     connect(kDoc, TQT_SIGNAL(started(KIO::Job *)), this, TQT_SLOT(lockDoc()));
     connect(kDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(unlockDoc()));
     if (kDoc){
-	kView = kDoc->createView(parent, "QXsldbgDocView");
+	kView = kDoc->createView(tqparent, "TQXsldbgDocView");
 	KURL cleanUrl;
 	// convert paths relative to PWD into a absolute path
 	TQString relUrl = url.prettyURL();
-	if (!relUrl.contains(":/")){
+	if (!relUrl.tqcontains(":/")){
 	    if (!(relUrl.left(1) == "/"))
 		relUrl.prepend(TQDir::currentDirPath() + "/");
 	    cleanUrl.setFileName(relUrl); 
@@ -37,7 +37,7 @@ QXsldbgDoc::QXsldbgDoc(TQWidget *parent, KURL url)
 }
 
 
-QXsldbgDoc::~QXsldbgDoc()
+TQXsldbgDoc::~TQXsldbgDoc()
 {
     if (kDoc){
 	if (kDoc->views().count() == 1){
@@ -47,7 +47,7 @@ QXsldbgDoc::~QXsldbgDoc()
     }
 }
 
-void QXsldbgDoc::slotResult( KIO::Job *job )
+void TQXsldbgDoc::slotResult( KIO::Job *job )
 {
     if ( job->error() != 0 ){
     }else{
@@ -55,7 +55,7 @@ void QXsldbgDoc::slotResult( KIO::Job *job )
     emit docChanged();
 }
 
-KURL QXsldbgDoc::url() const
+KURL TQXsldbgDoc::url() const
 {
     if (kDoc)
 	return kDoc->url();
@@ -63,7 +63,7 @@ KURL QXsldbgDoc::url() const
 	return KURL();
 }
 
-void QXsldbgDoc::refresh()
+void TQXsldbgDoc::refresh()
 {
     if (kDoc){
 	KURL lastUrl = kDoc->url();	
@@ -73,7 +73,7 @@ void QXsldbgDoc::refresh()
 }
 
 
-void QXsldbgDoc::enableBreakPoint(uint lineNumber, bool state)
+void TQXsldbgDoc::enableBreakPoint(uint lineNumber, bool state)
 {
     if (locked)
 	return;
@@ -88,7 +88,7 @@ void QXsldbgDoc::enableBreakPoint(uint lineNumber, bool state)
     }
 }
 
-void QXsldbgDoc::addBreakPoint(uint lineNumber, bool enabled)
+void TQXsldbgDoc::addBreakPoint(uint lineNumber, bool enabled)
 {
     if (locked)
 	return;
@@ -102,7 +102,7 @@ void QXsldbgDoc::addBreakPoint(uint lineNumber, bool enabled)
     }
 }
 
-void QXsldbgDoc::deleteBreakPoint(uint lineNumber)
+void TQXsldbgDoc::deleteBreakPoint(uint lineNumber)
 {
     if (locked)
 	return;
@@ -113,7 +113,7 @@ void QXsldbgDoc::deleteBreakPoint(uint lineNumber)
 }
 
 
-void QXsldbgDoc::clearMarks(bool allMarkTypes)
+void TQXsldbgDoc::clearMarks(bool allMarkTypes)
 {
     if (locked)
 	return;
@@ -134,7 +134,7 @@ void QXsldbgDoc::clearMarks(bool allMarkTypes)
 
 }
 
-void QXsldbgDoc::selectBreakPoint(uint lineNumber, bool reachedBreakPoint)
+void TQXsldbgDoc::selectBreakPoint(uint lineNumber, bool reachedBreakPoint)
 {
     if (locked)
 	return;
@@ -150,12 +150,12 @@ void QXsldbgDoc::selectBreakPoint(uint lineNumber, bool reachedBreakPoint)
     }
 }
 
-void QXsldbgDoc::lockDoc()
+void TQXsldbgDoc::lockDoc()
 {
     locked = true;
 }
 
-void QXsldbgDoc::unlockDoc()
+void TQXsldbgDoc::unlockDoc()
 {
     locked = false;
 }
diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.h b/kxsldbg/kxsldbgpart/qxsldbgdoc.h
index abc04448..0f19da1b 100644
--- a/kxsldbg/kxsldbgpart/qxsldbgdoc.h
+++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.h
@@ -6,8 +6,8 @@
  */
 
 
-#ifndef QXSLDBGDOC_H
-#define QXSLDBGDOC_H
+#ifndef TQXSLDBGDOC_H
+#define TQXSLDBGDOC_H
 
 #include <kio/job.h>
 #include <tqptrlist.h>
@@ -16,13 +16,14 @@
 #include <ktexteditor/document.h>
 #include <ktexteditor/view.h>
 
-class QXsldbgDoc : public TQObject {
+class TQXsldbgDoc : public TQObject {
 
 Q_OBJECT
+  TQ_OBJECT
 
  public:
-  QXsldbgDoc(TQWidget *parent=0, KURL url=TQString::null);
-  ~QXsldbgDoc();
+  TQXsldbgDoc(TQWidget *tqparent=0, KURL url=TQString());
+  ~TQXsldbgDoc();
 
   void enableBreakPoint(uint lineNumber, bool state);
   void addBreakPoint(uint lineNumber, bool enabled);
diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp
index a94e3a0f..80acb012 100644
--- a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp
@@ -18,11 +18,11 @@
 #include <klocale.h>
 #include "xsldbgbreakpointlistitem.h"
 
-XsldbgBreakpointListItem::XsldbgBreakpointListItem(TQListView *parent,
+XsldbgBreakpointListItem::XsldbgBreakpointListItem(TQListView *tqparent,
 			TQString fileName, int lineNumber,
 			TQString templateName, TQString modeName,
 			bool enabled, int id)
-	: XsldbgListItem(parent, 3, fileName, lineNumber)
+	: XsldbgListItem(tqparent, 3, fileName, lineNumber)
 {
 	this->id = id;
 	setText(0, TQString::number(id));
diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h
index b54d888a..c74cd3dc 100644
--- a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h
+++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.h
@@ -26,7 +26,7 @@
  
 class XsldbgBreakpointListItem : public XsldbgListItem  { 
 public:  
-	XsldbgBreakpointListItem(TQListView *parent,	 
+	XsldbgBreakpointListItem(TQListView *tqparent,	 
 			TQString fileName, int lineNumber,  
 				 TQString templateName, TQString modeName, 
 			bool enabled, int id); 
diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui
index a5af9c36..98a7e9a7 100644
--- a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>XsldbgBreakpoints</class>
 <author>Keith Isdale &lt;k_isdale@tpg.com.au&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>XsldbgBreakpoints</cstring>
     </property>
@@ -20,7 +20,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QListView">
+        <widget class="TQListView">
             <column>
                 <property name="text">
                     <string>ID</string>
@@ -102,7 +102,7 @@
                 <string>Click breakpoint in list to modify or delete it</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout7</cstring>
             </property>
@@ -116,7 +116,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout6</cstring>
                     </property>
@@ -130,7 +130,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>idLabel</cstring>
                             </property>
@@ -138,7 +138,7 @@
                                 <string>ID:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="4" column="0">
+                        <widget class="TQLabel" row="4" column="0">
                             <property name="name">
                                 <cstring>lineNumberLabel</cstring>
                             </property>
@@ -146,7 +146,7 @@
                                 <string>Line number:</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="3" column="1">
+                        <widget class="TQLineEdit" row="3" column="1">
                             <property name="name">
                                 <cstring>sourceFileEdit</cstring>
                             </property>
@@ -154,7 +154,7 @@
                                 <string>You don't need to specify directory for file name</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="1">
+                        <widget class="TQLineEdit" row="1" column="1">
                             <property name="name">
                                 <cstring>templateNameEdit</cstring>
                             </property>
@@ -162,7 +162,7 @@
                                 <string>Template name or match name to look for</string>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget" row="4" column="1">
+                        <widget class="TQLayoutWidget" row="4" column="1">
                             <property name="name">
                                 <cstring>Layout7</cstring>
                             </property>
@@ -176,7 +176,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLineEdit">
+                                <widget class="TQLineEdit">
                                     <property name="name">
                                         <cstring>lineNumberEdit</cstring>
                                     </property>
@@ -188,7 +188,7 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>60</width>
                                             <height>32767</height>
@@ -208,7 +208,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -217,7 +217,7 @@
                                 </spacer>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget" row="0" column="1">
+                        <widget class="TQLayoutWidget" row="0" column="1">
                             <property name="name">
                                 <cstring>Layout5</cstring>
                             </property>
@@ -231,7 +231,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLineEdit">
+                                <widget class="TQLineEdit">
                                     <property name="name">
                                         <cstring>idEdit</cstring>
                                     </property>
@@ -243,7 +243,7 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>60</width>
                                             <height>32767</height>
@@ -263,7 +263,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -272,12 +272,12 @@
                                 </spacer>
                             </hbox>
                         </widget>
-                        <widget class="QLineEdit" row="2" column="1">
+                        <widget class="TQLineEdit" row="2" column="1">
                             <property name="name">
                                 <cstring>modeNameEdit</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>
@@ -285,7 +285,7 @@
                                 <string>Mode:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>TextLabel1</cstring>
                             </property>
@@ -293,7 +293,7 @@
                                 <string>Name:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="TQLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>sourceFileLabel</cstring>
                             </property>
@@ -313,7 +313,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>81</width>
                             <height>20</height>
@@ -330,7 +330,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -349,22 +349,22 @@
             <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="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout18</cstring>
+                <cstring>tqlayout18</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton" row="0" column="1">
+                <widget class="TQPushButton" row="0" column="1">
                     <property name="name">
                         <cstring>deleteButton</cstring>
                     </property>
@@ -375,7 +375,7 @@
                         <string>Delete breakpoint using ID</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="2">
+                <widget class="TQPushButton" row="1" column="2">
                     <property name="name">
                         <cstring>PushButton5</cstring>
                     </property>
@@ -386,7 +386,7 @@
                         <string>Clear entered text</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="0">
+                <widget class="TQPushButton" row="1" column="0">
                     <property name="name">
                         <cstring>addAllButton</cstring>
                     </property>
@@ -397,7 +397,7 @@
                         <string>Add breakpoint on all templates found</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="1">
+                <widget class="TQPushButton" row="1" column="1">
                     <property name="name">
                         <cstring>deleteAllButton</cstring>
                     </property>
@@ -408,7 +408,7 @@
                         <string>Delete all breakpoints</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="2">
+                <widget class="TQPushButton" row="0" column="2">
                     <property name="name">
                         <cstring>enableButton</cstring>
                     </property>
@@ -419,7 +419,7 @@
                         <string>Enable breakpoint using ID</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="0">
+                <widget class="TQPushButton" row="0" column="0">
                     <property name="name">
                         <cstring>addButton</cstring>
                     </property>
@@ -442,14 +442,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="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</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="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>refreshBtn</cstring>
                     </property>
@@ -498,7 +498,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -512,9 +512,9 @@
 <connections>
     <connection>
         <sender>breakpointListView</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>XsldbgBreakpoints</receiver>
-        <slot>selectionChanged(QListViewItem*)</slot>
+        <slot>selectionChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>addButton</sender>
@@ -568,15 +568,15 @@
     <tabstop>deleteButton</tabstop>
     <tabstop>enableButton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>slotClear()</slot>
     <slot>refresh()</slot>
-    <slot>selectionChanged(QListViewItem*)</slot>
+    <slot>selectionChanged(TQListViewItem*)</slot>
     <slot>slotAddBreakpoint()</slot>
     <slot>slotDeleteBreakpoint()</slot>
     <slot>slotEnableBreakpoint()</slot>
     <slot>slotAddAllTemplateBreakpoints()</slot>
     <slot>slotDeleteAllBreakpoints()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp
index ba14d115..f38f1480 100644
--- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp
@@ -26,8 +26,8 @@
 
 
 XsldbgBreakpointsImpl::XsldbgBreakpointsImpl(XsldbgDebugger *debugger,
-	TQWidget *parent /*=0*/, const char *name /*=0*/)
-		:  XsldbgBreakpoints(parent, name), XsldbgDialogBase()
+	TQWidget *tqparent /*=0*/, const char *name /*=0*/)
+		:  XsldbgBreakpoints(tqparent, name), XsldbgDialogBase()
 {
 	this->debugger = debugger;
 	connect(debugger, TQT_SIGNAL(breakpointItem(TQString /* file*/,
diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h
index 5da172e7..52bbaf6c 100644
--- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h
+++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h
@@ -28,11 +28,12 @@
 class XsldbgDebugger; 
  
  
-class XsldbgBreakpointsImpl : public XsldbgBreakpoints, public XsldbgDialogBase  { 
-  Q_OBJECT 
+class XsldbgBreakpointsImpl : public XsldbgBreakpoints, public XsldbgDialogBase  {
+  Q_OBJECT
+  TQ_OBJECT
  
 public: 
-	XsldbgBreakpointsImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); 
+	XsldbgBreakpointsImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); 
 	~XsldbgBreakpointsImpl(); 
  
 	/* Return >= 0 if line number entered is valid */ 
@@ -51,7 +52,7 @@ public slots:
 	void slotEnableBreakpoint(); 
 	void selectionChanged(TQListViewItem *item); 
 	 
-	/** Recieve notification about breakpoint to add to view, First parameter is TQString::null 
+	/** Recieve notification about breakpoint to add to view, First parameter is TQString() 
 			to indicate start of breakpoint list notfication */ 
 	void slotProcBreakpointItem(TQString file, int lineNumber,  
 				    TQString templateName, TQString modeName, 
diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui
index 6203e764..148d3f82 100644
--- a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>XsldbgCallStack</class>
 <author>Keith Isdale &lt;k_isdale@tpg.com.au&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>XsldbgCallStack</cstring>
     </property>
@@ -26,7 +26,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView" row="0" column="0">
+        <widget class="TQListView" row="0" column="0">
             <column>
                 <property name="text">
                     <string>Frame# Template Name</string>
@@ -75,7 +75,7 @@
                 <string>Oldest Frame # is 0, Frame # has been added to the first column</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -99,14 +99,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>refreshBtn</cstring>
                     </property>
@@ -124,7 +124,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -138,9 +138,9 @@
 <connections>
     <connection>
         <sender>callStackListView</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>XsldbgCallStack</receiver>
-        <slot>selectionChanged(QListViewItem*)</slot>
+        <slot>selectionChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>refreshBtn</sender>
@@ -149,9 +149,9 @@
         <slot>refresh()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>refresh()</slot>
-    <slot>selectionChanged(QListViewItem*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot>selectionChanged(TQListViewItem*)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp
index 9a500b6c..ceadc76e 100644
--- a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp
@@ -22,8 +22,8 @@
 #include "xsldbggloballistitem.h" /* reuse global list item variable as a template list item */ 
  
 XsldbgCallStackImpl::XsldbgCallStackImpl(XsldbgDebugger *debugger, 
-	TQWidget *parent /*=0*/, const char *name /*=0*/) 
-		:  XsldbgCallStack(parent, name), XsldbgDialogBase() 
+	TQWidget *tqparent /*=0*/, const char *name /*=0*/) 
+		:  XsldbgCallStack(tqparent, name), XsldbgDialogBase() 
 {	 
 	this->debugger = debugger; 
 	 
diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h
index c105b54c..94e5eed6 100644
--- a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h
+++ b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h
@@ -27,17 +27,18 @@
  
 class XsldbgDebugger; 
  
-class XsldbgCallStackImpl : public XsldbgCallStack,  public XsldbgDialogBase   { 
-  Q_OBJECT	 
+class XsldbgCallStackImpl : public XsldbgCallStack,  public XsldbgDialogBase   {
+  Q_OBJECT
+  TQ_OBJECT
  
 public:  
-	XsldbgCallStackImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); 
+	XsldbgCallStackImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); 
 	~XsldbgCallStackImpl(); 
 	 
 public slots:	 
 	void selectionChanged(TQListViewItem *item);	 
 	 
-	/** Process request to add callstack to view, First parameter is TQString::null 
+	/** Process request to add callstack to view, First parameter is TQString() 
 			to indicate start of callstack list notfication */	 
 	void slotProcCallStackItem(TQString  templateName, TQString  fileName , int  lineNumber );	 
 	 
diff --git a/kxsldbg/kxsldbgpart/xsldbgconfig.ui b/kxsldbg/kxsldbgpart/xsldbgconfig.ui
index 660d9890..19e64a49 100644
--- a/kxsldbg/kxsldbgpart/xsldbgconfig.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgconfig.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>XsldbgConfig</class>
 <author>Keith Isdale &lt;k_isdale@tpg.com.au&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>XsldbgConfig</cstring>
     </property>
@@ -21,7 +21,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>300</width>
             <height>450</height>
@@ -34,9 +34,9 @@
         <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">
@@ -52,14 +52,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="QGroupBox" row="4" column="0">
+                <widget class="TQGroupBox" row="4" column="0">
                     <property name="name">
                         <cstring>groupBox1</cstring>
                     </property>
@@ -78,15 +78,15 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout12</cstring>
+                                <cstring>tqlayout12</cstring>
                             </property>
                             <grid>
                                 <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>Layout10_2</cstring>
                                     </property>
@@ -100,7 +100,7 @@
                                         <property name="spacing">
                                             <number>6</number>
                                         </property>
-                                        <widget class="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>paramValueLabel</cstring>
                                             </property>
@@ -108,7 +108,7 @@
                                                 <string>Parameter value:</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLineEdit">
+                                        <widget class="TQLineEdit">
                                             <property name="name">
                                                 <cstring>parameterValueEdit</cstring>
                                             </property>
@@ -126,7 +126,7 @@
                                         </widget>
                                     </hbox>
                                 </widget>
-                                <widget class="QLayoutWidget" row="0" column="0">
+                                <widget class="TQLayoutWidget" row="0" column="0">
                                     <property name="name">
                                         <cstring>Layout10</cstring>
                                     </property>
@@ -140,7 +140,7 @@
                                         <property name="spacing">
                                             <number>6</number>
                                         </property>
-                                        <widget class="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>paramNameLabel</cstring>
                                             </property>
@@ -148,7 +148,7 @@
                                                 <string>Parameter name:</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLineEdit">
+                                        <widget class="TQLineEdit">
                                             <property name="name">
                                                 <cstring>parameterNameEdit</cstring>
                                             </property>
@@ -168,7 +168,7 @@
                                 </widget>
                             </grid>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout11</cstring>
                             </property>
@@ -192,14 +192,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>Layout12</cstring>
                                     </property>
@@ -213,7 +213,7 @@
                                         <property name="spacing">
                                             <number>6</number>
                                         </property>
-                                        <widget class="QPushButton" row="1" column="0">
+                                        <widget class="TQPushButton" row="1" column="0">
                                             <property name="name">
                                                 <cstring>prevButton</cstring>
                                             </property>
@@ -229,7 +229,7 @@
                                                 <string>Prev</string>
                                             </property>
                                         </widget>
-                                        <widget class="QPushButton" row="0" column="1">
+                                        <widget class="TQPushButton" row="0" column="1">
                                             <property name="name">
                                                 <cstring>deleteButton</cstring>
                                             </property>
@@ -245,7 +245,7 @@
                                                 <string>Delete</string>
                                             </property>
                                         </widget>
-                                        <widget class="QPushButton" row="1" column="1">
+                                        <widget class="TQPushButton" row="1" column="1">
                                             <property name="name">
                                                 <cstring>nextButton</cstring>
                                             </property>
@@ -261,7 +261,7 @@
                                                 <string>Next</string>
                                             </property>
                                         </widget>
-                                        <widget class="QPushButton" row="0" column="0">
+                                        <widget class="TQPushButton" row="0" column="0">
                                             <property name="name">
                                                 <cstring>addButton</cstring>
                                             </property>
@@ -289,7 +289,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -310,14 +310,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="6" column="0">
+                <widget class="TQLayoutWidget" row="6" column="0">
                     <property name="name">
                         <cstring>Layout18</cstring>
                     </property>
@@ -341,14 +341,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>PushButton13</cstring>
                             </property>
@@ -360,7 +360,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>110</width>
                                     <height>0</height>
@@ -370,7 +370,7 @@
                                 <string>&amp;Apply</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>PushButton14</cstring>
                             </property>
@@ -382,7 +382,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>110</width>
                                     <height>0</height>
@@ -402,7 +402,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -421,14 +421,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="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
                         <cstring>Layout11</cstring>
                     </property>
@@ -442,7 +442,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLayoutWidget" row="4" column="0">
+                        <widget class="TQLayoutWidget" row="4" column="0">
                             <property name="name">
                                 <cstring>Layout8</cstring>
                             </property>
@@ -456,7 +456,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>outputFileLabel</cstring>
                                     </property>
@@ -464,7 +464,7 @@
                                         <string>Output file:</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit">
+                                <widget class="TQLineEdit">
                                     <property name="name">
                                         <cstring>outputFileEdit</cstring>
                                     </property>
@@ -472,7 +472,7 @@
                                         <bool>false</bool>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>outputFileButton</cstring>
                                     </property>
@@ -490,7 +490,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget" row="2" column="0">
+                        <widget class="TQLayoutWidget" row="2" column="0">
                             <property name="name">
                                 <cstring>Layout10</cstring>
                             </property>
@@ -504,7 +504,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>xmlSourceLabel</cstring>
                                     </property>
@@ -512,7 +512,7 @@
                                         <string>XML data:</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit">
+                                <widget class="TQLineEdit">
                                     <property name="name">
                                         <cstring>xmlDataEdit</cstring>
                                     </property>
@@ -520,7 +520,7 @@
                                         <bool>false</bool>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>xmlDataButton</cstring>
                                     </property>
@@ -538,7 +538,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget" row="0" column="0">
+                        <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
                                 <cstring>Layout6</cstring>
                             </property>
@@ -552,7 +552,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>xslSourceLabel</cstring>
                                     </property>
@@ -560,7 +560,7 @@
                                         <string>XSL source:</string>
                                     </property>
                                 </widget>
-                                <widget class="QLineEdit">
+                                <widget class="TQLineEdit">
                                     <property name="name">
                                         <cstring>xslSourceEdit</cstring>
                                     </property>
@@ -568,7 +568,7 @@
                                         <bool>false</bool>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>xslSourceButton</cstring>
                                     </property>
@@ -588,7 +588,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QButtonGroup" row="2" column="0">
+                <widget class="TQButtonGroup" row="2" column="0">
                     <property name="name">
                         <cstring>ButtonGroup1</cstring>
                     </property>
@@ -613,7 +613,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QCheckBox" row="0" column="0">
+                        <widget class="TQCheckBox" row="0" column="0">
                             <property name="name">
                                 <cstring>catalogsChkBox</cstring>
                             </property>
@@ -624,7 +624,7 @@
                                 <string>use catalogs from $SGML_CATALOGS_FILES</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="1" column="2">
+                        <widget class="TQCheckBox" row="1" column="2">
                             <property name="name">
                                 <cstring>novalidChkBox</cstring>
                             </property>
@@ -635,7 +635,7 @@
                                 <string>skip the DTD loading phase</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="0" column="1">
+                        <widget class="TQCheckBox" row="0" column="1">
                             <property name="name">
                                 <cstring>htmlChkBox</cstring>
                             </property>
@@ -646,7 +646,7 @@
                                 <string>the input document is(are) an HTML file(s)</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="0" column="2">
+                        <widget class="TQCheckBox" row="0" column="2">
                             <property name="name">
                                 <cstring>docbookChkBox</cstring>
                             </property>
@@ -657,7 +657,7 @@
                                 <string>the input document is SGML docbook</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="1" column="0">
+                        <widget class="TQCheckBox" row="1" column="0">
                             <property name="name">
                                 <cstring>debugChkBox</cstring>
                             </property>
@@ -668,7 +668,7 @@
                                 <string>dump the tree of the result instead</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="2" column="0">
+                        <widget class="TQCheckBox" row="2" column="0">
                             <property name="name">
                                 <cstring>nooutChkBox</cstring>
                             </property>
@@ -679,7 +679,7 @@
                                 <string>do not dump the result</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="2" column="1">
+                        <widget class="TQCheckBox" row="2" column="1">
                             <property name="name">
                                 <cstring>profileChkBox</cstring>
                             </property>
@@ -690,7 +690,7 @@
                                 <string>print profiling information</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="2" column="2">
+                        <widget class="TQCheckBox" row="2" column="2">
                             <property name="name">
                                 <cstring>timingChkBox</cstring>
                             </property>
@@ -701,7 +701,7 @@
                                 <string>display the time used</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="1" column="1">
+                        <widget class="TQCheckBox" row="1" column="1">
                             <property name="name">
                                 <cstring>nonetChkBox</cstring>
                             </property>
@@ -799,7 +799,7 @@
     <tabstop>xmlDataEdit</tabstop>
     <tabstop>xslSourceEdit</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>slotCancel()</slot>
     <slot>slotAddParam()</slot>
     <slot>slotApply()</slot>
@@ -812,6 +812,6 @@
     <slot>slotPrevParam()</slot>
     <slot>slotSourcefile(QString)</slot>
     <slot>slotoutputfile(QString)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
index 19c6bb66..73c76ef8 100644
--- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
@@ -74,8 +74,8 @@ bool LibxsltParam::isValid() const
 
 
 XsldbgConfigImpl::XsldbgConfigImpl(XsldbgDebugger *debugger,
-	TQWidget *parent /*=0*/, const char *name /*=0*/)
-		:  XsldbgConfig(parent, name)
+	TQWidget *tqparent /*=0*/, const char *name /*=0*/)
+		:  XsldbgConfig(tqparent, name)
 {
 	this->debugger = debugger;
 	connect(debugger, TQT_SIGNAL(parameterItem(TQString /* name*/, TQString /* value */)),
@@ -177,7 +177,7 @@ void XsldbgConfigImpl::deleteParam(TQString name)
 		isOk = paramList.remove(param);
 
 	if (isOk == false)
-	  kdDebug() << TQString(" Param %1 dosn't exist").arg(name) << endl;
+	  kdDebug() << TQString(" Param %1 dosn't exist").tqarg(name) << endl;
 	else
 	  kdDebug() << "Deleted param " << name << endl;
 }
@@ -308,7 +308,7 @@ void XsldbgConfigImpl::update()
 void XsldbgConfigImpl::refresh()
 {
   paramIndex = 0;
-  repaintParam();
+  tqrepaintParam();
   xslSourceEdit->setText(debugger->sourceFileName());
   xmlDataEdit->setText(debugger->dataFileName());
   outputFileEdit->setText(debugger->outputFileName());
@@ -366,7 +366,7 @@ void XsldbgConfigImpl::slotOutputFile(TQString outputFile)
 
 void XsldbgConfigImpl::slotChooseSourceFile()
 {
-	KURL url = KFileDialog::getOpenURL(TQString::null, "*.xsl; *.XSL; *.Xsl ; *.xslt; *.XSLT; *.Xslt \n *.*", this,
+	KURL url = KFileDialog::getOpenURL(TQString(), "*.xsl; *.XSL; *.Xsl ; *.xslt; *.XSLT; *.Xslt \n *.*", this,
 		i18n("Choose XSL Source to Debug"));
 	TQString fileName = url.prettyURL();
 
@@ -378,7 +378,7 @@ void XsldbgConfigImpl::slotChooseSourceFile()
 
 void XsldbgConfigImpl::slotChooseDataFile()
 {
-	KURL url = KFileDialog::getOpenURL(TQString::null, "*.xml; *.XML; *.Xml \n*.docbook \n *.html;*.HTML; *.htm ; *HTM \n *.*", this,
+	KURL url = KFileDialog::getOpenURL(TQString(), "*.xml; *.XML; *.Xml \n*.docbook \n *.html;*.HTML; *.htm ; *HTM \n *.*", this,
 									i18n("Choose XML Data to Debug"));
 	TQString fileName = url.prettyURL();
 
@@ -389,7 +389,7 @@ void XsldbgConfigImpl::slotChooseDataFile()
 
 void XsldbgConfigImpl::slotChooseOutputFile()
 {
-	KURL url = KFileDialog::getSaveURL(TQString::null, "*.xml; *.XML; *.Xml \n*.docbook \n *.txt; *.TXT \n *.htm;*.HTM;*.htm;*.HTML \n*.*", this,
+	KURL url = KFileDialog::getSaveURL(TQString(), "*.xml; *.XML; *.Xml \n*.docbook \n *.txt; *.TXT \n *.htm;*.HTM;*.htm;*.HTML \n*.*", this,
 									i18n("Choose Output File for XSL Transformation"));
 	TQString fileName;
 
@@ -410,7 +410,7 @@ void XsldbgConfigImpl::slotReloadFileNames()
 }
 
 
-void XsldbgConfigImpl::repaintParam()
+void XsldbgConfigImpl::tqrepaintParam()
 {
 	if (paramIndex < getParamCount()){
 		LibxsltParam *param = getParam(paramIndex);
@@ -428,13 +428,13 @@ void XsldbgConfigImpl::slotAddParam()
 	if (paramIndex < getParamCount())
 		paramIndex++;
 
-  	repaintParam();
+  	tqrepaintParam();
 }
 
 void XsldbgConfigImpl::slotDeleteParam()
 {
    deleteParam(parameterNameEdit->text());
-   repaintParam();
+   tqrepaintParam();
 }
 
 
@@ -444,7 +444,7 @@ void XsldbgConfigImpl::slotNextParam()
 	if (paramIndex < getParamCount())
 		paramIndex++;
 
-   repaintParam();
+   tqrepaintParam();
 }
 
 void XsldbgConfigImpl::slotPrevParam()
@@ -453,7 +453,7 @@ void XsldbgConfigImpl::slotPrevParam()
 	if (paramIndex > 0)
 		paramIndex--;
 
-   repaintParam();
+   tqrepaintParam();
 }
 
 void XsldbgConfigImpl::slotProcParameterItem(TQString name, TQString value)
diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h
index 1c3aa21e..b11357a7 100644
--- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h
+++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h
@@ -27,7 +27,7 @@
 #include <tqptrlist.h>
 
 
-class LibxsltParam : public QObject
+class LibxsltParam : public TQObject
 {
 	public:
 	LibxsltParam(const TQString & name, const TQString &value);
@@ -49,9 +49,10 @@ class XsldbgDebugger;
 
 class XsldbgConfigImpl : public XsldbgConfig, public XsldbgDialogBase {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-	XsldbgConfigImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0);
+	XsldbgConfigImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0);
 	~XsldbgConfigImpl();
 
 	LibxsltParam *getParam(int paramNumber);
@@ -59,7 +60,7 @@ public:
 	int getParamCount();
 	void addParam(TQString name, TQString value);
 	void deleteParam(TQString name);
-	void repaintParam();
+	void tqrepaintParam();
 
 	TQString getSourceFile();
 	TQString getDataFile();
@@ -128,7 +129,7 @@ public slots:
 	void slotCancel();
 
 	/** Process notification of add parameter to view, First parameter
-			is TQString::null to indicate start of parameter list notfication */
+			is TQString() to indicate start of parameter list notfication */
 	void slotProcParameterItem(TQString  name, TQString value);
 
 
diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
index deead4fa..7a4f4960 100644
--- a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
@@ -98,14 +98,14 @@ void XsldbgDebugger::timerEvent(TQTimerEvent *e)
 	if (e == 0L || (e->timerId() != updateTimerID))
 		return;
 
-	if  ((getInputReady() == 0) && (getInputStatus() == XSLDBG_MSG_AWAITING_INPUT) &&
+	if  ((getInputReady() == 0) && (getInputtqStatus() == XSLDBG_MSG_AWAITING_INPUT) &&
 		(commandQue.count() > 0)){
 		 TQString msg = commandQue.first();
  		 commandQue.remove(msg);
 		::fakeInput((const char*)msg.utf8());
 	}
 
-      	if ((!updateText.isEmpty()) && (getInputStatus() == XSLDBG_MSG_AWAITING_INPUT)){
+      	if ((!updateText.isEmpty()) && (getInputtqStatus() == XSLDBG_MSG_AWAITING_INPUT)){
       		/* flush remainding text to message window */
 		TQString msgCopy = updateText;
 		updateText = "";
@@ -199,7 +199,7 @@ bool XsldbgDebugger::start()
 bool XsldbgDebugger::stop()
 {
 	if (initialized == true){
-		setThreadStatus(XSLDBG_MSG_THREAD_STOP);
+		setThreadtqStatus(XSLDBG_MSG_THREAD_STOP);
 	}
 
 	  /* it always succeeds at the moment */
diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.h b/kxsldbg/kxsldbgpart/xsldbgdebugger.h
index 7cc64845..5eac3d89 100644
--- a/kxsldbg/kxsldbgpart/xsldbgdebugger.h
+++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.h
@@ -35,6 +35,7 @@ class XsldbgWalkSpeedImpl;
 
 class XsldbgDebugger : public XsldbgDebuggerBase {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 	XsldbgDebugger();
@@ -63,7 +64,7 @@ public:
 
 	void setOutputFileActive(bool b) {outputFileActive = b;};
 
-	/* helper function to handle differences between URI's in Qt/KDE and libxml2 */
+	/* helper function to handle differences between URI's in TQt/KDE and libxml2 */
 	static TQString fixLocalPaths(TQString & file);
 	
 private:
diff --git a/kxsldbg/kxsldbgpart/xsldbgdocmap.h b/kxsldbg/kxsldbgpart/xsldbgdocmap.h
index e6c79344..6310b711 100644
--- a/kxsldbg/kxsldbgpart/xsldbgdocmap.h
+++ b/kxsldbg/kxsldbgpart/xsldbgdocmap.h
@@ -1,5 +1,5 @@
  
 #include <tqmap.h> 
-#include "qxsldbgdoc.h" 
+#include "tqxsldbgdoc.h" 
  
-typedef TQMap<TQString, QXsldbgDoc> XsldbgDocMap; 
+typedef TQMap<TQString, TQXsldbgDoc> XsldbgDocMap; 
diff --git a/kxsldbg/kxsldbgpart/xsldbgentities.ui b/kxsldbg/kxsldbgpart/xsldbgentities.ui
index 3f3d1339..3369090a 100644
--- a/kxsldbg/kxsldbgpart/xsldbgentities.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgentities.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>XsldbgEntities</class>
 <author>Keith Isdale &lt;k_isdale@tpg.com.au&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>XsldbgEntities</cstring>
     </property>
@@ -34,7 +34,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView" row="0" column="0">
+        <widget class="TQListView" row="0" column="0">
             <column>
                 <property name="text">
                     <string>PublicID</string>
@@ -79,14 +79,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="QLayoutWidget" row="4" column="0">
+        <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
                 <cstring>Layout3</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>refreshBtn</cstring>
                     </property>
@@ -135,7 +135,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -154,8 +154,8 @@
         <slot>refresh()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>refresh()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp
index 03f21618..627db58b 100644
--- a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp
@@ -24,8 +24,8 @@
  
  
 XsldbgEntitiesImpl::XsldbgEntitiesImpl(XsldbgDebugger *debugger, 
-	TQWidget *parent /*=0*/, const char *name /*=0*/) 
-		:  XsldbgEntities(parent, name),  XsldbgDialogBase() 
+	TQWidget *tqparent /*=0*/, const char *name /*=0*/) 
+		:  XsldbgEntities(tqparent, name),  XsldbgDialogBase() 
 {	 
 	this->debugger = debugger; 
 	connect(debugger,  
diff --git a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h
index 220c09cd..4000dc0c 100644
--- a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h
+++ b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h
@@ -27,15 +27,16 @@
  
 class XsldbgDebugger; 
  
-class XsldbgEntitiesImpl : public XsldbgEntities, public XsldbgDialogBase  { 
-  Q_OBJECT 
+class XsldbgEntitiesImpl : public XsldbgEntities, public XsldbgDialogBase  {
+  Q_OBJECT
+  TQ_OBJECT
  
 public: 
-	XsldbgEntitiesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); 
+	XsldbgEntitiesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); 
 	~XsldbgEntitiesImpl(); 
  
 public slots: 
-	/** Process request to add entity to view, First parameter is TQString::null 
+	/** Process request to add entity to view, First parameter is TQString() 
 			to indicate start of entity list notfication */ 
 	void slotProcEntityItem(TQString SystemID,  TQString PublicID); 
 	 
diff --git a/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp b/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp
index 3ad3ed81..8628f8d0 100644
--- a/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbggloballistitem.cpp
@@ -17,9 +17,9 @@
  
 #include "xsldbggloballistitem.h" 
  
-XsldbgGlobalListItem::XsldbgGlobalListItem(TQListView *parent,	 
+XsldbgGlobalListItem::XsldbgGlobalListItem(TQListView *tqparent,	 
 								TQString fileName, int lineNumber, TQString globalName) 
-			: XsldbgListItem(parent, 1, fileName, lineNumber) 
+			: XsldbgListItem(tqparent, 1, fileName, lineNumber) 
 { 
 	varName = globalName; 
 	setText(0, globalName); 
diff --git a/kxsldbg/kxsldbgpart/xsldbggloballistitem.h b/kxsldbg/kxsldbgpart/xsldbggloballistitem.h
index fe3cd47f..9488d50e 100644
--- a/kxsldbg/kxsldbgpart/xsldbggloballistitem.h
+++ b/kxsldbg/kxsldbgpart/xsldbggloballistitem.h
@@ -27,7 +27,7 @@
  
 class XsldbgGlobalListItem : public XsldbgListItem  { 
 public:  
-	XsldbgGlobalListItem(TQListView *parent,	 
+	XsldbgGlobalListItem(TQListView *tqparent,	 
 								TQString fileName, int lineNumber, TQString globalName); 
 	~XsldbgGlobalListItem(); 
 	 
diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui
index 513e3079..ab7a4dc3 100644
--- a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>XsldbgGlobalVariables</class>
 <author>Keith Isdale &lt;k_isdale@tpg.com.au&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>XsldbgGlobalVariables</cstring>
     </property>
@@ -34,7 +34,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView" row="2" column="0">
+        <widget class="TQListView" row="2" column="0">
             <column>
                 <property name="text">
                     <string>Name</string>
@@ -90,14 +90,14 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -121,14 +121,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="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout1</cstring>
                     </property>
@@ -142,7 +142,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel1</cstring>
                             </property>
@@ -150,7 +150,7 @@
                                 <string>Expression:</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>expressionEdit</cstring>
                             </property>
@@ -170,14 +170,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">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>expressionButton</cstring>
                     </property>
@@ -190,7 +190,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -214,14 +214,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>refreshBtn</cstring>
                     </property>
@@ -239,7 +239,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -264,9 +264,9 @@
         <slot>refresh()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>refresh()</slot>
     <slot>slotEvaluate()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp
index 235c564a..b860d358 100644
--- a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp
@@ -24,8 +24,8 @@
  
  
 XsldbgGlobalVariablesImpl::XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, 
-	TQWidget *parent /*=0*/, const char *name /*=0*/) 
-		:  XsldbgGlobalVariables(parent, name),  XsldbgDialogBase() 
+	TQWidget *tqparent /*=0*/, const char *name /*=0*/) 
+		:  XsldbgGlobalVariables(tqparent, name),  XsldbgDialogBase() 
 {	 
 	this->debugger = debugger; 
 	connect(debugger, TQT_SIGNAL(globalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */)), 
diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h
index 42a40968..f0e3b2c0 100644
--- a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h
+++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h
@@ -27,15 +27,16 @@
  
 class XsldbgDebugger; 
  
-class XsldbgGlobalVariablesImpl : public XsldbgGlobalVariables, public XsldbgDialogBase  { 
-  Q_OBJECT 
+class XsldbgGlobalVariablesImpl : public XsldbgGlobalVariables, public XsldbgDialogBase  {
+  Q_OBJECT
+  TQ_OBJECT
  
-public:  
-	XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); 
+public:
+	XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); 
 	~XsldbgGlobalVariablesImpl(); 
  
 public slots: 
-	/** Process request to add global variable to view, First parameter is TQString::null 
+	/** Process request to add global variable to view, First parameter is TQString() 
 			to indicate start of global variable list notfication */ 
 	void slotProcGlobalVariableItem(TQString name , TQString fileName, int lineNumber); 
 	 
diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.cpp b/kxsldbg/kxsldbgpart/xsldbginspector.cpp
index b6a8f6df..db6fcb58 100644
--- a/kxsldbg/kxsldbgpart/xsldbginspector.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbginspector.cpp
@@ -44,15 +44,15 @@ static TQPixmap uic_load_pixmap_XsldbgInspector( const TQString &name )
     return pix;
 }
 /*
- *  Constructs a XsldbgInspector which is a child of 'parent', with the
+ *  Constructs a XsldbgInspector 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.
  */
-XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent,
+XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* tqparent,
 				  const char* name, bool modal, WFlags fl )
-    : TQDialog( parent, name, modal, fl )
+    : TQDialog( tqparent, name, modal, fl )
 {
     Q_CHECK_PTR(debugger);
     this->debugger = debugger;
@@ -159,7 +159,7 @@ XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent,
 XsldbgInspector::~XsldbgInspector()
 {
   debugger = 0L;
-  // 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/kxsldbg/kxsldbgpart/xsldbginspector.h b/kxsldbg/kxsldbgpart/xsldbginspector.h
index 60e4a59f..c96e1091 100644
--- a/kxsldbg/kxsldbgpart/xsldbginspector.h
+++ b/kxsldbg/kxsldbgpart/xsldbginspector.h
@@ -28,12 +28,13 @@ class XsldbgTemplatesImpl;
 class XsldbgSourcesImpl;
 class XsldbgEntitiesImpl;
 
-class XsldbgInspector : public QDialog
+class XsldbgInspector : public TQDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    XsldbgInspector( XsldbgDebugger *debugger, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~XsldbgInspector();
 
     TQTabWidget* tabWidget;
diff --git a/kxsldbg/kxsldbgpart/xsldbglistitem.cpp b/kxsldbg/kxsldbgpart/xsldbglistitem.cpp
index c04bc7b4..9c4d0ea4 100644
--- a/kxsldbg/kxsldbgpart/xsldbglistitem.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbglistitem.cpp
@@ -17,9 +17,9 @@
  
 #include "xsldbglistitem.h" 
  
-XsldbgListItem::XsldbgListItem(TQListView *parent, int columnOffset, 
+XsldbgListItem::XsldbgListItem(TQListView *tqparent, int columnOffset, 
 	const TQString & fileName, int lineNumber) 
-	: TQListViewItem(parent) 
+	: TQListViewItem(tqparent) 
 { 
 	this->fileName = fileName; 
 	this->lineNumber = lineNumber; 
diff --git a/kxsldbg/kxsldbgpart/xsldbglistitem.h b/kxsldbg/kxsldbgpart/xsldbglistitem.h
index 0d8ac6a7..0eb72f85 100644
--- a/kxsldbg/kxsldbgpart/xsldbglistitem.h
+++ b/kxsldbg/kxsldbgpart/xsldbglistitem.h
@@ -29,7 +29,7 @@
 class XsldbgListItem : public TQListViewItem  { 
 public: 
 	/** column offset is the index of the fileName column */ 
-	XsldbgListItem(TQListView *parent, int columnOffset, 
+	XsldbgListItem(TQListView *tqparent, int columnOffset, 
 					const TQString &fileName, int lineNumber); 
 	~XsldbgListItem(); 
  
diff --git a/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp b/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp
index 0d27f916..0b8125bd 100644
--- a/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp
@@ -18,9 +18,9 @@
 #include "xsldbglocallistitem.h" 
 #include <klocale.h>
  
-XsldbgLocalListItem::XsldbgLocalListItem(TQListView *parent, TQString fileName, int lineNumber, 
+XsldbgLocalListItem::XsldbgLocalListItem(TQListView *tqparent, TQString fileName, int lineNumber, 
 	TQString localName, TQString templateContext, TQString selectXPath, bool localVariable) 
-: XsldbgListItem(parent, 3, fileName, lineNumber)									 
+: XsldbgListItem(tqparent, 3, fileName, lineNumber)									 
 { 
     varName = localName; 
     contextName = templateContext;	 
diff --git a/kxsldbg/kxsldbgpart/xsldbglocallistitem.h b/kxsldbg/kxsldbgpart/xsldbglocallistitem.h
index 81c815e1..15401887 100644
--- a/kxsldbg/kxsldbgpart/xsldbglocallistitem.h
+++ b/kxsldbg/kxsldbgpart/xsldbglocallistitem.h
@@ -26,7 +26,7 @@
 
 class XsldbgLocalListItem : public XsldbgListItem  {
 public:
-	XsldbgLocalListItem(TQListView *parent, TQString fileName, int lineNumber,
+	XsldbgLocalListItem(TQListView *tqparent, TQString fileName, int lineNumber,
 			    TQString localName, TQString templateContext, TQString selectXPath, bool localVariable);
 	~XsldbgLocalListItem();
 
diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui
index 2d31320c..5574a95d 100644
--- a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui
+++ b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>XsldbgLocalVariables</class>
 <author>Keith Isdale &lt;k_isdale@tpg.com.au&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>XsldbgLocalVaraibles</cstring>
     </property>
@@ -34,7 +34,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout7</cstring>
             </property>
@@ -58,14 +58,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="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout1</cstring>
                     </property>
@@ -79,7 +79,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel1</cstring>
                             </property>
@@ -87,7 +87,7 @@
                                 <string>Expression:</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>expressionEdit</cstring>
                             </property>
@@ -107,14 +107,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">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>expressionButton</cstring>
                     </property>
@@ -137,14 +137,14 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QListView">
+        <widget class="TQListView">
             <column>
                 <property name="text">
                     <string>Name</string>
@@ -212,15 +212,15 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <grid>
                 <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>textLabel4</cstring>
                     </property>
@@ -228,12 +228,12 @@
                         <string>Variable expression:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1">
+                <widget class="TQLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>variableName</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="1">
+                <widget class="TQLabel" row="1" column="1">
                     <property name="name">
                         <cstring>variableType</cstring>
                     </property>
@@ -241,7 +241,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -249,20 +249,20 @@
                         <string>Variable type:</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="2" column="1">
+                <widget class="TQLayoutWidget" row="2" column="1">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>xPathEdit</cstring>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>setExpressionButton</cstring>
                             </property>
@@ -275,7 +275,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel2_2</cstring>
                     </property>
@@ -285,7 +285,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</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>refreshBtn</cstring>
                     </property>
@@ -334,7 +334,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -365,10 +365,10 @@
         <slot>slotSetExpression()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>refresh()</slot>
     <slot>slotEvaluate()</slot>
     <slot>slotSetExpression()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp
index fa8c756b..3a1f68d3 100644
--- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp
@@ -27,8 +27,8 @@
  
  
 XsldbgLocalVariablesImpl::XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, 
-	TQWidget *parent /*=0*/, const char *name /*=0*/) 
-		:  XsldbgLocalVariables(parent, name), XsldbgDialogBase() 
+	TQWidget *tqparent /*=0*/, const char *name /*=0*/) 
+		:  XsldbgLocalVariables(tqparent, name), XsldbgDialogBase() 
 {	 
 	this->debugger = debugger; 
 	connect(debugger, TQT_SIGNAL(variableItem(TQString /*name */, TQString /* templateContext*/,
diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h
index aa0156ee..b8456226 100644
--- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h
+++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h
@@ -27,15 +27,16 @@
  
 class XsldbgDebugger; 
  
-class XsldbgLocalVariablesImpl : public XsldbgLocalVariables, public XsldbgDialogBase  { 
-  Q_OBJECT 
+class XsldbgLocalVariablesImpl : public XsldbgLocalVariables, public XsldbgDialogBase  {
+  Q_OBJECT
+  TQ_OBJECT
  
 public:  
-	XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); 
+	XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); 
 	~XsldbgLocalVariablesImpl(); 
 	 
 public slots: 
-	/** Process request to add local varaible to view, First parameter is TQString::null 
+	/** Process request to add local varaible to view, First parameter is TQString() 
 			to indicate start of local variable list notfication */ 
 
 	void slotProcVariableItem(TQString /*name */, TQString /* templateContext*/,
diff --git a/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui b/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui
index 8ba1cac3..15f1a341 100644
--- a/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui
@@ -2,7 +2,7 @@
 <class>XsldbgMsgDialog</class>
 <comment>Used with QT3 or greater</comment>
 <author>Keith Isdale &lt;k_isdale@tpg.com.au&gt;</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>XsldbgMsgDialog</cstring>
     </property>
@@ -35,7 +35,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -49,7 +49,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout3</cstring>
                     </property>
@@ -63,7 +63,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>iconLbl</cstring>
                             </property>
@@ -81,7 +81,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -90,7 +90,7 @@
                         </spacer>
                     </vbox>
                 </widget>
-                <widget class="QTextEdit">
+                <widget class="TQTextEdit">
                     <property name="name">
                         <cstring>msgTextEdit</cstring>
                     </property>
@@ -103,7 +103,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <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>PushButton1</cstring>
                     </property>
@@ -152,7 +152,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -171,5 +171,5 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h b/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h
index 1c605e7e..7d5f5f92 100644
--- a/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h
+++ b/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h
@@ -21,7 +21,7 @@ class XsldbgMsgDialogImpl : public XsldbgMsgDialog {
 
 public:
 
-  XsldbgMsgDialogImpl(TQWidget *parent,
+  XsldbgMsgDialogImpl(TQWidget *tqparent,
 		      TQMessageBox::Icon icon, 
 		      const TQString & title, const TQString &msg);
 
diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
index 72e25fb3..0292e282 100644
--- a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
@@ -27,21 +27,13 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 
-#if QT_VERSION >= 300
 #include "xsldbgmsgdialogimpl.h"
-#else
-#include "xsldbgmsgdialogimpl2.h"
-#endif
 
 
-XsldbgMsgDialogImpl::XsldbgMsgDialogImpl(TQWidget *parent,
+XsldbgMsgDialogImpl::XsldbgMsgDialogImpl(TQWidget *tqparent,
 					 TQMessageBox::Icon icon,
 					 const TQString &title, const TQString &msg)
-#if QT_VERSION >= 300
-  : XsldbgMsgDialog(parent, "XsldbgMsgDialogImpl" , TRUE )
-#else
-  : XsldbgMsgDialog2(parent, "XsldbgMsgDialogImpl" , TRUE )
-#endif
+  : XsldbgMsgDialog(tqparent, "XsldbgMsgDialogImpl" , TRUE )
 {
   setCaption(title);
 
@@ -58,15 +50,13 @@ void XsldbgMsgDialogImpl::append(const TQString &text)
 
 
 
-#if QT_VERSION >= 300
-
 #include "xsldbgoutputview.h"
 
-XsldbgOutputView::XsldbgOutputView(TQWidget * parent)
-  : TQTextEdit(parent, "outputview")
+XsldbgOutputView::XsldbgOutputView(TQWidget * tqparent)
+  : TQTextEdit(tqparent, "outputview")
 {
   new TQBoxLayout(this, TQBoxLayout::TopToBottom);
-  setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
+  tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
   setMinimumSize(TQSize(500, 80));
   setCaption(i18n("xsldbg Output"));
   setText(i18n("\t\txsldbg output capture ready\n\n"));
@@ -75,48 +65,31 @@ XsldbgOutputView::XsldbgOutputView(TQWidget * parent)
   setReadOnly(TRUE);
 }
 
-#else
-
-#include "xsldbgoutputview2.h"
-
-XsldbgOutputView::XsldbgOutputView(TQWidget * parent)
-  : TQTextView(parent, "outputview")
-{
-  new TQBoxLayout(this, TQBoxLayout::TopToBottom);
-  setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
-  setMinimumSize(TQSize(500,80));
-  setCaption(i18n("xsldbg Output"));
-  setText(i18n("\t\txsldbg output capture ready\n\n"));
-  dlg = 0L;
-  show();
-}
-#endif // QT_VERSION
-
 void XsldbgOutputView::slotProcShowMessage(TQString  msg)
 {
   bool processed = FALSE;
   // Is this a result of an evaluate command
   if ((msg[0] == TQChar('=')) && (msg[1] == TQChar(' '))){
-    int endPosition = msg.find(TQChar('\n'));
+    int endPosition = msg.tqfind(TQChar('\n'));
     if (endPosition >= 0){
       processed = TRUE;
       showDialog(TQMessageBox::Information, i18n("Result of evaluation"),
 		 msg.mid(endPosition + 1));
     }
   }else  /* Is there some sort of error message in msg */
-    if ((msg.find("Error:") != -1) ||
-	(msg.find("Warning:") != -1) ||
-	(msg.find("Request to xsldbg failed") != -1) ||
+    if ((msg.tqfind("Error:") != -1) ||
+	(msg.tqfind("Warning:") != -1) ||
+	(msg.tqfind("Request to xsldbg failed") != -1) ||
          /* the following errors are libxml or libxslt generated */
-	(msg.find("error:") != -1) ||
-	(msg.find("xmlXPathEval:") != -1) ||
-	(msg.find("runtime error")  != -1)) {
+	(msg.tqfind("error:") != -1) ||
+	(msg.tqfind("xmlXPathEval:") != -1) ||
+	(msg.tqfind("runtime error")  != -1)) {
       /* OK we've found an error but ingore any errors about
 	 data or source files */
-      if ((msg.find("Error: No XSL source file supplied") == -1) &&
-	  (msg.find("Error: No XML data file supplied") == -1) &&
-	  (msg.find("Load of source deferred") == -1) &&
-	  (msg.find("Load of data deferred") == -1) )
+      if ((msg.tqfind("Error: No XSL source file supplied") == -1) &&
+	  (msg.tqfind("Error: No XML data file supplied") == -1) &&
+	  (msg.tqfind("Load of source deferred") == -1) &&
+	  (msg.tqfind("Load of data deferred") == -1) )
 	showDialog(TQMessageBox::Warning, i18n("Request Failed "),
 		 msg);
       processed = TRUE;
diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.h b/kxsldbg/kxsldbgpart/xsldbgoutputview.h
index 3c4c453a..20fafdd5 100644
--- a/kxsldbg/kxsldbgpart/xsldbgoutputview.h
+++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.h
@@ -29,9 +29,10 @@ class XsldbgMsgDialogImpl;
 
 class XsldbgOutputView : public TQTextEdit {
   Q_OBJECT
+  TQ_OBJECT
   
 public :
-    XsldbgOutputView(TQWidget *parent = 0);
+    XsldbgOutputView(TQWidget *tqparent = 0);
 
    void showDialog(TQMessageBox::Icon icon, TQString title, TQString msg);
   
diff --git a/kxsldbg/kxsldbgpart/xsldbgsources.ui b/kxsldbg/kxsldbgpart/xsldbgsources.ui
index b6073eb6..f16fc183 100644
--- a/kxsldbg/kxsldbgpart/xsldbgsources.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgsources.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>XsldbgSources</class>
 <author>Keith Isdale &lt;k_isdale@tpg.com.au&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>XsldbgSources</cstring>
     </property>
@@ -26,7 +26,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView" row="0" column="0">
+        <widget class="TQListView" row="0" column="0">
             <column>
                 <property name="text">
                     <string>Source File</string>
@@ -72,7 +72,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -96,14 +96,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>refreshBtn</cstring>
                     </property>
@@ -121,7 +121,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -135,9 +135,9 @@
 <connections>
     <connection>
         <sender>sourceListView</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>XsldbgSources</receiver>
-        <slot>selectionChanged(QListViewItem*)</slot>
+        <slot>selectionChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>refreshBtn</sender>
@@ -146,9 +146,9 @@
         <slot>refresh()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>refresh()</slot>
-    <slot>selectionChanged(QListViewItem*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot>selectionChanged(TQListViewItem*)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp
index f291ab6d..a4bbcc94 100644
--- a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp
@@ -24,12 +24,12 @@
  
  
 XsldbgSourcesImpl::XsldbgSourcesImpl(XsldbgDebugger *debugger, 
-	TQWidget *parent /*=0*/, const char *name /*=0*/) 
-		:  XsldbgSources(parent, name), XsldbgDialogBase() 
+	TQWidget *tqparent /*=0*/, const char *name /*=0*/) 
+		:  XsldbgSources(tqparent, name), XsldbgDialogBase() 
 {	 
 	this->debugger = debugger; 
-	connect(debugger, TQT_SIGNAL(sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */)), 
-		this, TQT_SLOT(slotProcSourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */))); 
+	connect(debugger, TQT_SIGNAL(sourceItem(TQString /* fileName */, TQString /* tqparentFileName */, int /*lineNumber */)), 
+		this, TQT_SLOT(slotProcSourceItem(TQString /* fileName */, TQString /* tqparentFileName */, int /*lineNumber */))); 
 		 
 	connect( sourceListView,  TQT_SIGNAL(selectionChanged(TQListViewItem *)), 
 						this, TQT_SLOT(selectionChanged(TQListViewItem*))); 
@@ -42,13 +42,13 @@ XsldbgSourcesImpl::~XsldbgSourcesImpl(){
     debugger = 0L; 
 } 
  
-void XsldbgSourcesImpl::slotProcSourceItem(TQString  fileName , TQString  parentFileName , int lineNumber ) 
+void XsldbgSourcesImpl::slotProcSourceItem(TQString  fileName , TQString  tqparentFileName , int lineNumber ) 
 { 
 	if (fileName.isNull()){ 
 		  sourceListView->clear(); 
 	}else{ 
 		sourceListView->insertItem(new XsldbgGlobalListItem(sourceListView, 
-																					parentFileName, lineNumber, fileName)); 
+																					tqparentFileName, lineNumber, fileName)); 
 	} 
 } 
  
diff --git a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h
index 7b805de4..51893559 100644
--- a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h
+++ b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h
@@ -27,19 +27,20 @@
  
 class XsldbgDebugger; 
  
-class XsldbgSourcesImpl : public XsldbgSources, public XsldbgDialogBase   { 
-  Q_OBJECT 
+class XsldbgSourcesImpl : public XsldbgSources, public XsldbgDialogBase   {
+  Q_OBJECT
+  TQ_OBJECT
  
 public:  
-	XsldbgSourcesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); 
+	XsldbgSourcesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); 
 	~XsldbgSourcesImpl(); 
  
 public slots:	 
 	void selectionChanged(TQListViewItem *item);	 
 	 
-	/** Process request to add source to view, First parameter is TQString::null 
+	/** Process request to add source to view, First parameter is TQString() 
 			to indicate start of source list notfication */ 
-	void slotProcSourceItem(TQString  fileName , TQString  parentFileName , int lineNumber ); 
+	void slotProcSourceItem(TQString  fileName , TQString  tqparentFileName , int lineNumber ); 
 	 
 	/** refresh data from source */ 
 	void refresh(); 
diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp
index cd07e89e..3df077c1 100644
--- a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.cpp
@@ -17,9 +17,9 @@
  
 #include "xsldbgtemplatelistitem.h" 
  
-XsldbgTemplateListItem::XsldbgTemplateListItem(TQListView *parent,	 
+XsldbgTemplateListItem::XsldbgTemplateListItem(TQListView *tqparent,	 
 								TQString fileName, int lineNumber, TQString templateName, TQString modeName) 
-		: XsldbgListItem(parent, 2, fileName, lineNumber) 
+		: XsldbgListItem(tqparent, 2, fileName, lineNumber) 
 { 
 	this->templateName = templateName; 
 	setText(0, templateName);	 
diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h
index e1c0a8b6..e9f6637a 100644
--- a/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h
+++ b/kxsldbg/kxsldbgpart/xsldbgtemplatelistitem.h
@@ -25,7 +25,7 @@
  
 class XsldbgTemplateListItem : public XsldbgListItem  { 
 public:  
-	XsldbgTemplateListItem(TQListView *parent,	 
+	XsldbgTemplateListItem(TQListView *tqparent,	 
 								TQString fileName, int lineNumber, TQString templateName, TQString modeName); 
 	~XsldbgTemplateListItem(); 
 	 
diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplates.ui b/kxsldbg/kxsldbgpart/xsldbgtemplates.ui
index 9804bcef..672a93e2 100644
--- a/kxsldbg/kxsldbgpart/xsldbgtemplates.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgtemplates.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>XsldbgTemplates</class>
 <author>Keith Isdale &lt;k_isdale@tpg.com.au&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>XsldbgTemplates</cstring>
     </property>
@@ -26,7 +26,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView" row="0" column="0">
+        <widget class="TQListView" row="0" column="0">
             <column>
                 <property name="text">
                     <string>Name</string>
@@ -88,13 +88,13 @@
 <connections>
     <connection>
         <sender>templatesListView</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>XsldbgTemplates</receiver>
-        <slot>selectionChanged(QListViewItem*)</slot>
+        <slot>selectionChanged(TQListViewItem*)</slot>
     </connection>
 </connections>
-<slots>
-    <slot>selectionChanged(QListViewItem*)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+<Q_SLOTS>
+    <slot>selectionChanged(TQListViewItem*)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp
index 66cb9227..6b467baf 100644
--- a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp
@@ -22,8 +22,8 @@
 #include "xsldbgtemplatelistitem.h" 
  
 XsldbgTemplatesImpl::XsldbgTemplatesImpl(XsldbgDebugger *debugger, 
-	TQWidget *parent /*=0*/, const char *name /*=0*/) 
-		:  XsldbgTemplates(parent, name), XsldbgDialogBase() 
+	TQWidget *tqparent /*=0*/, const char *name /*=0*/) 
+		:  XsldbgTemplates(tqparent, name), XsldbgDialogBase() 
 {	 
 	this->debugger = debugger; 
 	 
diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h
index 6d06cb6b..acf60c25 100644
--- a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h
+++ b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h
@@ -29,17 +29,18 @@
  
 class XsldbgDebugger; 
  
-class XsldbgTemplatesImpl : public XsldbgTemplates, public XsldbgDialogBase  { 
-  Q_OBJECT 
+class XsldbgTemplatesImpl : public XsldbgTemplates, public XsldbgDialogBase  {
+  Q_OBJECT
+  TQ_OBJECT
  
 public:  
-	XsldbgTemplatesImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); 
+	XsldbgTemplatesImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); 
 	~XsldbgTemplatesImpl(); 
 	 
 public slots:	 
 	void selectionChanged(TQListViewItem *item);	 
 	 
-	/** Process request to add template to view, First parameter is TQString::null 
+	/** Process request to add template to view, First parameter is TQString() 
 			to indicate start of template list notfication */	 
 	void slotProcTemplateItem(TQString  name, TQString mode, TQString  fileName , int  lineNumber );	 
 	 
diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui b/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui
index 2088d97f..db5c3c8e 100644
--- a/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>XsldbgWalkSpeed</class>
 <author>Keith Isdale &lt;k_isdale@tpg.com.au&gt;</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>XsldbgWalkSpeed</cstring>
     </property>
@@ -29,7 +29,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -41,7 +41,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>60</height>
@@ -50,7 +50,7 @@
             <property name="text">
                 <string>Change the speed at which xsldbg walks through execution of the stylesheet.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="wordwrap" stdset="0">
@@ -66,14 +66,14 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>51</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -87,7 +87,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -95,7 +95,7 @@
                         <string>Slow</string>
                     </property>
                 </widget>
-                <widget class="QSlider">
+                <widget class="TQSlider">
                     <property name="name">
                         <cstring>walkSpeedSlider</cstring>
                     </property>
@@ -109,7 +109,7 @@
                         <enum>Horizontal</enum>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -129,14 +129,14 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>51</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</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>
@@ -185,14 +185,14 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton2</cstring>
                     </property>
@@ -210,7 +210,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -235,5 +235,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp
index 58497cea..1c8a18e1 100644
--- a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.cpp
@@ -21,8 +21,8 @@
 #include "xsldbgwalkspeedimpl.h" 
  
 XsldbgWalkSpeedImpl::XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, 
-																							TQWidget *parent /*=0 */, const char *name /*=0*/ ) 
-	: XsldbgWalkSpeed(parent, name, false)	 
+																							TQWidget *tqparent /*=0 */, const char *name /*=0*/ ) 
+	: XsldbgWalkSpeed(tqparent, name, false)	 
 { 
 	this->debugger = debugger; 
 } 
diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h
index e0cbe69e..f8a2e3f5 100644
--- a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h
+++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h
@@ -26,11 +26,12 @@
  
 class XsldbgDebugger; 
  
-class XsldbgWalkSpeedImpl : public XsldbgWalkSpeed  { 
-  Q_OBJECT 
+class XsldbgWalkSpeedImpl : public XsldbgWalkSpeed  {
+  Q_OBJECT
+  TQ_OBJECT
  
 public:  
-	XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, TQWidget *parent=0, const char *name=0); 
+	XsldbgWalkSpeedImpl(XsldbgDebugger *debugger, TQWidget *tqparent=0, const char *name=0); 
 	~XsldbgWalkSpeedImpl(); 
 	 
 public slots:	 
diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp
index bcc1852e..9df822c8 100644
--- a/kxsldbg/xsldbgmain.cpp
+++ b/kxsldbg/xsldbgmain.cpp
@@ -121,10 +121,10 @@ int main(int argc, char **argv)
 {
     KLocale::setMainCatalogue("kxsldbg"); // Translations come from KXSLDbg's catalog
 
-    TQString xsldbgRunTimeInfo(i18n("Using libxml %1, libxslt %2 and libexslt %3\n").arg(xmlParserVersion).arg(xsltEngineVersion).arg(exsltLibraryVersion));
-    TQString libxmlCompileTimeInfo(i18n("xsldbg was compiled against libxml %1, libxslt %2 and libexslt %3\n").arg(LIBXML_VERSION).arg(LIBXSLT_VERSION).arg(LIBEXSLT_VERSION));
-    TQString libxsltCompileTimeInfo(i18n("libxslt %1 was compiled against libxml %2\n").arg(xsltLibxsltVersion).arg(xsltLibxmlVersion));
-    TQString libexsltCompileTimeInfo(i18n("libexslt %1 was compiled against libxml %2\n").arg(exsltLibexsltVersion).arg(exsltLibxmlVersion));
+    TQString xsldbgRunTimeInfo(i18n("Using libxml %1, libxslt %2 and libexslt %3\n").tqarg(xmlParserVersion).tqarg(xsltEngineVersion).tqarg(exsltLibraryVersion));
+    TQString libxmlCompileTimeInfo(i18n("xsldbg was compiled against libxml %1, libxslt %2 and libexslt %3\n").tqarg(LIBXML_VERSION).tqarg(LIBXSLT_VERSION).tqarg(LIBEXSLT_VERSION));
+    TQString libxsltCompileTimeInfo(i18n("libxslt %1 was compiled against libxml %2\n").tqarg(xsltLibxsltVersion).tqarg(xsltLibxmlVersion));
+    TQString libexsltCompileTimeInfo(i18n("libexslt %1 was compiled against libxml %2\n").tqarg(exsltLibexsltVersion).tqarg(exsltLibxmlVersion));
     TQString freeFormText = xsldbgRunTimeInfo + libxmlCompileTimeInfo + libxsltCompileTimeInfo + libexsltCompileTimeInfo;
 
     KAboutData about("xsldbg", I18N_NOOP("Xsldbg"), version, description, KAboutData::License_GPL, "(C) 2003 Keith Isdale", freeFormText, 0, "k_isdale@tpg.com.au");
diff --git a/lib/compatibility/kmdi/qextmdi/kdelibs_export.h b/lib/compatibility/kmdi/qextmdi/kdelibs_export.h
index 0ca49784..c46b5005 100644
--- a/lib/compatibility/kmdi/qextmdi/kdelibs_export.h
+++ b/lib/compatibility/kmdi/qextmdi/kdelibs_export.h
@@ -26,7 +26,7 @@
 /* needed, because e.g. Q_OS_UNIX is so frequently used */
 #include <tqglobal.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include <kdelibs_export_win.h>
 
 #else /* Q_OS_UNIX */
@@ -68,7 +68,7 @@
 
 #endif /*_KDELIBS_EXPORT_H*/
 
-/* workaround for kdecore: stupid moc's grammar doesn't accept two macros
+/* workaround for kdecore: stupid tqmoc's grammar doesn't accept two macros
    between 'class' keyword and <classname>: */
 #ifdef KDE_DEPRECATED
 # ifndef KDECORE_EXPORT_DEPRECATED
diff --git a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in b/lib/compatibility/kmdi/qextmdi/kdemacros.h.in
index 95ac5d8e..9308c18d 100644
--- a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in
+++ b/lib/compatibility/kmdi/qextmdi/kdemacros.h.in
@@ -40,7 +40,7 @@
 #ifdef __KDE_HAVE_GCC_VISIBILITY
 #define KDE_NO_EXPORT __attribute__ ((visibility("hidden")))
 #define KDE_EXPORT __attribute__ ((visibility("default")))
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
 #define KDE_NO_EXPORT
 #define KDE_EXPORT __declspec(dllexport)
 #else
@@ -49,13 +49,13 @@
 #endif
 
 /**
- * KDE_Q_EXPORT_PLUGIN is a workaround for Qt not being able to
+ * KDE_TQ_EXPORT_PLUGIN is a workaround for TQt not being able to
  * cope with symbol visibility.
  */
-#define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
-  Q_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
-  Q_EXTERN_C KDE_EXPORT QUnknownInterface* ucm_instantiate(); \
-  Q_EXPORT_PLUGIN(PLUGIN)
+#define KDE_TQ_EXPORT_PLUGIN(PLUGIN) \
+  TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
+  TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
+  TQ_EXPORT_PLUGIN(PLUGIN)
 
 /**
  * The KDE_PACKED can be used to hint the compiler that a particular
@@ -101,15 +101,15 @@
  * \endcode
  *
  * \note
- * It does not make much sense to use the KDE_DEPRECATED keyword for a Qt signal;
+ * It does not make much sense to use the KDE_DEPRECATED keyword for a TQt signal;
  * this is because usually get called by the class which they belong to,
  * and one'd assume that a class author doesn't use deprecated methods of his
  * own class. The only exception to this are signals which are connected to
- * other signals; they get invoked from moc-generated code. In any case, 
+ * other signals; they get invoked from tqmoc-generated code. In any case, 
  * printing a warning message in either case is not useful.
  * For slots, it can make sense (since slots can be invoked directly) but be
  * aware that if the slots get triggered by a signal, the will get called from
- * moc code as well and thus the warnings are useless.
+ * tqmoc code as well and thus the warnings are useless.
  *
  * \par
  * Also note that it is not possible to use KDE_DEPRECATED for classes which
@@ -172,7 +172,7 @@
  *
  * \note The added functions must be added to the header at the same location
  * as the macro; changing the order of virtual functions in a header is also
- * binary incompatible as it breaks the layout of the vtable.
+ * binary incompatible as it breaks the tqlayout of the vtable.
  */
 
 #define RESERVE_VIRTUAL_1 \
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
index 32a5eaf0..fdb463dc 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
@@ -43,7 +43,7 @@
 #include <kglobalsettings.h>
 
 #include "config.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #endif
@@ -99,8 +99,8 @@ static const char* const not_close_xpm[]={
  *
  * @author Max Judin.
 */
-KDockMainWindow::KDockMainWindow( TQWidget* parent, const char *name, WFlags f)
-:KMainWindow( parent, name, f )
+KDockMainWindow::KDockMainWindow( TQWidget* tqparent, const char *name, WFlags f)
+:KMainWindow( tqparent, name, f )
 {
   TQString new_name = TQString(name) + TQString("_DockManager");
   dockManager = new KDockManager( this, new_name.latin1() );
@@ -122,7 +122,7 @@ void KDockMainWindow::setMainDockWidget( KDockWidget* mdw )
 void KDockMainWindow::setView( TQWidget *view )
 {
   if ( view->isA("KDockWidget") ){
-    if ( view->parent() != this ) ((KDockWidget*)view)->applyToWidget( this );
+    if ( TQT_BASE_OBJECT(view->tqparent()) != TQT_BASE_OBJECT(this) ) ((KDockWidget*)view)->applyToWidget( this );
   }
 
 #ifndef NO_KDE2
@@ -132,9 +132,9 @@ void KDockMainWindow::setView( TQWidget *view )
 #endif
 }
 
-KDockWidget* KDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel)
+KDockWidget* KDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel)
 {
-  return new KDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel );
+  return new KDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel );
 }
 
 void KDockMainWindow::makeDockVisible( KDockWidget* dock )
@@ -185,15 +185,15 @@ void KDockMainWindow::slotDockWidgetUndocked()
 }
 
 /*************************************************************************/
-KDockWidgetAbstractHeaderDrag::KDockWidgetAbstractHeaderDrag( KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name )
-:TQFrame( parent, name )
+KDockWidgetAbstractHeaderDrag::KDockWidgetAbstractHeaderDrag( KDockWidgetAbstractHeader* tqparent, KDockWidget* dock, const char* name )
+:TQFrame( tqparent, name )
 {
   dw = dock;
   installEventFilter( dock->dockManager() );
 }
 /*************************************************************************/
-KDockWidgetHeaderDrag::KDockWidgetHeaderDrag( KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name )
-:KDockWidgetAbstractHeaderDrag( parent, dock, name )
+KDockWidgetHeaderDrag::KDockWidgetHeaderDrag( KDockWidgetAbstractHeader* tqparent, KDockWidget* dock, const char* name )
+:KDockWidgetAbstractHeaderDrag( tqparent, dock, name )
 {
 }
 
@@ -203,38 +203,38 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
 
   paint.begin( this );
 
-  style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
+  tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
 
   paint.end();
 }
 /*************************************************************************/
-KDockWidgetAbstractHeader::KDockWidgetAbstractHeader( KDockWidget* parent, const char* name )
-:TQFrame( parent, name )
+KDockWidgetAbstractHeader::KDockWidgetAbstractHeader( KDockWidget* tqparent, const char* name )
+:TQFrame( tqparent, name )
 {
 }
 /*************************************************************************/
-KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
-:KDockWidgetAbstractHeader( parent, name )
+KDockWidgetHeader::KDockWidgetHeader( KDockWidget* tqparent, const char* name )
+:KDockWidgetAbstractHeader( tqparent, name )
 {
 #ifdef BORDERLESS_WINDOWS
   setCursor(TQCursor(ArrowCursor));
 #endif
-  d = new KDockWidgetHeaderPrivate( this );
+  d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) );
 
-  layout = new TQHBoxLayout( this );
-  layout->setResizeMode( TQLayout::Minimum );
+  tqlayout = new TQHBoxLayout( this );
+  tqlayout->setResizeMode( TQLayout::Minimum );
 
-  drag = new KDockWidgetHeaderDrag( this, parent );
+  drag = new KDockWidgetHeaderDrag( this, tqparent );
 
   closeButton = new KDockButton_Private( this, "DockCloseButton" );
   TQToolTip::add( closeButton, i18n("Close") );
-  closeButton->setPixmap( style().stylePixmap (TQStyle::SP_TitleBarCloseButton , this));
+  closeButton->setPixmap( tqstyle().stylePixmap (TQStyle::SP_TitleBarCloseButton , this));
   closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
-  connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked()));
-  connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock()));
+  connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerCloseButtonClicked()));
+  connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(undock()));
 
   stayButton = new KDockButton_Private( this, "DockStayButton" );
-  TQToolTip::add( stayButton, i18n("Freeze the window geometry", "Freeze") );
+  TQToolTip::add( stayButton, i18n("Freeze the window tqgeometry", "Freeze") );
   stayButton->setToggleButton( true );
   stayButton->setPixmap( const_cast< const char** >(not_close_xpm) );
   stayButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
@@ -244,36 +244,36 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
   TQToolTip::add( dockbackButton, i18n("Dock this window", "Dock") );
   dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm));
   dockbackButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
-  connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked()));
-  connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack()));
+  connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerDockbackButtonClicked()));
+  connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(dockBack()));
 
   d->toDesktopButton = new KDockButton_Private( this, "ToDesktopButton" );
   TQToolTip::add( d->toDesktopButton, i18n("Detach") );
   d->toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm));
   d->toDesktopButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
-  connect( d->toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop()));
+  connect( d->toDesktopButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(toDesktop()));
   stayButton->hide();
 
   d->dummy = new TQWidget( this );
   d->dummy->setFixedSize( 1,closeButton->pixmap()->height() );
 
 
-  layout->addWidget( drag );
-  layout->addWidget( dockbackButton );
-  layout->addWidget( d->toDesktopButton );
-  layout->addWidget( d->dummy);
-  layout->addWidget( stayButton );
-  layout->addWidget( closeButton );
-  layout->activate();
+  tqlayout->addWidget( drag );
+  tqlayout->addWidget( dockbackButton );
+  tqlayout->addWidget( d->toDesktopButton );
+  tqlayout->addWidget( d->dummy);
+  tqlayout->addWidget( stayButton );
+  tqlayout->addWidget( closeButton );
+  tqlayout->activate();
   d->dummy->hide();
-  drag->setFixedHeight( layout->minimumSize().height() );
+  drag->setFixedHeight( tqlayout->tqminimumSize().height() );
 }
 
 void KDockWidgetHeader::setTopLevel( bool isTopLevel )
 {
   d->topLevel = isTopLevel;
   if ( isTopLevel ){
-    KDockWidget* par = (KDockWidget*)parent();
+    KDockWidget* par = (KDockWidget*)tqparent();
     if( par) {
       if( par->isDockBackPossible())
         dockbackButton->show();
@@ -291,7 +291,7 @@ void KDockWidgetHeader::setTopLevel( bool isTopLevel )
     if( d->showToDesktopButton )
       d->toDesktopButton->show();
   }
-  layout->activate();
+  tqlayout->activate();
 
    bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) ||
         d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) ||
@@ -318,75 +318,75 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
 {
   if ( !nd ) return;
 
-  delete layout;
-  layout = new TQHBoxLayout( this );
-  layout->setResizeMode( TQLayout::Minimum );
+  delete tqlayout;
+  tqlayout = new TQHBoxLayout( this );
+  tqlayout->setResizeMode( TQLayout::Minimum );
 
   delete drag;
   drag = nd;
-  if (drag->parentWidget()!=this) {
+  if (drag->tqparentWidget()!=this) {
 	drag->reparent(this,TQPoint(0,0));
   }
 
 
-  layout->addWidget( drag );
-  layout->addWidget( dockbackButton );
-  layout->addWidget( d->dummy );
-  layout->addWidget( d->toDesktopButton );
-  layout->addWidget( stayButton );
+  tqlayout->addWidget( drag );
+  tqlayout->addWidget( dockbackButton );
+  tqlayout->addWidget( d->dummy );
+  tqlayout->addWidget( d->toDesktopButton );
+  tqlayout->addWidget( stayButton );
   bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) ||
 	d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) ||
 	closeButton->isVisibleTo(this);
   for (TQPtrListIterator<KDockButton_Private> it( d->btns );it.current();++it) {
-      layout->addWidget(it.current());
+      tqlayout->addWidget(it.current());
 	dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this));
   }
   if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
-  layout->addWidget( closeButton );
-  layout->activate();
-  kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->minimumSize().height()<<endl;
+  tqlayout->addWidget( closeButton );
+  tqlayout->activate();
+  kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<tqlayout->tqminimumSize().height()<<endl;
 #ifdef __GNUC__
 #warning FIXME
 #endif
-  drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/sizeHint().height() );
+  drag->setFixedHeight( closeButton->height()); // /*tqlayout->minimumS*/tqsizeHint().height() );
 }
 
 void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
 	if (!btn) return;
 
-	if (btn->parentWidget()!=this) {
+	if (btn->tqparentWidget()!=this) {
 		btn->reparent(this,TQPoint(0,0));
 	}
 	btn->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
-	if (!d->btns.containsRef(btn)) d->btns.append(btn);
+	if (!d->btns.tqcontainsRef(btn)) d->btns.append(btn);
 
 	btn->show();
 
-	delete layout;
-	layout = new TQHBoxLayout( this );
-	layout->setResizeMode( TQLayout::Minimum );
+	delete tqlayout;
+	tqlayout = new TQHBoxLayout( this );
+	tqlayout->setResizeMode( TQLayout::Minimum );
 
-	layout->addWidget( drag );
- 	layout->addWidget( dockbackButton );
-	layout->addWidget( d->toDesktopButton );
-	layout->addWidget( d->dummy);
-	layout->addWidget( stayButton );
+	tqlayout->addWidget( drag );
+ 	tqlayout->addWidget( dockbackButton );
+	tqlayout->addWidget( d->toDesktopButton );
+	tqlayout->addWidget( d->dummy);
+	tqlayout->addWidget( stayButton );
 	 bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) ||
 	        d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) ||
         	closeButton->isVisibleTo(this);
 	 for (TQPtrListIterator<KDockButton_Private> it( d->btns );it.current();++it) {
-	        layout->addWidget(it.current());
+	        tqlayout->addWidget(it.current());
 		dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this));
    	}
   	if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
-	layout->addWidget( closeButton );
-	layout->activate();
-	drag->setFixedHeight( layout->minimumSize().height() );
+	tqlayout->addWidget( closeButton );
+	tqlayout->activate();
+	drag->setFixedHeight( tqlayout->tqminimumSize().height() );
 }
 
 void KDockWidgetHeader::removeButton(KDockButton_Private* btn) {
-	if (btn->parentWidget()==this) {
-		if (d->btns.containsRef(btn)) d->btns.removeRef(btn);
+	if (btn->tqparentWidget()==this) {
+		if (d->btns.tqcontainsRef(btn)) d->btns.removeRef(btn);
 		delete btn;
 	}
 }
@@ -425,12 +425,12 @@ void KDockWidgetHeader::setDragEnabled(bool b)
 #ifndef NO_KDE2
 void KDockWidgetHeader::saveConfig( KConfig* c )
 {
-  c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() );
+  c->writeEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), stayButton->isOn() );
 }
 
 void KDockWidgetHeader::loadConfig( KConfig* c )
 {
-  setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) );
+  setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), false ) );
 }
 #endif
 
@@ -479,11 +479,11 @@ public:
 
 
 /*************************************************************************/
-KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f)
+KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f)
 #ifdef BORDERLESS_WINDOWS
-: TQWidget( parent, name, f )//| WType_Dialog | WStyle_Customize | WStyle_NoBorder )
+: TQWidget( tqparent, name, f )//| WType_Dialog | WStyle_Customize | WStyle_NoBorder )
 #else
-: TQWidget( parent, name, f )
+: TQWidget( tqparent, name, f )
 #endif
   ,formerBrotherDockWidget(0L)
   ,currentDockPos(DockNone)
@@ -495,13 +495,13 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP
 {
   d = new KDockWidgetPrivate();  // create private data
 
-  d->_parent = parent;
+  d->_parent = tqparent;
 
-  layout = new TQVBoxLayout( this );
-  layout->setResizeMode( TQLayout::Minimum );
+  tqlayout = new TQVBoxLayout( this );
+  tqlayout->setResizeMode( TQLayout::Minimum );
 
   manager = dockManager;
-  manager->childDock->append( this );
+  manager->childDock->append( TQT_TQOBJECT(this) );
   installEventFilter( manager );
 
   eDocking = DockFullDocking;
@@ -526,17 +526,17 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP
   widget = 0L;
 
   TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) );
-  applyToWidget( parent, TQPoint(0,0) );
+  applyToWidget( tqparent, TQPoint(0,0) );
 }
 
 void KDockWidget::setPixmap(const TQPixmap& pixmap) {
 	delete pix;
 	pix=new TQPixmap(pixmap);
 	setIcon(*pix);
-	KDockTabGroup *dtg=parentDockTabGroup();
+	KDockTabGroup *dtg=tqparentDockTabGroup();
 	if (dtg)
 		dtg->changeTab(this,pixmap,dtg->tabLabel(this));
-	 TQWidget *contWid=parentDockContainer();
+	 TQWidget *contWid=tqparentDockContainer();
          if (contWid) {
          	KDockContainer *x = dynamic_cast<KDockContainer*>(contWid);
                 if (x) {
@@ -565,8 +565,8 @@ KDockWidget::~KDockWidget()
     }
   }
   emit iMBeingClosed();
-  if (manager->d) manager->d->containerDocks.remove(this);
-  manager->childDock->remove( this );
+  if (manager->d) manager->d->containerDocks.remove(TQT_TQOBJECT(this));
+  manager->childDock->remove( TQT_TQOBJECT(this) );
   delete pix;
   delete d; // destroy private data
   d=0;
@@ -577,7 +577,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe)
 	TQWidget::paintEvent(pe);
         TQPainter paint;
         paint.begin( this );
-        style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
+        tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
         paint.end();
 }
 
@@ -585,7 +585,7 @@ void KDockWidget::leaveEvent(TQEvent *e)
 {
 	TQWidget::leaveEvent(e);
 #ifdef BORDERLESS_WINDOWS
-	if (parent()) return;
+	if (tqparent()) return;
 //	setCursor(TQCursor(ArrowCursor));
 #endif
 }
@@ -593,7 +593,7 @@ void KDockWidget::leaveEvent(TQEvent *e)
 void KDockWidget::mousePressEvent(TQMouseEvent* mme)
 {
 #ifdef BORDERLESS_WINDOWS
-	if (!parent())
+	if (!tqparent())
 	{
 		kdDebug(282)<<"KDockWidget::mousePressEvent"<<endl;
 
@@ -604,7 +604,7 @@ void KDockWidget::mousePressEvent(TQMouseEvent* mme)
 		int styleheight;
 		TQPoint mp;
 		mp=mme->pos();
-      		styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+      		styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this);
 		bbottom=mp.y()>=height()-styleheight;
 		btop=mp.y()<=styleheight;
 		bleft=mp.x()<=styleheight;
@@ -663,7 +663,7 @@ void  KDockWidget::mouseMoveEvent(TQMouseEvent* mme)
 {
 	TQWidget::mouseMoveEvent(mme);
 #ifdef BORDERLESS_WINDOWS
-	if (parent()) return;
+	if (tqparent()) return;
 
 	if (d->resizing)
 	{
@@ -692,7 +692,7 @@ void  KDockWidget::mouseMoveEvent(TQMouseEvent* mme)
 	int styleheight;
 	TQPoint mp;
 	mp=mme->pos();
-      	styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+      	styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this);
 	bbottom=mp.y()>=height()-styleheight;
 	btop=mp.y()<=styleheight;
 	bleft=mp.x()<=styleheight;
@@ -748,15 +748,15 @@ void KDockWidget::setHeader( KDockWidgetAbstractHeader* h )
 
   if ( header ){
     delete header;
-    delete layout;
+    delete tqlayout;
     header = h;
-    layout = new TQVBoxLayout( this );
-    layout->setResizeMode( TQLayout::Minimum );
-    layout->addWidget( header );
+    tqlayout = new TQVBoxLayout( this );
+    tqlayout->setResizeMode( TQLayout::Minimum );
+    tqlayout->addWidget( header );
      setWidget( widget );
   } else {
     header = h;
-    layout->addWidget( header );
+    tqlayout->addWidget( header );
   }
   kdDebug(282)<<caption()<<": KDockWidget::setHeader"<<endl;
   setEnableDocking(eDocking);
@@ -772,14 +772,14 @@ void KDockWidget::setEnableDocking( int pos )
 
 void KDockWidget::updateHeader()
 {
-  if ( parent() ){
+  if ( tqparent() ){
 #ifdef BORDERLESS_WINDOWS
-      layout->setMargin(0);
+      tqlayout->setMargin(0);
       setMouseTracking(false);
       setCursor(TQCursor(ArrowCursor));
 #endif
 
-    if ( (parent() == manager->main) || isGroup || (eDocking == KDockWidget::DockNone) ){
+    if ( (TQT_BASE_OBJECT(tqparent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == KDockWidget::DockNone) ){
       header->hide();
     } else {
       header->setTopLevel( false );
@@ -792,7 +792,7 @@ void KDockWidget::updateHeader()
     header->setTopLevel( true );
     header->show();
 #ifdef BORDERLESS_WINDOWS
-      layout->setMargin(2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this));
+      tqlayout->setMargin(2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this));
       setMouseTracking(true);
 #endif
   }
@@ -800,7 +800,7 @@ void KDockWidget::updateHeader()
 
 void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
 {
-  if ( parent() != s )
+  if ( TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(s) )
   {
     hide();
     reparent(s, 0, TQPoint(0,0), false);
@@ -811,7 +811,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
   }
 
   if ( manager && s == manager->main ){
-      setGeometry( TQRect(TQPoint(0,0), manager->main->geometry().size()) );
+      setGeometry( TQRect(TQPoint(0,0), manager->main->tqgeometry().size()) );
   }
 
   if ( !s )
@@ -819,7 +819,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
     move(p);
 
 #ifndef NO_KDE2
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if (d->transient && d->_parent)
       XSetTransientForHint( qt_xdisplay(), winId(), d->_parent->winId() );
 
@@ -829,7 +829,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
 #else
     KWin::setType( winId(), d->windowType );
 #endif // BORDERLESS_WINDOW
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 #endif
 
   }
@@ -840,11 +840,11 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
 
 void KDockWidget::show()
 {
-  if ( parent() || manager->main->isVisible() )
-    if ( !parent() ){
+  if ( tqparent() || manager->main->isVisible() )
+    if ( !tqparent() ){
      emit manager->setDockDefaultPos( this );
      emit setDockDefaultPos();
-     if ( parent() ){
+     if ( tqparent() ){
         makeDockVisible();
       } else {
         TQWidget::show();
@@ -859,16 +859,16 @@ void KDockWidget::show()
 void KDockWidget::setDockWindowType (NET::WindowType windowType)
 {
   d->windowType = windowType;
-  applyToWidget( parentWidget(), TQPoint(0,0) );
+  applyToWidget( tqparentWidget(), TQPoint(0,0) );
 }
 
 #endif
 
-void KDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnabled)
+void KDockWidget::setDockWindowTransient (TQWidget *tqparent, bool transientEnabled)
 {
-  d->_parent = parent;
+  d->_parent = tqparent;
   d->transient = transientEnabled;
-  applyToWidget( parentWidget(), TQPoint(0,0) );
+  applyToWidget( tqparentWidget(), TQPoint(0,0) );
 }
 
 TQWidget *KDockWidget::transientTo() {
@@ -899,13 +899,13 @@ bool KDockWidget::event( TQEvent *event )
       emit manager->change();
       break;
     case TQEvent::CaptionChange:
-      if ( parentWidget() ){
-        if ( parent()->inherits("KDockSplitter") ){
-          ((KDockSplitter*)(parent()))->updateName();
+      if ( tqparentWidget() ){
+        if ( tqparent()->inherits("KDockSplitter") ){
+          ((KDockSplitter*)(tqparent()))->updateName();
         }
-        if ( parentDockTabGroup() ){
-          setDockTabName( parentDockTabGroup() );
-          parentDockTabGroup()->setTabLabel( this, tabPageLabel() );
+        if ( tqparentDockTabGroup() ){
+          setDockTabName( tqparentDockTabGroup() );
+          tqparentDockTabGroup()->setTabLabel( this, tabPageLabel() );
         }
       }
       break;
@@ -920,18 +920,18 @@ bool KDockWidget::event( TQEvent *event )
 
 KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
 {
-	if (!parent()) return 0;
-	if (!parent()->inherits("KDockSplitter")) return 0;
-	Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ? Vertical:Horizontal;
-		if (((KDockSplitter*)(parent()))->orientation()==orientation)
+	if (!tqparent()) return 0;
+	if (!tqparent()->inherits("KDockSplitter")) return 0;
+	Qt::Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ?Qt::Vertical:Qt::Horizontal;
+		if (((KDockSplitter*)(tqparent()))->orientation()==orientation)
 		{
 			KDockWidget *neighbor=
 				((pos==DockLeft)||(pos==DockTop))?
-				static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getFirst()):
-				static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getLast());
+				static_cast<KDockWidget*>(((KDockSplitter*)(tqparent()))->getFirst()):
+				static_cast<KDockWidget*>(((KDockSplitter*)(tqparent()))->getLast());
 
 			if (neighbor==this)
-			return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos));
+			return (static_cast<KDockWidget*>(TQT_TQWIDGET(tqparent()->tqparent()))->findNearestDockWidget(pos));
 			else
 			if (neighbor->getWidget() && (neighbor->getWidget()->qt_cast("KDockTabGroup")))
 				return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0));
@@ -939,7 +939,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
 			return neighbor;
 		}
 		else
-		return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos));
+		return (static_cast<KDockWidget*>(TQT_TQWIDGET(tqparent()->tqparent()))->findNearestDockWidget(pos));
 
 	return 0;
 }
@@ -983,10 +983,10 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
 //  kdDebug(282)<<"KDockWidget::manualDock(): success = false (2)"<<endl;
   }
 
-  if ( parent() && !parent()->inherits("KDockSplitter") && !parentDockTabGroup() &&
-  	!(dynamic_cast<KDockContainer*>(parent())) && !parentDockContainer()){
+  if ( tqparent() && !tqparent()->inherits("KDockSplitter") && !tqparentDockTabGroup() &&
+  	!(dynamic_cast<KDockContainer*>(tqparent())) && !tqparentDockContainer()){
 //  kdDebug(282)<<"KDockWidget::manualDock(): success = false (3)"<<endl;
-//  kdDebug(282)<<parent()->name()<<endl;
+//  kdDebug(282)<<tqparent()->name()<<endl;
     succes = false;
   }
 
@@ -1021,28 +1021,28 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
   }
 
 //  kdDebug(282)<<"Looking for  KDockTabGroup"<<endl;
-  KDockTabGroup* parentTab = target->parentDockTabGroup();
-  if ( parentTab ){
+  KDockTabGroup* tqparentTab = target->tqparentDockTabGroup();
+  if ( tqparentTab ){
     // add to existing TabGroup
-    applyToWidget( parentTab );
-    parentTab->insertTab( this, icon() ? *icon() : TQPixmap(),
+    applyToWidget( tqparentTab );
+    tqparentTab->insertTab( this, icon() ? *icon() : TQPixmap(),
                           tabPageLabel(), tabIndex );
 
-    TQWidget *wantTransient=parentTab->transientTo();
+    TQWidget *wantTransient=tqparentTab->transientTo();
     target->setDockWindowTransient(wantTransient,wantTransient);
 
-    setDockTabName( parentTab );
+    setDockTabName( tqparentTab );
     if( !toolTipStr.isEmpty())
-      parentTab->setTabToolTip( this, toolTipStr);
+      tqparentTab->setTabToolTip( this, toolTipStr);
 
     currentDockPos = KDockWidget::DockCenter;
     emit manager->change();
-    return (KDockWidget*)parentTab->parent();
+    return (KDockWidget*)tqparentTab->tqparent();
   }
   else
   {
 //  	kdDebug(282)<<"Looking for  KDockContainer"<<endl;
-  	TQWidget *contWid=target->parentDockContainer();
+  	TQWidget *contWid=target->tqparentDockContainer();
 	  if (!contWid) contWid=target->widget;
 	  if (contWid)
 	  {
@@ -1060,21 +1060,21 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
 			cont->insertWidget( this, icon() ? *icon() : TQPixmap(),
 						tabPageLabel(), tabIndex );
 			setLatestKDockContainer(contWid);
-//			setDockTabName( parentTab );
+//			setDockTabName( tqparentTab );
 			if( !toolTipStr.isEmpty())
 			cont->setToolTip( this, toolTipStr);
 
 			currentDockPos = KDockWidget::DockCenter;
 			emit manager->change();
-			return (KDockWidget*)(cont->parentDockWidget());
+			return (KDockWidget*)(cont->tqparentDockWidget());
 
 		  }
 	  }
   }
 
   // create a new dockwidget that will contain the target and this
-  TQWidget* parentDock = target->parentWidget();
-  KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(""), parentDock );
+  TQWidget* tqparentDock = target->tqparentWidget();
+  KDockWidget* newDock = new KDockWidget( manager, "tempName", TQPixmap(TQString("")), tqparentDock );
   newDock->currentDockPos = target->currentDockPos;
 
   if ( dockPos == KDockWidget::DockCenter ){
@@ -1084,12 +1084,12 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
   }
   newDock->eDocking = (target->eDocking & eDocking) & (~(int)KDockWidget::DockCenter);
 
-  newDock->applyToWidget( parentDock );
+  newDock->applyToWidget( tqparentDock );
 
-  if ( !parentDock ){
+  if ( !tqparentDock ){
     // dock to a toplevel dockwidget means newDock is toplevel now
     newDock->move( target->frameGeometry().topLeft() );
-    newDock->resize( target->geometry().size() );
+    newDock->resize( target->tqgeometry().size() );
     if ( target->isVisibleToTLW() ) newDock->show();
   }
 
@@ -1124,7 +1124,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
     tab->insertTab( this, icon() ? *icon() : TQPixmap(),
                     tabPageLabel(), tabIndex );
 
-    TQRect geom=newDock->geometry();
+    TQRect geom=newDock->tqgeometry();
     TQWidget *wantTransient=tab->transientTo();
     newDock->setDockWindowTransient(wantTransient,wantTransient);
     newDock->setGeometry(geom);
@@ -1143,13 +1143,13 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
     // if to dock not to the center of the target dockwidget,
     // dock to newDock
     KDockSplitter* panner = 0L;
-    if ( dockPos == KDockWidget::DockTop  || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_", Horizontal, spliPos, manager->splitterHighResolution() );
-    if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight  ) panner = new KDockSplitter( newDock, "_dock_split_", Vertical , spliPos, manager->splitterHighResolution() );
+    if ( dockPos == KDockWidget::DockTop  || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_",Qt::Horizontal, spliPos, manager->splitterHighResolution() );
+    if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight  ) panner = new KDockSplitter( newDock, "_dock_split_",Qt::Vertical , spliPos, manager->splitterHighResolution() );
     newDock->setWidget( panner );
 
     panner->setOpaqueResize(manager->splitterOpaqueResize());
     panner->setKeepSize(manager->splitterKeepSize());
-    panner->setFocusPolicy( NoFocus );
+    panner->setFocusPolicy( TQ_NoFocus );
     target->applyToWidget( panner );
     applyToWidget( panner );
     target->formerDockPos = target->currentDockPos;
@@ -1178,9 +1178,9 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
     panner->show();
   }
 
-  if ( parentDock ){
-    if ( parentDock->inherits("KDockSplitter") ){
-      KDockSplitter* sp = (KDockSplitter*)parentDock;
+  if ( tqparentDock ){
+    if ( tqparentDock->inherits("KDockSplitter") ){
+      KDockSplitter* sp = (KDockSplitter*)tqparentDock;
       sp->deactivate();
       if ( sp->getFirst() == target )
         sp->activate( newDock, 0L );
@@ -1197,18 +1197,18 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
   return newDock;
 }
 
-KDockTabGroup* KDockWidget::parentDockTabGroup() const
+KDockTabGroup* KDockWidget::tqparentDockTabGroup() const
 {
-  if ( !parent() ) return 0L;
-  TQWidget* candidate = parentWidget()->parentWidget();
+  if ( !tqparent() ) return 0L;
+  TQWidget* candidate = tqparentWidget()->tqparentWidget();
   if ( candidate && candidate->inherits("KDockTabGroup") ) return (KDockTabGroup*)candidate;
   return 0L;
 }
 
-TQWidget *KDockWidget::parentDockContainer() const
+TQWidget *KDockWidget::tqparentDockContainer() const
 {
-  if (!parent()) return 0L;
-  TQWidget* candidate = parentWidget()->parentWidget();
+  if (!tqparent()) return 0L;
+  TQWidget* candidate = tqparentWidget()->tqparentWidget();
   if (candidate && dynamic_cast<KDockContainer*>(candidate)) return candidate;
   return 0L;
 }
@@ -1218,18 +1218,18 @@ void KDockWidget::setForcedFixedWidth(int w)
 {
 	d->forcedWidth=w;
 	setFixedWidth(w);
-	if (!parent()) return;
-	if (parent()->inherits("KDockSplitter"))
-		static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->setForcedFixedWidth(this,w);
+	if (!tqparent()) return;
+	if (tqparent()->inherits("KDockSplitter"))
+		static_cast<KDockSplitter*>(tqparent()->qt_cast("KDockSplitter"))->setForcedFixedWidth(this,w);
 }
 
 void KDockWidget::setForcedFixedHeight(int h)
 {
 	d->forcedHeight=h;
 	setFixedHeight(h);
-	if (!parent()) return;
-	if (parent()->inherits("KDockSplitter"))
-		static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->setForcedFixedHeight(this,h);
+	if (!tqparent()) return;
+	if (tqparent()->inherits("KDockSplitter"))
+		static_cast<KDockSplitter*>(tqparent()->qt_cast("KDockSplitter"))->setForcedFixedHeight(this,h);
 }
 
 int KDockWidget::forcedFixedWidth()
@@ -1249,9 +1249,9 @@ void KDockWidget::restoreFromForcedFixedSize()
 	setMaximumWidth(32000);
 	setMinimumHeight(0);
 	setMaximumHeight(32000);
-	if (!parent()) return;
-	if (parent()->inherits("KDockSplitter"))
-		static_cast<KDockSplitter*>(parent()->qt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this);
+	if (!tqparent()) return;
+	if (tqparent()->inherits("KDockSplitter"))
+		static_cast<KDockSplitter*>(tqparent()->qt_cast("KDockSplitter"))->restoreFromForcedFixedSize(this);
 }
 
 void KDockWidget::toDesktop()
@@ -1276,8 +1276,8 @@ void KDockWidget::undock()
   manager->d->dragRect = TQRect ();
   manager->drawDragRectangle ();
 
-  TQWidget* parentW = parentWidget();
-  if ( !parentW ){
+  TQWidget* tqparentW = tqparentWidget();
+  if ( !tqparentW ){
     hide();
     if (!d->blockHasUndockedSignal)
       emit hasUndocked();
@@ -1290,74 +1290,74 @@ void KDockWidget::undock()
   manager->blockSignals(true);
   manager->undockProcess = true;
 
-  bool isV = parentW->isVisibleToTLW();
+  bool isV = tqparentW->isVisibleToTLW();
 
   //UNDOCK HAS TO BE IMPLEMENTED CORRECTLY :)
-  KDockTabGroup* parentTab = parentDockTabGroup();
-  if ( parentTab ){
-    d->index = parentTab->indexOf( this); // memorize the page position in the tab widget
-    parentTab->removePage( this );
+  KDockTabGroup* tqparentTab = tqparentDockTabGroup();
+  if ( tqparentTab ){
+    d->index = tqparentTab->indexOf( this); // memorize the page position in the tab widget
+    tqparentTab->removePage( this );
 /*
-    TQWidget *wantTransient=parentTab->transientTo();
+    TQWidget *wantTransient=tqparentTab->transientTo();
     target->setDockWindowTransient(wantTransient,wantTransient);
  */
-    setFormerBrotherDockWidget((KDockWidget*)parentTab->page(0));
+    setFormerBrotherDockWidget((KDockWidget*)tqparentTab->page(0));
     applyToWidget( 0L );
-    if ( parentTab->count() == 1 ){
+    if ( tqparentTab->count() == 1 ){
 
       // last subdock widget in the tab control
-      KDockWidget* lastTab = (KDockWidget*)parentTab->page(0);
-      parentTab->removePage( lastTab );
-/*      TQWidget *wantTransient=parentTab->transientTo();
+      KDockWidget* lastTab = (KDockWidget*)tqparentTab->page(0);
+      tqparentTab->removePage( lastTab );
+/*      TQWidget *wantTransient=tqparentTab->transientTo();
       target->setDockWindowTransient(wantTransient,wantTransient);*/
 
       lastTab->applyToWidget( 0L );
-      lastTab->move( parentTab->mapToGlobal(parentTab->frameGeometry().topLeft()) );
+      lastTab->move( tqparentTab->mapToGlobal(tqparentTab->frameGeometry().topLeft()) );
 
-      // KDockTabGroup always have a parent that is a KDockWidget
-      KDockWidget* parentOfTab = (KDockWidget*)parentTab->parent();
-      delete parentTab; // KDockTabGroup
+      // KDockTabGroup always have a tqparent that is a KDockWidget
+      KDockWidget* tqparentOfTab = (KDockWidget*)tqparentTab->tqparent();
+      delete tqparentTab; // KDockTabGroup
 
-      TQWidget* parentOfDockWidget = parentOfTab->parentWidget();
-      if ( !parentOfDockWidget ){
+      TQWidget* tqparentOfDockWidget = tqparentOfTab->tqparentWidget();
+      if ( !tqparentOfDockWidget ){
           if ( isV ) lastTab->show();
       } else {
-        if ( parentOfDockWidget->inherits("KDockSplitter") ){
-          KDockSplitter* split = (KDockSplitter*)parentOfDockWidget;
+        if ( tqparentOfDockWidget->inherits("KDockSplitter") ){
+          KDockSplitter* split = (KDockSplitter*)tqparentOfDockWidget;
           lastTab->applyToWidget( split );
           split->deactivate();
-          if ( split->getFirst() == parentOfTab ){
+          if ( split->getFirst() == tqparentOfTab ){
             split->activate( lastTab );
-            if ( ((KDockWidget*)split->parent())->splitterOrientation == Vertical )
-              emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft );
+            if ( ((KDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
+              emit ((KDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, KDockWidget::DockLeft );
             else
-              emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop );
+              emit ((KDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, KDockWidget::DockTop );
           } else {
             split->activate( 0L, lastTab );
-            if ( ((KDockWidget*)split->parent())->splitterOrientation == Vertical )
-              emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight );
+            if ( ((KDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
+              emit ((KDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, KDockWidget::DockRight );
             else
-              emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom );
+              emit ((KDockWidget*)split->getAnother(tqparentOfTab))->docking( tqparentOfTab, KDockWidget::DockBottom );
           }
           split->show();
         } else {
-          lastTab->applyToWidget( parentOfDockWidget );
+          lastTab->applyToWidget( tqparentOfDockWidget );
         }
         lastTab->show();
       }
       manager->blockSignals(false);
-      emit manager->replaceDock( parentOfTab, lastTab );
-      lastTab->currentDockPos = parentOfTab->currentDockPos;
-      emit parentOfTab->iMBeingClosed();
+      emit manager->replaceDock( tqparentOfTab, lastTab );
+      lastTab->currentDockPos = tqparentOfTab->currentDockPos;
+      emit tqparentOfTab->iMBeingClosed();
       manager->blockSignals(true);
-      delete parentOfTab;
+      delete tqparentOfTab;
 
     } else {
-      setDockTabName( parentTab );
+      setDockTabName( tqparentTab );
     }
   } else {
  /*********************************************************************************************/
-  //TQWidget* containerWidget = (TQWidget*)parent();
+  //TQWidget* containerWidget = (TQWidget*)tqparent();
   bool undockedFromContainer=false;
   if (d->container)
   {
@@ -1366,41 +1366,41 @@ void KDockWidget::undock()
 	  KDockContainer* dc = dynamic_cast<KDockContainer*>(d->container.operator->());
 	  if (dc) {
 		  dc->undockWidget(this);
-		  setFormerBrotherDockWidget(dc->parentDockWidget());
+		  setFormerBrotherDockWidget(dc->tqparentDockWidget());
 	  }
 	  applyToWidget( 0L );
   }
    if (!undockedFromContainer) {
 /*********************************************************************************************/
-    if ( parentW->inherits("KDockSplitter") ){
-      KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)parentW;
-      d->splitPosInPercent = parentSplitterOfDockWidget->separatorPos();
+    if ( tqparentW->inherits("KDockSplitter") ){
+      KDockSplitter* tqparentSplitterOfDockWidget = (KDockSplitter*)tqparentW;
+      d->splitPosInPercent = tqparentSplitterOfDockWidget->separatorPos();
 
-      KDockWidget* secondWidget = (KDockWidget*)parentSplitterOfDockWidget->getAnother( this );
-      KDockWidget* group        = (KDockWidget*)parentSplitterOfDockWidget->parentWidget();
+      KDockWidget* secondWidget = (KDockWidget*)tqparentSplitterOfDockWidget->getAnother( this );
+      KDockWidget* group        = (KDockWidget*)tqparentSplitterOfDockWidget->tqparentWidget();
       setFormerBrotherDockWidget(secondWidget);
       applyToWidget( 0L );
       group->hide();
 
-      if ( !group->parentWidget() ){
+      if ( !group->tqparentWidget() ){
         secondWidget->applyToWidget( 0L, group->frameGeometry().topLeft() );
         secondWidget->resize( group->width(), group->height() );
       } else {
-        TQWidget* obj = group->parentWidget();
+        TQWidget* obj = group->tqparentWidget();
         secondWidget->applyToWidget( obj );
         if ( obj->inherits("KDockSplitter") ){
-          KDockSplitter* parentOfGroup = (KDockSplitter*)obj;
-          parentOfGroup->deactivate();
+          KDockSplitter* tqparentOfGroup = (KDockSplitter*)obj;
+          tqparentOfGroup->deactivate();
 
-          if ( parentOfGroup->getFirst() == group )
-            parentOfGroup->activate( secondWidget );
+          if ( tqparentOfGroup->getFirst() == group )
+            tqparentOfGroup->activate( secondWidget );
           else
-            parentOfGroup->activate( 0L, secondWidget );
+            tqparentOfGroup->activate( 0L, secondWidget );
         }
       }
       secondWidget->currentDockPos = group->currentDockPos;
       secondWidget->formerDockPos  = group->formerDockPos;
-      delete parentSplitterOfDockWidget;
+      delete tqparentSplitterOfDockWidget;
       manager->blockSignals(false);
       emit manager->replaceDock( group, secondWidget );
       emit group->iMBeingClosed();
@@ -1430,7 +1430,7 @@ void KDockWidget::setWidget( TQWidget* mw )
 {
   if ( !mw ) return;
 
-  if ( mw->parent() != this ){
+  if ( TQT_BASE_OBJECT(mw->tqparent()) != TQT_BASE_OBJECT(this) ){
     mw->reparent(this, 0, TQPoint(0,0), false);
   }
 
@@ -1438,16 +1438,16 @@ void KDockWidget::setWidget( TQWidget* mw )
   if (!mw->ownCursor()) mw->setCursor(TQCursor(ArrowCursor));
 #endif
   widget = mw;
-  delete layout;
+  delete tqlayout;
 
-  layout = new TQVBoxLayout( this );
-  layout->setResizeMode( TQLayout::Minimum );
+  tqlayout = new TQVBoxLayout( this );
+  tqlayout->setResizeMode( TQLayout::Minimum );
 
   KDockContainer* dc = dynamic_cast<KDockContainer*>(widget);
   if (dc)
   {
     d->isContainer=true;
-    manager->d->containerDocks.append(this);
+    manager->d->containerDocks.append(TQT_TQOBJECT(this));
   }
   else
   {
@@ -1456,8 +1456,8 @@ void KDockWidget::setWidget( TQWidget* mw )
 
   {
      header->show();
-     layout->addWidget( header );
-     layout->addWidget( widget,1 );
+     tqlayout->addWidget( header );
+     tqlayout->addWidget( widget,1 );
   }
   updateHeader();
   emit widgetSet(mw);
@@ -1475,24 +1475,24 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab )
   listOfCaption.remove( listOfCaption.length()-1, 1 );
   listOfName.remove( listOfName.length()-1, 1 );
 
-  tab->parentWidget()->setName( listOfName.utf8() );
-  tab->parentWidget()->setCaption( listOfCaption );
+  tab->tqparentWidget()->setName( listOfName.utf8() );
+  tab->tqparentWidget()->setCaption( listOfCaption );
 
-  tab->parentWidget()->repaint( false ); // KDockWidget->repaint
-  if ( tab->parentWidget()->parent() )
-    if ( tab->parentWidget()->parent()->inherits("KDockSplitter") )
-      ((KDockSplitter*)(tab->parentWidget()->parent()))->updateName();
+  tab->tqparentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint
+  if ( tab->tqparentWidget()->tqparent() )
+    if ( tab->tqparentWidget()->tqparent()->inherits("KDockSplitter") )
+      ((KDockSplitter*)(tab->tqparentWidget()->tqparent()))->updateName();
 }
 
 bool KDockWidget::mayBeHide() const
 {
-  bool f = (parent() != manager->main);
+  bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main));
   return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)KDockWidget::DockNone ) );
 }
 
 bool KDockWidget::mayBeShow() const
 {
-  bool f = (parent() != manager->main);
+  bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main));
   return ( !isGroup && !isTabGroup && f && !isVisible() );
 }
 
@@ -1514,11 +1514,11 @@ void KDockWidget::changeHideShowState()
 
 void KDockWidget::makeDockVisible()
 {
-  if ( parentDockTabGroup() ){
-    parentDockTabGroup()->showPage( this );
+  if ( tqparentDockTabGroup() ){
+    tqparentDockTabGroup()->showPage( this );
   }
-  if (parentDockContainer()) {
-    TQWidget *contWid=parentDockContainer();
+  if (tqparentDockContainer()) {
+    TQWidget *contWid=tqparentDockContainer();
     KDockContainer *x = dynamic_cast<KDockContainer*>(contWid);
     if (x) {
       x->showWidget(this);
@@ -1526,13 +1526,13 @@ void KDockWidget::makeDockVisible()
   }
   if ( isVisible() ) return;
 
-  TQWidget* p = parentWidget();
+  TQWidget* p = tqparentWidget();
   while ( p ){
     if ( !p->isVisible() )
       p->show();
-    p = p->parentWidget();
+    p = p->tqparentWidget();
   }
-  if( !parent() ) // is undocked
+  if( !tqparent() ) // is undocked
     dockBack();
   show();
 }
@@ -1551,13 +1551,13 @@ void KDockWidget::loseFormerBrotherDockWidget()
     TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
                          this, TQT_SLOT(loseFormerBrotherDockWidget()) );
   formerBrotherDockWidget = 0L;
-  repaint();
+  tqrepaint();
 }
 
 void KDockWidget::dockBack()
 {
   if( formerBrotherDockWidget) {
-    // search all children if it tries to dock back to a child
+    // search all tqchildren if it tries to dock back to a child
     bool found = false;
     TQObjectList* cl = queryList("KDockWidget");
     TQObjectListIt it( *cl );
@@ -1582,7 +1582,7 @@ void KDockWidget::dockBack()
   // else dockback to the dockmainwindow (default behavior)
   manualDock( ((KDockMainWindow*)manager->main)->getMainDockWidget(), formerDockPos, d->splitPosInPercent, TQPoint(0,0), false, d->index);
   formerBrotherDockWidget = 0L;
-  if (parent())
+  if (tqparent())
     makeDockVisible();
 }
 
@@ -1676,7 +1676,7 @@ void KDockManager::activate()
   while ( (obj=(KDockWidget*)it.current()) ) {
     ++it;
     if ( obj->widget ) obj->widget->show();
-    if ( !obj->parentDockTabGroup() ){
+    if ( !obj->tqparentDockTabGroup() ){
         obj->show();
     }
   }
@@ -1700,11 +1700,11 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
         break;
 
       case TQEvent::MouseButtonPress:
-        if ( ((TQMouseEvent*)event)->button() == LeftButton ){
+        if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){
           if ( curdw->eDocking != (int)KDockWidget::DockNone ){
             dropCancel = true;
             curdw->setFocus();
-            qApp->processOneEvent();
+            tqApp->processOneEvent();
 
             currentDragWidget = curdw;
             currentMoveWidget = 0L;
@@ -1713,7 +1713,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
             findChildDockWidget( curdw, childDockWidgetList );
 
             //d->oldDragRect = TQRect(); should fix rectangle not erased problem
-            d->dragRect = TQRect(curdw->geometry());
+            d->dragRect = TQRect(curdw->tqgeometry());
             TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
             d->dragRect.moveTopLeft(p);
             drawDragRectangle();
@@ -1725,7 +1725,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
         }
         break;
       case TQEvent::MouseButtonRelease:
-        if ( ((TQMouseEvent*)event)->button() == LeftButton ){
+        if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){
           if ( dragging ){
             if ( !dropCancel )
               drop();
@@ -1735,7 +1735,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
           if (d->readyToDrag) {
               d->readyToDrag = false;
               //d->oldDragRect = TQRect(); should fix rectangle not erased problem
-              d->dragRect = TQRect(curdw->geometry());
+              d->dragRect = TQRect(curdw->tqgeometry());
               TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
               d->dragRect.moveTopLeft(p);
               drawDragRectangle();
@@ -1753,7 +1753,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
 #ifdef BORDERLESS_WINDOWS
 //BEGIN TEST
 	  KDockWidget *oldMoveWidget;
-	  if (!curdw->parent())
+	  if (!curdw->tqparent())
 	  {
 	  	curdw->move(TQCursor::pos()-d->dragOffset);
    	        pDockWdgAtCursor = findDockWidgetAt( TQCursor::pos()-TQPoint(0,d->dragOffset.y()+3) );
@@ -1775,7 +1775,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
             break;
           } else {
             if (dropCancel && curdw) {
-              d->dragRect = TQRect(curdw->geometry());
+              d->dragRect = TQRect(curdw->tqgeometry());
               TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
               d->dragRect.moveTopLeft(p);
             }else
@@ -1803,7 +1803,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
           if (d->readyToDrag) {
             d->readyToDrag = false;
           }
-          if ( (((TQMouseEvent*)event)->state() == LeftButton) &&
+          if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) &&
                (curdw->eDocking != (int)KDockWidget::DockNone) ) {
             startDrag( curdw);
           }
@@ -1831,7 +1831,7 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
     return 0L;
   }
 #if defined(_OS_WIN32_) || defined(Q_OS_WIN32)
-  p = p->topLevelWidget();
+  p = p->tqtopLevelWidget();
 #endif
   TQWidget* w = 0L;
   findChildDockWidget( w, p, p->mapFromGlobal(pos) );
@@ -1841,13 +1841,13 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
     }
     w = p;
   }
-  if ( qt_find_obj_child( w, "KDockSplitter", "_dock_split_" ) ) return 0L;
-  if ( qt_find_obj_child( w, "KDockTabGroup", "_dock_tab" ) ) return 0L;
+  if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L;
+  if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L;
   if (dynamic_cast<KDockContainer*>(w)) return 0L;
 
   if (!childDockWidgetList) return 0L;
-  if ( childDockWidgetList->find(w) != -1 ) return 0L;
-  if ( currentDragWidget->isGroup && ((KDockWidget*)w)->parentDockTabGroup() ) return 0L;
+  if ( childDockWidgetList->tqfind(w) != -1 ) return 0L;
+  if ( currentDragWidget->isGroup && ((KDockWidget*)w)->tqparentDockTabGroup() ) return 0L;
 
   KDockWidget* www = (KDockWidget*)w;
   if ( www->sDocking == (int)KDockWidget::DockNone ) return 0L;
@@ -1884,14 +1884,15 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
 
 void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const TQPoint& pos )
 {
-  if ( p->children() ) {
+  TQObjectList clo = p->childrenListObject();
+  if ( !clo.isEmpty() ) {
     TQWidget *w;
-    TQObjectListIt it( *p->children() );
+    TQObjectListIt it( clo );
     it.toLast();
     while ( it.current() ) {
       if ( it.current()->isWidgetType() ) {
         w = (TQWidget*)it.current();
-        if ( w->isVisible() && w->geometry().contains(pos) ) {
+        if ( w->isVisible() && w->tqgeometry().tqcontains(pos) ) {
           if ( w->inherits("KDockWidget") ) ww = w;
           findChildDockWidget( ww, w, w->mapFromParent(pos) );
           return;
@@ -1905,9 +1906,10 @@ void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const
 
 void KDockManager::findChildDockWidget( const TQWidget* p, TQWidgetList*& list )
 {
-  if ( p->children() ) {
+  TQObjectList clo = p->childrenListObject();
+  if ( !clo.isEmpty() ) {
     TQWidget *w;
-    TQObjectListIt it( *p->children() );
+    TQObjectListIt it( clo );
     it.toLast();
     while ( it.current() ) {
       if ( it.current()->isWidgetType() ) {
@@ -1929,9 +1931,9 @@ void KDockManager::startDrag( KDockWidget* w )
    || ( w->currentDockPos == KDockWidget::DockTop) || ( w->currentDockPos == KDockWidget::DockBottom)) {
     w->prevSideDockPosBeforeDrag = w->currentDockPos;
 
-    if ( w->parentWidget()->inherits("KDockSplitter") ){
-      KDockSplitter* parentSplitterOfDockWidget = (KDockSplitter*)(w->parentWidget());
-      w->d->splitPosInPercent = parentSplitterOfDockWidget->separatorPos();
+    if ( w->tqparentWidget()->inherits("KDockSplitter") ){
+      KDockSplitter* tqparentSplitterOfDockWidget = (KDockSplitter*)(w->tqparentWidget());
+      w->d->splitPosInPercent = tqparentSplitterOfDockWidget->separatorPos();
     }
   }
 
@@ -1947,7 +1949,7 @@ void KDockManager::dragMove( KDockWidget* dw, TQPoint pos )
   KDockWidget::DockPosition oldPos = curPos;
 
   TQSize r = dw->widget->size();
-  if ( dw->parentDockTabGroup() ){
+  if ( dw->tqparentDockTabGroup() ){
     curPos = KDockWidget::DockCenter;
     if ( oldPos != curPos ) {
       d->dragRect.setRect( p.x()+2, p.y()+2, r.width()-4, r.height()-4 );
@@ -2017,7 +2019,7 @@ void KDockManager::drop()
     drawDragRectangle();    // only the old rect will be deleted
     return;
   }
-  if ( !currentMoveWidget && !currentDragWidget->parent() ) {
+  if ( !currentMoveWidget && !currentDragWidget->tqparent() ) {
     currentDragWidget->move( TQCursor::pos() - d->dragOffset );
   }
   else {
@@ -2049,7 +2051,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam
 
 static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b)
 {
-    return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false"));
+    return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false"));
 }
 
 
@@ -2088,7 +2090,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName,
     TQStrListIterator it(list);
     for (; it.current(); ++it) {
         TQDomElement subel = doc.createElement(subTagName);
-        subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current())));
+        subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current())));
         el.appendChild(subel);
     }
 
@@ -2157,8 +2159,8 @@ void KDockManager::writeConfig(TQDomElement &base)
     TQObjectListIt it(*childDock);
     KDockWidget *obj1;
     while ( (obj1=(KDockWidget*)it.current()) ) {
-        if ( obj1->parent() == main )
-            mainWidgetStr = TQString::fromLatin1(obj1->name());
+        if ( TQT_BASE_OBJECT(obj1->tqparent()) == TQT_BASE_OBJECT(main) )
+            mainWidgetStr = TQString::tqfromLatin1(obj1->name());
         nList.append(obj1->name());
         ++it;
     }
@@ -2174,9 +2176,9 @@ void KDockManager::writeConfig(TQDomElement &base)
     TQStringList::Iterator nListIt=nList.begin();
     while ( nListIt!=nList.end() ) {
         KDockWidget *obj = getDockWidgetFromName( *nListIt);
-        if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.find( obj->firstName.latin1() ) == -1
-                             || nameList.find(obj->lastName.latin1()) == -1)) {
-            // Skip until children are saved (why?)
+        if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.tqfind( obj->firstName.latin1() ) == -1
+                             || nameList.tqfind(obj->lastName.latin1()) == -1)) {
+            // Skip until tqchildren are saved (why?)
             ++nListIt;
 //            nList.next();
 //falk?            if ( !nList.current() ) nList.first();
@@ -2208,7 +2210,7 @@ void KDockManager::writeConfig(TQDomElement &base)
                 list.append( ((KDockTabGroup*)obj->widget)->page( i )->name() );
             groupEl.appendChild(createListEntry(doc, "tabs", "tab", list));
             groupEl.appendChild(createNumberEntry(doc, "currentTab", ((KDockTabGroup*)obj->widget)->currentPageIndex()));
-            if (!obj->parent()) {
+            if (!obj->tqparent()) {
                 groupEl.appendChild(createStringEntry(doc, "dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : ""));
                 groupEl.appendChild(createNumberEntry(doc, "dockBackToPos", obj->formerDockPos));
             }
@@ -2217,15 +2219,15 @@ void KDockManager::writeConfig(TQDomElement &base)
             groupEl = doc.createElement("dock");
             groupEl.appendChild(createStringEntry(doc, "tabCaption", obj->tabPageLabel()));
             groupEl.appendChild(createStringEntry(doc, "tabToolTip", obj->toolTipString()));
-            if (!obj->parent()) {
+            if (!obj->tqparent()) {
                 groupEl.appendChild(createStringEntry(doc, "dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : ""));
                 groupEl.appendChild(createNumberEntry(doc, "dockBackToPos", obj->formerDockPos));
             }
         }
 
-        groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name())));
-        groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent()));
-        if ( !obj->parent() ) {
+        groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name())));
+        groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->tqparent()));
+        if ( !obj->tqparent() ) {
             groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size())));
             groupEl.appendChild(createBoolEntry(doc, "visible", obj->isVisible()));
         }
@@ -2274,7 +2276,7 @@ void KDockManager::readConfig(TQDomElement &base)
     KDockWidget *obj1;
     while ( (obj1=(KDockWidget*)it.current()) ) {
         if ( !obj1->isGroup && !obj1->isTabGroup ) {
-            if ( obj1->parent() )
+            if ( obj1->tqparent() )
                 obj1->undock();
             else
                 obj1->hide();
@@ -2345,7 +2347,7 @@ void KDockManager::readConfig(TQDomElement &base)
             KDockWidget *second = getDockWidgetFromName(secondName);
             if (first && second) {
                 obj = first->manualDock(second,
-                                        (orientation == (int)Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop,
+				(orientation == (int)Qt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop,
                                         separatorPos);
                 if (obj)
                     obj->setName(name.latin1());
@@ -2456,7 +2458,7 @@ void KDockManager::removeFromAutoCreateList(KDockWidget* pDockWidget)
 {
     if (!autoCreateDock) return;
     autoCreateDock->setAutoDelete(false);
-    autoCreateDock->removeRef(pDockWidget);
+    autoCreateDock->removeRef(TQT_TQOBJECT(pDockWidget));
     autoCreateDock->setAutoDelete(true);
 }
 
@@ -2492,11 +2494,11 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
     ++it;
     //debug("  +Add subdock %s", obj->name());
     nList.append( obj->name() );
-    if ( obj->parent() == main )
+    if ( TQT_BASE_OBJECT(obj->tqparent()) == TQT_BASE_OBJECT(main) )
       c->writeEntry( "Main:view", obj->name() );
   }
 
-//  kdDebug(282)<<TQString("list size: %1").arg(nList.count())<<endl;
+//  kdDebug(282)<<TQString("list size: %1").tqarg(nList.count())<<endl;
   for (TQObjectListIt it(d->containerDocks);it.current();++it)
   {
   	KDockContainer* dc = dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget);
@@ -2504,7 +2506,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
 		dc->prepareSave(nList);
 	}
   }
-//  kdDebug(282)<<TQString("new list size: %1").arg(nList.count())<<endl;
+//  kdDebug(282)<<TQString("new list size: %1").tqarg(nList.count())<<endl;
 
   TQStringList::Iterator nListIt=nList.begin();
   while ( nListIt!=nList.end() ){
@@ -2522,15 +2524,15 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
     }
 /*************************************************************************************************/
     if ( obj->isGroup ){
-      if ( (findList.find( obj->firstName ) != findList.end()) && (findList.find( obj->lastName ) != findList.end() )){
+      if ( (findList.tqfind( obj->firstName ) != findList.end()) && (findList.tqfind( obj->lastName ) != findList.end() )){
 
         c->writeEntry( cname+":type", "GROUP");
-        if ( !obj->parent() ){
-          c->writeEntry( cname+":parent", "___null___");
-          c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+        if ( !obj->tqparent() ){
+          c->writeEntry( cname+":tqparent", "___null___");
+          c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
         } else {
-          c->writeEntry( cname+":parent", "yes");
+          c->writeEntry( cname+":tqparent", "yes");
         }
         c->writeEntry( cname+":first_name", obj->firstName );
         c->writeEntry( cname+":last_name", obj->lastName );
@@ -2545,9 +2547,9 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
       } else {
 /*************************************************************************************************/
         //debug("  Skip %s", nList.current());
-        //if ( findList.find( obj->firstName ) == -1 )
+        //if ( findList.tqfind( obj->firstName ) == -1 )
         //  debug("  ? Not found %s", obj->firstName);
-        //if ( findList.find( obj->lastName ) == -1 )
+        //if ( findList.tqfind( obj->lastName ) == -1 )
         //  debug("  ? Not found %s", obj->lastName);
         ++nListIt;
         // if ( !nList.current() ) nList.first();
@@ -2557,14 +2559,14 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
 /*************************************************************************************************/
       if ( obj->isTabGroup){
         c->writeEntry( cname+":type", "TAB_GROUP");
-        if ( !obj->parent() ){
-          c->writeEntry( cname+":parent", "___null___");
-          c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+        if ( !obj->tqparent() ){
+          c->writeEntry( cname+":tqparent", "___null___");
+          c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
           c->writeEntry( cname+":dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : "");
           c->writeEntry( cname+":dockBackToPos", obj->formerDockPos);
         } else {
-          c->writeEntry( cname+":parent", "yes");
+          c->writeEntry( cname+":tqparent", "yes");
         }
         TQStrList list;
         for ( int i = 0; i < ((KDockTabGroup*)obj->widget)->count(); ++i )
@@ -2581,9 +2583,9 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
 /*************************************************************************************************/
         c->writeEntry( cname+":tabCaption", obj->tabPageLabel());
         c->writeEntry( cname+":tabToolTip", obj->toolTipString());
-        if ( !obj->parent() ){
+        if ( !obj->tqparent() ){
           c->writeEntry( cname+":type", "NULL_DOCK");
-          c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+          c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
           c->writeEntry( cname+":dockBackTo", obj->formerBrotherDockWidget ? obj->formerBrotherDockWidget->name() : "");
           c->writeEntry( cname+":dockBackToPos", obj->formerDockPos);
@@ -2644,7 +2646,7 @@ void KDockManager::readConfig( KConfig* c, TQString group )
     ++it;
     if ( !obj->isGroup && !obj->isTabGroup )
     {
-      if ( obj->parent() ) obj->undock(); else obj->hide();
+      if ( obj->tqparent() ) obj->undock(); else obj->hide();
     }
   }
 
@@ -2657,8 +2659,8 @@ void KDockManager::readConfig( KConfig* c, TQString group )
     TQString type = c->readEntry( oname + ":type" );
     obj = 0L;
 
-    if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){
-      TQRect r = c->readRectEntry( oname + ":geometry" );
+    if ( type == "NULL_DOCK" || c->readEntry( oname + ":tqparent") == "___null___" ){
+      TQRect r = c->readRectEntry( oname + ":tqgeometry" );
       obj = getDockWidgetFromName( oname );
       obj->applyToWidget( 0L );
       obj->setGeometry(r);
@@ -2700,9 +2702,9 @@ void KDockManager::readConfig( KConfig* c, TQString group )
       KDockWidget* last  = getDockWidgetFromName( c->readEntry( oname + ":last_name"  ) );
       int sepPos = c->readNumEntry( oname + ":sepPos" );
 
-      Orientation p = (Orientation)c->readNumEntry( oname + ":orientation" );
+      Qt::Orientation p = (Qt::Orientation)c->readNumEntry( oname + ":orientation" );
       if ( first  && last ){
-        obj = first->manualDock( last, ( p == Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos );
+        obj = first->manualDock( last, ( p ==Qt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos );
         if (obj){
           obj->setName( oname.latin1() );
         }
@@ -2751,7 +2753,7 @@ void KDockManager::readConfig( KConfig* c, TQString group )
     TQString type = c->readEntry( oname + ":type" );
     obj = 0L;
 
-    if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){
+    if ( type == "NULL_DOCK" || c->readEntry( oname + ":tqparent") == "___null___" ){
       obj = getDockWidgetFromName( oname );
       c->setGroup( group );
       TQString name = c->readEntry( oname + ":dockBackTo" );
@@ -2828,8 +2830,8 @@ KDockWidget* KDockManager::getDockWidgetFromName( const TQString& dockName )
   KDockWidget* autoCreate = 0L;
   if ( autoCreateDock ){
     kdDebug(282)<<"Autocreating dock: "<<dockName<<endl;
-    autoCreate = new KDockWidget( this, dockName.latin1(), TQPixmap("") );
-    autoCreateDock->append( autoCreate );
+    autoCreate = new KDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) );
+    autoCreateDock->append( TQT_TQOBJECT(autoCreate) );
   }
   return autoCreate;
 }
@@ -2875,13 +2877,13 @@ void KDockManager::slotMenuPopup()
     ++it;
     if ( obj->mayBeHide() )
     {
-      menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Hide %1").arg(obj->caption()), numerator++ );
+      menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Hide %1").tqarg(obj->caption()), numerator++ );
       menuData->append( new MenuDockData( obj, true ) );
     }
 
     if ( obj->mayBeShow() )
     {
-      menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Show %1").arg(obj->caption()), numerator++ );
+      menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Show %1").tqarg(obj->caption()), numerator++ );
       menuData->append( new MenuDockData( obj, false ) );
     }
   }
@@ -2933,14 +2935,14 @@ void KDockManager::drawDragRectangle()
     KDockMainWindow* pMain = 0L;
     KDockWidget* pTLDockWdg = 0L;
     TQWidget* topWdg;
-    if (pDockWdgAtRect->topLevelWidget() == main) {
+    if (pDockWdgAtRect->tqtopLevelWidget() == main) {
       isOverMainWdg = true;
       topWdg = pMain = (KDockMainWindow*) main;
       unclipped = pMain->testWFlags( WPaintUnclipped );
       pMain->setWFlags( WPaintUnclipped );
     }
     else {
-      topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->topLevelWidget();
+      topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->tqtopLevelWidget();
       unclipped = pTLDockWdg->testWFlags( WPaintUnclipped );
       pTLDockWdg->setWFlags( WPaintUnclipped );
     }
@@ -2955,7 +2957,7 @@ void KDockManager::drawDragRectangle()
           pTLDockWdg->clearWFlags(WPaintUnclipped);
       }
       // draw the rectangle
-      p.setRasterOp(Qt::NotXorROP);
+      p.setRasterOp(TQt::NotXorROP);
       TQRect r = oldAndNewDragRect[i];
       r.moveTopLeft( r.topLeft() - topWdg->mapToGlobal(TQPoint(0,0)) );
       p.drawRect(r.x(), r.y(), r.width(), r.height());
@@ -2984,8 +2986,8 @@ void KDockManager::setSpecialBottomDockContainer(KDockWidget* container) {
 }
 
 
-KDockArea::KDockArea( TQWidget* parent, const char *name)
-:TQWidget( parent, name)
+KDockArea::KDockArea( TQWidget* tqparent, const char *name)
+:TQWidget( tqparent, name)
 {
   TQString new_name = TQString(name) + TQString("_DockManager");
   dockManager = new KDockManager( this, new_name.latin1() );
@@ -2997,9 +2999,9 @@ KDockArea::~KDockArea()
 	delete dockManager;
 }
 
-KDockWidget* KDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel)
+KDockWidget* KDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel)
 {
-  return new KDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel );
+  return new KDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel );
 }
 
 void KDockArea::makeDockVisible( KDockWidget* dock )
@@ -3040,7 +3042,7 @@ void KDockArea::slotDockWidgetUndocked()
 void KDockArea::resizeEvent(TQResizeEvent *rsize)
 {
   TQWidget::resizeEvent(rsize);
-  if (children()){
+  if (!childrenListObject().isEmpty()){
 #ifndef NO_KDE2
 //    kdDebug(282)<<"KDockArea::resize"<<endl;
 #endif
@@ -3057,11 +3059,11 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize)
     delete list;
 #if 0
     KDockSplitter *split;
-//    for (unsigned int i=0;i<children()->count();i++)
+//    for (unsigned int i=0;i<tqchildren()->count();i++)
     {
-//    	TQPtrList<TQObject> list(children());
-//       TQObject *obj=((TQPtrList<TQObject*>)children())->at(i);
-	TQObject *obj=children()->getFirst();
+//    	TQPtrList<TQObject> list(tqchildren());
+//       TQObject *obj=((TQPtrList<TQObject*>)tqchildren())->at(i);
+	TQObject *obj=tqchildren()->getFirst();
        if (split = dynamic_cast<KDockSplitter*>(obj))
        {
           split->setGeometry( TQRect(TQPoint(0,0), size() ));
@@ -3094,12 +3096,12 @@ void KDockArea::setMainDockWidget( KDockWidget* mdw )
 
 
 // KDOCKCONTAINER - AN ABSTRACTION OF THE KDOCKTABWIDGET
-KDockContainer::KDockContainer(){m_overlapMode=false; m_childrenListBegin=0; m_childrenListEnd=0;}
+KDockContainer::KDockContainer(){m_overlapMode=false; m_tqchildrenListBegin=0; m_tqchildrenListEnd=0;}
 KDockContainer::~KDockContainer(){
 
-	if (m_childrenListBegin)
+	if (m_tqchildrenListBegin)
 	{
-		struct ListItem *tmp=m_childrenListBegin;
+		struct ListItem *tmp=m_tqchildrenListBegin;
 		while (tmp)
 		{
 			struct ListItem *tmp2=tmp->next;
@@ -3107,8 +3109,8 @@ KDockContainer::~KDockContainer(){
 			delete tmp;
 			tmp=tmp2;
 		}
-		m_childrenListBegin=0;
-		m_childrenListEnd=0;
+		m_tqchildrenListBegin=0;
+		m_tqchildrenListEnd=0;
 	}
 
 }
@@ -3116,11 +3118,11 @@ KDockContainer::~KDockContainer(){
 void KDockContainer::activateOverlapMode(int nonOverlapSize) {
 	m_nonOverlapSize=nonOverlapSize;
 	m_overlapMode=true;
-	if (parentDockWidget()) {
-		if (parentDockWidget()->parent()) {
+	if (tqparentDockWidget()) {
+		if (tqparentDockWidget()->tqparent()) {
 			kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl;
-			KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
-				parent()->qt_cast("KDockSplitter"));
+			KDockSplitter *sp= static_cast<KDockSplitter*>(tqparentDockWidget()->
+				tqparent()->qt_cast("KDockSplitter"));
 			if (sp) sp->resizeEvent(0);
 		}
 	}
@@ -3129,11 +3131,11 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) {
 void KDockContainer::deactivateOverlapMode() {
 	if (!m_overlapMode) return;
 	m_overlapMode=false;
-	if (parentDockWidget()) {
-		if (parentDockWidget()->parent()) {
+	if (tqparentDockWidget()) {
+		if (tqparentDockWidget()->tqparent()) {
 			kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl;
-			KDockSplitter *sp= static_cast<KDockSplitter*>(parentDockWidget()->
-				parent()->qt_cast("KDockSplitter"));
+			KDockSplitter *sp= static_cast<KDockSplitter*>(tqparentDockWidget()->
+				tqparent()->qt_cast("KDockSplitter"));
 			if (sp) sp->resizeEvent(0);
 		}
 	}
@@ -3150,11 +3152,11 @@ bool KDockContainer::dockDragMove(KDockWidget*, TQMouseEvent *) { return false;}
 bool KDockContainer::dockDragLeave(KDockWidget*, TQMouseEvent *) { return false;}
 
 
-KDockWidget *KDockContainer::parentDockWidget(){return 0;}
+KDockWidget *KDockContainer::tqparentDockWidget(){return 0;}
 
 TQStringList KDockContainer::containedWidgets() const {
 	TQStringList tmp;
-	for (struct ListItem *it=m_childrenListBegin;it;it=it->next) {
+	for (struct ListItem *it=m_tqchildrenListBegin;it;it=it->next) {
 		tmp<<TQString(it->data);
 	}
 
@@ -3170,36 +3172,36 @@ void KDockContainer::insertWidget (KDockWidget *dw, TQPixmap, const TQString &,
 		it->data=strdup(dw->name());
 		it->next=0;
 
-		if (m_childrenListEnd)
+		if (m_tqchildrenListEnd)
 		{
-			m_childrenListEnd->next=it;
-			it->prev=m_childrenListEnd;
-			m_childrenListEnd=it;
+			m_tqchildrenListEnd->next=it;
+			it->prev=m_tqchildrenListEnd;
+			m_tqchildrenListEnd=it;
 		}
 		else
 		{
 			it->prev=0;
-			m_childrenListEnd=it;
-			m_childrenListBegin=it;
+			m_tqchildrenListEnd=it;
+			m_tqchildrenListBegin=it;
 		}
 	}
 void KDockContainer::removeWidget (KDockWidget *dw){
-	for (struct ListItem *tmp=m_childrenListBegin;tmp;tmp=tmp->next)
+	for (struct ListItem *tmp=m_tqchildrenListBegin;tmp;tmp=tmp->next)
 	{
 		if (!strcmp(tmp->data,dw->name()))
 		{
 			free(tmp->data);
 			if (tmp->next) tmp->next->prev=tmp->prev;
 			if (tmp->prev) tmp->prev->next=tmp->next;
-			if (tmp==m_childrenListBegin) m_childrenListBegin=tmp->next;
-			if (tmp==m_childrenListEnd) m_childrenListEnd=tmp->prev;
+			if (tmp==m_tqchildrenListBegin) m_tqchildrenListBegin=tmp->next;
+			if (tmp==m_tqchildrenListEnd) m_tqchildrenListEnd=tmp->prev;
 			delete tmp;
 			break;
 		}
 	}
 }
 
-//m_children.remove(dw->name());}
+//m_tqchildren.remove(dw->name());}
 void KDockContainer::undockWidget (KDockWidget *){;}
 void KDockContainer::setToolTip(KDockWidget *, TQString &){;}
 void KDockContainer::setPixmap(KDockWidget*,const TQPixmap&){;}
@@ -3210,11 +3212,11 @@ void KDockContainer::save (TQDomElement&){;}
 void KDockContainer::prepareSave(TQStringList &names)
 {
 
-	for (struct ListItem *tmp=m_childrenListBegin;tmp; tmp=tmp->next)
+	for (struct ListItem *tmp=m_tqchildrenListBegin;tmp; tmp=tmp->next)
 		names.remove(tmp->data);
-//	for (uint i=0;i<m_children.count();i++)
+//	for (uint i=0;i<m_tqchildren.count();i++)
 //	{
-//		names.remove(m_children.at(i));
+//		names.remove(m_tqchildren.at(i));
 //	}
 }
 
@@ -3268,6 +3270,6 @@ void KDockArea::virtual_hook( int, void* )
 { /*KMainWindow::virtual_hook( id, data );*/ }
 
 
-#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name
+#ifndef NO_INCLUDE_TQMOCFILES // for TQt-only projects, because tmake doesn't take this name
 #include "kdockwidget.moc"
 #endif
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
index 9c738d3c..8fffb002 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
@@ -37,9 +37,9 @@
    - KDockWidget                   - IMPORTANT CLASS: the one and only dockwidget class
    - KDockManager                  - helper class
    - KDockMainWindow               - IMPORTANT CLASS: a special KMainWindow that can have dockwidgets
-   - KDockArea                     - like KDockMainWindow but inherits just QWidget
+   - KDockArea                     - like KDockMainWindow but inherits just TQWidget
 
-   IMPORTANT Note: This file compiles also in Qt-only mode by using the NO_KDE2 precompiler definition!
+   IMPORTANT Note: This file compiles also in TQt-only mode by using the NO_KDE2 precompiler definition!
 */
 
 
@@ -102,18 +102,19 @@ namespace KMDI
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDockWidgetAbstractHeader : public QFrame
+class KDockWidgetAbstractHeader : public TQFrame
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
 
   /**
    * Constructs this.
    *
-   * @param parent the parent widget (usually a dockwidget)
+   * @param tqparent the tqparent widget (usually a dockwidget)
    * @param name   the object instance name
    */
-  KDockWidgetAbstractHeader( KDockWidget* parent, const char* name = 0L );
+  KDockWidgetAbstractHeader( KDockWidget* tqparent, const char* name = 0L );
 
   /**
    * Destructs this.
@@ -151,19 +152,20 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public QFrame
+class KDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
 
   /**
    * Constructs this.
    *
-   * @param parent the parent widget (usually a dockwidget header)
+   * @param tqparent the tqparent widget (usually a dockwidget header)
    * @param dock   the dockwidget where it belongs to
    * @param name   the object instance name
    */
-  KDockWidgetAbstractHeaderDrag( KDockWidgetAbstractHeader* parent,
+  KDockWidgetAbstractHeaderDrag( KDockWidgetAbstractHeader* tqparent,
                                  KDockWidget* dock, const char* name = 0L );
 
   /**
@@ -199,16 +201,17 @@ private:
 class KDEUI_EXPORT KDockWidgetHeaderDrag : public KDockWidgetAbstractHeaderDrag
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
 
   /**
    * Constructs this.
    *
-   * @param parent the parent widget (usually a dockwidget header)
+   * @param tqparent the tqparent widget (usually a dockwidget header)
    * @param dock   the dockwidget where it belongs to
    * @param name   the object instance name
    */
-  KDockWidgetHeaderDrag( KDockWidgetAbstractHeader* parent, KDockWidget* dock,
+  KDockWidgetHeaderDrag( KDockWidgetAbstractHeader* tqparent, KDockWidget* dock,
                          const char* name = 0L );
 
   /**
@@ -240,15 +243,16 @@ private:
 class KDEUI_EXPORT KDockWidgetHeader : public KDockWidgetAbstractHeader
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
 
   /**
    * Constructs this.
    *
-   * @param parent the parent widget (usually a dockwidget)
+   * @param tqparent the tqparent widget (usually a dockwidget)
    * @param name   the object instance name
    */
-  KDockWidgetHeader( KDockWidget* parent, const char* name = 0L );
+  KDockWidgetHeader( KDockWidget* tqparent, const char* name = 0L );
 
   /**
    * Destructs this.
@@ -324,9 +328,9 @@ protected slots:
 protected:
 
   /**
-   * A layout manager for placing the embedded buttons (close and stay)
+   * A tqlayout manager for placing the embedded buttons (close and stay)
    */
-  TQHBoxLayout* layout;
+  TQHBoxLayout* tqlayout;
 
   /**
    * a little button for closing (undocking and hiding) the dockwidget
@@ -362,15 +366,16 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockTabGroup : public QTabWidget
+class KDEUI_EXPORT KDockTabGroup : public TQTabWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructs this. It just calls the method of the base class.
    */
-  KDockTabGroup( TQWidget *parent = 0, const char *name = 0 )
-  :TQTabWidget( parent, name ){};
+  KDockTabGroup( TQWidget *tqparent = 0, const char *name = 0 )
+  :TQTabWidget( tqparent, name ){};
 
   /**
    * Destructs a KDockTabGroup.
@@ -391,7 +396,7 @@ private:
  * encapsulate the actual widgets (and member of the dockwidget class
  * set).
  *
- * You just grip the double-lined panel, tear it off its parent
+ * You just grip the double-lined panel, tear it off its tqparent
  * widget, drag it somewhere and let it loose. Depending on the
  * position where you leave it, the dockwidget becomes a toplevel
  * window on the desktop (floating mode) or docks to a new widget
@@ -410,7 +415,7 @@ private:
  * KDockMainWindow* mainWidget;
  * ...
  * KDockWidget* dock = 0L;
- * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no parent
+ * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no tqparent
  * TQWidget* actualWidget = new TQWidget( dock);
  * dock->setWidget( actualWidget); // embed it
  * dock->setToolTipString(i18n("That's me")); // available when appearing as tab page
@@ -422,9 +427,10 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockWidget: public QWidget
+class KDEUI_EXPORT KDockWidget: public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 friend class KDockManager;
 friend class KDockSplitter;
 friend class KDockMainWindow;
@@ -441,14 +447,14 @@ public:
    * @param dockManager The responsible manager (dock helper)
    * @param name        Object instance name
    * @param pixmap      An icon (for instance shown when docked centered)
-   * @param parent      Parent widget
+   * @param tqparent      Parent widget
    * @param strCaption  Title of the dockwidget window (shown when toplevel)
    * @param strTabPageLabel The title of the tab page (shown when in tab page mode), if it is "", only the icon will be shown, if it is 0L, the label is set to strCaption
-   * @param f Qt::WidgetFlags widget flags
+   * @param f TQt::WidgetFlags widget flags
    */
   KDockWidget( KDockManager* dockManager, const char* name,
-               const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString::null,
-               const TQString& strTabPageLabel = TQString::fromLatin1( " " ), WFlags f = 0);
+               const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = TQString(),
+               const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ), WFlags f = 0);
 
   /**
    * Destructs a dockwidget.
@@ -481,8 +487,8 @@ public:
    *
    * If the target is null, it will become a toplevel dockwidget at position pos;
    * Note: Docking to another dockwidget means exactly:
-   * A new parent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner)
-   * which contains both dockwidgets, this and the target dockwidget. So consider parent<->child relationships change completely during such actions.
+   * A new tqparent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner)
+   * which contains both dockwidgets, this and the target dockwidget. So consider tqparent<->child relationships change completely during such actions.
    *
    * @param  target The dockwidget to dock to
    * @param  dockPos One of the DockPositions this is going to dock to
@@ -490,7 +496,7 @@ public:
    * @param  pos The dock position, mainly of interest for docking to the desktop (as toplevel dockwidget)
    * @param  check Only for internal use;
    * @param  tabIndex The position index of the tab widget (when in tab page mode), -1 (default) means append
-   * @return result The group dockwidget that replaces the target dockwidget and will be grandparent of target and @p this.
+   * @return result The group dockwidget that replaces the target dockwidget and will be grandtqparent of target and @p this.
    */
   KDockWidget* manualDock( KDockWidget* target, DockPosition dockPos, int spliPos = 50, TQPoint pos = TQPoint(0,0), bool check = false, int tabIndex = -1);
 
@@ -562,7 +568,7 @@ public:
    * There are reasons that it's impossible:
    * @li It is a (tab) group.
    * @li It is already invisible ;-)
-   * @li The parent of this is the KDockMainWindow.
+   * @li The tqparent of this is the KDockMainWindow.
    * @li It isn't able to dock to another widget.
    */
   bool mayBeHide() const;
@@ -572,7 +578,7 @@ public:
    * There are reasons that it's impossible:
    * @li It is a (tab) group.
    * @li It is already visible ;-)
-   * @li The parent of this is the @p KDockMainWindow.
+   * @li The tqparent of this is the @p KDockMainWindow.
    */
   bool mayBeShow() const;
 
@@ -624,12 +630,12 @@ public:
    */
   virtual void show();
   /**
-   * @return the parent widget of this if it inherits class KDockTabGroup
+   * @return the tqparent widget of this if it inherits class KDockTabGroup
    */
-  KDockTabGroup* parentDockTabGroup() const;
+  KDockTabGroup* tqparentDockTabGroup() const;
 
   /// @since 3.1
-  TQWidget *parentDockContainer() const;
+  TQWidget *tqparentDockContainer() const;
 
 #ifndef NO_KDE2
 
@@ -642,7 +648,7 @@ public:
 
 #endif
 
-  void setDockWindowTransient (TQWidget *parent, bool transientEnabled);
+  void setDockWindowTransient (TQWidget *tqparent, bool transientEnabled);
 
   /**
    * Returns the widget this dockwidget is set transient to, otherwise 0
@@ -732,7 +738,7 @@ protected:
   /**
    * Checks some conditions and shows or hides the dockwidget header (drag panel).
    * The header is hidden if:
-   * @li the parent widget is the KDockMainWindow
+   * @li the tqparent widget is the KDockMainWindow
    * @li this is a (tab) group dockwidget
    * @li it is not able to dock to another dockwidget
    */
@@ -831,7 +837,7 @@ private:
   void setDockTabName( KDockTabGroup* g);
 
   /**
-   * Reparent to s or set this to the KDockMainWindow's view if s is that dockmainwindow.
+   * Retqparent to s or set this to the KDockMainWindow's view if s is that dockmainwindow.
    * If s is O, simply move the widget.
    *
    * @param s the target widget to reparent to
@@ -850,9 +856,9 @@ private:
   TQWidget* widget;
 
   /**
-   * the layout manager that takes care about proper resizing and moving the embedded widget and the header
+   * the tqlayout manager that takes care about proper resizing and moving the embedded widget and the header
    */
-  TQVBoxLayout* layout;
+  TQVBoxLayout* tqlayout;
 
   /**
    * the responsible dockmanager
@@ -882,7 +888,7 @@ private:
   // GROUP data
   TQString firstName;
   TQString lastName;
-  Orientation splitterOrientation;
+  Qt::Orientation splitterOrientation;
   bool isGroup;
   bool isTabGroup;
 protected:
@@ -903,9 +909,10 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class KDEUI_EXPORT KDockManager: public QObject
+class KDEUI_EXPORT KDockManager: public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 friend class KDockWidget;
 friend class KDockMainWindow;
 
@@ -925,7 +932,7 @@ public:
    * @li Some state variables are set
    *
    * @param mainWindow the main window controlled by this
-   * @param name the internal QOject name
+   * @param name the internal TQOject name
    */
   KDockManager( TQWidget* mainWindow, const char* name = 0L );
 
@@ -939,14 +946,14 @@ public:
 #ifndef NO_KDE2
   /**
    * Saves the current state of the dockmanager and of all controlled widgets.
-   * State means here to save the geometry, visibility, parents, internal object names, orientation,
+   * State means here to save the tqgeometry, visibility, tqparents, internal object names, orientation,
    * separator positions, dockwidget-group information, tab widget states (if it is a tab group) and
    * last but not least some necessary things for recovering the dockmainwindow state.
    *
    * @param c the KDE configuration saver
    * @param group the name of the section in KConfig
    */
-  void writeConfig( KConfig* c = 0L, TQString group = TQString::null );
+  void writeConfig( KConfig* c = 0L, TQString group = TQString() );
 
   /**
    * Like writeConfig but reads the whole stuff in.
@@ -956,7 +963,7 @@ public:
    * (TQObject::name) in the childDock variable of
    * KDockManager. This list in turn contains all
    * KDockWidgets (according to the KDockWidget constructor).
-   * So in principle, in order to restore a window layout,
+   * So in principle, in order to restore a window tqlayout,
    * one must first construct all widgets, put each of them in a
    * KDockWidget and then call readConfig(). And for all that
    * to work, each widget must have a unique name.
@@ -964,24 +971,24 @@ public:
    * @param c the KDE configuration saver
    * @param group the name of the section in KConfig
    */
-  void readConfig ( KConfig* c = 0L, TQString group = TQString::null );
+  void readConfig ( KConfig* c = 0L, TQString group = TQString() );
 #endif
 
   /// @since 3.1
   void setMainDockWidget2(KDockWidget *);
 
   /**
-   * Saves the current dock window layout into a DOM tree below the given element.
+   * Saves the current dock window tqlayout into a DOM tree below the given element.
    */
   void writeConfig(TQDomElement &base);
   /**
-   * Reads the current dock window layout from a DOM tree below the given element.
+   * Reads the current dock window tqlayout from a DOM tree below the given element.
    */
   void readConfig(TQDomElement &base);
 
   /**
    * Shows all encapsulated widgets of all controlled dockwidgets and shows all dockwidgets which are
-   * parent of a dockwidget tab group.
+   * tqparent of a dockwidget tab group.
    */
   void activate();
 
@@ -1083,7 +1090,7 @@ signals:
   void replaceDock( KDockWidget* oldDock, KDockWidget* newDock );
 
   /**
-   * Signals a dockwidget without parent (toplevel) is shown.
+   * Signals a dockwidget without tqparent (toplevel) is shown.
    */
   void setDockDefaultPos( KDockWidget* );
 
@@ -1137,7 +1144,7 @@ private:
    * Finds the TQWidget recursively at the position given as parameter
    *
    * @param w a variable where the method puts the TQWidget at that position (instead of a return value)
-   * @param p the parent widget where the recursive search should start from
+   * @param p the tqparent widget where the recursive search should start from
    * @param pos global (desktop) position of the wanted dockwidget
    */
   void findChildDockWidget( TQWidget*& w, const TQWidget* p, const TQPoint& pos );
@@ -1145,7 +1152,7 @@ private:
   /**
    * Finds all dockwidgets which are child, grandchild and so on of p.
    *
-   * @param p the parent widget where the recursive search starts from
+   * @param p the tqparent widget where the recursive search starts from
    * @param l the widget list that contains the search result after the return of this method
    */
   void findChildDockWidget( const TQWidget* p, TQWidgetList*& l);
@@ -1202,7 +1209,7 @@ private:
   KDockWidget::DockPosition curPos;
 
   /**
-   * A QList of all objects that are important for docking.
+   * A TQList of all objects that are important for docking.
    * Some serve as group widgets of dockwidgets, others encapsulate normal widgets.
    */
   TQObjectList* childDock;
@@ -1302,6 +1309,7 @@ private:
 class KDEUI_EXPORT KDockMainWindow : public KMainWindow
 {
   Q_OBJECT
+  TQ_OBJECT
 
 friend class KDockManager;
 
@@ -1310,16 +1318,16 @@ public:
   /**
    * Constructs a dockmainwindow. It calls its base class constructor and does additional things concerning
    * to the dock stuff:
-   * @li information about the dock state of this' children gets initialized
+   * @li information about the dock state of this' tqchildren gets initialized
    * @li a dockmanager is created...
    * @li ...and gets initialized
    * @li the main dockwidget is set to 0
    *
-   * @param parent Parent widget for the dock main widget
+   * @param tqparent Parent widget for the dock main widget
    * @param name internal object name
-   * @param f Qt::WidgetFlags widget flags
+   * @param f TQt::WidgetFlags widget flags
    */
-  KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose );
+  KDockMainWindow( TQWidget* tqparent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose );
 
   /**
    * Destructs a dockmainwindow.
@@ -1354,20 +1362,20 @@ public:
    *
    * @param name   TQObject name (default dockwidget caption)
    * @param pixmap window icon (for instance shown when docked as tabwidget entry)
-   * @param parent parent widget for the new dockwidget
+   * @param tqparent tqparent widget for the new dockwidget
    * @param strCaption  window title (shown when toplevel)
    * @param strTabPageLabel title of the tab page (visible when in tab page mode), if it is "", only the icon will be shown; if it is 0L, the label is set to strCaption
    * @return    a pointer to the new created dockwidget
    */
-  KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
-    const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) );
+  KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L,
+    const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
 
   /**
-   * Saves the current dock window layout into a DOM tree below the given element.
+   * Saves the current dock window tqlayout into a DOM tree below the given element.
    */
   void writeDockConfig(TQDomElement &base);
   /**
-   * Reads the current dock window layout from a DOM tree below the given element.
+   * Reads the current dock window tqlayout from a DOM tree below the given element.
    */
   void readDockConfig(TQDomElement &base);
 
@@ -1378,7 +1386,7 @@ public:
    * @param c     KDE class for saving configurations
    * @param group name of section to write to
    */
-  void writeDockConfig( KConfig* c = 0L, TQString group = TQString::null );
+  void writeDockConfig( KConfig* c = 0L, TQString group = TQString() );
 
   /**
    * It reads the current dock state from the given section of KConfig.
@@ -1386,7 +1394,7 @@ public:
    * @param c     KDE class for saving configurations
    * @param group name of section to read from
    */
-  void readDockConfig ( KConfig* c = 0L, TQString group = TQString::null );
+  void readDockConfig ( KConfig* c = 0L, TQString group = TQString() );
 #endif
 
   /**
@@ -1465,16 +1473,17 @@ private:
   KDockMainWindowPrivate *d;
 };
 
-class KDEUI_EXPORT KDockArea : public QWidget
+class KDEUI_EXPORT KDockArea : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
 friend class KDockManager;
 
 public:
 
 
-  KDockArea( TQWidget* parent = 0L, const char *name = 0L);
+  KDockArea( TQWidget* tqparent = 0L, const char *name = 0L);
 
   virtual ~KDockArea();
 
@@ -1484,15 +1493,15 @@ public:
   void setMainDockWidget( KDockWidget* );
   KDockWidget* getMainDockWidget(){ return mainDockWidget; }
 
-  KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
-    const TQString& strCaption = TQString::null, const TQString& strTabPageLabel = TQString::fromLatin1( " " ) );
+  KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L,
+    const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
 
   void writeDockConfig(TQDomElement &base);
   void readDockConfig(TQDomElement &base);
 
 #ifndef NO_KDE2
-  void writeDockConfig( KConfig* c = 0L, TQString group = TQString::null );
-  void readDockConfig ( KConfig* c = 0L, TQString group = TQString::null );
+  void writeDockConfig( KConfig* c = 0L, TQString group = TQString() );
+  void readDockConfig ( KConfig* c = 0L, TQString group = TQString() );
 #endif
 
 
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h
index 98af140f..39c9ffe1 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h
@@ -45,7 +45,7 @@ class KDEUI_EXPORT KDockContainer
 public:
   KDockContainer();
   virtual ~KDockContainer();
-  virtual KDockWidget *parentDockWidget();
+  virtual KDockWidget *tqparentDockWidget();
   virtual void insertWidget (KDockWidget *, TQPixmap, const TQString &, int &);
   virtual void showWidget(KDockWidget *);
   virtual void removeWidget(KDockWidget*);
@@ -77,8 +77,8 @@ private:
 
 
 
-  struct ListItem *m_childrenListBegin;
-  struct ListItem *m_childrenListEnd;
+  struct ListItem *m_tqchildrenListBegin;
+  struct ListItem *m_tqchildrenListEnd;
 
   class KDockContainerPrivate;
   KDockContainerPrivate *d;
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
index 4106d101..f428783a 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
@@ -26,8 +26,8 @@
 #include <tqtimer.h>
 #include <tqapplication.h>
 
-KDockSplitter::KDockSplitter(TQWidget *parent, const char *name, Orientation orient, int pos, bool highResolution)
-: TQWidget(parent, name)
+KDockSplitter::KDockSplitter(TQWidget *tqparent, const char *name, Qt::Orientation orient, int pos, bool highResolution)
+: TQWidget(tqparent, name)
 {
   m_dontRecalc=false;
   divider = 0L;
@@ -59,7 +59,7 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1)
   divider->setLineWidth(1);
   divider->raise();
 
-  if (m_orientation == Horizontal)
+  if (m_orientation ==Qt::Horizontal)
     divider->setCursor(TQCursor(sizeVerCursor));
   else
     divider->setCursor(TQCursor(sizeHorCursor));
@@ -179,21 +179,21 @@ void KDockSplitter::setupMinMaxSize()
 {
   // Set the minimum and maximum sizes
   int minx, maxx, miny, maxy;
-  if (m_orientation == Horizontal) {
-    miny = child0->minimumSize().height() + child1->minimumSize().height()+4;
-    maxy = child0->maximumSize().height() + child1->maximumSize().height()+4;
-    minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width();
-    maxx = (child0->maximumSize().width() > child1->maximumSize().width()) ? child0->maximumSize().width() : child1->maximumSize().width();
+  if (m_orientation ==Qt::Horizontal) {
+    miny = child0->tqminimumSize().height() + child1->tqminimumSize().height()+4;
+    maxy = child0->tqmaximumSize().height() + child1->tqmaximumSize().height()+4;
+    minx = (child0->tqminimumSize().width() > child1->tqminimumSize().width()) ? child0->tqminimumSize().width() : child1->tqminimumSize().width();
+    maxx = (child0->tqmaximumSize().width() > child1->tqmaximumSize().width()) ? child0->tqmaximumSize().width() : child1->tqmaximumSize().width();
 
     miny = (miny > 4) ? miny : 4;
     maxy = (maxy < 32000) ? maxy : 32000;
     minx = (minx > 2) ? minx : 2;
     maxx = (maxx < 32000) ? maxx : 32000;
   } else {
-    minx = child0->minimumSize().width() + child1->minimumSize().width()+4;
-    maxx = child0->maximumSize().width() + child1->maximumSize().width()+4;
-    miny = (child0->minimumSize().height() > child1->minimumSize().height()) ? child0->minimumSize().height() : child1->minimumSize().height();
-    maxy = (child0->maximumSize().height() > child1->maximumSize().height()) ? child0->maximumSize().height() : child1->maximumSize().height();
+    minx = child0->tqminimumSize().width() + child1->tqminimumSize().width()+4;
+    maxx = child0->tqmaximumSize().width() + child1->tqmaximumSize().width()+4;
+    miny = (child0->tqminimumSize().height() > child1->tqminimumSize().height()) ? child0->tqminimumSize().height() : child1->tqminimumSize().height();
+    maxy = (child0->tqmaximumSize().height() > child1->tqmaximumSize().height()) ? child0->tqmaximumSize().height() : child1->tqmaximumSize().height();
 
     minx = (minx > 4) ? minx : 4;
     maxx = (maxx < 32000) ? maxx : 32000;
@@ -238,32 +238,32 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
     double factor = (mHighResolution)? 10000.0:100.0;
     // real resize event, recalculate xpos
     if (ev && mKeepSize && isVisible()) {
-//	kdDebug(282)<<"mKeepSize : "<< ((m_orientation == Horizontal) ? "Horizontal":"Vertical") <<endl;
+//	kdDebug(282)<<"mKeepSize : "<< ((m_orientation ==Qt::Horizontal) ? "Horizontal":"Vertical") <<endl;
 
       if (ev->oldSize().width() != ev->size().width())
       {
-          if (m_orientation == Horizontal) {
-          xpos = qRound(factor * checkValue( child0->height()+1 ) / height());
+          if (m_orientation ==Qt::Horizontal) {
+          xpos = tqRound(factor * checkValue( child0->height()+1 ) / height());
           } else {
-          xpos = qRound(factor * checkValue( child0->width()+1 ) / width());
+          xpos = tqRound(factor * checkValue( child0->width()+1 ) / width());
 	  }
 
           }
       }
           else
           {
-//	kdDebug(282)<<"!mKeepSize : "<< ((m_orientation == Horizontal) ? "Horizontal":"Vertical") <<endl;
+//	kdDebug(282)<<"!mKeepSize : "<< ((m_orientation ==Qt::Horizontal) ? "Horizontal":"Vertical") <<endl;
 	if (/*ev &&*/ isVisible()) {
-		if (m_orientation == Horizontal) {
+		if (m_orientation ==Qt::Horizontal) {
 		/*	if (ev->oldSize().height() != ev->size().height())*/
 			{
 			  if (fixedHeight0!=-1)
 // 				xpos=floor(fixedHeight0*factor/height());
-                                xpos=qRound(fixedHeight0*factor/height());
+                                xpos=tqRound(fixedHeight0*factor/height());
 			  else
 			  if (fixedHeight1!=-1)
 // 				xpos=ceil((height()-fixedHeight1)*factor/height());
-                                xpos=qRound((height()-fixedHeight1)*factor/height());
+                                xpos=tqRound((height()-fixedHeight1)*factor/height());
 			}
 		}
 		else
@@ -272,11 +272,11 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
 			{
 			  if (fixedWidth0!=-1)
 // 				xpos=floor(fixedWidth0*factor/width());
-                                xpos=qRound(fixedWidth0*factor/width());
+                                xpos=tqRound(fixedWidth0*factor/width());
 			  else
 			  if (fixedWidth1!=-1)
 // 				xpos=ceil((width()-fixedWidth1)*factor/width());
-                              xpos=qRound((width()-fixedWidth1)*factor/width());
+                              xpos=tqRound((width()-fixedWidth1)*factor/width());
 			}
 		}
 	}
@@ -287,15 +287,15 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
     KDockWidget *c0=(KDockWidget*)child0;
     KDockWidget *c1=(KDockWidget*)child1;
     bool stdHandling=false;
-    if ( ( (m_orientation==Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) ||
-    	( (m_orientation==Horizontal)  &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) {
+    if ( ( (m_orientation==Qt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) ||
+    	( (m_orientation==Qt::Horizontal)  &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) {
 	    if ((c0->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c0->getWidget()))
 		 && (dc->m_overlapMode)) {
-			int position= qRound((m_orientation == Vertical ? width() : height()) * xpos/factor);
+			int position= tqRound((m_orientation ==Qt::Vertical ? width() : height()) * xpos/factor);
 			position=checkValueOverlapped(position,child0);
 			child0->raise();
 			divider->raise();
-	        	      if (m_orientation == Horizontal){
+	        	      if (m_orientation ==Qt::Horizontal){
         	        	child0->setGeometry(0, 0, width(), position);
 	                	child1->setGeometry(0, dc->m_nonOverlapSize+4, width(),
 						height()-dc->m_nonOverlapSize-4);
@@ -309,11 +309,11 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
 	    } else {
 		 if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))
         	 && (dc->m_overlapMode)) {
-                	int position= qRound((m_orientation == Vertical ? width() : height()) * xpos/factor);
+                	int position= tqRound((m_orientation ==Qt::Vertical ? width() : height()) * xpos/factor);
 			position=checkValueOverlapped(position,child1);
 	                child1->raise();
         	        divider->raise();
-	                      if (m_orientation == Horizontal){
+	                      if (m_orientation ==Qt::Horizontal){
         	                child0->setGeometry(0, 0, width(), height()-dc->m_nonOverlapSize-4);
                 	        child1->setGeometry(0, position+4, width(),
 	                                        height()-position-4);
@@ -331,8 +331,8 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
 	 else stdHandling=true;
 
 	if (stdHandling) {
-		      int position = checkValue( qRound((m_orientation == Vertical ? width() : height()) * xpos/factor) );
-		      if (m_orientation == Horizontal){
+		      int position = checkValue( tqRound((m_orientation ==Qt::Vertical ? width() : height()) * xpos/factor) );
+		      if (m_orientation ==Qt::Horizontal){
         		child0->setGeometry(0, 0, width(), position);
 		        child1->setGeometry(0, position+4, width(), height()-position-4);
         		divider->setGeometry(0, position, width(), 4);
@@ -349,22 +349,22 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
 
 int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidget) const {
 	if (initialised) {
-		if (m_orientation == Vertical) {
+		if (m_orientation ==Qt::Vertical) {
 			if (child0==overlappingWidget) {
-				if (position<(child0->minimumSize().width()))
-					position=child0->minimumSize().width();
+				if (position<(child0->tqminimumSize().width()))
+					position=child0->tqminimumSize().width();
 				if (position>width()) position=width()-4;
-			} else if (position>(width()-(child1->minimumSize().width())-4)){
-				position=width()-(child1->minimumSize().width())-4;
+			} else if (position>(width()-(child1->tqminimumSize().width())-4)){
+				position=width()-(child1->tqminimumSize().width())-4;
 				if (position<0) position=0;
 			}
-		} else {// orientation  == Horizontal
+		} else {// orientation  ==Qt::Horizontal
 			if (child0==overlappingWidget) {
-				if (position<(child0->minimumSize().height()))
-					position=child0->minimumSize().height();
+				if (position<(child0->tqminimumSize().height()))
+					position=child0->tqminimumSize().height();
 				if (position>height()) position=height()-4;
-			} else if (position>(height()-(child1->minimumSize().height())-4)){
-				position=height()-(child1->minimumSize().height())-4;
+			} else if (position>(height()-(child1->tqminimumSize().height())-4)){
+				position=height()-(child1->tqminimumSize().height())-4;
 				if (position<0) position=0;
 
 			}
@@ -377,24 +377,24 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge
 int KDockSplitter::checkValue( int position ) const
 {
   if (initialised){
-    if (m_orientation == Vertical){
-      if (position < (child0->minimumSize().width()))
-        position = child0->minimumSize().width();
-      if ((width()-4-position) < (child1->minimumSize().width()))
-        position = width() - (child1->minimumSize().width()) -4;
+    if (m_orientation ==Qt::Vertical){
+      if (position < (child0->tqminimumSize().width()))
+        position = child0->tqminimumSize().width();
+      if ((width()-4-position) < (child1->tqminimumSize().width()))
+        position = width() - (child1->tqminimumSize().width()) -4;
     } else {
-      if (position < (child0->minimumSize().height()))
-        position = (child0->minimumSize().height());
-      if ((height()-4-position) < (child1->minimumSize().height()))
-        position = height() - (child1->minimumSize().height()) -4;
+      if (position < (child0->tqminimumSize().height()))
+        position = (child0->tqminimumSize().height());
+      if ((height()-4-position) < (child1->tqminimumSize().height()))
+        position = height() - (child1->tqminimumSize().height()) -4;
     }
   }
 
   if (position < 0) position = 0;
 
-  if ((m_orientation == Vertical) && (position > width()))
+  if ((m_orientation ==Qt::Vertical) && (position > width()))
     position = width();
-  if ((m_orientation == Horizontal) && (position > height()))
+  if ((m_orientation ==Qt::Horizontal) && (position > height()))
     position = height();
 
   return position;
@@ -411,7 +411,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
       mev= (TQMouseEvent*)e;
       child0->setUpdatesEnabled(mOpaqueResize);
       child1->setUpdatesEnabled(mOpaqueResize);
-      if (m_orientation == Horizontal) {
+      if (m_orientation ==Qt::Horizontal) {
         if ((fixedHeight0!=-1) || (fixedHeight1!=-1))
         {
                 handled=true; break;
@@ -423,7 +423,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
         } else {
           xpos = factor * checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
           resizeEvent(0);
-          divider->repaint(true);
+          divider->tqrepaint(true);
         }
       } else {
         if ((fixedWidth0!=-1) || (fixedWidth1!=-1))
@@ -436,7 +436,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
         } else {
           xpos = factor * checkValue( mapFromGlobal( mev->globalPos()).x() ) / width();
           resizeEvent(0);
-          divider->repaint(true);
+          divider->tqrepaint(true);
         }
       }
       handled= true;
@@ -445,14 +445,14 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
       child0->setUpdatesEnabled(true);
       child1->setUpdatesEnabled(true);
       mev= (TQMouseEvent*)e;
-      if (m_orientation == Horizontal){
+      if (m_orientation ==Qt::Horizontal){
         if ((fixedHeight0!=-1) || (fixedHeight1!=-1))
         {
                 handled=true; break;
         }
         xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
         resizeEvent(0);
-        divider->repaint(true);
+        divider->tqrepaint(true);
       } else {
         if ((fixedWidth0!=-1) || (fixedWidth1!=-1))
         {
@@ -460,7 +460,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
         }
         xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width();
         resizeEvent(0);
-        divider->repaint(true);
+        divider->tqrepaint(true);
       }
       handled= true;
       break;
@@ -473,7 +473,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
 bool KDockSplitter::event( TQEvent* e )
 {
   if ( e->type() == TQEvent::LayoutHint ){
-    // change children min/max size
+    // change tqchildren min/max size
     setupMinMaxSize();
     setSeparatorPos(xpos);
   }
@@ -490,15 +490,15 @@ void KDockSplitter::updateName()
   if ( !initialised ) return;
 
   TQString new_name = TQString( child0->name() ) + "," + child1->name();
-  parentWidget()->setName( new_name.latin1() );
-  parentWidget()->setCaption( child0->caption() + "," + child1->caption() );
-  parentWidget()->repaint( false );
+  tqparentWidget()->setName( new_name.latin1() );
+  tqparentWidget()->setCaption( child0->caption() + "," + child1->caption() );
+  tqparentWidget()->tqrepaint( false );
 
-  ((KDockWidget*)parentWidget())->firstName = child0->name();
-  ((KDockWidget*)parentWidget())->lastName = child1->name();
-  ((KDockWidget*)parentWidget())->splitterOrientation = m_orientation;
+  ((KDockWidget*)tqparentWidget())->firstName = child0->name();
+  ((KDockWidget*)tqparentWidget())->lastName = child1->name();
+  ((KDockWidget*)tqparentWidget())->splitterOrientation = m_orientation;
 
-  TQWidget* p = parentWidget()->parentWidget();
+  TQWidget* p = tqparentWidget()->tqparentWidget();
   if ( p && p->inherits("KDockSplitter" ) )
     ((KDockSplitter*)p)->updateName();
 }
@@ -540,11 +540,11 @@ bool KDockSplitter::highResolution() const
 
 
 /*************************************************************************/
-KDockButton_Private::KDockButton_Private( TQWidget *parent, const char * name )
-:TQPushButton( parent, name )
+KDockButton_Private::KDockButton_Private( TQWidget *tqparent, const char * name )
+:TQPushButton( tqparent, name )
 {
   moveMouse = false;
-  setFocusPolicy( NoFocus );
+  setFocusPolicy( TQ_NoFocus );
 }
 
 KDockButton_Private::~KDockButton_Private()
@@ -553,7 +553,7 @@ KDockButton_Private::~KDockButton_Private()
 
 void KDockButton_Private::drawButton( TQPainter* p )
 {
-  p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) );
+  p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) );
   p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() );
   if ( moveMouse && !isDown() ){
     p->setPen( white );
@@ -561,12 +561,12 @@ void KDockButton_Private::drawButton( TQPainter* p )
     p->lineTo( 0, 0 );
     p->lineTo( width() - 1, 0 );
 
-    p->setPen( colorGroup().dark() );
+    p->setPen( tqcolorGroup().dark() );
     p->lineTo( width() - 1, height() - 1 );
     p->lineTo( 0, height() - 1 );
   }
   if ( isOn() || isDown() ){
-    p->setPen( colorGroup().dark() );
+    p->setPen( tqcolorGroup().dark() );
     p->moveTo( 0, height() - 1 );
     p->lineTo( 0, 0 );
     p->lineTo( width() - 1, 0 );
@@ -580,13 +580,13 @@ void KDockButton_Private::drawButton( TQPainter* p )
 void KDockButton_Private::enterEvent( TQEvent * )
 {
   moveMouse = true;
-  repaint();
+  tqrepaint();
 }
 
 void KDockButton_Private::leaveEvent( TQEvent * )
 {
   moveMouse = false;
-  repaint();
+  tqrepaint();
 }
 
 /*************************************************************************/
@@ -620,12 +620,12 @@ void KDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w)
 {
    if (w) {
       TQWidget* embeddedWdg = ((KDockWidget*)w)->getWidget();
-      if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQWidget::ClickFocus) || (embeddedWdg->focusPolicy() == TQWidget::StrongFocus))) {
+      if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQ_ClickFocus) || (embeddedWdg->focusPolicy() == TQ_StrongFocus))) {
          embeddedWdg->setFocus();
       }
    }
 }
 
-#ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this name
+#ifndef NO_INCLUDE_TQMOCFILES // for TQt-only projects, because tmake doesn't take this name
 #include "kdockwidget_private.moc"
 #endif
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h
index 327471ed..4f9c119f 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h
@@ -17,7 +17,7 @@
 */
 
 /*
-   IMPORTANT Note: This file compiles also in Qt-only mode by using the NO_KDE2 precompiler definition
+   IMPORTANT Note: This file compiles also in TQt-only mode by using the NO_KDE2 precompiler definition
 */
 
 #ifndef KDOCKWIDGET_PRIVATE_H
@@ -40,11 +40,12 @@ class KDockContainer;
  *
  * @author Max Judin.
 */
-class KDEUI_EXPORT KDockSplitter : public QWidget
+class KDEUI_EXPORT KDockSplitter : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient= Vertical, int pos= 50, bool highResolution=false);
+  KDockSplitter(TQWidget *tqparent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false);
   virtual ~KDockSplitter(){};
 
   void activate(TQWidget *c0, TQWidget *c1 = 0L);
@@ -84,7 +85,7 @@ public:
   void setForcedFixedHeight(KDockWidget *dw,int h);
   void restoreFromForcedFixedSize(KDockWidget *dw);
 
-  Orientation orientation(){return m_orientation;}
+  Qt::Orientation orientation(){return m_orientation;}
 
 protected:
   friend class  KDockContainer;
@@ -98,7 +99,7 @@ protected slots:
 private:
   void setupMinMaxSize();
   TQWidget *child0, *child1;
-  Orientation m_orientation;
+  Qt::Orientation m_orientation;
   bool initialised;
   TQFrame* divider;
   int xpos, savedXPos;
@@ -114,11 +115,12 @@ private:
  *
  * @author Max Judin.
 */
-class KDEUI_EXPORT KDockButton_Private : public QPushButton
+class KDEUI_EXPORT KDockButton_Private : public TQPushButton
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  KDockButton_Private( TQWidget *parent=0, const char *name=0 );
+  KDockButton_Private( TQWidget *tqparent=0, const char *name=0 );
   ~KDockButton_Private();
 
 protected:
@@ -139,9 +141,10 @@ private:
 /**
  * additional KDockWidget stuff (private)
 */
-class KDEUI_EXPORT KDockWidgetPrivate : public QObject
+class KDEUI_EXPORT KDockWidgetPrivate : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   KDockWidgetPrivate();
   ~KDockWidgetPrivate();
@@ -180,11 +183,11 @@ public:
 };
 
 class KDEUI_EXPORT KDockWidgetHeaderPrivate
-   : public QObject
+   : public TQObject
 {
 public:
-  KDockWidgetHeaderPrivate( TQObject* parent )
-        : TQObject( parent )
+  KDockWidgetHeaderPrivate( TQObject* tqparent )
+        : TQObject( tqparent )
   {
     forceCloseButtonHidden=false;
     toDesktopButton = 0;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
index 923b5537..da7ede0d 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
@@ -6,8 +6,8 @@
 //    begin                : 07/1999       by Szymon Stefanek as part of kvirc
 //                                         (an IRC application)
 //    changes              : 09/1999       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //
 //    copyright            : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
@@ -45,8 +45,8 @@
 
 //============ KMdiChildArea ============//
 
-KMdiChildArea::KMdiChildArea( TQWidget *parent )
-		: TQFrame( parent, "kmdi_childarea" )
+KMdiChildArea::KMdiChildArea( TQWidget *tqparent )
+		: TQFrame( tqparent, "kmdi_childarea" )
 {
 	setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 	m_captionFont = TQFont();
@@ -58,7 +58,7 @@ KMdiChildArea::KMdiChildArea( TQWidget *parent )
 	m_captionInactiveForeColor = KGlobalSettings::inactiveTextColor();
 	m_pZ = new TQPtrList<KMdiChildFrm>;
 	m_pZ->setAutoDelete( true );
-	setFocusPolicy( ClickFocus );
+	setFocusPolicy( TQ_ClickFocus );
 	m_defaultChildFrmSize = TQSize( 400, 300 );
 }
 
@@ -75,11 +75,11 @@ void KMdiChildArea::manageChild( KMdiChildFrm* child, bool show, bool cascade )
 	KMdiChildFrm* top = topChild();
 	
 	//remove old references. There can be more than one so we remove them all
-	if ( m_pZ->findRef( child ) != -1 )
+	if ( m_pZ->tqfindRef( child ) != -1 )
 	{
-		//TQPtrList::find* moves current() to the found item
+		//TQPtrList::tqfind* moves current() to the found item
 		m_pZ->take(); 
-		while ( m_pZ->findNextRef( child ) != -1 )
+		while ( m_pZ->tqfindNextRef( child ) != -1 )
 			m_pZ->take();
 	}
 
@@ -112,7 +112,7 @@ void KMdiChildArea::destroyChild( KMdiChildFrm *child, bool focusTop )
 	bool wasMaximized = ( child->state() == KMdiChildFrm::Maximized );
 
 	// destroy the old one
-	TQObject::disconnect( child );
+	TQT_BASE_OBJECT_NAME::disconnect( child );
 	child->blockSignals( true );
 	m_pZ->setAutoDelete( false );
 	m_pZ->removeRef( child );
@@ -144,7 +144,7 @@ void KMdiChildArea::destroyChildButNotItsView( KMdiChildFrm* child, bool focusTo
 	bool wasMaximized = ( child->state() == KMdiChildFrm::Maximized );
 
 	// destroy the old one
-	TQObject::disconnect( child );
+	TQT_BASE_OBJECT_NAME::disconnect( child );
 	child->unsetClient();
 	m_pZ->setAutoDelete( false );
 	m_pZ->removeRef( child );
@@ -181,7 +181,7 @@ void KMdiChildArea::setTopChild( KMdiChildFrm* child, bool /* bSetFocus */ )
 			m_pZ->removeRef( child );
 		m_pZ->setAutoDelete( true );
 		
-		//disable the labels of all the other children
+		//disable the labels of all the other tqchildren
 		TQPtrListIterator<KMdiChildFrm> it( *m_pZ );
 		for ( ; ( *it ); ++it )
 			( *it )->m_pCaption->setActive( false );
@@ -194,7 +194,7 @@ void KMdiChildArea::setTopChild( KMdiChildFrm* child, bool /* bSetFocus */ )
 		m_pZ->append( child );
 		
 		int nChildAreaMinW = 0, nChildAreaMinH = 0;
-		int nChildAreaMaxW = QWIDGETSIZE_MAX, nChildAreaMaxH = QWIDGETSIZE_MAX;
+		int nChildAreaMaxW = TQWIDGETSIZE_MAX, nChildAreaMaxH = TQWIDGETSIZE_MAX;
 		if ( topChildMaximized && child->m_pClient )
 		{
 			//the former top child is maximized, so maximize the new one
@@ -218,15 +218,19 @@ void KMdiChildArea::setTopChild( KMdiChildFrm* child, bool /* bSetFocus */ )
 		else
 			child->raise();
 		
+#ifdef USE_QT4
+		child->m_pClient->setFocus();
+#else // USE_QT4
 		TQFocusEvent::setReason( TQFocusEvent::Other );
 		child->m_pClient->setFocus();
+#endif // USE_QT4
 	}
 }
 
 
 void KMdiChildArea::resizeEvent( TQResizeEvent* e )
 {
-	//If we have a maximized children at the top , adjust its size
+	//If we have a maximized tqchildren at the top , adjust its size
 	KMdiChildFrm* child = topChild();
 	if ( child && child->state() == KMdiChildFrm::Maximized  )
 	{
@@ -240,7 +244,7 @@ void KMdiChildArea::resizeEvent( TQResizeEvent* e )
 		               height() + child->m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR + KMDI_CHILDFRM_DOUBLE_BORDER );
 
 	}
-	layoutMinimizedChildren();
+	tqlayoutMinimizedChildren();
 	TQWidget::resizeEvent( e );
 }
 
@@ -249,7 +253,7 @@ void KMdiChildArea::resizeEvent( TQResizeEvent* e )
 void KMdiChildArea::mousePressEvent( TQMouseEvent *e )
 {
 	//Popup the window menu
-	if ( e->button() & RightButton )
+	if ( e->button() & Qt::RightButton )
 		emit popupWindowMenu( mapToGlobal( e->pos() ) );
 }
 
@@ -319,7 +323,7 @@ TQPoint KMdiChildArea::getCascadePoint( int indexOfWindow )
 void KMdiChildArea::childMinimized( KMdiChildFrm *minimizedChild, bool wasMaximized )
 {
 	//can't find the child in our list, so we don't care.
-	if ( m_pZ->findRef( minimizedChild ) == -1 )
+	if ( m_pZ->tqfindRef( minimizedChild ) == -1 )
 	{
 		kdDebug( 760 ) << k_funcinfo << "child was minimized but wasn't in our list!" << endl;
 		return;
@@ -364,7 +368,7 @@ void KMdiChildArea::focusTopChild()
 
 	if ( !lastChild->m_pClient->hasFocus() )
 	{
-		//disable the labels of all the other children
+		//disable the labels of all the other tqchildren
 		TQPtrListIterator<KMdiChildFrm> it ( *m_pZ );
 		for ( ; ( *it ); ++it )
 		{
@@ -420,10 +424,10 @@ void KMdiChildArea::cascadeMaximized()
 			childFrm->move( pnt );
 			TQSize curSize( width() - pnt.x(), height() - pnt.y() );
 			
-			if ( ( childFrm->minimumSize().width() > curSize.width() ) ||
-			     ( childFrm->minimumSize().height() > curSize.height() ) )
+			if ( ( childFrm->tqminimumSize().width() > curSize.width() ) ||
+			     ( childFrm->tqminimumSize().height() > curSize.height() ) )
 			{
-				childFrm->resize( childFrm->minimumSize() );
+				childFrm->resize( childFrm->tqminimumSize() );
 			}
 			else
 				childFrm->resize( curSize );
@@ -607,7 +611,7 @@ void KMdiChildArea::tileAnodine()
 		return ;
 	
 	int numCols = int( sqrt( ( double ) numVisible ) ); // set columns to square root of visible count
-	// create an array to form grid layout
+	// create an array to form grid tqlayout
 	int *numRows = new int[ numCols ];
 	int numCurCol = 0;
 	
@@ -720,7 +724,7 @@ void KMdiChildArea::tileVertically()
 }
 
 
-void KMdiChildArea::layoutMinimizedChildren()
+void KMdiChildArea::tqlayoutMinimizedChildren()
 {
 	int posX = 0;
 	int posY = height();
@@ -738,7 +742,7 @@ void KMdiChildArea::layoutMinimizedChildren()
 			}
 			
 			child->move( posX, posY - child->height() );
-			posX = child->geometry().right();
+			posX = child->tqgeometry().right();
 		}
 	}
 }
@@ -786,4 +790,4 @@ void KMdiChildArea::getCaptionColors( const TQPalette& /*pal*/, TQColor& activeB
 	inactiveFG = KGlobalSettings::inactiveTextColor();
 }
 
-// kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands;
+// kate: space-indent off; tqreplace-tabs off; tab-width 4; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h
index 4a074889..ef1495e7 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h
@@ -6,8 +6,8 @@
 //    begin                : 07/1999       by Szymon Stefanek as part of kvirc
 //                                         (an IRC application)
 //    changes              : 09/1999       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //
 //    copyright            : (C) 1999-2003 by Falk Brettschneider
@@ -49,12 +49,13 @@ class KMdiChildAreaPrivate;
   * and manages the frame widgets of attached MDI views.
   * All actions and stuff concerning only to childframes are handled here.
   */
-class KMDI_EXPORT KMdiChildArea : public QFrame
+class KMDI_EXPORT KMdiChildArea : public TQFrame
 {
 	friend class KMdiChildFrmCaption;
 	friend class KMdiChildFrm;
 
 Q_OBJECT
+  TQ_OBJECT
 
 	// attributes
 public:
@@ -101,7 +102,7 @@ public:
 	/**
 	 * Consruction. Note: This class needn't to know about KMdiMainFrm .
 	 */
-	KMdiChildArea( TQWidget *parent );
+	KMdiChildArea( TQWidget *tqparent );
 	
 	/**
 	 * Destructor : THERE should be no child windows anymore...
@@ -137,13 +138,13 @@ public:
 	void setTopChild( KMdiChildFrm* child, bool setFocus = false );
 	
 	/**
-	 * Returns the topmost child (the active one) or 0 if there are no children.
+	 * Returns the topmost child (the active one) or 0 if there are no tqchildren.
 	 * Note that the topmost child may be also hidded , if ALL the windows are minimized.
 	 */
 	inline KMdiChildFrm * topChild() const { return m_pZ->last(); }
 	
 	/**
-	 * Returns the number of visible children
+	 * Returns the number of visible tqchildren
 	 */
 	int getVisibleChildCount() const;
 	
@@ -156,31 +157,31 @@ public:
 	
 	/**
 	 * Sets the MDI childframe window caption font
-	 * A relayout does not occur when using this function
+	 * A retqlayout does not occur when using this function
 	 */
 	void setMdiCaptionFont( const TQFont &fnt );
 	
 	/**
 	 * Sets the foreground color of the active MDI childframe window caption
-	 * A relayout does not occur when using this function
+	 * A retqlayout does not occur when using this function
 	 */
 	void setMdiCaptionActiveForeColor( const TQColor &clr );
 	
 	/**
 	 * Sets the background color of the active MDI childframe window captions
-	 * A relayout does not occur when using this function
+	 * A retqlayout does not occur when using this function
 	 */
 	void setMdiCaptionActiveBackColor( const TQColor &clr );
 	
 	/**
 	 * Sets the foreground color of inactive MDI childframe window captions
-	 * A relayout does not occur when using this function
+	 * A retqlayout does not occur when using this function
 	 */
 	void setMdiCaptionInactiveForeColor( const TQColor &clr );
 	
 	/**
 	 * Sets the background color of inactive MDI childframe window captions
-	 * A relayout does not occur when using this function
+	 * A retqlayout does not occur when using this function
 	 */
 	void setMdiCaptionInactiveBackColor( const TQColor &clr );
 	
@@ -239,9 +240,9 @@ public slots:
 	void tileVertically();
 	
 	/**
-	 * Position and layout the minimized child frames
+	 * Position and tqlayout the minimized child frames
 	 */
-	void layoutMinimizedChildren();
+	void tqlayoutMinimizedChildren();
 
 protected:
 	
@@ -251,7 +252,7 @@ protected:
 	void tileAllInternal( int maxWnds );
 	
 	/**
-	 * Automatically resizes a maximized MDI view and layouts the positions of minimized MDI views.
+	 * Automatically resizes a maximized MDI view and tqlayouts the positions of minimized MDI views.
 	 */
 	virtual void resizeEvent( TQResizeEvent * );
 	
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
index 49378c18..d4926546 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
@@ -6,8 +6,8 @@
 //    begin                : 07/1999       by Szymon Stefanek as part of kvirc
 //                                         (an IRC application)
 //    changes              : 09/1999       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                         : 01/2003       by Jens Zurheide to allow switching
 //                                         between views based on timestamps
 //                           2000-2003     maintained by the KDevelop project
@@ -85,8 +85,8 @@
 #include "kde2laptop_undockbutton.xpm"
 
 
-KMdiWin32IconButton::KMdiWin32IconButton( TQWidget* parent, const char* name )
-		: TQLabel( parent, name )
+KMdiWin32IconButton::KMdiWin32IconButton( TQWidget* tqparent, const char* name )
+		: TQLabel( tqparent, name )
 {}
 
 //============ mousePressEvent ============//
@@ -98,8 +98,8 @@ void KMdiWin32IconButton::mousePressEvent( TQMouseEvent* )
 
 //============ KMdiChildFrm ============//
 
-KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
-	: TQFrame( parent, "kmdi_childfrm" )
+KMdiChildFrm::KMdiChildFrm( KMdiChildArea *tqparent )
+	: TQFrame( tqparent, "kmdi_childfrm" )
 	, m_pClient( 0L )
 	, m_pManager( 0L )
 	, m_pCaption( 0L )
@@ -129,7 +129,7 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
 {
 	m_pCaption = new KMdiChildFrmCaption( this );
 
-	m_pManager = parent;
+	m_pManager = tqparent;
 
 	m_pWinIcon = new KMdiWin32IconButton( m_pCaption, "kmdi_iconbutton_icon" );
 	m_pUnixIcon = new TQToolButton( m_pCaption, "kmdi_toolbutton_icon" );
@@ -149,15 +149,15 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
 
 	redecorateButtons();
 
-	m_pWinIcon->setFocusPolicy( NoFocus );
-	m_pUnixIcon->setFocusPolicy( NoFocus );
-	m_pClose->setFocusPolicy( NoFocus );
-	m_pMinimize->setFocusPolicy( NoFocus );
-	m_pMaximize->setFocusPolicy( NoFocus );
-	m_pUndock->setFocusPolicy( NoFocus );
+	m_pWinIcon->setFocusPolicy( TQ_NoFocus );
+	m_pUnixIcon->setFocusPolicy( TQ_NoFocus );
+	m_pClose->setFocusPolicy( TQ_NoFocus );
+	m_pMinimize->setFocusPolicy( TQ_NoFocus );
+	m_pMaximize->setFocusPolicy( TQ_NoFocus );
+	m_pUndock->setFocusPolicy( TQ_NoFocus );
 
 	setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
-	setFocusPolicy( NoFocus );
+	setFocusPolicy( TQ_NoFocus );
 
 	setMouseTracking( true );
 
@@ -238,19 +238,19 @@ void KMdiChildFrm::setResizeCursor( int resizeCorner )
 		break;
 	case KMDI_RESIZE_LEFT:
 	case KMDI_RESIZE_RIGHT:
-		TQApplication::setOverrideCursor( Qt::sizeHorCursor, true );
+		TQApplication::setOverrideCursor( TQt::sizeHorCursor, true );
 		break;
 	case KMDI_RESIZE_TOP:
 	case KMDI_RESIZE_BOTTOM:
-		TQApplication::setOverrideCursor( Qt::sizeVerCursor, true );
+		TQApplication::setOverrideCursor( TQt::sizeVerCursor, true );
 		break;
 	case KMDI_RESIZE_TOPLEFT:
 	case KMDI_RESIZE_BOTTOMRIGHT:
-		TQApplication::setOverrideCursor( Qt::sizeFDiagCursor, true );
+		TQApplication::setOverrideCursor( TQt::sizeFDiagCursor, true );
 		break;
 	case KMDI_RESIZE_BOTTOMLEFT:
 	case KMDI_RESIZE_TOPRIGHT:
-		TQApplication::setOverrideCursor( Qt::sizeBDiagCursor, true );
+		TQApplication::setOverrideCursor( TQt::sizeBDiagCursor, true );
 		break;
 	}
 }
@@ -278,15 +278,15 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e )
 	if ( !m_pClient )
 		return;
 	
-	if ( m_pClient->minimumSize() == m_pClient->maximumSize() )
+	if ( m_pClient->tqminimumSize() == m_pClient->tqmaximumSize() )
 		return; 
 
 	if ( m_bResizing )
 	{
-		if ( !( e->state() & RightButton ) && !( e->state() & MidButton ) )
+		if ( !( e->state() & Qt::RightButton ) && !( e->state() & Qt::MidButton ) )
 		{
 			// same as: if no button or left button pressed
-			TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() );
+			TQPoint p = tqparentWidget()->mapFromGlobal( e->globalPos() );
 			resizeWindow( m_iResizeCorner, p.x(), p.y() );
 		}
 		else
@@ -323,17 +323,17 @@ void KMdiChildFrm::resizeWindow( int resizeCorner, int xPos, int yPos )
 	// Calculate the minimum width & height
 	int minWidth = 0;
 	int minHeight = 0;
-	int maxWidth = QWIDGETSIZE_MAX;
-	int maxHeight = QWIDGETSIZE_MAX;
+	int maxWidth = TQWIDGETSIZE_MAX;
+	int maxHeight = TQWIDGETSIZE_MAX;
 	
 	// it could be the client forces the childframe to enlarge its minimum size
 	if ( m_pClient )
 	{
-		minWidth = m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
-		minHeight = m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+		minWidth = m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+		minHeight = m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
 		            m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR;
-		maxWidth = m_pClient->maximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
-		maxHeight = m_pClient->maximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+		maxWidth = m_pClient->tqmaximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+		maxHeight = m_pClient->tqmaximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
 		            m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR;
 	}
 	
@@ -521,22 +521,22 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 		case Maximized:
 			m_pClient->m_stateChanged = true;
 			m_state = state;
-			// client min / max size / layout behavior don't change
+			// client min / max size / tqlayout behavior don't change
 			// set frame max size indirectly by setting the clients max size to
 			// it's current value (calls setMaxSize() of frame)
-			m_pClient->setMaximumSize( m_pClient->maximumSize().width(), m_pClient->maximumSize().height() );
+			m_pClient->setMaximumSize( m_pClient->tqmaximumSize().width(), m_pClient->tqmaximumSize().height() );
 			m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
 			setGeometry( m_restoredRect );
 			break;
 		case Minimized:
 			m_pClient->m_stateChanged = true;
 			m_state = state;
-			// restore client min / max size / layout behavior
+			// restore client min / max size / tqlayout behavior
 			m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() );
 			m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() );
-			if ( m_pClient->layout() != 0L )
+			if ( m_pClient->tqlayout() != 0L )
 			{
-				m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode );
+				m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode );
 			}
 			m_pMinimize->setPixmap( *m_pMinButtonPixmap );
 			m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
@@ -555,14 +555,14 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 			{
 				m_pClient->m_stateChanged = true;
 				m_state = state;
-				// restore client min / max size / layout behavior
+				// restore client min / max size / tqlayout behavior
 				m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() );
 				m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() );
-				if ( m_pClient->layout() != 0L )
+				if ( m_pClient->tqlayout() != 0L )
 				{
-					m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode );
+					m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode );
 				}
-				setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
+				setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
 				// reset to maximize-captionbar
 				m_pMaximize->setPixmap( *m_pRestoreButtonPixmap );
 				m_pMinimize->setPixmap( *m_pMinButtonPixmap );
@@ -581,8 +581,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 			{
 				m_pClient->m_stateChanged = true;
 				m_state = state;
-				// client min / max size / layout behavior don't change
-				setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
+				// client min / max size / tqlayout behavior don't change
+				setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
 				m_pMaximize->setPixmap( *m_pRestoreButtonPixmap );
 				int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER;
 				int nFrameHeight = KMDI_CHILDFRM_DOUBLE_BORDER + KMDI_CHILDFRM_SEPARATOR +
@@ -590,7 +590,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 				TQRect maximizedFrmRect( -m_pClient->x(), -m_pClient->y(),
 				                        m_pManager->width() + nFrameWidth,
 				                        m_pManager->height() + nFrameHeight );
-				if ( geometry() != maximizedFrmRect )
+				if ( tqgeometry() != maximizedFrmRect )
 				{
 					setGeometry( maximizedFrmRect );
 				}
@@ -607,18 +607,18 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 		case Maximized:
 			m_pClient->m_stateChanged = true;
 			m_state = state;
-			// save client min / max size / layout behavior
-			m_oldClientMinSize = m_pClient->minimumSize();
-			m_oldClientMaxSize = m_pClient->maximumSize();
-			if ( m_pClient->layout() != 0L )
+			// save client min / max size / tqlayout behavior
+			m_oldClientMinSize = m_pClient->tqminimumSize();
+			m_oldClientMaxSize = m_pClient->tqmaximumSize();
+			if ( m_pClient->tqlayout() != 0L )
 			{
-				m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
+				m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode();
 			}
 			m_pClient->setMinimumSize( 0, 0 );
 			m_pClient->setMaximumSize( 0, 0 );
-			if ( m_pClient->layout() != 0L )
+			if ( m_pClient->tqlayout() != 0L )
 			{
-				m_pClient->layout() ->setResizeMode( TQLayout::FreeResize );
+				m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize );
 			}
 			switchToMinimizeLayout();
 			m_pManager->childMinimized( this, true );
@@ -626,19 +626,19 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 		case Normal:
 			m_pClient->m_stateChanged = true;
 			m_state = state;
-			// save client min / max size / layout behavior
-			m_oldClientMinSize = m_pClient->minimumSize();
-			m_oldClientMaxSize = m_pClient->maximumSize();
-			if ( m_pClient->layout() != 0L )
+			// save client min / max size / tqlayout behavior
+			m_oldClientMinSize = m_pClient->tqminimumSize();
+			m_oldClientMaxSize = m_pClient->tqmaximumSize();
+			if ( m_pClient->tqlayout() != 0L )
 			{
-				m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
+				m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode();
 			}
-			m_restoredRect = geometry();
+			m_restoredRect = tqgeometry();
 			m_pClient->setMinimumSize( 0, 0 );
 			m_pClient->setMaximumSize( 0, 0 );
-			if ( m_pClient->layout() != 0L )
+			if ( m_pClient->tqlayout() != 0L )
 			{
-				m_pClient->layout() ->setResizeMode( TQLayout::FreeResize );
+				m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize );
 			}
 			switchToMinimizeLayout();
 			m_pManager->childMinimized( this, false );
@@ -664,7 +664,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 	else
 	{
 		m_pManager->setMinimumSize( 0, 0 );
-		m_pManager->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
+		m_pManager->setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
 	}
 }
 
@@ -694,7 +694,7 @@ void KMdiChildFrm::setCaption( const TQString& text )
 void KMdiChildFrm::enableClose( bool bEnable )
 {
 	m_pClose->setEnabled( bEnable );
-	m_pClose->repaint( false );
+	m_pClose->tqrepaint( false );
 }
 
 //============ setIcon ==================//
@@ -705,7 +705,7 @@ void KMdiChildFrm::setIcon( const TQPixmap& pxm )
 	if ( p.width() != 18 || p.height() != 18 )
 	{
 		TQImage img = p.convertToImage();
-		p = img.smoothScale( 18, 18, TQImage::ScaleMin );
+		p = img.smoothScale( 18, 18, TQ_ScaleMin );
 	}
 	const bool do_resize = m_pIconButtonPixmap->size() != p.size();
 	*m_pIconButtonPixmap = p;
@@ -750,7 +750,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
 	}
 
 	// memorize the focuses in a dictionary because they will get lost during reparenting
-	TQDict<FocusPolicy>* pFocPolDict = new TQDict<FocusPolicy>;
+	TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>;
 	pFocPolDict->setAutoDelete( true );
 	TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
 	TQObjectListIt it( *list );          // iterate over the buttons
@@ -768,21 +768,21 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
 			widg->setName( tmpStr.latin1() );
 			i++;
 		}
-		FocusPolicy* pFocPol = new FocusPolicy;
+		TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy;
 		*pFocPol = widg->focusPolicy();
 		pFocPolDict->insert( widg->name(), pFocPol );
 	}
 	delete list;                        // delete the list, not the objects
 
-	//Reparent if needed
-	if ( w->parent() != this )
+	//Retqparent if needed
+	if ( TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(this) )
 	{
 		//reparent to this widget , no flags , point , show it
 		TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos );
-		TQSize mincs = w->minimumSize();
-		TQSize maxcs = w->maximumSize();
+		TQSize mincs = w->tqminimumSize();
+		TQSize maxcs = w->tqmaximumSize();
 		w->setMinimumSize( 0, 0 );
-		w->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
+		w->setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
 
 		// min/max sizes, flags, DND get lost. :-(
 		w->reparent( this, 0, pnt2, w->isVisible() );
@@ -798,11 +798,11 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
 	TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) );
 
 	if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() )
-		setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
+		setMinimumWidth( m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
 
 	if ( m_pClient->minimumHeight() > m_pManager->m_defaultChildFrmSize.height() )
 	{
-		setMinimumHeight( m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+		setMinimumHeight( m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
 		                  m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR );
 	}
 }
@@ -817,7 +817,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 	TQObject::disconnect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) );
 
 	//reparent to desktop widget , no flags , point , show it
-	TQDict<FocusPolicy>* pFocPolDict;
+	TQDict<TQ_FocusPolicy>* pFocPolDict;
 	pFocPolDict = unlinkChildren();
 
 	// get name of focused child widget
@@ -826,8 +826,8 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 	if ( focusedChildWidget != 0 )
 		nameOfFocusedWidget = focusedChildWidget->name();
 
-	TQSize mins = m_pClient->minimumSize();
-	TQSize maxs = m_pClient->maximumSize();
+	TQSize mins = m_pClient->tqminimumSize();
+	TQSize maxs = m_pClient->tqmaximumSize();
 	m_pClient->reparent( 0, 0, mapToGlobal( pos() ) - pos() + positionOffset, isVisible() );
 	m_pClient->setMinimumSize( mins.width(), mins.height() );
 	m_pClient->setMaximumSize( maxs.width(), maxs.height() );
@@ -842,7 +842,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 	{ // for each found object...
 		TQWidget * widg = ( TQWidget* ) obj;
 		++it;
-		FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
+		TQ_FocusPolicy* pFocPol = pFocPolDict->tqfind( widg->name() ); // remember the focus policy from before the reparent
 		if ( pFocPol )
 			widg->setFocusPolicy( *pFocPol );
 		
@@ -851,7 +851,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 			widg->setFocus();
 
 		// get first and last focusable widget
-		if ( ( widg->focusPolicy() == TQWidget::StrongFocus ) || ( widg->focusPolicy() == TQWidget::TabFocus ) )
+		if ( ( widg->focusPolicy() == TQ_StrongFocus ) || ( widg->focusPolicy() == TQ_TabFocus ) )
 		{
 			if ( firstFocusableChildWidget == 0 )
 				firstFocusableChildWidget = widg;  // first widget
@@ -860,7 +860,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 		}
 		else
 		{
-			if ( widg->focusPolicy() == TQWidget::WheelFocus )
+			if ( widg->focusPolicy() == TQ_WheelFocus )
 			{
 				if ( firstFocusableChildWidget == 0 )
 					firstFocusableChildWidget = widg;  // first widget
@@ -877,14 +877,14 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 	m_pClient->setLastFocusableChildWidget( lastFocusableChildWidget );
 
 	// reset the focus policy of the view
-	m_pClient->setFocusPolicy( TQWidget::ClickFocus );
+	m_pClient->setFocusPolicy( TQ_ClickFocus );
 
 	// lose information about the view (because it's undocked now)
 	m_pClient = 0;
 }
 
 //============== linkChildren =============//
-void KMdiChildFrm::linkChildren( TQDict<FocusPolicy>* pFocPolDict )
+void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict )
 {
 	// reset the focus policies for all widgets in the view (take them from the dictionary)
 	TQObjectList* list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
@@ -894,7 +894,7 @@ void KMdiChildFrm::linkChildren( TQDict<FocusPolicy>* pFocPolDict )
 	{ // for each found object...
 		TQWidget* widg = ( TQWidget* ) obj;
 		++it;
-		FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
+		TQ_FocusPolicy* pFocPol = pFocPolDict->tqfind( widg->name() ); // remember the focus policy from before the reparent
 		
 		if ( pFocPol != 0 )
 			widg->setFocusPolicy( *pFocPol );
@@ -907,14 +907,14 @@ void KMdiChildFrm::linkChildren( TQDict<FocusPolicy>* pFocPolDict )
 	delete pFocPolDict;
 
 	// reset the focus policies for the rest
-	m_pWinIcon->setFocusPolicy( TQWidget::NoFocus );
-	m_pUnixIcon->setFocusPolicy( TQWidget::NoFocus );
-	m_pClient->setFocusPolicy( TQWidget::ClickFocus );
-	m_pCaption->setFocusPolicy( TQWidget::NoFocus );
-	m_pUndock->setFocusPolicy( TQWidget::NoFocus );
-	m_pMinimize->setFocusPolicy( TQWidget::NoFocus );
-	m_pMaximize->setFocusPolicy( TQWidget::NoFocus );
-	m_pClose->setFocusPolicy( TQWidget::NoFocus );
+	m_pWinIcon->setFocusPolicy( TQ_NoFocus );
+	m_pUnixIcon->setFocusPolicy( TQ_NoFocus );
+	m_pClient->setFocusPolicy( TQ_ClickFocus );
+	m_pCaption->setFocusPolicy( TQ_NoFocus );
+	m_pUndock->setFocusPolicy( TQ_NoFocus );
+	m_pMinimize->setFocusPolicy( TQ_NoFocus );
+	m_pMaximize->setFocusPolicy( TQ_NoFocus );
+	m_pClose->setFocusPolicy( TQ_NoFocus );
 
 	// install the event filter (catch mouse clicks) for the rest
 	m_pWinIcon->installEventFilter( this );
@@ -930,10 +930,10 @@ void KMdiChildFrm::linkChildren( TQDict<FocusPolicy>* pFocPolDict )
 
 //============== unlinkChildren =============//
 
-TQDict<TQWidget::FocusPolicy>* KMdiChildFrm::unlinkChildren()
+TQDict<TQ_FocusPolicy>* KMdiChildFrm::unlinkChildren()
 {
 	// memorize the focuses in a dictionary because they will get lost during reparenting
-	TQDict<FocusPolicy>* pFocPolDict = new TQDict<FocusPolicy>;
+	TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>;
 	pFocPolDict->setAutoDelete( true );
 
 	TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
@@ -953,7 +953,7 @@ TQDict<TQWidget::FocusPolicy>* KMdiChildFrm::unlinkChildren()
 			w->setName( tmpStr.latin1() );
 			i++;
 		}
-		FocusPolicy* pFocPol = new FocusPolicy;
+		TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy;
 		*pFocPol = w->focusPolicy();
 		// memorize focus policy
 		pFocPolDict->insert( w->name(), pFocPol );
@@ -1005,7 +1005,7 @@ void KMdiChildFrm::doResize( bool captionOnly )
 	TQWidget* pIconWidget = m_pWinIcon;
 	m_pCaption->setGeometry( KMDI_CHILDFRM_BORDER, KMDI_CHILDFRM_BORDER, captionWidth, captionHeight );
 	
-	//The buttons are caption children
+	//The buttons are caption tqchildren
 	if ( KMdiMainFrm::frameDecorOfAttachedViews() == KMdi::Win95Look )
 	{
 		rightOffset2 += 2;
@@ -1068,7 +1068,7 @@ void KMdiChildFrm::doResize( bool captionOnly )
 static bool hasParent( TQObject* par, TQObject* o )
 {
 	while ( o && o != par )
-		o = o->parent();
+		o = o->tqparent();
 	return o == par;
 }
 
@@ -1085,8 +1085,8 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 			TQObject* pObj = obj;
 			while ( ( pObj != 0L ) && !bIsChild )
 			{
-				bIsChild = ( pObj == this );
-				pObj = pObj->parent();
+				bIsChild = ( TQT_BASE_OBJECT(pObj) == TQT_BASE_OBJECT(this) );
+				pObj = pObj->tqparent();
 			}
 			// unset the resize cursor if the cursor moved from the frame into a inner widget
 			if ( bIsChild )
@@ -1095,33 +1095,33 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 		break;
 	case TQEvent::MouseButtonPress:
 		{
-			if ( !hasParent( m_pClient, obj ) )
+			if ( !hasParent( TQT_TQOBJECT(m_pClient), TQT_TQOBJECT(obj) ) )
 			{
 				bool bIsSecondClick = false;
 				if ( m_timeMeasure.elapsed() <= TQApplication::doubleClickInterval() )
 					bIsSecondClick = true;  // of a possible double click
 
-				if ( !( ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) ) && bIsSecondClick ) )
+				if ( !( ( ( TQT_BASE_OBJECT(obj) == m_pWinIcon ) || ( TQT_BASE_OBJECT(obj) == m_pUnixIcon ) ) && bIsSecondClick ) )
 				{
 					// in case we didn't click on the icon button
 					TQFocusEvent* pFE = new TQFocusEvent( TQFocusEvent::FocusIn );
-					TQApplication::sendEvent( qApp->mainWidget(), pFE );
+					TQApplication::sendEvent( tqApp->mainWidget(), pFE );
 					if ( m_pClient )
 					{
 						m_pClient->updateTimeStamp();
 						m_pClient->activate();
 					}
 					
-					if ( ( obj->parent() != m_pCaption ) && ( obj != m_pCaption ) )
+					if ( ( TQT_BASE_OBJECT(obj->tqparent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) )
 					{
 						TQWidget* w = ( TQWidget* ) obj;
-						if ( ( w->focusPolicy() == TQWidget::ClickFocus ) || ( w->focusPolicy() == TQWidget::StrongFocus ) )
+						if ( ( w->focusPolicy() == TQ_ClickFocus ) || ( w->focusPolicy() == TQ_StrongFocus ) )
 						{
 							w->setFocus();
 						}
 					}
 				}
-				if ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) )
+				if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( TQT_TQOBJECT(obj) == TQT_BASE_OBJECT(m_pUnixIcon) ) )
 				{
 					// in case we clicked on the icon button
 					if ( m_timeMeasure.elapsed() > TQApplication::doubleClickInterval() )
@@ -1139,7 +1139,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 		break;
 	case TQEvent::Resize:
 		{
-			if ( ( ( TQWidget* ) obj == m_pClient ) && ( m_state == Normal ) )
+			if ( ( ( TQWidget* ) TQT_TQOBJECT(obj) == m_pClient ) && ( m_state == Normal ) )
 			{
 				TQResizeEvent* re = ( TQResizeEvent* ) e;
 				int captionHeight = m_pCaption->heightHint();
@@ -1153,8 +1153,8 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 	case TQEvent::ChildRemoved:
 		{
 			// if we lost a child we uninstall ourself as event filter for the lost
-			// child and its children
-			TQObject* pLostChild = ( ( TQChildEvent* ) e )->child();
+			// child and its tqchildren
+			TQObject* pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child());
 			if ( ( pLostChild != 0L )   /*&& (pLostChild->inherits(TQWIDGET_OBJECT_NAME_STRING))*/ )
 			{
 				TQObjectList* list = pLostChild->queryList();
@@ -1174,12 +1174,12 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 	case TQEvent::ChildInserted:
 		{
 			// if we got a new child we install ourself as event filter for the new
-			// child and its children (as we did when we got our client).
+			// child and its tqchildren (as we did when we got our client).
 			// XXX see linkChildren() and focus policy stuff
-			TQObject* pNewChild = ( ( TQChildEvent* ) e ) ->child();
-			if ( ( pNewChild != 0L ) && ::qt_cast<TQWidget*>( pNewChild ) )
+			TQObject* pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
+			if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) )
 			{
-				TQWidget * pNewWidget = static_cast<TQWidget*>( pNewChild );
+				TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild );
 				TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
 				list->insert( 0, pNewChild );         // add the new child to the list too, just to save code
 				TQObjectListIt it( *list );          // iterate over all new child widgets
@@ -1188,7 +1188,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 				{ // for each found object...
 					TQWidget * widg = ( TQWidget* ) obj;
 					++it;
-					if ( !::qt_cast<TQPopupMenu*>( widg ) )
+					if ( !::tqqt_cast<TQPopupMenu*>( widg ) )
 					{
 						widg->installEventFilter( this );
 					}
@@ -1201,7 +1201,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 		break;
 	}
 
-	return false;                  // standard event processing (see Qt documentation)
+	return false;                  // standard event processing (see TQt documentation)
 }
 
 //============= raiseAndActivate ===============//
@@ -1284,9 +1284,9 @@ void KMdiChildFrm::showSystemMenu()
 	
 	TQRect iconGeom;
 	if ( KMdiMainFrm::frameDecorOfAttachedViews() == KMdi::Win95Look )
-		iconGeom = m_pWinIcon->geometry();
+		iconGeom = m_pWinIcon->tqgeometry();
 	else
-		iconGeom = m_pUnixIcon->geometry();
+		iconGeom = m_pUnixIcon->tqgeometry();
 	
 	popupmenuPosition = TQPoint( iconGeom.x(), iconGeom.y() + captionHeight() + KMDI_CHILDFRM_BORDER );
 	systemMenu() ->popup( mapToGlobal( popupmenuPosition ) );
@@ -1308,7 +1308,7 @@ void KMdiChildFrm::switchToMinimizeLayout()
 	resize( 300, minimumHeight() );
 
 	// positioning
-	m_pManager->layoutMinimizedChildren();
+	m_pManager->tqlayoutMinimizedChildren();
 }
 
 void KMdiChildFrm::slot_resizeViaSystemMenu()
@@ -1394,7 +1394,7 @@ void KMdiChildFrm::redecorateButtons()
 
 TQRect KMdiChildFrm::mdiAreaContentsRect() const
 {
-	TQFrame * p = ( TQFrame* ) parentWidget();
+	TQFrame * p = ( TQFrame* ) tqparentWidget();
 	if ( p )
 	{
 		return p->contentsRect();
@@ -1406,4 +1406,4 @@ TQRect KMdiChildFrm::mdiAreaContentsRect() const
 	}
 }
 
-// kate: indent-mode csands; tab-width 4; space-indent off; replace-tabs off;
+// kate: indent-mode csands; tab-width 4; space-indent off; tqreplace-tabs off;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
index 23435479..535804e8 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
@@ -6,8 +6,8 @@
 //    begin                : 07/1999       by Szymon Stefanek as part of kvirc
 //                                         (an IRC application)
 //    changes              : 09/1999       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //    patches              : */2000        Lars Beikirch (Lars.Beikirch@gmx.net)
 //
@@ -49,11 +49,12 @@ class TQToolButton;
   * @short Internal class, only used on Win32.
   * This class provides a label widget that can process mouse click events.
   */
-class KMDI_EXPORT KMdiWin32IconButton : public QLabel
+class KMDI_EXPORT KMdiWin32IconButton : public TQLabel
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KMdiWin32IconButton( TQWidget* parent, const char* name = 0 );
+	KMdiWin32IconButton( TQWidget* tqparent, const char* name = 0 );
 	virtual void mousePressEvent( TQMouseEvent* );
 
 signals:
@@ -68,7 +69,7 @@ signals:
  * @short a TQCustomEvent for move
  * This special event will be useful, to inform view about child frame event.
  */
-class KMDI_EXPORT KMdiChildFrmMoveEvent : public QCustomEvent
+class KMDI_EXPORT KMdiChildFrmMoveEvent : public TQCustomEvent
 {
 public:
 	KMdiChildFrmMoveEvent( TQMoveEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_Move ) ), e ) {}
@@ -80,7 +81,7 @@ public:
  * @short a TQCustomEvent for begin of dragging
  * This special event will be useful, to inform view about child frame event.
  */
-class KMDI_EXPORT KMdiChildFrmDragBeginEvent : public QCustomEvent
+class KMDI_EXPORT KMdiChildFrmDragBeginEvent : public TQCustomEvent
 {
 public:
 	KMdiChildFrmDragBeginEvent( TQMouseEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_DragBegin ) ), e ) {}
@@ -91,7 +92,7 @@ public:
  * @short a TQCustomEvent for end of dragging
  * This special event will be useful, to inform view about child frame event.
  */
-class KMDI_EXPORT KMdiChildFrmDragEndEvent : public QCustomEvent
+class KMDI_EXPORT KMdiChildFrmDragEndEvent : public TQCustomEvent
 {
 public:
 	KMdiChildFrmDragEndEvent( TQMouseEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_DragEnd ) ), e ) {}
@@ -102,7 +103,7 @@ public:
  * @short a TQCustomEvent for begin of resizing
  * This special event will be useful, to inform view about child frame event.
  */
-class KMDI_EXPORT KMdiChildFrmResizeBeginEvent : public QCustomEvent
+class KMDI_EXPORT KMdiChildFrmResizeBeginEvent : public TQCustomEvent
 {
 public:
 	KMdiChildFrmResizeBeginEvent( TQMouseEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_ResizeBegin ) ), e ) {}
@@ -113,7 +114,7 @@ public:
  * @short a TQCustomEvent for end of resizing
  * This special event will be useful, to inform view about child frame event.
  */
-class KMDI_EXPORT KMdiChildFrmResizeEndEvent : public QCustomEvent
+class KMDI_EXPORT KMdiChildFrmResizeEndEvent : public TQCustomEvent
 {
 public:
 	KMdiChildFrmResizeEndEvent( TQMouseEvent *e ) : TQCustomEvent( TQEvent::Type( TQEvent::User + int( KMdi::EV_ResizeEnd ) ), e ) {}
@@ -127,12 +128,13 @@ class KMdiChildFrmPrivate;
   * It's an MDI child frame widget. It contains a view widget and a frame caption. Usually you derive from its view.
   */ 
 //------------------------------------------------------------------------------
-class KMDI_EXPORT KMdiChildFrm : public QFrame
+class KMDI_EXPORT KMdiChildFrm : public TQFrame
 {
 	friend class KMdiChildArea;
 	friend class KMdiChildFrmCaption;
 
 	Q_OBJECT
+  TQ_OBJECT
 
 	// attributes
 public:
@@ -183,7 +185,7 @@ public:
 	/**
 	 * Creates a new KMdiChildFrm class.
 	 */
-	KMdiChildFrm( KMdiChildArea *parent );
+	KMdiChildFrm( KMdiChildArea *tqparent );
 	
 	/**
 	 * Destroys this KMdiChildFrm
@@ -192,14 +194,14 @@ public:
 	~KMdiChildFrm();
 	
 	/**
-	 * Reparents the widget w to this KMdiChildFrm (if this is not already done)
+	 * Retqparents the widget w to this KMdiChildFrm (if this is not already done)
 	 * Installs an event filter to catch focus events.
 	 * Resizes this mdi child in a way that the child fits perfectly in.
 	 */
 	void setClient( KMdiChildView *w, bool bAutomaticResize = false );
 	
 	/**
-	 * Reparents the client widget to 0 (desktop), moves with an offset from the original position
+	 * Retqparents the client widget to 0 (desktop), moves with an offset from the original position
 	 * Removes the event filter.
 	 */
 	void unsetClient( TQPoint positionOffset = TQPoint( 0, 0 ) );
@@ -240,17 +242,17 @@ public:
 	inline MdiWindowState state() const { return m_state; }
 	
 	/**
-	 * Returns the inner client area of the parent of this (which is KMdiChildArea).
+	 * Returns the inner client area of the tqparent of this (which is KMdiChildArea).
 	 */
 	TQRect mdiAreaContentsRect() const;
 	
 	/**
-	 * Returns the geometry that will be restored by calling restore().
+	 * Returns the tqgeometry that will be restored by calling restore().
 	 */
 	TQRect restoreGeometry() const;
 	
 	/**
-	 * Sets the geometry that will be restored by calling restore().
+	 * Sets the tqgeometry that will be restored by calling restore().
 	 */
 	void setRestoreGeometry( const TQRect& newRestGeo );
 	
@@ -306,7 +308,7 @@ protected:
 	
 	/**
 	 * Reimplemented from the base class.
-	 * Resizes the captionbar, relayouts the position of the system buttons,
+	 * Resizes the captionbar, retqlayouts the position of the system buttons,
 	 * and calls resize for its embedded KMdiChildView with the proper size
 	 */
 	virtual void resizeEvent( TQResizeEvent * );
@@ -352,7 +354,7 @@ protected:
 	virtual bool eventFilter( TQObject*, TQEvent* ); 
 	
 	/**
-	 * Calculates the new geometry from the new mouse position given as parameters
+	 * Calculates the new tqgeometry from the new mouse position given as parameters
 	 * and calls KMdiChildFrm::setGeometry
 	 */
 	void resizeWindow( int resizeCorner, int x, int y );
@@ -422,13 +424,13 @@ protected:
 	 * Restore the focus policies for _all_ widgets in the view using the list given as parameter.
 	 * Install the event filter for all direct child widgets of this. (See KMdiChildFrm::eventFilter)
 	 */
-	void linkChildren( TQDict<FocusPolicy>* pFocPolDict );
+	void linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict );
 
 	/**
 	 * Backups all focus policies of _all_ child widgets in the MDI childview since they get lost during a reparent.
 	 * Remove all event filters for all direct child widgets of this. (See KMdiChildFrm::eventFilter)
 	 */
-	TQDict<TQWidget::FocusPolicy>* unlinkChildren();
+	TQDict<TQ_FocusPolicy>* unlinkChildren();
 	
 	/**
 	 * Calculates the corner id for the resize cursor. The return value can be tested for:
@@ -443,4 +445,4 @@ private:
 
 #endif //_KMDICHILDFRM_H_
 
-// kate: space-indent off; replace-tabs off; tab-width 4; indent-mode csands;
+// kate: space-indent off; tqreplace-tabs off; tab-width 4; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp
index 65d348f3..add999e9 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp
@@ -6,8 +6,8 @@
 //    begin                : 07/1999       by Szymon Stefanek as part of kvirc
 //                                         (an IRC application)
 //    changes              : 09/1999       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //
 //    copyright            : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
@@ -41,7 +41,7 @@
 #include <klocale.h>
 #include <iostream>
 
-#ifdef Q_WS_WIN 
+#ifdef TQ_WS_WIN 
 //TODO: one day gradient can be added for win98/winnt5+
 // ask system properties on windows
 #ifndef SPI_GETGRADIENTCAPTIONS
@@ -65,14 +65,14 @@
 
 //============== KMdiChildFrmCaption =============//
 
-KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *parent )
-		: TQWidget( parent, "kmdi_childfrmcaption" )
+KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *tqparent )
+		: TQWidget( tqparent, "kmdi_childfrmcaption" )
 {
 	m_szCaption = i18n( "Unnamed" );
 	m_bActive = false;
-	m_pParent = parent;
+	m_pParent = tqparent;
 	setBackgroundMode( NoBackground );
-	setFocusPolicy( NoFocus );
+	setFocusPolicy( TQ_NoFocus );
 	m_bChildInDrag = false;
 }
 
@@ -85,17 +85,17 @@ KMdiChildFrmCaption::~KMdiChildFrmCaption()
 
 void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e )
 {
-	if ( e->button() == LeftButton )
+	if ( e->button() == Qt::LeftButton )
 	{
 		setMouseTracking( false );
 		if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
 		{
-			TQApplication::setOverrideCursor( Qt::sizeAllCursor, true );
+			TQApplication::setOverrideCursor( TQt::sizeAllCursor, true );
 		}
 		m_pParent->m_bDragging = true;
 		m_offset = mapToParent( e->pos() );
 	}
-	else if ( e->button() == RightButton )
+	else if ( e->button() == Qt::RightButton )
 	{
 		m_pParent->systemMenu()->popup( mapToGlobal( e->pos() ) );
 	}
@@ -105,7 +105,7 @@ void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e )
 
 void KMdiChildFrmCaption::mouseReleaseEvent( TQMouseEvent *e )
 {
-	if ( e->button() == LeftButton )
+	if ( e->button() == Qt::LeftButton )
 	{
 		if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
 			TQApplication::restoreOverrideCursor();
@@ -146,7 +146,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e )
 	TQPoint relMousePosInChildArea = m_pParent->m_pManager->mapFromGlobal( e->globalPos() );
 
 	// mouse out of child area? stop child frame dragging
-	if ( !m_pParent->m_pManager->rect().contains( relMousePosInChildArea ) )
+	if ( !TQT_TQRECT_OBJECT(m_pParent->m_pManager->rect()).tqcontains( relMousePosInChildArea ) )
 	{
 		if ( relMousePosInChildArea.x() < 0 )
 			relMousePosInChildArea.rx() = 0;
@@ -163,7 +163,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e )
 	TQPoint mousePosInChildArea = relMousePosInChildArea - m_offset;
 
 	// set new child frame position
-	parentWidget() ->move( mousePosInChildArea );
+	tqparentWidget() ->move( mousePosInChildArea );
 }
 
 //=============== setActive ===============//
@@ -182,7 +182,7 @@ void KMdiChildFrmCaption::setActive( bool bActive )
 	                                            m_pParent->m_pManager->m_captionInactiveBackColor );
 
 	m_bActive = bActive;
-	repaint( false );
+	tqrepaint( false );
 }
 
 //=============== setCaption ===============//
@@ -190,7 +190,7 @@ void KMdiChildFrmCaption::setActive( bool bActive )
 void KMdiChildFrmCaption::setCaption( const TQString& text )
 {
 	m_szCaption = text;
-	repaint( false );
+	tqrepaint( false );
 }
 
 //============== heightHint ===============//
@@ -313,10 +313,10 @@ void KMdiChildFrmCaption::slot_moveViaSystemMenu()
 	grabMouse();
 	
 	if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
-		TQApplication::setOverrideCursor( Qt::sizeAllCursor, true );
+		TQApplication::setOverrideCursor( TQt::sizeAllCursor, true );
 	
 	m_pParent->m_bDragging = true;
 	m_offset = mapFromGlobal( TQCursor::pos() );
 }
 
-// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
+// kate: space-indent off; tqreplace-tabs off; indent-mode csands; tab-width 4;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h
index 4151f0c0..b3c8d88a 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.h
@@ -6,8 +6,8 @@
 //    begin                : 07/1999       by Szymon Stefanek as part of kvirc
 //                                         (an IRC application)
 //    changes              : 09/1999       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //
 //    copyright            : (C) 1999-2003 by Falk Brettschneider
@@ -41,14 +41,15 @@ class KMdiChildFrmCaptionPrivate;
 *
 * It's the caption bar of a child frame widget.
 */
-class KMDI_EXPORT KMdiChildFrmCaption : public QWidget
+class KMDI_EXPORT KMdiChildFrmCaption : public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
 	 * Constructor
 	 */
-	KMdiChildFrmCaption( KMdiChildFrm *parent );
+	KMdiChildFrmCaption( KMdiChildFrm *tqparent );
 	
 	/**
 	 * Destructor
@@ -88,7 +89,7 @@ protected:
 	virtual void mousePressEvent( TQMouseEvent * );
 	
 	/**
-	 * Calls maximizePressed of the parent widget ( KMdiChildFrm )
+	 * Calls maximizePressed of the tqparent widget ( KMdiChildFrm )
 	 */
 	virtual void mouseDoubleClickEvent( TQMouseEvent * );
 	
@@ -117,7 +118,7 @@ public:
 
 protected:  // Protected attributes
 	/**
-	 * parent widget
+	 * tqparent widget
 	 */
 	KMdiChildFrm *m_pParent;
 	
@@ -127,7 +128,7 @@ protected:  // Protected attributes
 	bool m_bActive;
 	
 	/**
-	 * the position offset related to its parent widget (internally used for translating mouse move positions
+	 * the position offset related to its tqparent widget (internally used for translating mouse move positions
 	 */
 	TQPoint m_offset;
 	
@@ -142,4 +143,4 @@ private:
 
 #endif //_KMDICAPTION_H_
 
-// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
+// kate: space-indent off; tqreplace-tabs off; indent-mode csands; tab-width 4;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp
index 57c0bea4..ba80552a 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp
@@ -6,8 +6,8 @@
 //    begin                : 07/1999       by Szymon Stefanek as part of kvirc
 //                                         (an IRC application)
 //    changes              : 09/1999       by Falk Brettschneider to create a
-//                           -06/2000      stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           -06/2000      stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //    patches              : 02/2000       by Massimo Morin (mmorin@schedsys.com)
 //                           */2000        by Lars Beikirch (Lars.Beikirch@gmx.net)
@@ -44,8 +44,8 @@
 
 //============ KMdiChildView ============//
 
-KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, const char* name, WFlags f )
-	: TQWidget( parentWidget, name, f )
+KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* tqparentWidget, const char* name, WFlags f )
+	: TQWidget( tqparentWidget, name, f )
 	, m_focusedChildWidget( 0L )
 	, m_firstFocusableChildWidget( 0L )
 	, m_lastFocusableChildWidget( 0L )
@@ -63,7 +63,7 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, c
 		m_szCaption = i18n( "Unnamed" );
 	
 	m_sTabCaption = m_szCaption;
-	setFocusPolicy( ClickFocus );
+	setFocusPolicy( TQ_ClickFocus );
 	installEventFilter( this );
 	
 	// store the current time
@@ -73,8 +73,8 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, c
 
 //============ KMdiChildView ============//
 
-KMdiChildView::KMdiChildView( TQWidget* parentWidget, const char* name, WFlags f )
-	: TQWidget( parentWidget, name, f )
+KMdiChildView::KMdiChildView( TQWidget* tqparentWidget, const char* name, WFlags f )
+	: TQWidget( tqparentWidget, name, f )
 	, m_focusedChildWidget( 0L )
 	, m_firstFocusableChildWidget( 0L )
 	, m_lastFocusableChildWidget( 0L )
@@ -87,7 +87,7 @@ KMdiChildView::KMdiChildView( TQWidget* parentWidget, const char* name, WFlags f
 	setGeometry( 0, 0, 0, 0 );  // reset
 	m_szCaption = i18n( "Unnamed" );
 	m_sTabCaption = m_szCaption;
-	setFocusPolicy( ClickFocus );
+	setFocusPolicy( TQ_ClickFocus );
 	installEventFilter( this );
 
 	// store the current time
@@ -107,15 +107,15 @@ void KMdiChildView::trackIconAndCaptionChanges( TQWidget *view )
 }
 
 
-//============== internal geometry ==============//
+//============== internal tqgeometry ==============//
 
 TQRect KMdiChildView::internalGeometry() const
 {
 	if ( mdiParent() )
 	{ // is attached
 		// get the client area coordinates inside the MDI child frame
-		TQRect posInFrame = geometry();
-		// map these values to the parent of the MDI child frame
+		TQRect posInFrame = tqgeometry();
+		// map these values to the tqparent of the MDI child frame
 		// (this usually is the MDI child area) and return
 		TQPoint ptTopLeft = mdiParent() ->mapToParent( posInFrame.topLeft() );
 		TQSize sz = size();
@@ -123,14 +123,14 @@ TQRect KMdiChildView::internalGeometry() const
 	}
 	else
 	{
-		TQRect geo = geometry();
+		TQRect geo = tqgeometry();
 		TQRect frameGeo = externalGeometry();
 		return TQRect( frameGeo.x(), frameGeo.y(), geo.width(), geo.height() );
-		//      return geometry();
+		//      return tqgeometry();
 	}
 }
 
-//============== set internal geometry ==============//
+//============== set internal tqgeometry ==============//
 
 void KMdiChildView::setInternalGeometry( const TQRect& newGeometry )
 {
@@ -142,18 +142,18 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry )
 		int nFrameSizeTop = geo.y() - frameGeo.y();
 		int nFrameSizeLeft = geo.x() - frameGeo.x();
 
-		// create the new geometry that is accepted by the TQWidget::setGeometry() method
-		TQRect newGeoQt;
-		newGeoQt.setX( newGeometry.x() - nFrameSizeLeft );
-		newGeoQt.setY( newGeometry.y() - nFrameSizeTop );
+		// create the new tqgeometry that is accepted by the TQWidget::setGeometry() method
+		TQRect newGeoTQt;
+		newGeoTQt.setX( newGeometry.x() - nFrameSizeLeft );
+		newGeoTQt.setY( newGeometry.y() - nFrameSizeTop );
 
-		newGeoQt.setWidth( newGeometry.width() + nFrameSizeLeft + KMDI_CHILDFRM_DOUBLE_BORDER / 2 );
-		newGeoQt.setHeight( newGeometry.height() + nFrameSizeTop + KMDI_CHILDFRM_DOUBLE_BORDER / 2 );
-		//      newGeoQt.setWidth(newGeometry.width()+KMDI_MDI_CHILDFRM_DOUBLE_BORDER);
-		//      newGeoQt.setHeight(newGeometry.height()+mdiParent()->captionHeight()+KMDI_MDI_CHILDFRM_DOUBLE_BORDER);
+		newGeoTQt.setWidth( newGeometry.width() + nFrameSizeLeft + KMDI_CHILDFRM_DOUBLE_BORDER / 2 );
+		newGeoTQt.setHeight( newGeometry.height() + nFrameSizeTop + KMDI_CHILDFRM_DOUBLE_BORDER / 2 );
+		//      newGeoTQt.setWidth(newGeometry.width()+KMDI_MDI_CHILDFRM_DOUBLE_BORDER);
+		//      newGeoTQt.setHeight(newGeometry.height()+mdiParent()->captionHeight()+KMDI_MDI_CHILDFRM_DOUBLE_BORDER);
 
-		// set the geometry
-		mdiParent()->setGeometry( newGeoQt );
+		// set the tqgeometry
+		mdiParent()->setGeometry( newGeoTQt );
 	}
 	else
 	{
@@ -163,28 +163,28 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry )
 		int nFrameSizeTop = geo.y() - frameGeo.y();
 		int nFrameSizeLeft = geo.x() - frameGeo.x();
 
-		// create the new geometry that is accepted by the TQWidget::setGeometry() method
-		TQRect newGeoQt;
+		// create the new tqgeometry that is accepted by the TQWidget::setGeometry() method
+		TQRect newGeoTQt;
 
-		newGeoQt.setX( newGeometry.x() - nFrameSizeLeft );
-		newGeoQt.setY( newGeometry.y() - nFrameSizeTop );
+		newGeoTQt.setX( newGeometry.x() - nFrameSizeLeft );
+		newGeoTQt.setY( newGeometry.y() - nFrameSizeTop );
 
-		newGeoQt.setWidth( newGeometry.width() );
-		newGeoQt.setHeight( newGeometry.height() );
+		newGeoTQt.setWidth( newGeometry.width() );
+		newGeoTQt.setHeight( newGeometry.height() );
 
-		// set the geometry
-		setGeometry( newGeoQt );
+		// set the tqgeometry
+		setGeometry( newGeoTQt );
 	}
 }
 
-//============== external geometry ==============//
+//============== external tqgeometry ==============//
 
 TQRect KMdiChildView::externalGeometry() const
 {
 	return mdiParent() ? mdiParent()->frameGeometry() : frameGeometry();
 }
 
-//============== set external geometry ==============//
+//============== set external tqgeometry ==============//
 
 void KMdiChildView::setExternalGeometry( const TQRect& newGeometry )
 {
@@ -202,16 +202,16 @@ void KMdiChildView::setExternalGeometry( const TQRect& newGeometry )
 		int nFrameSizeTop = geo.y() - frameGeo.y();
 		int nFrameSizeLeft = geo.x() - frameGeo.x();
 
-		// create the new geometry that is accepted by the TQWidget::setGeometry() method
+		// create the new tqgeometry that is accepted by the TQWidget::setGeometry() method
 		// not attached => the window system makes the frame
-		TQRect newGeoQt;
-		newGeoQt.setX( newGeometry.x() + nFrameSizeLeft );
-		newGeoQt.setY( newGeometry.y() + nFrameSizeTop );
-		newGeoQt.setWidth( newGeometry.width() - nTotalFrameWidth );
-		newGeoQt.setHeight( newGeometry.height() - nTotalFrameHeight );
-
-		// set the geometry
-		setGeometry( newGeoQt );
+		TQRect newGeoTQt;
+		newGeoTQt.setX( newGeometry.x() + nFrameSizeLeft );
+		newGeoTQt.setY( newGeometry.y() + nFrameSizeTop );
+		newGeoTQt.setWidth( newGeometry.width() - nTotalFrameWidth );
+		newGeoTQt.setHeight( newGeometry.height() - nTotalFrameHeight );
+
+		// set the tqgeometry
+		setGeometry( newGeoTQt );
 	}
 }
 
@@ -277,7 +277,7 @@ TQRect KMdiChildView::restoreGeometry()
 	if ( mdiParent() )
 		return mdiParent() ->restoreGeometry();
 	else //FIXME not really supported, may be we must use Windows or X11 funtions
-		return geometry();
+		return tqgeometry();
 }
 
 //============== setRestoreGeometry ================//
@@ -362,7 +362,7 @@ void KMdiChildView::youAreDetached()
 	if ( myIconPtr() )
 		setIcon( *( myIconPtr() ) );
 	
-	setFocusPolicy( TQWidget::StrongFocus );
+	setFocusPolicy( TQ_StrongFocus );
 
 	emit isDetachedNow();
 }
@@ -375,7 +375,7 @@ void KMdiChildView::setCaption( const TQString& szCaption )
 	m_szCaption = szCaption;
 	if ( mdiParent() )
 		mdiParent() ->setCaption( m_szCaption );
-	else //have to call the parent one
+	else //have to call the tqparent one
 		TQWidget::setCaption( m_szCaption );
 
 	emit windowCaptionChanged( m_szCaption );
@@ -491,8 +491,8 @@ void KMdiChildView::slot_childDestroyed()
 	// do what we do if a child is removed
 
 	// if we lost a child we uninstall ourself as event filter for the lost
-	// child and its children
-	const TQObject * pLostChild = TQObject::sender();
+	// child and its tqchildren
+	const TQObject * pLostChild = TQT_TQOBJECT(TQT_BASE_OBJECT_NAME::sender());
 	if ( pLostChild && ( pLostChild->isWidgetType() ) )
 	{
 		TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( TQWIDGET_OBJECT_NAME_STRING );
@@ -523,11 +523,11 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 	if ( e->type() == TQEvent::KeyPress && isAttached() )
 	{
 		TQKeyEvent* ke = ( TQKeyEvent* ) e;
-		if ( ke->key() == Qt::Key_Tab )
+		if ( ke->key() == TQt::Key_Tab )
 		{
 			TQWidget* w = ( TQWidget* ) obj;
-			FocusPolicy wfp = w->focusPolicy();
-			if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || w->focusPolicy() == TQWidget::WheelFocus )
+			TQ_FocusPolicy wfp = w->focusPolicy();
+			if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || w->focusPolicy() == TQ_WheelFocus )
 			{
 				if ( m_lastFocusableChildWidget != 0 )
 				{
@@ -545,7 +545,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 		if ( obj->isWidgetType() )
 		{
 			TQObjectList * list = queryList( TQWIDGET_OBJECT_NAME_STRING );
-			if ( list->find( obj ) != -1 )
+			if ( list->tqfind( obj ) != -1 )
 				m_focusedChildWidget = ( TQWidget* ) obj;
 
 			delete list;   // delete the list, not the objects
@@ -564,8 +564,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 	else if ( e->type() == TQEvent::ChildRemoved )
 	{
 		// if we lost a child we uninstall ourself as event filter for the lost
-		// child and its children
-		TQObject * pLostChild = ( ( TQChildEvent* ) e ) ->child();
+		// child and its tqchildren
+		TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
 		if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) )
 		{
 			TQObjectList * list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING );
@@ -577,8 +577,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 				TQWidget * widg = ( TQWidget* ) o;
 				++it;
 				widg->removeEventFilter( this );
-				FocusPolicy wfp = widg->focusPolicy();
-				if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus )
+				TQ_FocusPolicy wfp = widg->focusPolicy();
+				if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus )
 				{
 					if ( m_firstFocusableChildWidget == widg )
 						m_firstFocusableChildWidget = 0L;   // reset first widget
@@ -593,13 +593,13 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 	else if ( e->type() == TQEvent::ChildInserted )
 	{
 		// if we got a new child and we are attached to the MDI system we
-		// install ourself as event filter for the new child and its children
+		// install ourself as event filter for the new child and its tqchildren
 		// (as we did when we were added to the MDI system).
-		TQObject * pNewChild = ( ( TQChildEvent* ) e ) ->child();
+		TQObject * pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
 		if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) )
 		{
 			TQWidget * pNewWidget = ( TQWidget* ) pNewChild;
-			if ( pNewWidget->testWFlags( Qt::WType_Dialog | Qt::WShowModal ) )
+			if ( pNewWidget->testWFlags( TQt::WType_Dialog | TQt::WShowModal ) )
 				return false;
 			TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
 			list->insert( 0, pNewChild );         // add the new child to the list too, just to save code
@@ -611,8 +611,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 				++it;
 				widg->installEventFilter( this );
 				connect( widg, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slot_childDestroyed() ) );
-				FocusPolicy wfp = widg->focusPolicy();
-				if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus )
+				TQ_FocusPolicy wfp = widg->focusPolicy();
+				if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus )
 				{
 					if ( m_firstFocusableChildWidget == 0 )
 						m_firstFocusableChildWidget = widg;  // first widge
@@ -628,14 +628,14 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 		if ( e->type() == TQEvent::IconChange )
 		{
 			//            qDebug("KMDiChildView:: TQEvent:IconChange intercepted\n");
-			if ( obj == this )
+			if ( TQT_BASE_OBJECT(obj) == this )
 				iconUpdated( this, icon() ? ( *icon() ) : TQPixmap() );
-			else if ( obj == m_trackChanges )
+			else if ( TQT_BASE_OBJECT(obj) == m_trackChanges )
 				setIcon( m_trackChanges->icon() ? ( *( m_trackChanges->icon() ) ) : TQPixmap() );
 		}
 		if ( e->type() == TQEvent::CaptionChange )
 		{
-			if ( obj == this )
+			if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) )
 				captionUpdated( this, caption() );
 		}
 	}
@@ -728,12 +728,12 @@ void KMdiChildView::setMaximumSize( int maxw, int maxh )
 	if ( mdiParent() && mdiParent()->state() == KMdiChildFrm::Normal )
 	{
 		int w = maxw + KMDI_CHILDFRM_DOUBLE_BORDER;
-		if ( w > QWIDGETSIZE_MAX )
-			w = QWIDGETSIZE_MAX;
+		if ( w > TQWIDGETSIZE_MAX )
+			w = TQWIDGETSIZE_MAX;
 
 		int h = maxh + KMDI_CHILDFRM_DOUBLE_BORDER + KMDI_CHILDFRM_SEPARATOR + mdiParent() ->captionHeight();
-		if ( h > QWIDGETSIZE_MAX )
-			h = QWIDGETSIZE_MAX;
+		if ( h > TQWIDGETSIZE_MAX )
+			h = TQWIDGETSIZE_MAX;
 
 		mdiParent()->setMaximumSize( w, h );
 	}
@@ -770,4 +770,4 @@ void KMdiChildView::raise()
 	TQWidget::raise();
 }
 
-// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
+// kate: space-indent off; tqreplace-tabs off; indent-mode csands; tab-width 4;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.h b/lib/compatibility/kmdi/qextmdi/kmdichildview.h
index 656c17fd..298b2198 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildview.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.h
@@ -6,8 +6,8 @@
 //    begin                : 07/1999       by Szymon Stefanek as part of kvirc
 //                                         (an IRC application)
 //    changes              : 09/1999       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //    patches              : 02/2000       by Massimo Morin (mmorin@schedsys.com)
 //                           */2000        by Lars Beikirch (Lars.Beikirch@gmx.net)
@@ -49,7 +49,7 @@ class KMdiChildViewPrivate;
   *
   * All such windows 'lives' attached to a KMdiChildFrm widget
   * managed by KMdiChildArea, or detached (managed by the window manager.)
-  * So remember that the KMdiChildView::parent pointer may change, and may be 0L, too.
+  * So remember that the KMdiChildView::tqparent pointer may change, and may be 0L, too.
   *
   * There are 2 possibilities for you to put your widgets under MDI control:
   *
@@ -71,14 +71,14 @@ class KMdiChildViewPrivate;
   *   KMdiChildView* pMDICover = new KMdiChildView( pNewView->caption());
   *   pMDICover->setIcon(icon);
   *   m_MDICoverList.append( pMDICover);
-  *   TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "layout");
+  *   TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout");
   *   pNewView->reparent( pMDICover, TQPoint(0,0));
   *   pLayout->addWidget( pNewView);
   *   pMDICover->setName( pNewView->name());
   *   // captions
   *   TQString shortName = pNewView->caption();
   *   int length = shortName.length();
-  *   shortName = shortName.right(length - (shortName.findRev('/') +1));
+  *   shortName = shortName.right(length - (shortName.tqfindRev('/') +1));
   *   pMDICover->setTabCaption( shortName);
   *   pMDICover->setCaption(pNewView->caption());
   *
@@ -105,11 +105,12 @@ class KMdiChildViewPrivate;
   *
   */
 
-class KMDI_EXPORT KMdiChildView : public QWidget
+class KMDI_EXPORT KMdiChildView : public TQWidget
 {
 	friend class KMdiMainFrm;
 	friend class KMdiChildFrm;
 	Q_OBJECT
+  TQ_OBJECT
 
 	// attributes
 protected:
@@ -182,13 +183,13 @@ public:
 	/**
 	 * Constructor
 	 */
-	KMdiChildView( const TQString& caption, TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 );
+	KMdiChildView( const TQString& caption, TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 );
 	
 	/**
 	 * Constructor 
 	 * sets "Unnamed" as default caption
 	 */
-	KMdiChildView( TQWidget* parentWidget = 0L, const char* name = 0L, WFlags f = 0 );
+	KMdiChildView( TQWidget* tqparentWidget = 0L, const char* name = 0L, WFlags f = 0 );
 	
 	/**
 	 * Destructor
@@ -253,7 +254,7 @@ public:
 	virtual void setMDICaption( const TQString &caption );
 	
 	/**
-	 * Returns the KMdiChildFrm parent widget (or 0 if the window is not attached)
+	 * Returns the KMdiChildFrm tqparent widget (or 0 if the window is not attached)
 	 */
 	KMdiChildFrm *mdiParent() const;
 	
@@ -270,28 +271,28 @@ public:
 	bool isMaximized() const;
 	
 	/**
-	 * Returns the geometry of this MDI child window as TQWidget::geometry() does.
+	 * Returns the tqgeometry of this MDI child window as TQWidget::tqgeometry() does.
 	 */
 	TQRect internalGeometry() const;
 	
 	/**
-	 * Sets the geometry of the client area of this MDI child window. The
+	 * Sets the tqgeometry of the client area of this MDI child window. The
 	 * top left position of the argument is the position of the top left point
-	 * of the client area in its parent coordinates and the arguments width
+	 * of the client area in its tqparent coordinates and the arguments width
 	 * and height is the width and height of the client area. Please note: This
 	 * differs from the behavior of TQWidget::setGeometry()!
 	 */
 	void setInternalGeometry( const TQRect& newGeomety );
 	
 	/**
-	 * Returns the frame geometry of this window or of the parent if there is any...
+	 * Returns the frame tqgeometry of this window or of the tqparent if there is any...
 	 */
 	TQRect externalGeometry() const;
 	
 	/**
-	 * Sets the geometry of the frame of this MDI child window. The top left
+	 * Sets the tqgeometry of the frame of this MDI child window. The top left
 	 * position of the argument is the position of the top left point of the
-	 * frame in its parent coordinates and the arguments width and height is
+	 * frame in its tqparent coordinates and the arguments width and height is
 	 * the width and height of the widget frame. Please note: This differs
 	 * from the behavior of TQWidget::setGeometry()!
 	 */
@@ -315,12 +316,12 @@ public:
 	virtual void maximize( bool bAnimate );
 	
 	/**
-	 * Returns the geometry that will be restored by calling restore().
+	 * Returns the tqgeometry that will be restored by calling restore().
 	 */
 	TQRect restoreGeometry();
 	
 	/**
-	 * Sets the geometry that will be restored by calling restore().
+	 * Sets the tqgeometry that will be restored by calling restore().
 	 */
 	void setRestoreGeometry( const TQRect& newRestGeo );
 	
@@ -358,7 +359,7 @@ public:
 	 */
 	inline void updateTimeStamp()
 	{
-		m_time.setDate( TQDate::currentDate() );
+		m_time.setDate( TQDate::tqcurrentDate() );
 		m_time.setTime( TQTime::currentTime() );
 	}
 	
@@ -424,17 +425,17 @@ public slots:
 	virtual void slot_clickedInDockMenu();
 	
 	/**
-	 * Calls TQWidget::show but also for it's parent widget if attached
+	 * Calls TQWidget::show but also for it's tqparent widget if attached
 	 */
 	virtual void show();
 	
 	/**
-	 * Calls TQWidget::hide() or it's parent widget hide() if attached
+	 * Calls TQWidget::hide() or it's tqparent widget hide() if attached
 	 */
 	virtual void hide();
 	
 	/**
-	 * Calls TQWidget::raise() or it's parent widget raise() if attached
+	 * Calls TQWidget::raise() or it's tqparent widget raise() if attached
 	 */
 	virtual void raise();
 	
@@ -465,7 +466,7 @@ protected:
 	virtual void closeEvent( TQCloseEvent *e );
 	
 	/**
-	 * It only catches TQEvent::KeyPress events there. If a Qt::Key_Tab is pressed, the internal MDI focus
+	 * It only catches TQEvent::KeyPress events there. If a TQt::Key_Tab is pressed, the internal MDI focus
 	 * handling is called. That means if the last focusable child widget of this is called, it will jump to the
 	 * first focusable child widget of this.
 	 * See KMdiChildView::setFirstFocusableChildWidget and KMdiChildView::lastFirstFocusableChildWidget
@@ -603,7 +604,7 @@ private:
 
 inline KMdiChildFrm *KMdiChildView::mdiParent() const
 {
-	TQWidget * pw = parentWidget();
+	TQWidget * pw = tqparentWidget();
 	if ( pw != 0L )
 		if ( pw->inherits( "KMdiChildFrm" ) )
 			return ( KMdiChildFrm * ) pw;
@@ -612,4 +613,4 @@ inline KMdiChildFrm *KMdiChildView::mdiParent() const
 
 #endif //_KMDICHILDVIEW_H_
 
-// kate: space-indent off; replace-tabs off; indent-mode csands; tab-width 4;
+// kate: space-indent off; tqreplace-tabs off; indent-mode csands; tab-width 4;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidefines.h b/lib/compatibility/kmdi/qextmdi/kmdidefines.h
index 16be290a..ea4861ba 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidefines.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdidefines.h
@@ -6,8 +6,8 @@
 //    begin                : 07/1999       by Szymon Stefanek as part of kvirc
 //                                         (an IRC application)
 //    changes              : 09/1999       by Falk Brettschneider to create an
-//                                         stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                                         stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //
 //    copyright            : (C) 1999-2003 by Falk Brettschneider
@@ -40,7 +40,7 @@
 */
 namespace KMdi
 {
-   /** extent Qt events
+   /** extent TQt events
       @see TQCustomEvent, TQEvent::User
       \code
       bool B_MyWidget::event( TQEvent* e) {
@@ -66,7 +66,7 @@ namespace KMdi
       /**
       * standard is: show normal, attached, visible, document view (not toolview). Maximize, Minimize, Hide adds
       * appropriately. Detach adds a view that appears toplevel, ToolWindow adds the view as tool view.
-      * That means it is stay-on-top and toplevel. UseKMdiSizeHint should use the restore geometry of the
+      * That means it is stay-on-top and toplevel. UseKMdiSizeHint should use the restore tqgeometry of the
       * latest current top childframe but is not supported yet.
       */
       StandardAdd = 0,
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
index f541a824..ff24a983 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
@@ -49,8 +49,8 @@ static const char* const kmdi_not_close_xpm[] =
         "#####"
     };
 
-KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int position, int flags )
-		: TQWidget( parent ), KDockContainer()
+KMdiDockContainer::KMdiDockContainer( TQWidget *tqparent, TQWidget *win, int position, int flags )
+		: TQWidget( tqparent ), KDockContainer()
 {
 	m_tabSwitching = false;
 	m_block = false;
@@ -70,9 +70,9 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit
 
 
 	if ( m_horizontal )
-		l = new TQVBoxLayout( this ); //vertical layout for top and bottom docks
+		l = new TQVBoxLayout( this ); //vertical tqlayout for top and bottom docks
 	else
-		l = new TQHBoxLayout( this ); //horizontal layout for left and right docks
+		l = new TQHBoxLayout( this ); //horizontal tqlayout for left and right docks
 
 	l->setAutoAdd( false );
 
@@ -104,9 +104,9 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit
 
 	m_ws = new TQWidgetStack( this );
 
-	m_ws->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+	m_ws->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
 
-	//layout the tabbar
+	//tqlayout the tabbar
 	if ( position == KDockWidget::DockLeft || position == KDockWidget::DockTop )
 	{
 		//add the tabbar then the widget stack
@@ -138,7 +138,7 @@ KMdiDockContainer::~KMdiDockContainer()
 	{
 		it = m_map.begin();
 		KDockWidget *w = it.key();
-		if ( m_overlapButtons.contains( w ) )
+		if ( m_overlapButtons.tqcontains( w ) )
 		{
 			( static_cast<KDockWidgetHeader*>( w->getHeader()->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[w] );
 			m_overlapButtons.remove( w );
@@ -156,28 +156,28 @@ void KMdiDockContainer::init()
 	if ( !m_horizontal )
 	{
 		kdDebug( 760 ) << k_funcinfo << "Horizontal tabbar. Setting forced fixed width." << endl;
-		parentDockWidget()->setForcedFixedWidth( m_tb->width() );
+		tqparentDockWidget()->setForcedFixedWidth( m_tb->width() );
 		activateOverlapMode( m_tb->width() );
 	}
 	else
 	{
 		kdDebug( 760 ) << k_funcinfo << "Vertical tabbar. Setting forced fixed height." << endl;
-		parentDockWidget()->setForcedFixedHeight( m_tb->height() );
+		tqparentDockWidget()->setForcedFixedHeight( m_tb->height() );
 		activateOverlapMode( m_tb->height() );
 	}
 
 	// try to restore splitter size
-	if ( parentDockWidget() && parentDockWidget()->parent() )
+	if ( tqparentDockWidget() && tqparentDockWidget()->tqparent() )
 	{
-		KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) );
+		KDockSplitter * sp = static_cast<KDockSplitter*>( tqparentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
 		if ( sp )
 			sp->setSeparatorPosX( m_separatorPos );
 	}
 }
 
-KDockWidget* KMdiDockContainer::parentDockWidget()
+KDockWidget* KMdiDockContainer::tqparentDockWidget()
 {
-	return ( ( KDockWidget* ) parent() );
+	return ( ( KDockWidget* ) tqparent() );
 }
 
 void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const TQString &text, int & )
@@ -185,7 +185,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 	kdDebug( 760 ) << k_funcinfo << "Adding a dockwidget to the dock container" << endl;
 	KDockWidget* w = dwdg;
 	int tab;
-	bool alreadyThere = m_map.contains( w );
+	bool alreadyThere = m_map.tqcontains( w );
 
 	if ( alreadyThere )
 	{
@@ -201,8 +201,8 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 		m_map.insert( w, tab );
 		m_revMap.insert( tab, w );
 
-		if ( ( ( KDockWidget* ) parentWidget() ) ->mayBeShow() )
-			( ( KDockWidget* ) parentWidget() ) ->dockBack();
+		if ( ( ( KDockWidget* ) tqparentWidget() ) ->mayBeShow() )
+			( ( KDockWidget* ) tqparentWidget() ) ->dockBack();
 
 		if ( w->getHeader()->qt_cast( "KDockWidgetHeader" ) )
 		{
@@ -277,7 +277,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
 		}
 		
 		m_dockManager = w->dockManager();
-		m_dragPanel = hdr->dragPanel();
+		m_dragPanel = TQT_TQOBJECT(hdr->dragPanel());
 		
 		if ( m_dragPanel )
 			m_movingState = WaitingForMoveStart;
@@ -300,7 +300,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
 			TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() );
 			if ( p.manhattanLength() > KGlobalSettings::dndEventDelay() )
 			{
-				m_dockManager->eventFilter( m_dragPanel, m_startEvent );
+				m_dockManager->eventFilter( m_dragPanel, TQT_TQEVENT(m_startEvent) );
 				m_dockManager->eventFilter( m_dragPanel, event );
 				m_movingState = Moving;
 			}
@@ -319,7 +319,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
 
 void KMdiDockContainer::showWidget( KDockWidget *w )
 {
-	if ( !m_map.contains( w ) )
+	if ( !m_map.tqcontains( w ) )
 		return ;
 	
 	int id = m_map[ w ];
@@ -359,14 +359,14 @@ void KMdiDockContainer::hideIfNeeded()
 	if ( itemNames.count() == 0 )
 	{
 		kdDebug( 760 ) << k_funcinfo << "Hiding the dock container" << endl;
-		( ( KDockWidget* ) parentWidget() )->undock();
+		( ( KDockWidget* ) tqparentWidget() )->undock();
 	}
 }
 
 void KMdiDockContainer::removeWidget( KDockWidget* dwdg )
 {
 	KDockWidget * w = dwdg;
-	if ( !m_map.contains( w ) )
+	if ( !m_map.tqcontains( w ) )
 		return; //we don't have this widget in our container
 
 	kdDebug( 760 ) << k_funcinfo << endl;
@@ -382,7 +382,7 @@ void KMdiDockContainer::removeWidget( KDockWidget* dwdg )
 	m_ws->removeWidget( w );
 	m_map.remove( w );
 	m_revMap.remove( id );
-	if ( m_overlapButtons.contains( w ) )
+	if ( m_overlapButtons.tqcontains( w ) )
 	{
 		( static_cast<KDockWidgetHeader*>( w->getHeader() ->qt_cast( "KDockWidgetHeader" ) ) )->removeButton( m_overlapButtons[ w ] );
 		m_overlapButtons.remove( w );
@@ -398,7 +398,7 @@ void KMdiDockContainer::undockWidget( KDockWidget *dwdg )
 {
 	KDockWidget * w = dwdg;
 
-	if ( !m_map.contains( w ) )
+	if ( !m_map.tqcontains( w ) )
 		return ;
 
 	int id = m_map[ w ];
@@ -421,14 +421,14 @@ void KMdiDockContainer::tabClicked( int t )
 		{
 			kdDebug( 760 ) << k_funcinfo << "Showing widgetstack for tab just clicked" << endl;
 			m_ws->show();
-			parentDockWidget()->restoreFromForcedFixedSize();
+			tqparentDockWidget()->restoreFromForcedFixedSize();
 		}
 		
 		if ( !m_ws->widget( t ) )
 		{
 			kdDebug( 760 ) << k_funcinfo << "Widget tab was clicked for is not in our stack" << endl;
 			kdDebug( 760 ) << k_funcinfo << "Docking it back in" << endl;
-			m_revMap[t]->manualDock( parentDockWidget(), KDockWidget::DockCenter, 20 );
+			m_revMap[t]->manualDock( tqparentDockWidget(), KDockWidget::DockCenter, 20 );
 			if ( call_makeVisible )
 				m_revMap[t]->makeDockVisible();
 			m_tabSwitching = false;
@@ -462,9 +462,9 @@ void KMdiDockContainer::tabClicked( int t )
 	{
 		kdDebug( 760 ) << k_funcinfo << "Tab " << t << " was just deactiviated" << endl;
 		// try save splitter position
-		if ( parentDockWidget() && parentDockWidget()->parent() )
+		if ( tqparentDockWidget() && tqparentDockWidget()->tqparent() )
 		{
-			KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget()->parent()->qt_cast( "KDockSplitter" ) );
+			KDockSplitter * sp = static_cast<KDockSplitter*>( tqparentDockWidget()->tqparent()->qt_cast( "KDockSplitter" ) );
 			if ( sp )
 				m_separatorPos = sp->separatorPos();
 		}
@@ -484,9 +484,9 @@ void KMdiDockContainer::tabClicked( int t )
 
 		kdDebug( 760 ) << k_funcinfo << "Fixed Width:" << m_tb->width() << endl;
 		if ( !m_horizontal )
-			parentDockWidget()->setForcedFixedWidth( m_tb->width() ); // strange why it worked before at all
+			tqparentDockWidget()->setForcedFixedWidth( m_tb->width() ); // strange why it worked before at all
 		else
-			parentDockWidget()->setForcedFixedHeight( m_tb->height() ); // strange why it worked before at all
+			tqparentDockWidget()->setForcedFixedHeight( m_tb->height() ); // strange why it worked before at all
 	}
 	m_tabSwitching = false;
 }
@@ -514,7 +514,7 @@ void KMdiDockContainer::save( TQDomElement& dockEl )
 	TQDomDocument doc = dockEl.ownerDocument();
 	TQDomElement el;
 	el = doc.createElement( "name" );
-	el.appendChild( doc.createTextNode( TQString( "%1" ).arg( parent() ->name() ) ) );
+	el.appendChild( doc.createTextNode( TQString( "%1" ).tqarg( tqparent() ->name() ) ) );
 	dockEl.appendChild( el );
 	el = doc.createElement( "overlapMode" );
 	el.appendChild( doc.createTextNode( isOverlapMode() ? "true" : "false" ) );
@@ -526,7 +526,7 @@ void KMdiDockContainer::save( TQDomElement& dockEl )
 	for ( ;it.current() != 0;++it, ++it2 )
 	{
 		el = doc.createElement( "child" );
-		el.setAttribute( "pos", TQString( "%1" ).arg( i ) );
+		el.setAttribute( "pos", TQString( "%1" ).tqarg( i ) );
 		TQString s = tabCaptions[ *it2 ];
 		if ( !s.isEmpty() )
 		{
@@ -569,7 +569,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 		}
 		else if ( el.tagName() == "child" )
 		{
-			KDockWidget * dw = ( ( KDockWidget* ) parent() ) ->dockManager() ->getDockWidgetFromName( el.text() );
+			KDockWidget * dw = ( ( KDockWidget* ) tqparent() ) ->dockManager() ->getDockWidgetFromName( el.text() );
 			if ( dw )
 			{
 				if ( el.hasAttribute( "tabCaption" ) )
@@ -580,7 +580,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 				{
 					dw->setToolTipString( el.attribute( "tabTooltip" ) );
 				}
-				dw->manualDock( ( KDockWidget* ) parent(), KDockWidget::DockCenter );
+				dw->manualDock( ( KDockWidget* ) tqparent(), KDockWidget::DockCenter );
 			}
 		}
 	}
@@ -589,9 +589,9 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 	TQPtrListIterator<KMultiTabBarTab> it1( *tl );
 	m_ws->hide();
 	if ( !m_horizontal )
-		parentDockWidget()->setForcedFixedWidth( m_tb->width() );
+		tqparentDockWidget()->setForcedFixedWidth( m_tb->width() );
 	else
-		parentDockWidget()->setForcedFixedHeight( m_tb->height() );
+		tqparentDockWidget()->setForcedFixedHeight( m_tb->height() );
 	
 	for ( ;it1.current() != 0;++it1 )
 		m_tb->setTab( it1.current() ->id(), false );
@@ -624,8 +624,8 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 {
 	TQString grp = cfg->group();
-	cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
-	cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
+	cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).tqarg( tqparent() ->name() ) );
+	cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( tqparent() ->name() ) );
 
 	if ( isOverlapMode() )
 		cfg->writeEntry( "overlapMode", "true" );
@@ -633,10 +633,10 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 		cfg->writeEntry( "overlapMode", "false" );
 
 	// try to save the splitter position
-	if ( parentDockWidget() && parentDockWidget() ->parent() )
+	if ( tqparentDockWidget() && tqparentDockWidget() ->tqparent() )
 	{
-		KDockSplitter * sp = static_cast<KDockSplitter*>( parentDockWidget() ->
-		                     parent() ->qt_cast( "KDockSplitter" ) );
+		KDockSplitter * sp = static_cast<KDockSplitter*>( tqparentDockWidget() ->
+		                     tqparent() ->qt_cast( "KDockSplitter" ) );
 		if ( sp )
 			cfg->writeEntry( "separatorPos", m_separatorPos );
 	}
@@ -647,17 +647,17 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 	int i = 0;
 	for ( ;it.current() != 0;++it, ++it2 )
 	{
-		//    cfg->writeEntry(TQString("widget%1").arg(i),m_ws->widget(it.current()->id())->name());
-		cfg->writeEntry( TQString( "widget%1" ).arg( i ), ( *it2 ) );
+		//    cfg->writeEntry(TQString("widget%1").tqarg(i),m_ws->widget(it.current()->id())->name());
+		cfg->writeEntry( TQString( "widget%1" ).tqarg( i ), ( *it2 ) );
 		TQString s = tabCaptions[ *it2 ];
 		if ( !s.isEmpty() )
 		{
-			cfg->writeEntry( TQString( "widget%1-tabCaption" ).arg( i ), s );
+			cfg->writeEntry( TQString( "widget%1-tabCaption" ).tqarg( i ), s );
 		}
 		s = tabTooltips[ *it2 ];
 		if ( !s.isEmpty() )
 		{
-			cfg->writeEntry( TQString( "widget%1-tabTooltip" ).arg( i ), s );
+			cfg->writeEntry( TQString( "widget%1-tabTooltip" ).tqarg( i ), s );
 		}
 		//    kdDebug(760)<<"****************************************Saving: "<<m_ws->widget(it.current()->id())->name()<<endl;
 		if ( m_tb->isTabRaised( it.current() ->id() ) )
@@ -672,7 +672,7 @@ void KMdiDockContainer::save( KConfig* cfg, const TQString& group_or_prefix )
 void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
 {
 	TQString grp = cfg->group();
-	cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
+	cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( tqparent() ->name() ) );
 
 	if ( cfg->readEntry( "overlapMode" ) != "false" )
 		activateOverlapMode( m_tb->width() );
@@ -685,24 +685,24 @@ void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
 	TQString raise;
 	while ( true )
 	{
-		TQString dwn = cfg->readEntry( TQString( "widget%1" ).arg( i ) );
+		TQString dwn = cfg->readEntry( TQString( "widget%1" ).tqarg( i ) );
 		if ( dwn.isEmpty() )
 			break;
 		kdDebug( 760 ) << k_funcinfo << "configuring dockwidget :" << dwn << endl;
-		KDockWidget *dw = ( ( KDockWidget* ) parent() ) ->dockManager() ->getDockWidgetFromName( dwn );
+		KDockWidget *dw = ( ( KDockWidget* ) tqparent() ) ->dockManager() ->getDockWidgetFromName( dwn );
 		if ( dw )
 		{
-			TQString s = cfg->readEntry( TQString( "widget%1-tabCaption" ).arg( i ) );
+			TQString s = cfg->readEntry( TQString( "widget%1-tabCaption" ).tqarg( i ) );
 			if ( !s.isEmpty() )
 			{
 				dw->setTabPageLabel( s );
 			}
-			s = cfg->readEntry( TQString( "widget%1-tabTooltip" ).arg( i ) );
+			s = cfg->readEntry( TQString( "widget%1-tabTooltip" ).tqarg( i ) );
 			if ( !s.isEmpty() )
 			{
 				dw->setToolTipString( s );
 			}
-			dw->manualDock( ( KDockWidget* ) parent(), KDockWidget::DockCenter );
+			dw->manualDock( ( KDockWidget* ) tqparent(), KDockWidget::DockCenter );
 		}
 		if ( cfg->readBoolEntry( dwn, false ) )
 			raise = dwn;
@@ -714,9 +714,9 @@ void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
 	TQPtrListIterator<KMultiTabBarTab> it1( *tl );
 	m_ws->hide();
 	if ( !m_horizontal )
-		parentDockWidget() ->setForcedFixedWidth( m_tb->width() );
+		tqparentDockWidget() ->setForcedFixedWidth( m_tb->width() );
 	else
-		parentDockWidget() ->setForcedFixedHeight( m_tb->height() );
+		tqparentDockWidget() ->setForcedFixedHeight( m_tb->height() );
 	for ( ;it1.current() != 0;++it1 )
 	{
 		m_tb->setTab( it1.current() ->id(), false );
@@ -815,7 +815,7 @@ void KMdiDockContainer::prevToolView()
 {
 	kdDebug( 760 ) << k_funcinfo << endl;
 	TQPtrList<KMultiTabBarTab>* tabs = m_tb->tabs();
-	int pos = tabs->findRef( m_tb->tab( oldtab ) );
+	int pos = tabs->tqfindRef( m_tb->tab( oldtab ) );
 	
 	if ( pos == -1 )
 		return ;
@@ -836,7 +836,7 @@ void KMdiDockContainer::nextToolView()
 {
 	kdDebug( 760 ) << k_funcinfo << endl;
 	TQPtrList<KMultiTabBarTab>* tabs = m_tb->tabs();
-	int pos = tabs->findRef( m_tb->tab( oldtab ) );
+	int pos = tabs->tqfindRef( m_tb->tab( oldtab ) );
 	
 	if ( pos == -1 )
 		return ;
@@ -853,4 +853,4 @@ void KMdiDockContainer::nextToolView()
 	tabClicked( tab->id() );
 }
 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
index cb0d6e4c..3806194e 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.h
@@ -37,13 +37,14 @@ class KDockButton_Private;
 class KMDI_EXPORT KMdiDockContainer: public TQWidget, public KDockContainer
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	KMdiDockContainer( TQWidget *parent, TQWidget *win, int position, int flags );
+	KMdiDockContainer( TQWidget *tqparent, TQWidget *win, int position, int flags );
 	virtual ~KMdiDockContainer();
 
-	/** Get the KDockWidget that is our parent */
-	KDockWidget *parentDockWidget();
+	/** Get the KDockWidget that is our tqparent */
+	KDockWidget *tqparentDockWidget();
 
 	/**
 	 * Add a widget to this container
@@ -90,28 +91,28 @@ public:
 	/**
 	 * Save the config using a KConfig object
 	 *
-	 * The combination of the group_or_prefix variable and the parent
+	 * The combination of the group_or_prefix variable and the tqparent
 	 * dockwidget's name will be the group the configuration is saved in
-	 * \param group_or_prefix the prefix to append to the parent dockwidget's name
+	 * \param group_or_prefix the prefix to append to the tqparent dockwidget's name
 	 */
 	virtual void save( KConfig *, const TQString& group_or_prefix );
 
 	/**
 	 * Load the config using a KConfig object
 	 * 
-	 * The combination of the group_or_prefix variable and the parent
+	 * The combination of the group_or_prefix variable and the tqparent
 	 * dockwidget's name will be the group the configuration is loaded from
-	 * \param group_or_prefix the prefix to append to the parent dockwidget's name
+	 * \param group_or_prefix the prefix to append to the tqparent dockwidget's name
 	 */
 	virtual void load( KConfig *, const TQString& group_or_prefix );
 
 	/**
-	 * Save the config to a QDomElement
+	 * Save the config to a TQDomElement
 	 */
 	virtual void save( TQDomElement& );
 
 	/**
-	 * Load the config from a QDomElement
+	 * Load the config from a TQDomElement
 	 */
 	virtual void load( TQDomElement& );
 
@@ -164,4 +165,4 @@ signals:
 
 #endif
 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp
index b97830af..c595700e 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp
@@ -11,11 +11,11 @@
 #include <kpopupmenu.h>
 #include "kmdidocumentviewtabwidget.h"
 
-KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const char* name ) : KTabWidget( parent, name )
+KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* tqparent, const char* name ) : KTabWidget( tqparent, name )
 {
 	m_visibility = KMdi::ShowWhenMoreThanOneTab;
 	tabBar() ->hide();
-#ifndef Q_WS_WIN //todo
+#ifndef TQ_WS_WIN //todo
 
 	setHoverCloseButton( true );
 #endif
@@ -56,7 +56,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQString & l
 	KTabWidget::insertTab( child, label, index );
 	showPage( child );
 	maybeShow();
-	tabBar() ->repaint();
+	tabBar() ->tqrepaint();
 }
 
 void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index )
@@ -64,7 +64,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet &
 	KTabWidget::insertTab( child, iconset, label, index );
 	showPage( child );
 	maybeShow();
-	tabBar() ->repaint();
+	tabBar() ->tqrepaint();
 }
 
 void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index )
@@ -72,7 +72,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int i
 	KTabWidget::insertTab( child, tab, index );
 	showPage( child );
 	maybeShow();
-	tabBar() ->repaint();
+	tabBar() ->tqrepaint();
 }
 
 void KMdiDocumentViewTabWidget::removePage ( TQWidget * w )
@@ -144,9 +144,9 @@ KMdi::TabWidgetVisibility KMdiDocumentViewTabWidget::tabWidgetVisibility( )
 }
 
 
-#ifndef NO_INCLUDE_MOCFILES
+#ifndef NO_INCLUDE_TQMOCFILES
 #include "kmdidocumentviewtabwidget.moc"
 #endif
 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h
index f24b7800..f3d3346b 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.h
@@ -23,55 +23,56 @@ class KMDI_EXPORT KMdiDocumentViewTabWidget:
 			public KTabWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KMdiDocumentViewTabWidget( TQWidget* parent, const char* name = 0 );
+	KMdiDocumentViewTabWidget( TQWidget* tqparent, const char* name = 0 );
 	~KMdiDocumentViewTabWidget();
 
 	/**
 	 * Add a tab into the tabwidget
-	 * \sa QTabWidget
+	 * \sa TQTabWidget
 	 * \sa KTabWidget
 	 */
 	virtual void addTab ( TQWidget * child, const TQString & label );
 
 	/**
 	 * Add a tab into the tabwidget
-	 * \sa QTabWidget
+	 * \sa TQTabWidget
 	 * \sa KTabWidget
 	 */
 	virtual void addTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label );
 
 	/**
 	 * Add a tab into the tabwidget
-	 * \sa QTabWidget
+	 * \sa TQTabWidget
 	 * \sa KTabWidget
 	 */
 	virtual void addTab ( TQWidget * child, TQTab * tab );
 
 	/**
 	 * Insert a tab into the tabwidget with a label
-	 * \sa QTabWidget
+	 * \sa TQTabWidget
 	 * \sa KTabWidget
 	 */
 	virtual void insertTab ( TQWidget * child, const TQString & label, int index = -1 );
 
 	/**
 	 * Inserts a tab into the tabwidget with an icon and label
-	 * \sa QTabWidget
+	 * \sa TQTabWidget
 	 * \sa KTabWidget
 	 */
 	virtual void insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index = -1 );
 
 	/**
 	 * Inserts a tab into the tabwidget
-	 * \sa QTabWidget
+	 * \sa TQTabWidget
 	 * \sa KTabWidget
 	 */
 	virtual void insertTab ( TQWidget * child, TQTab * tab, int index = -1 );
 
 	/**
 	 * Removes the tab from the tabwidget
-	 * \sa QTabWidget
+	 * \sa TQTabWidget
 	 * \sa KTabWidget
 	 */
 	virtual void removePage ( TQWidget * w );
@@ -119,5 +120,5 @@ signals:
 
 
 #endif 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp
index 2e9b7700..ff9ff0b4 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.cpp
@@ -21,7 +21,7 @@
 #include <tqobjectlist.h>
 #include <kdebug.h>
 
-KMdiFocusList::KMdiFocusList( TQObject *parent ) : TQObject( parent )
+KMdiFocusList::KMdiFocusList( TQObject *tqparent ) : TQObject( tqparent )
 {}
 
 KMdiFocusList::~KMdiFocusList()
@@ -31,7 +31,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w )
 {
 	//this method should never be called twice on the same hierarchy
 	m_list.insert( w, w->focusPolicy() );
-	w->setFocusPolicy( TQWidget::ClickFocus );
+	w->setFocusPolicy( TQ_ClickFocus );
 	kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl;
 	connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
 	TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
@@ -41,7 +41,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w )
 	{
 		TQWidget * wid = ( TQWidget* ) obj;
 		m_list.insert( wid, wid->focusPolicy() );
-		wid->setFocusPolicy( TQWidget::ClickFocus );
+		wid->setFocusPolicy( TQ_ClickFocus );
 		kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding widget" << endl;
 		connect( wid, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
 		++it;
@@ -51,13 +51,8 @@ void KMdiFocusList::addWidgetTree( TQWidget* w )
 
 void KMdiFocusList::restore()
 {
-#if (QT_VERSION-0 >= 0x030200)
-	for ( TQMap<TQWidget*, TQWidget::FocusPolicy>::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it )
+	for ( TQMap<TQWidget*, TQ_FocusPolicy>::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it )
 	{
-#else
-	for ( TQMap<TQWidget*, TQWidget::FocusPolicy>::iterator it = m_list.begin();it != m_list.end();++it )
-	{
-#endif
 		it.key() ->setFocusPolicy( it.data() );
 	}
 	m_list.clear();
@@ -72,4 +67,4 @@ void KMdiFocusList::objectHasBeenDestroyed( TQObject * o )
 	m_list.remove( w );
 }
 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h
index 71e2f05c..a816fc4f 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdifocuslist.h
@@ -23,20 +23,21 @@
 #include <tqwidget.h>
 #include <kdelibs_export.h>
 
-class KMDI_EXPORT KMdiFocusList: public QObject
+class KMDI_EXPORT KMdiFocusList: public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KMdiFocusList( TQObject *parent );
+	KMdiFocusList( TQObject *tqparent );
 	~KMdiFocusList();
 	void addWidgetTree( TQWidget* );
 	void restore();
 protected slots:
 	void objectHasBeenDestroyed( TQObject* );
 private:
-	TQMap<TQWidget*, TQWidget::FocusPolicy> m_list;
+	TQMap<TQWidget*, TQ_FocusPolicy> m_list;
 
 };
 
 #endif 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
index 6279253b..8c4c10ca 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
@@ -58,8 +58,8 @@ using namespace KMDIPrivate;
 
 
 ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const KShortcut& cut, KDockWidget *dw, KMdiMainFrm *mdiMainFrm,
-        TQObject* parent, const char* name )
-		: KToggleAction( text, cut, parent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm )
+        TQObject* tqparent, const char* name )
+		: KToggleAction( text, cut, tqparent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm )
 {
 	if ( m_dw )
 	{
@@ -82,9 +82,9 @@ void ToggleToolViewAction::anDWChanged()
 		setChecked( false );
 	else if ( ( !isChecked() ) && m_dw->mayBeHide() )
 		setChecked( true );
-	else if ( isChecked() && ( m_dw->parentDockTabGroup() &&
-	                           ( ( static_cast<KDockWidget*>( m_dw->parentDockTabGroup() ->
-	                                                          parent() ->qt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) )
+	else if ( isChecked() && ( m_dw->tqparentDockTabGroup() &&
+	                           ( ( static_cast<KDockWidget*>( m_dw->tqparentDockTabGroup() ->
+	                                                          tqparent() ->qt_cast( "KDockWidget" ) ) ) ->mayBeShow() ) ) )
 		setChecked( false );
 }
 
@@ -128,8 +128,8 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 	if ( domDocument().documentElement().isNull() )
 	{
 
-		TQString completeDescription = TQString::fromLatin1( guiDescription )
-		                              .arg( actionListName );
+		TQString completeDescription = TQString::tqfromLatin1( guiDescription )
+		                              .tqarg( actionListName );
 
 		setXML( completeDescription, false /*merge*/ );
 	}
@@ -152,18 +152,18 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 	         this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) );
 
 	m_gotoToolDockMenu = new KActionMenu( i18n( "Tool &Docks" ), actionCollection(), "kmdi_tooldock_menu" );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQT_SIGNAL( toggleTop() ),
+	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, TQT_TQOBJECT(this), TQT_SIGNAL( toggleTop() ),
 	                            actionCollection(), "kmdi_activate_top" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQT_SIGNAL( toggleLeft() ),
+	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, TQT_TQOBJECT(this), TQT_SIGNAL( toggleLeft() ),
 	                            actionCollection(), "kmdi_activate_left" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQT_SIGNAL( toggleRight() ),
+	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, TQT_TQOBJECT(this), TQT_SIGNAL( toggleRight() ),
 	                            actionCollection(), "kmdi_activate_right" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ),
+	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, TQT_TQOBJECT(this), TQT_SIGNAL( toggleBottom() ),
 	                            actionCollection(), "kmdi_activate_bottom" ) );
 	m_gotoToolDockMenu->insert( new KActionSeparator( actionCollection(), "kmdi_goto_menu_separator" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQT_SLOT( prevToolViewInDock() ),
+	m_gotoToolDockMenu->insert( new KAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ),
 	                            actionCollection(), "kmdi_prev_toolview" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQT_SLOT( nextToolViewInDock() ),
+	m_gotoToolDockMenu->insert( new KAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ),
 	                            actionCollection(), "kmdi_next_toolview" ) );
 
 	actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() );
@@ -224,7 +224,7 @@ void KMDIGUIClient::setupActions()
 
 	//    m_toolBars = builder.toolBars();
 
-	//    m_toolViewActions.append(new KAction( "TESTKMDIGUICLIENT", TQString::null, 0,
+	//    m_toolViewActions.append(new KAction( "TESTKMDIGUICLIENT", TQString(), 0,
 	//             this, TQT_SLOT(blah()),actionCollection(),"nothing"));
 
 	TQPtrList<KAction> addList;
@@ -257,12 +257,12 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
 	// 	if ( cfg->hasKey( aname ) )
 	sc = KShortcut( cfg->readEntry( aname, "" ) );
 	cfg->setGroup( _grp );
-	KAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ),
-	                                       /*TQString::null*/sc, dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ),
+	KAction *a = new ToggleToolViewAction( i18n( "Show %1" ).tqarg( mtva->wrappedWidget() ->caption() ),
+	                                       /*TQString()*/sc, dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ),
 	                                       m_mdiMainFrm, actionCollection(), aname.latin1() );
 #if KDE_IS_VERSION(3,2,90)
 
-	( ( ToggleToolViewAction* ) a ) ->setCheckedState( i18n( "Hide %1" ).arg( mtva->wrappedWidget() ->caption() ) );
+	( ( ToggleToolViewAction* ) a ) ->setCheckedState( i18n( "Hide %1" ).tqarg( mtva->wrappedWidget() ->caption() ) );
 #endif
 
 	connect( a, TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( actionDeleted( TQObject* ) ) );
@@ -317,4 +317,4 @@ void KMDIGUIClient::mdiModeHasBeenChangedTo( KMdi::MdiMode mode )
 }
 
 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h
index 9c963431..13491db3 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.h
@@ -42,6 +42,7 @@ class KMDI_EXPORT KMDIGUIClient : public TQObject,
 			public KXMLGUIClient
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 
 	KMDIGUIClient( KMdiMainFrm *mdiMainFrm, bool showMDIModeAction, const char *name = 0 );
@@ -121,10 +122,11 @@ private:
 class KMDI_EXPORT ToggleToolViewAction: public KToggleAction
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 
 	ToggleToolViewAction( const TQString& text, const KShortcut& cut = KShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0,
-	                      TQObject* parent = 0, const char* name = 0 );
+	                      TQObject* tqparent = 0, const char* name = 0 );
 
 	virtual ~ToggleToolViewAction();
 
@@ -143,4 +145,4 @@ protected slots:
 }
 
 #endif 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdiiterator.h b/lib/compatibility/kmdi/qextmdi/kmdiiterator.h
index 6bb6f7ea..52ae39dd 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdiiterator.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdiiterator.h
@@ -5,8 +5,8 @@
 //
 //    begin                : 02/2000       by Massimo Morin
 //    changes              : 02/2000       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //
 //    copyright            : (C) 1999-2003 by Massimo Morin (mmorin@schedsys.com)
@@ -47,5 +47,5 @@ protected:
 ;
 
 #endif // _KMDIITERATOR_H_ 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h b/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h
index 40e4aef2..5236b389 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdilistiterator.h
@@ -5,8 +5,8 @@
 //
 //    begin                : 02/2000       by Massimo Morin
 //    changes              : 02/2000       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //
 //    copyright            : (C) 1999-2003 by Massimo Morin (mmorin@schedsys.com)
@@ -57,5 +57,5 @@ private:
 };
 
 #endif // _KMDILISTITERATOR_H_ 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
index cf4c094c..a9f5e7f7 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
@@ -6,8 +6,8 @@
 //    begin                : 07/1999       by Szymon Stefanek as part of kvirc
 //                                         (an IRC application)
 //    changes              : 09/1999       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //    patches              : 02/2000       by Massimo Morin (mmorin@schedsys.com)
 //                           */2000        by Lars Beikirch (Lars.Beikirch@gmx.net)
@@ -92,7 +92,7 @@
 #include "kde2laptop_closebutton.xpm"
 #include "kde2laptop_closebutton_menu.xpm"
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #ifndef NO_KDE
 #include <X11/X.h> // schroder
 #include <X11/Xlib.h> // schroder
@@ -107,7 +107,7 @@
 /* I hate the defines in the X11 header files. Get rid of one of them */
 #undef KeyPress
 #endif
-#endif // Q_WS_X11 && ! K_WS_QTONLY
+#endif // TQ_WS_X11 && ! K_WS_TQTONLY
 
 using namespace KParts;
 
@@ -135,8 +135,8 @@ public:
 };
 
 //============ constructor ============//
-KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags )
-		: KParts::DockMainWindow( parentWidget, name, flags )
+KMdiMainFrm::KMdiMainFrm( TQWidget* tqparentWidget, const char* name, KMdi::MdiMode mdiMode, WFlags flags )
+		: KParts::DockMainWindow( tqparentWidget, name, flags )
 		, m_mdiMode( KMdi::UndefinedMode )
 		, m_pMdi( 0L )
 		, m_pTaskBar( 0L )
@@ -182,8 +182,8 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
 	m_pDocumentViews->setAutoDelete( false );
 	m_pToolViews = new TQMap<TQWidget*, KMdiToolViewAccessor*>;
 
-	// This seems to be needed (re-check it after Qt2.0 comed out)
-	setFocusPolicy( ClickFocus );
+	// This seems to be needed (re-check it after TQt2.0 comed out)
+	setFocusPolicy( TQ_ClickFocus );
 
 	// create the central widget
 	createMdiManager();
@@ -217,12 +217,12 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
 	m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" );
 
 	d->closeWindowAction = new KAction(i18n("&Close"),
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 		CTRL|Key_F4,
 #else
 		0,
 #endif
-		this, TQT_SLOT(closeActiveView()), actionCollection(), "window_close");
+	    TQT_TQOBJECT(this), TQT_SLOT(closeActiveView()), actionCollection(), "window_close");
 
 	// the MDI view taskbar
 	createTaskBar();
@@ -298,16 +298,16 @@ void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu )
 //============ ~KMdiMainFrm ============//
 KMdiMainFrm::~KMdiMainFrm()
 {
-	//save the children first to a list, as removing invalidates our iterator
-	TQValueList<KMdiChildView*> children;
+	//save the tqchildren first to a list, as removing tqinvalidates our iterator
+	TQValueList<KMdiChildView*> tqchildren;
 	for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() )
-		children.append( w );
+		tqchildren.append( w );
 
 	// safely close the windows so properties are saved...
 	TQValueListIterator<KMdiChildView*> childIt;
-	for ( childIt = children.begin(); childIt != children.end(); ++childIt )
+	for ( childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt )
 	{
-		closeWindow( *childIt, false ); // without re-layout taskbar!
+		closeWindow( *childIt, false ); // without re-tqlayout taskbar!
 	}
 
 	emit lastChildViewClosed();
@@ -345,7 +345,7 @@ void KMdiMainFrm::applyOptions()
 		TQWidget* childFrame = 0L;
 		if ( ( *it )->mdiParent() )
 		{
-			kdDebug(760) << k_funcinfo << "using child view's mdi parent for resize hack" << endl;
+			kdDebug(760) << k_funcinfo << "using child view's mdi tqparent for resize hack" << endl;
 			childFrame = ( *it )->mdiParent();
 		}
 		else
@@ -395,7 +395,7 @@ void KMdiMainFrm::slot_toggleTaskBar()
 
 void KMdiMainFrm::resizeEvent( TQResizeEvent *e )
 {
-	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() )
+	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
 	{
 		if ( e->oldSize().height() != e->size().height() )
 			return ;
@@ -410,7 +410,7 @@ void KMdiMainFrm::resizeEvent( TQResizeEvent *e )
 
 void KMdiMainFrm::setMinimumSize( int minw, int minh )
 {
-	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() )
+	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
 		return ;
 	DockMainWindow::setMinimumSize( minw, minh );
 }
@@ -421,9 +421,9 @@ KMdiChildView* KMdiMainFrm::createWrapper( TQWidget *view, const TQString& name,
 {
 	Q_ASSERT( view ); // if this assert fails, then some part didn't return a widget. Fix the part ;)
 
-	KMdiChildView* pMDICover = new KMdiChildView( name /*caption*/, 0L /*parent*/,
+	KMdiChildView* pMDICover = new KMdiChildView( name /*caption*/, 0L /*tqparent*/,
 	                                              name.latin1() );
-	TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "layout" );
+	TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout" );
 	view->reparent( pMDICover, TQPoint( 0, 0 ) );
 	pLayout->addWidget( view );
 	//  pMDICover->setName(name);
@@ -557,7 +557,7 @@ KMdiToolViewAccessor *KMdiMainFrm::createToolWindow()
 
 void KMdiMainFrm::deleteToolWindow( TQWidget* pWnd )
 {
-	if ( m_pToolViews->contains( pWnd ) )
+	if ( m_pToolViews->tqcontains( pWnd ) )
 		deleteToolWindow( ( *m_pToolViews ) [ pWnd ] );
 }
 
@@ -586,7 +586,7 @@ KMdiToolViewAccessor *KMdiMainFrm::addToolWindow( TQWidget* pWnd, KDockWidget::D
 		pWnd = pDW;
 	}
 
-	TQRect r = pWnd->geometry();
+	TQRect r = pWnd->tqgeometry();
 
 	KMdiToolViewAccessor *mtva = new KMdiToolViewAccessor( this, pWnd, tabToolTip, ( tabCaption == 0 ) ? pWnd->caption() : tabCaption );
 	m_pToolViews->insert( tvta, mtva );
@@ -594,7 +594,7 @@ KMdiToolViewAccessor *KMdiMainFrm::addToolWindow( TQWidget* pWnd, KDockWidget::D
 	if ( pos == KDockWidget::DockNone )
 	{
 		mtva->d->widgetContainer->setEnableDocking( KDockWidget::DockNone );
-		mtva->d->widgetContainer->reparent( this, Qt::WType_TopLevel | Qt::WType_Dialog, r.topLeft(), true ); //pToolView->isVisible());
+		mtva->d->widgetContainer->reparent( this, TQt::WType_TopLevel | TQt::WType_Dialog, r.topLeft(), true ); //pToolView->isVisible());
 	}
 	else //add and dock the toolview as a dockwidget view
 		mtva->place( pos, pTargetWnd, percent );
@@ -614,7 +614,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic
 	TQRect frameGeo = pWnd->frameGeometry();
 	TQPoint topLeftScreen = pWnd->mapToGlobal( TQPoint( 0, 0 ) );
 	TQPoint topLeftMdiChildArea = m_pMdi->mapFromGlobal( topLeftScreen );
-	TQRect childAreaGeo = m_pMdi->geometry();
+	TQRect childAreaGeo = m_pMdi->tqgeometry();
 	if ( topLeftMdiChildArea.x() < 0 || topLeftMdiChildArea.y() < 0 ||
 	     ( topLeftMdiChildArea.x() + frameGeo.width() > childAreaGeo.width() ) ||
 	     ( topLeftMdiChildArea.y() + frameGeo.height() > childAreaGeo.height() ) )
@@ -631,7 +631,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic
 	lpC->setClient( pWnd, bAutomaticResize );
 	lpC->setFocus();
 	pWnd->youAreAttached( lpC );
-	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() )
+	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
 	{
 		setMinimumHeight( m_oldMainFrmMinHeight );
 		setMaximumHeight( m_oldMainFrmMaxHeight );
@@ -643,7 +643,7 @@ void KMdiMainFrm::attachWindow( KMdiChildView *pWnd, bool bShow, bool bAutomatic
 	m_pMdi->manageChild( lpC, false, bCascade );
 	if ( m_pMdi->topChild() && m_pMdi->topChild() ->isMaximized() )
 	{
-		TQRect r = lpC->geometry();
+		TQRect r = lpC->tqgeometry();
 		lpC->setGeometry( -lpC->m_pClient->x(), -lpC->m_pClient->y(),
 		                  m_pMdi->width() + KMDI_CHILDFRM_DOUBLE_BORDER,
 		                  m_pMdi->height() + lpC->captionHeight() + KMDI_CHILDFRM_SEPARATOR + KMDI_CHILDFRM_DOUBLE_BORDER );
@@ -670,7 +670,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
 		pWnd->removeEventFilter( this );
 		pWnd->youAreDetached();
 		// this is only if it was attached and you want to detach it
-		if ( pWnd->parent() )
+		if ( pWnd->tqparent() )
 		{
 			KMdiChildFrm * lpC = pWnd->mdiParent();
 			if ( lpC )
@@ -702,20 +702,20 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
 				pWnd->setGeometry( TQRect( m_pMdi->getCascadePoint( m_pDocumentViews->count() - 1 ), defaultChildFrmSize() ) );
 			}
 		}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 		if ( mdiMode() == KMdi::ToplevelMode )
 		{
-			XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
+			XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() );
 		}
 #endif
 
 		return ;
 	}
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	if ( mdiMode() == KMdi::ToplevelMode )
 	{
-		XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
+		XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() );
 	}
 #endif
 
@@ -776,12 +776,12 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd )
 			m_pDockbaseOfTabPage = m_pDockbaseAreaOfDocumentViews;
 			m_pClose->hide();
 		}
-		KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget();
+		KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget();
 		pWnd->reparent( 0L, TQPoint( 0, 0 ) );
 		pDockW->setWidget( 0L );
 		if ( pDockW == m_pDockbaseOfTabPage )
 		{
-			TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget();
+			TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget();
 			int cnt = pTab->count();
 			m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 );
 			if ( pDockW == m_pDockbaseOfTabPage )
@@ -829,7 +829,7 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd )
 }
 
 //============== closeWindow ==============//
-void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool layoutTaskBar )
+void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar )
 {
 	if ( !pWnd )
 		return ;
@@ -840,7 +840,7 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool layoutTaskBar )
 
 	if ( m_pTaskBar )
 	{
-		m_pTaskBar->removeWinButton( pWnd, layoutTaskBar );
+		m_pTaskBar->removeWinButton( pWnd, tqlayoutTaskBar );
 	}
 
 	if ( ( m_mdiMode == KMdi::TabPageMode ) || ( m_mdiMode == KMdi::IDEAlMode ) )
@@ -878,12 +878,12 @@ void KMdiMainFrm::closeWindow( KMdiChildView *pWnd, bool layoutTaskBar )
 			m_pClose->hide();
 		}
 #if 0
-		KDockWidget* pDockW = ( KDockWidget* ) pWnd->parentWidget();
+		KDockWidget* pDockW = ( KDockWidget* ) pWnd->tqparentWidget();
 		pWnd->reparent( 0L, TQPoint( 0, 0 ) );
 		pDockW->setWidget( 0L );
 		if ( pDockW == m_pDockbaseOfTabPage )
 		{
-			TQTabWidget * pTab = ( TQTabWidget* ) pDockW->parentWidget() ->parentWidget();
+			TQTabWidget * pTab = ( TQTabWidget* ) pDockW->tqparentWidget() ->tqparentWidget();
 			int cnt = pTab->count();
 			m_pDockbaseOfTabPage = ( KDockWidget* ) pTab->page( cnt - 2 );
 			if ( pDockW == m_pDockbaseOfTabPage )
@@ -963,13 +963,13 @@ bool KMdiMainFrm::windowExists( KMdiChildView *pWnd, ExistsAs as )
 {
 	if ( ( as == ToolView ) || ( as == AnyView ) )
 	{
-		if ( m_pToolViews->contains( pWnd ) )
+		if ( m_pToolViews->tqcontains( pWnd ) )
 			return true;
 		if ( as == ToolView )
 			return false;
 	}
 	
-	if ( m_pDocumentViews->findRef( pWnd ) != -1  )
+	if ( m_pDocumentViews->tqfindRef( pWnd ) != -1  )
 		return true;
 
 	return false;
@@ -1212,12 +1212,12 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e )
 
 				/** these are quite some assumptions:
 				 *   The key combination uses exactly one modifier key
-				 *   The WIN button in KDE is the meta button in Qt
+				 *   The WIN button in KDE is the meta button in TQt
 				 **/
 				if ( state != ( ( TQKeyEvent * ) e ) ->stateAfter() &&
-				        ( ( modFlags & KKey::CTRL ) > 0 ) == ( ( state & Qt::ControlButton ) > 0 ) &&
-				        ( ( modFlags & KKey::ALT ) > 0 ) == ( ( state & Qt::AltButton ) > 0 ) &&
-				        ( ( modFlags & KKey::WIN ) > 0 ) == ( ( state & Qt::MetaButton ) > 0 ) )
+				        ( ( modFlags & KKey::CTRL ) > 0 ) == ( ( state & TQt::ControlButton ) > 0 ) &&
+				        ( ( modFlags & KKey::ALT ) > 0 ) == ( ( state & TQt::AltButton ) > 0 ) &&
+				        ( ( modFlags & KKey::WIN ) > 0 ) == ( ( state & TQt::MetaButton ) > 0 ) )
 				{
 					activeWindow() ->updateTimeStamp();
 					setSwitching( false );
@@ -1238,14 +1238,14 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e )
  */
 void KMdiMainFrm::closeAllViews()
 {
-	//save the children first to a list, as removing invalidates our iterator
-	TQValueList<KMdiChildView*> children;
+	//save the tqchildren first to a list, as removing tqinvalidates our iterator
+	TQValueList<KMdiChildView*> tqchildren;
 	for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() )
 	{
-		children.append( w );
+		tqchildren.append( w );
 	}
 	TQValueListIterator<KMdiChildView *> childIt;
-	for ( childIt = children.begin(); childIt != children.end(); ++childIt )
+	for ( childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt )
 	{
 		( *childIt )->close();
 	}
@@ -1273,7 +1273,7 @@ void KMdiMainFrm::closeActiveView()
 		m_pCurrentWindow->close();
 }
 
-/** find the root dockwidgets and store their geometry */
+/** find the root dockwidgets and store their tqgeometry */
 void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetList, TQValueList<TQRect>* positionList )
 {
 	//nothing is valid
@@ -1289,24 +1289,24 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis
 		pObjList = queryList( "KDockWidget_Compat::KDockWidget" );
 
 	TQObjectListIt it( *pObjList );
-	// for all dockwidgets (which are children of this mainwindow)
+	// for all dockwidgets (which are tqchildren of this mainwindow)
 	while ( ( *it ) )
 	{
 		KDockWidget* dockWindow = 0L; /* pDockW */
 		KDockWidget* rootDockWindow = 0L; /* pRootDockWindow */
 		KDockWidget* undockCandidate = 0L; /* pUndockCandidate */
-		TQWidget* pW = static_cast<TQWidget*>( ( *it ) );
+		TQWidget* pW = TQT_TQWIDGET( ( *it ) );
 		
 		// find the oldest ancestor of the current dockwidget that can be undocked
 		while ( !pW->isTopLevel() )
 		{
-			if ( ::qt_cast<KDockWidget*>( pW ) ||  pW->inherits( "KDockWidget_Compat::KDockWidget" ) )
+			if ( ::tqqt_cast<KDockWidget*>( pW ) ||  pW->inherits( "KDockWidget_Compat::KDockWidget" ) )
 			{
 				undockCandidate = static_cast<KDockWidget*>( pW );
 				if ( undockCandidate->enableDocking() != KDockWidget::DockNone )
 					rootDockWindow = undockCandidate;
 			}
-			pW = pW->parentWidget();
+			pW = pW->tqparentWidget();
 		}
 		
 		if ( rootDockWindow )
@@ -1357,7 +1357,7 @@ void KMdiMainFrm::switchToToplevelMode()
 	const int frameBorderWidth = 7;  // @todo: Can we / do we need to ask the window manager?
 	setUndockPositioningOffset( TQPoint( 0, ( m_pTaskBar ? m_pTaskBar->height() : 0 ) + frameBorderWidth ) );
 
-	// 1.) select the dockwidgets to be undocked and store their geometry
+	// 1.) select the dockwidgets to be undocked and store their tqgeometry
 	TQPtrList<KDockWidget> rootDockWidgetList;
 	TQValueList<TQRect> positionList;
 
@@ -1399,11 +1399,11 @@ void KMdiMainFrm::switchToToplevelMode()
 		setMainDockWidget( m_pDockbaseAreaOfDocumentViews );
 	}
 	//	TQApplication::sendPostedEvents(); //why do we need to empty the event queue?
-	if ( !parentWidget() )
+	if ( !tqparentWidget() )
 	{
-		//if we don't have a parent widget ( which i expect we wouldn't )
+		//if we don't have a tqparent widget ( which i expect we wouldn't )
 		//make sure we take into account the size of the docks provided by
-		//QMainWindow
+		//TQMainWindow
 		int topDockHeight = topDock() ? topDock()->height() : 0;
 		int bottomDockHeight = bottomDock() ? bottomDock()->height() : 0;
 		int menuBarHeight = hasMenuBar() ? menuBar()->height() : 0;
@@ -1425,7 +1425,7 @@ void KMdiMainFrm::switchToToplevelMode()
 	TQPtrListIterator<KMdiChildView> kmdicvit( *m_pDocumentViews );
 	for ( kmdicvit.toFirst(); ( *kmdicvit ); ++kmdicvit )
 	{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 		XSetTransientForHint( qt_xdisplay(), ( *kmdicvit )->winId(), winId() );
 #endif
 		( *kmdicvit )->show();
@@ -1470,7 +1470,7 @@ void KMdiMainFrm::switchToChildframeMode()
 	if ( m_mdiMode == KMdi::TabPageMode )
 	{
 		kdDebug(760) << k_funcinfo << "finishing tab page mode" << endl;
-		// select the dockwidgets to be undocked and store their geometry
+		// select the dockwidgets to be undocked and store their tqgeometry
 		findRootDockWidgets( &rootDockWidgetList, &positionList );
 		kdDebug(760) << k_funcinfo << "Found " << rootDockWidgetList.count() << " widgets to undock" << endl;
 		
@@ -1490,7 +1490,7 @@ void KMdiMainFrm::switchToChildframeMode()
 		kdDebug(760) << k_funcinfo << "finishing ideal mode" << endl;
 		finishIDEAlMode( false );
 
-		// select the dockwidgets to be undocked and store their geometry
+		// select the dockwidgets to be undocked and store their tqgeometry
 		findRootDockWidgets( &rootDockWidgetList, &positionList );
 		kdDebug(760) << k_funcinfo << "Found " << rootDockWidgetList.count() << " widgets to undock" << endl;
 		
@@ -1560,7 +1560,7 @@ void KMdiMainFrm::switchToChildframeMode()
 		if ( !pView->isToolView() )
 			pView->show();
 	}
-	if ( ( oldMdiMode == KMdi::ToplevelMode ) && !parentWidget() )
+	if ( ( oldMdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
 	{
 		setMinimumHeight( m_oldMainFrmMinHeight );
 		setMaximumHeight( m_oldMainFrmMaxHeight );
@@ -1663,10 +1663,10 @@ void KMdiMainFrm::finishTabPageMode()
 			if ( pView->isToolView() )
 				continue;
 			kdDebug(760) << "KMdiMainFrm::finishTabPageMode: in loop" << endl;
-			TQSize mins = pView->minimumSize();
-			TQSize maxs = pView->maximumSize();
+			TQSize mins = pView->tqminimumSize();
+			TQSize maxs = pView->tqmaximumSize();
 			TQSize sz = pView->size();
-			TQWidget* pParent = pView->parentWidget();
+			TQWidget* pParent = pView->tqparentWidget();
 			TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
 			m_documentTabWidget->removePage( pView );
 			pView->reparent( 0, 0, p );
@@ -1692,7 +1692,7 @@ void KMdiMainFrm::finishTabPageMode()
 void KMdiMainFrm::setupTabbedDocumentViewSpace()
 {
 	// resize to childframe mode size of the mainwindow if we were in toplevel mode
-	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !parentWidget() )
+	if ( ( m_mdiMode == KMdi::ToplevelMode ) && !tqparentWidget() )
 	{
 		setMinimumHeight( m_oldMainFrmMinHeight );
 		setMaximumHeight( m_oldMainFrmMaxHeight );
@@ -1787,7 +1787,7 @@ void KMdiMainFrm::setToolviewStyle( int flag )
 			switch ( flag )
 			{
 			case KMdi::IconOnly:
-				dockWidget->setTabPageLabel( TQString::null );
+				dockWidget->setTabPageLabel( TQString() );
 				dockWidget->setPixmap( *( it.data()->wrappedWidget()->icon() ) );
 				break;
 			case KMdi::TextOnly:
@@ -1875,9 +1875,9 @@ void KMdiMainFrm::switchToIDEAlMode()
 }
 
 
-void KMdiMainFrm::dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToReparent, KDockWidget *container )
+void KMdiMainFrm::dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToRetqparent, KDockWidget *container )
 {
-	TQPtrListIterator<KDockWidget> it( widgetsToReparent );
+	TQPtrListIterator<KDockWidget> it( widgetsToRetqparent );
 	for ( ; ( *it ); ++it )
 	{
 		( *it )->manualDock( container, KDockWidget::DockCenter, 20 );
@@ -1888,9 +1888,9 @@ void KMdiMainFrm::dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsTo
 void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw )
 {
 	KDockWidget* mainDock = getMainDockWidget();
-	if ( mainDock->parentDockTabGroup() )
+	if ( mainDock->tqparentDockTabGroup() )
 	{
-		mainDock = dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() );
+		mainDock = dynamic_cast<KDockWidget*>( mainDock->tqparentDockTabGroup()->tqparent() );
 		// FIXME: will likely crash below due to unchecked cast
 	}
 
@@ -1901,9 +1901,9 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock
 	}
 	
 	KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw );
-	if ( widget && widget->parentDockTabGroup() )
+	if ( widget && widget->tqparentDockTabGroup() )
 	{
-		widget = static_cast<KDockWidget*>( widget->parentDockTabGroup() ->parent() );
+		widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->tqparentDockTabGroup() ->tqparent()) );
 
 		if ( widget )
 		{
@@ -1934,21 +1934,21 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
 
 	KDockWidget *mainDock = getMainDockWidget();
 	KDockWidget *w = mainDock;
-	if ( mainDock->parentDockTabGroup() )
-		w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() );
+	if ( mainDock->tqparentDockTabGroup() )
+		w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->tqparentDockTabGroup()->tqparent()) );
 
-	TQPtrList<KDockWidget> leftReparentWidgets;
-	TQPtrList<KDockWidget> rightReparentWidgets;
-	TQPtrList<KDockWidget> bottomReparentWidgets;
-	TQPtrList<KDockWidget> topReparentWidgets;
+	TQPtrList<KDockWidget> leftRetqparentWidgets;
+	TQPtrList<KDockWidget> rightRetqparentWidgets;
+	TQPtrList<KDockWidget> bottomRetqparentWidgets;
+	TQPtrList<KDockWidget> topRetqparentWidgets;
 
-	if ( mainDock->parentDockTabGroup() )
-		mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() );
+	if ( mainDock->tqparentDockTabGroup() )
+		mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->tqparentDockTabGroup() ->tqparent()) );
 
-	findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft );
-	findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight );
-	findToolViewsDockedToMain( &bottomReparentWidgets, KDockWidget::DockBottom );
-	findToolViewsDockedToMain( &topReparentWidgets, KDockWidget::DockTop );
+	findToolViewsDockedToMain( &leftRetqparentWidgets, KDockWidget::DockLeft );
+	findToolViewsDockedToMain( &rightRetqparentWidgets, KDockWidget::DockRight );
+	findToolViewsDockedToMain( &bottomRetqparentWidgets, KDockWidget::DockBottom );
+	findToolViewsDockedToMain( &topRetqparentWidgets, KDockWidget::DockTop );
 
 	mainDock->setEnableDocking( KDockWidget::DockNone ); //::DockCorner);
 	mainDock->setDockSite( KDockWidget::DockCorner );
@@ -2000,10 +2000,10 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
 	m_topContainer->setDockSite( KDockWidget::DockCenter );
 	m_bottomContainer->setDockSite( KDockWidget::DockCenter );
 
-	dockToolViewsIntoContainers( leftReparentWidgets, m_leftContainer );
-	dockToolViewsIntoContainers( rightReparentWidgets, m_rightContainer );
-	dockToolViewsIntoContainers( bottomReparentWidgets, m_bottomContainer );
-	dockToolViewsIntoContainers( topReparentWidgets, m_topContainer );
+	dockToolViewsIntoContainers( leftRetqparentWidgets, m_leftContainer );
+	dockToolViewsIntoContainers( rightRetqparentWidgets, m_rightContainer );
+	dockToolViewsIntoContainers( bottomRetqparentWidgets, m_bottomContainer );
+	dockToolViewsIntoContainers( topRetqparentWidgets, m_topContainer );
 
 
 	dockManager->setSpecialLeftDockContainer( m_leftContainer );
@@ -2079,10 +2079,10 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
 			KMdiChildView* pView = it.current();
 			if ( pView->isToolView() )
 				continue;
-			TQSize mins = pView->minimumSize();
-			TQSize maxs = pView->maximumSize();
+			TQSize mins = pView->tqminimumSize();
+			TQSize maxs = pView->tqmaximumSize();
 			TQSize sz = pView->size();
-			TQWidget* pParent = pView->parentWidget();
+			TQWidget* pParent = pView->tqparentWidget();
 			TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
 			pView->reparent( 0, 0, p );
 			pView->reparent( 0, 0, p );
@@ -2105,7 +2105,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
 				}
 				else
 				{
-					pParent = pParent->parentWidget();
+					pParent = pParent->tqparentWidget();
 				}
 			}
 			while ( pParent && !pDockW );
@@ -2139,9 +2139,9 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW
 	Q_UNUSED( size )
 
 	KDockWidget * mainDock = getMainDockWidget();
-	if ( mainDock->parentDockTabGroup() )
+	if ( mainDock->tqparentDockTabGroup() )
 	{
-		mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() );
+		mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->tqparentDockTabGroup() ->tqparent()) );
 	}
 
 	if ( widgetNames.count() > 0 )
@@ -2167,7 +2167,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW
 		}
 
 #if 0
-		TQWidget *wid = dwpd->parentDockTabGroup();
+		TQWidget *wid = dwpd->tqparentDockTabGroup();
 		if ( !wid )
 			wid = dwpd;
 		wid->setGeometry( 0, 0, 20, 20 );
@@ -2266,10 +2266,10 @@ void KMdiMainFrm::setSysButtonsAtMenuPosition()
 {
 	if ( m_pMainMenuBar == 0L )
 		return ;
-	if ( m_pMainMenuBar->parentWidget() == 0L )
+	if ( m_pMainMenuBar->tqparentWidget() == 0L )
 		return ;
 
-	int menuW = m_pMainMenuBar->parentWidget() ->width();
+	int menuW = m_pMainMenuBar->tqparentWidget() ->width();
 	int h;
 	int y;
 	if ( frameDecorOfAttachedViews() == KMdi::Win95Look )
@@ -2361,7 +2361,7 @@ void KMdiMainFrm::activateFirstWin()
 		return ;
 
 	TQDateTime current = activeWindow() ->getTimeStamp();
-	TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.find( current ) );
+	TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.tqfind( current ) );
 	TQMap<TQDateTime, KMdiChildView*>::iterator newPos = pos;
 	if ( pos != m.end() )
 	{
@@ -2394,7 +2394,7 @@ void KMdiMainFrm::activateLastWin()
 		return ;
 
 	TQDateTime current = activeWindow() ->getTimeStamp();
-	TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.find( current ) );
+	TQMap<TQDateTime, KMdiChildView*>::iterator pos( m.tqfind( current ) );
 	if ( pos != m.begin() )
 	{
 		--pos;
@@ -2938,4 +2938,4 @@ KTabWidget * KMdiMainFrm::tabWidget() const
 #include "kmdimainfrm.moc"
 
 // vim: ts=2 sw=2 et
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
index 68322f69..6f94451e 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
@@ -6,8 +6,8 @@
 //    begin                : 07/1999       by Szymon Stefanek as part of kvirc
 //                                         (an IRC application)
 //    changes              : 09/1999       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                         : 02/2000       by Massimo Morin (mmorin@schedsys.com)
 //                           2000-2003     maintained by the KDevelop project
 //    patches              : */2000        by Lars Beikirch (Lars.Beikirch@gmx.net)
@@ -69,7 +69,7 @@ class KMdiMainFrmPrivate;
  *
  * This special event is needed because the view has to inform the main frame that it`s being closed.
  */
-class KMDI_EXPORT KMdiViewCloseEvent : public QCustomEvent
+class KMDI_EXPORT KMdiViewCloseEvent : public TQCustomEvent
 {
 public:
 	KMdiViewCloseEvent( KMdiChildView* pWnd ) : TQCustomEvent( TQEvent::User, pWnd ) {}
@@ -78,7 +78,7 @@ public:
 /**
  * \short Base class for all your special main frames.
  *
- * It contains the child frame area (QMainWindow's central widget) and a child view taskbar
+ * It contains the child frame area (TQMainWindow's central widget) and a child view taskbar
  * for switching the MDI views. Most methods are virtual functions for later overriding.
  *
  * Basically, this class provides functionality for docking/undocking view windows and
@@ -98,7 +98,7 @@ public:
  *
  * \code
  *		MyMainWindow mainframe;
- *		qApp->setMainWidget(&mainframe);
+ *		tqApp->setMainWidget(&mainframe);
  *		mainframe->addWindow(view1); // put it under MDI control
  *		mainframe->addWindow(view2);
  * \endcode
@@ -142,7 +142,7 @@ public:
  * use fakeSDIApplication() to fake it and isFakingSDIApplication() to query whether or not an SDI
  * interface is being faked.
  *
- * You can dynamically change the shape of the attached MDI views using setFrameDecorOfAttachedViews().
+ * You can dynamically change the tqshape of the attached MDI views using setFrameDecorOfAttachedViews().
  *
  * Additionally, here's a hint how to restore the mainframe's settings from config file:
  * \code
@@ -241,6 +241,7 @@ class KMDI_EXPORT KMdiMainFrm : public KParts::DockMainWindow
 	friend class KMdiChildView;
 	friend class KMdiTaskBar;
 	Q_OBJECT
+  TQ_OBJECT
 
 	friend class KMdiToolViewAccessor;
 	// attributes
@@ -296,7 +297,7 @@ private:
 
 	// methods
 public:
-	KMdiMainFrm( TQWidget* parentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose );
+	KMdiMainFrm( TQWidget* tqparentWidget, const char* name = "", KMdi::MdiMode mdiMode = KMdi::ChildframeMode, WFlags flags = WType_TopLevel | WDestructiveClose );
 	virtual ~KMdiMainFrm();
 
 	/**
@@ -354,7 +355,7 @@ public:
 	bool windowExists( KMdiChildView *pWnd, ExistsAs as );
 	
 	/**
-	 * Catches certain Qt events and processes it here.
+	 * Catches certain TQt events and processes it here.
 	 * Currently, here this catches only the KMdiViewCloseEvent (a KMdi user event) which is sent
 	 * from itself in childWindowCloseRequest() right after a KMdiChildView::closeEvent() .
 	 * The reason for this event to itself is simple: It just wants to break the function call stack.
@@ -447,7 +448,7 @@ public:
 	 */
 	int childFrameModeHeight() { return m_oldMainFrmHeight; };
 	/**
-	 * Tells the MDI system a QMenu where it can insert buttons for
+	 * Tells the MDI system a TQMenu where it can insert buttons for
 	 * the system menu, undock, minimize, restore actions.
 	 * If no such menu is given, KMdi simply overlays the buttons
 	 * at the upper right-hand side of the main widget.
@@ -525,7 +526,7 @@ public slots:
 	
 	/**
 	 * Adds a KMdiChildView to the MDI system. The main frame takes control of it.
-	 * \param rectNormal Sets the geometry for this child view
+	 * \param rectNormal Sets the tqgeometry for this child view
 	 * \param flags the flags for the view such as:
 	 * \li whether the view should be attached or detached.
 	 * \li whether the view should be shown or hidden
@@ -548,7 +549,7 @@ public slots:
 	
 	/**
 	 * Using this method you have to use the setWidget method of the access object, and it is very recommendet, that you use
-	 * the widgetContainer() method for the parent of your newly created widget
+	 * the widgetContainer() method for the tqparent of your newly created widget
 	 */
 	KMdiToolViewAccessor *createToolWindow();
 	
@@ -563,7 +564,7 @@ public slots:
 	 * Removes a KMdiChildView from the MDI system and from the main frame`s control.
 	 * Note: The view will be deleted!
 	 */
-	virtual void closeWindow( KMdiChildView *pWnd, bool layoutTaskBar = true );
+	virtual void closeWindow( KMdiChildView *pWnd, bool tqlayoutTaskBar = true );
 	
 	/**
 	 * Switches the KMdiTaskBar on and off.
@@ -691,7 +692,7 @@ public slots:
 	virtual void tileAnodine() { m_pMdi->tileAnodine(); }
 
 	/**
-	 * Tile Vertically
+	 * TileQt::Vertically
 	 */
 	virtual void tileVertically() { m_pMdi->tileVertically(); }
 	
@@ -757,7 +758,7 @@ protected:
 	void blockClearingOfWindowMenu( bool bBlocked ) { m_bClearingOfWindowMenuBlocked = bBlocked; }
 
 	void findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDockWidget::DockPosition dprtmw );
-	void dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToReparent, KDockWidget *container );
+	void dockToolViewsIntoContainers( TQPtrList<KDockWidget>& widgetsToRetqparent, KDockWidget *container );
 	TQStringList prepareIdealToTabs( KDockWidget* container );
 	void idealToolViewsToStandardTabs( TQStringList widgetNames, KDockWidget::DockPosition pos, int sizee );
 
@@ -869,4 +870,4 @@ signals:
 
 #endif //_KMDIMAINFRM_H_
 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmdinulliterator.h b/lib/compatibility/kmdi/qextmdi/kmdinulliterator.h
index 3c976caa..3e0e1268 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdinulliterator.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdinulliterator.h
@@ -5,8 +5,8 @@
 //
 //    begin                : 02/2000       by Massimo Morin
 //    changes              : 02/2000       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //
 //    copyright            : (C) 1999-2003 by Massimo Morin (mmorin@schedsys.com)
@@ -45,5 +45,5 @@ public:
 };
 
 #endif // _KMDINULLITERATOR_H_
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
index 71c3de45..f99f5b76 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
@@ -6,8 +6,8 @@
 //    begin                : 07/1999       by Szymon Stefanek as part of kvirc
 //                                         (an IRC application)
 //    changes              : 09/1999       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //    patches              : 02/2000       by Massimo Morin (mmorin@schedsys.com)
 //
@@ -63,7 +63,7 @@ KMdiTaskBarButton::KMdiTaskBarButton( KMdiTaskBar *pTaskBar, KMdiChildView *win_
 	m_pWindow = win_ptr;
 	TQToolTip::add
 		( this, win_ptr->caption() );
-	setFocusPolicy( NoFocus );
+	setFocusPolicy( TQ_NoFocus );
 }
 
 KMdiTaskBarButton::~KMdiTaskBarButton()
@@ -73,10 +73,10 @@ void KMdiTaskBarButton::mousePressEvent( TQMouseEvent* e )
 {
 	switch ( e->button() )
 	{
-	case TQMouseEvent::LeftButton:
+	case Qt::LeftButton:
 		emit leftMouseButtonClicked( m_pWindow );
 		break;
-	case TQMouseEvent::RightButton:
+	case Qt::RightButton:
 		emit rightMouseButtonClicked( m_pWindow );
 		break;
 	default:
@@ -102,7 +102,7 @@ void KMdiTaskBarButton::fitText( const TQString& origStr, int newWidth )
 {
 	TQButton::setText( m_actualText );
 
-	int actualWidth = sizeHint().width();
+	int actualWidth = tqsizeHint().width();
 	int realLetterCount = origStr.length();
 	int newLetterCount = ( newWidth * realLetterCount ) / actualWidth;
 	int w = newWidth + 1;
@@ -140,20 +140,20 @@ TQString KMdiTaskBarButton::actualText() const
 //
 //####################################################################
 
-KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock )
-		: KToolBar( parent, "KMdiTaskBar",  /*honor_style*/ false,  /*readConfig*/ true )
+KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *tqparent, TQMainWindow::ToolBarDock dock )
+		: KToolBar( tqparent, "KMdiTaskBar",  /*honor_style*/ false,  /*readConfig*/ true )
 		, m_pCurrentFocusedWindow( 0 )
 		, m_pStretchSpace( 0 )
 		, m_layoutIsPending( false )
 		, m_bSwitchedOn( false )
 {
-	m_pFrm = parent;
+	m_pFrm = tqparent;
 	m_pButtonList = new TQPtrList<KMdiTaskBarButton>;
 	m_pButtonList->setAutoDelete( true );
 	//QT30   setFontPropagation(TQWidget::SameFont);
 	setMinimumWidth( 1 );
-	setFocusPolicy( NoFocus );
-	parent->moveToolBar( this, dock ); //XXX obsolete!
+	setFocusPolicy( TQ_NoFocus );
+	tqparent->moveToolBar( this, dock ); //XXX obsolete!
 }
 
 KMdiTaskBar::~KMdiTaskBar()
@@ -175,12 +175,12 @@ KMdiTaskBarButton * KMdiTaskBar::addWinButton( KMdiChildView *win_ptr )
 	TQObject::connect( b, TQT_SIGNAL( clicked( KMdiChildView* ) ), this, TQT_SLOT( setActiveButton( KMdiChildView* ) ) );
 	TQObject::connect( b, TQT_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( activateView( KMdiChildView* ) ) );
 	TQObject::connect( b, TQT_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) );
-	TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( layoutTaskBar( int ) ) );
+	TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( tqlayoutTaskBar( int ) ) );
 	m_pButtonList->append( b );
 	b->setToggleButton( true );
 	b->setText( win_ptr->tabCaption() );
 
-	layoutTaskBar();
+	tqlayoutTaskBar();
 
 	m_pStretchSpace = new TQLabel( this, "empty" );
 	m_pStretchSpace->setText( "" );
@@ -202,7 +202,7 @@ void KMdiTaskBar::removeWinButton( KMdiChildView *win_ptr, bool haveToLayoutTask
 	{
 		m_pButtonList->removeRef( b );
 		if ( haveToLayoutTaskBar )
-			layoutTaskBar();
+			tqlayoutTaskBar();
 	}
 	if ( m_pButtonList->count() == 0 )
 	{
@@ -303,7 +303,7 @@ void KMdiTaskBar::setActiveButton( KMdiChildView *win_ptr )
 	}
 }
 
-void KMdiTaskBar::layoutTaskBar( int taskBarWidth )
+void KMdiTaskBar::tqlayoutTaskBar( int taskBarWidth )
 {
 	if ( m_layoutIsPending )
 		return ;
@@ -337,16 +337,16 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth )
 	// if there's enough space, use actual width
 	int buttonCount = m_pButtonList->count();
 	int tbHandlePixel;
-	tbHandlePixel = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
-	int buttonAreaWidth = taskBarWidth - tbHandlePixel - style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
-	if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) )
+	tbHandlePixel = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+	int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
+	if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < tqparentWidget() ->width() ) )
 	{
 		for ( b = m_pButtonList->first();b;b = m_pButtonList->next() )
 		{
 			b->setText( b->actualText() );
-			if ( b->width() != b->sizeHint().width() )
+			if ( b->width() != b->tqsizeHint().width() )
 			{
-				b->setFixedWidth( b->sizeHint().width() );
+				b->setFixedWidth( b->tqsizeHint().width() );
 				b->show();
 			}
 		}
@@ -381,10 +381,10 @@ void KMdiTaskBar::resizeEvent( TQResizeEvent* rse )
 	{
 		if ( m_pButtonList->count() != 0 )
 		{
-			layoutTaskBar( rse->size().width() );
+			tqlayoutTaskBar( rse->size().width() );
 		}
 	}
 	KToolBar::resizeEvent( rse );
 }
 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h b/lib/compatibility/kmdi/qextmdi/kmditaskbar.h
index c333070a..2de377cb 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.h
+++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.h
@@ -6,8 +6,8 @@
 //    begin                : 07/1999       by Szymon Stefanek as part of kvirc
 //                                         (an IRC application)
 //    changes              : 09/1999       by Falk Brettschneider to create an
-//                           - 06/2000     stand-alone Qt extension set of
-//                                         classes and a Qt-based library
+//                           - 06/2000     stand-alone TQt extension set of
+//                                         classes and a TQt-based library
 //                           2000-2003     maintained by the KDevelop project
 //
 //    copyright            : (C) 1999-2003 by Falk Brettschneider
@@ -48,9 +48,10 @@ class KMdiTaskBarButtonPrivate;
   * It's a special kind of TQPushButton catching mouse clicks.
   * And you have the ability to abbreviate the text that it fits in the button.
   */
-class KMdiTaskBarButton : public QPushButton
+class KMdiTaskBarButton : public TQPushButton
 {
 	Q_OBJECT
+  TQ_OBJECT
 	// methods
 public:
 	/**
@@ -87,7 +88,7 @@ signals:
 	*/
 	void rightMouseButtonClicked( KMdiChildView* );
 	/**
-	* Emitted when the button text has changed. Internally connected with KMdiTaskBar::layoutTaskBar
+	* Emitted when the button text has changed. Internally connected with KMdiTaskBar::tqlayoutTaskBar
 	*/
 	void buttonTextChanged( int );
 public slots:
@@ -129,11 +130,12 @@ class KMdiTaskBarPrivate;
 class KMDI_EXPORT KMdiTaskBar : public KToolBar
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
 	* Constructor (NoFocus, minimum width = 1, an internal TQPtrList of taskbar buttons (autodelete))
 	*/
-	KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock );
+	KMdiTaskBar( KMdiMainFrm *tqparent, TQMainWindow::ToolBarDock dock );
 	/**
 	* Destructor (deletes the taskbar button list)
 	*/
@@ -171,7 +173,7 @@ public:
 	};
 protected:
 	/**
-	* Reimplemented from its base class to call layoutTaskBar, additionally.
+	* Reimplemented from its base class to call tqlayoutTaskBar, additionally.
 	*/
 	void resizeEvent( TQResizeEvent* );
 protected slots:
@@ -182,7 +184,7 @@ protected slots:
 	* fixed width and show() is called for each one.
 	* If one drags the taskbar to a vertical orientation, the button width is set to 80 pixel.
 	*/
-	void layoutTaskBar( int taskBarWidth = 0 );
+	void tqlayoutTaskBar( int taskBarWidth = 0 );
 public slots:
 	/**
 	* Pushes the desired taskbar button down (switch on), the old one is released (switched off).
@@ -196,7 +198,7 @@ protected:
 	*/
 	TQPtrList<KMdiTaskBarButton>* m_pButtonList;
 	/**
-	* The belonging MDI mainframe (parent widget of this)
+	* The belonging MDI mainframe (tqparent widget of this)
 	*/
 	KMdiMainFrm* m_pFrm;
 	/**
@@ -215,5 +217,5 @@ private:
 };
 
 #endif //_KMDITASKBAR_H_ 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp
index 1d2cce94..af304edf 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.cpp
@@ -29,10 +29,10 @@
 #include "kmditoolviewaccessor.h"
 #include "kmditoolviewaccessor_p.h"
 
-KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent, TQWidget *widgetToWrap, const TQString& tabToolTip, const TQString& tabCaption )
-		: TQObject( parent )
+KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *tqparent, TQWidget *widgetToWrap, const TQString& tabToolTip, const TQString& tabCaption )
+		: TQObject( tqparent )
 {
-	mdiMainFrm = parent;
+	mdiMainFrm = tqparent;
 	d = new KMdiToolViewAccessorPrivate();
 	if ( widgetToWrap->inherits( "KDockWidget" ) )
 	{
@@ -55,9 +55,9 @@ KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent, TQWidget *widge
 		{
 			finalTabCaption = tabCaption;
 		}
-		d->widgetContainer = parent->createDockWidget( widgetToWrap->name(),
+		d->widgetContainer = tqparent->createDockWidget( widgetToWrap->name(),
 		                     ( widgetToWrap->icon() ? ( *( widgetToWrap->icon() ) ) : TQPixmap() ),
-		                     0L,   // parent
+		                     0L,   // tqparent
 		                     widgetToWrap->caption(),
 		                     finalTabCaption );
 		d->widgetContainer->setWidget( widgetToWrap );
@@ -75,9 +75,9 @@ KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent, TQWidget *widge
 	d->widget->installEventFilter( this );
 }
 
-KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent )
+KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *tqparent )
 {
-	mdiMainFrm = parent;
+	mdiMainFrm = tqparent;
 	d = new KMdiToolViewAccessorPrivate();
 }
 
@@ -133,7 +133,7 @@ void KMdiToolViewAccessor::setWidgetToWrap( TQWidget *widgetToWrap, const TQStri
 	{
 		tmp = mdiMainFrm->createDockWidget( widgetToWrap->name(),
 		                                    widgetToWrap->icon() ? ( *( widgetToWrap->icon() ) ) : TQPixmap(),
-		                                    0L,   // parent
+		                                    0L,   // tqparent
 		                                    widgetToWrap->caption(),
 		                                    finalTabCaption );
 		d->widgetContainer = tmp;
@@ -186,7 +186,7 @@ void KMdiToolViewAccessor::place( KDockWidget::DockPosition pos, TQWidget* pTarg
 	if ( pos == KDockWidget::DockNone )
 	{
 		d->widgetContainer->setEnableDocking( KDockWidget::DockNone );
-		d->widgetContainer->reparent( mdiMainFrm, Qt::WType_TopLevel | Qt::WType_Dialog, TQPoint( 0, 0 ), true ); //pToolView->isVisible());
+		d->widgetContainer->reparent( mdiMainFrm, TQt::WType_TopLevel | TQt::WType_Dialog, TQPoint( 0, 0 ), true ); //pToolView->isVisible());
 	}
 	else
 	{   // add (and dock) the toolview as DockWidget view
@@ -222,9 +222,9 @@ void KMdiToolViewAccessor::place( KDockWidget::DockPosition pos, TQWidget* pTarg
 				pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd );
 				if ( !pTargetDock )
 				{
-					if ( pTargetWnd->parentWidget() )
+					if ( pTargetWnd->tqparentWidget() )
 					{
-						pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->parentWidget() );
+						pTargetDock = mdiMainFrm->dockManager->findWidgetParentDock( pTargetWnd->tqparentWidget() );
 					}
 				}
 			}
@@ -262,8 +262,8 @@ void KMdiToolViewAccessor::show()
 }
 
 
-#ifndef NO_INCLUDE_MOCFILES
+#ifndef NO_INCLUDE_TQMOCFILES
 #include "kmditoolviewaccessor.moc"
 #endif 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h
index 28241ea3..bb21bbcb 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h
+++ b/lib/compatibility/kmdi/qextmdi/kmditoolviewaccessor.h
@@ -35,9 +35,10 @@ class KMDIGUIClient;
 }
 
 
-class KMDI_EXPORT KMdiToolViewAccessor : public QObject
+class KMDI_EXPORT KMdiToolViewAccessor : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 
 	friend class KMdiMainFrm;
@@ -60,8 +61,8 @@ private:
 	bool m_bFocusInEventIsPending;
 
 private:
-	KMdiToolViewAccessor( class KMdiMainFrm *parent , TQWidget *widgetToWrap, const TQString& tabToolTip = 0, const TQString& tabCaption = 0 );
-	KMdiToolViewAccessor( class KMdiMainFrm *parent );
+	KMdiToolViewAccessor( class KMdiMainFrm *tqparent , TQWidget *widgetToWrap, const TQString& tabToolTip = 0, const TQString& tabCaption = 0 );
+	KMdiToolViewAccessor( class KMdiMainFrm *tqparent );
 public:
 	~KMdiToolViewAccessor();
 	TQWidget *wrapperWidget();
@@ -82,5 +83,5 @@ protected:
 
 
 #endif //_KMDITOOLVIEWACCESSOR_H_ 
-// kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
+// kate: space-indent off; tab-width 4; tqreplace-tabs off; indent-mode csands;
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
index 853f8e8e..3ad39b1c 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
@@ -47,7 +47,7 @@ public:
 };
 
 
-KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *parent, KMultiTabBar::KMultiTabBarMode bm):TQScrollView(parent)
+KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *tqparent, KMultiTabBar::KMultiTabBarMode bm):TQScrollView(tqparent)
 {
 	m_expandedTabSize=-1;
 	m_showActiveTabTexts=false;
@@ -73,9 +73,9 @@ KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *parent, KMultiTabBar::KMult
 	}
 	addChild(box);
 	setFrameStyle(NoFrame);
-	viewport()->setBackgroundMode(Qt::PaletteBackground);
-/*	box->setPaletteBackgroundColor(Qt::red);
-	setPaletteBackgroundColor(Qt::green);*/
+	viewport()->setBackgroundMode(TQt::PaletteBackground);
+/*	box->setPaletteBackgroundColor(TQt::red);
+	setPaletteBackgroundColor(TQt::green);*/
 }
 
 void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style)
@@ -110,7 +110,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style)
 		mainLayout->setAutoAdd(true);
 
 	}
-        viewport()->repaint();
+        viewport()->tqrepaint();
 }
 
 void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph )
@@ -120,9 +120,9 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
 	if (m_position==KMultiTabBar::Right)
 	{
 
-                paint->setPen(colorGroup().shadow());
+                paint->setPen(tqcolorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());
-                paint->setPen(colorGroup().background().dark(120));
+                paint->setPen(tqcolorGroup().background().dark(120));
                 paint->drawLine(1,0,1,viewport()->height());
 
 
@@ -130,28 +130,28 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
 	else
 	if (m_position==KMultiTabBar::Left)
 	{
-                paint->setPen(colorGroup().light());
+                paint->setPen(tqcolorGroup().light());
 		paint->drawLine(23,0,23,viewport()->height());
                 paint->drawLine(22,0,22,viewport()->height());
 
-                paint->setPen(colorGroup().shadow());
+                paint->setPen(tqcolorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());
 	}
 	else
 	if (m_position==KMultiTabBar::Bottom)
 	{
-		paint->setPen(colorGroup().shadow());
+		paint->setPen(tqcolorGroup().shadow());
 		paint->drawLine(0,0,viewport()->width(),0);
-                paint->setPen(colorGroup().background().dark(120));
+                paint->setPen(tqcolorGroup().background().dark(120));
                 paint->drawLine(0,1,viewport()->width(),1);
 	}
 	else
 	{
-	        paint->setPen(colorGroup().light());
+	        paint->setPen(tqcolorGroup().light());
 		paint->drawLine(0,23,viewport()->width(),23);
                 paint->drawLine(0,22,viewport()->width(),22);
 
-/*                paint->setPen(colorGroup().shadow());
+/*                paint->setPen(tqcolorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());*/
 
 	}
@@ -188,8 +188,8 @@ void KMultiTabBarInternal::mousePressEvent(TQMouseEvent *ev)
 
 void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) {
 /*	kdDebug()<<"KMultiTabBarInternal::resizeEvent"<<endl;
-	kdDebug()<<"KMultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl;
-	kdDebug()<<"KMultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/
+	kdDebug()<<"KMultiTabBarInternal::resizeEvent - box tqgeometry"<<box->tqgeometry()<<endl;
+	kdDebug()<<"KMultiTabBarInternal::resizeEvent - tqgeometry"<<tqgeometry()<<endl;*/
 	if (ev) TQScrollView::resizeEvent(ev);
 
 	if ( (m_style==KMultiTabBar::KDEV3) ||
@@ -346,7 +346,7 @@ int KMultiTabBarInternal::appendTab(const TQPixmap &pic ,int id,const TQString&
 	tab->installEventFilter(this);
 	tab->showActiveTabText(m_showActiveTabTexts);
 
-	if (m_style==KMultiTabBar::KONQSBC)
+	if (m_style==KMultiTabBar::KONTQSBC)
 	{
 		if (m_expandedTabSize<tab->neededSize()) {
 			m_expandedTabSize=tab->neededSize();
@@ -378,13 +378,13 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p
 	m_position=pos;
 	for (uint i=0;i<m_tabs.count();i++)
 		m_tabs.at(i)->setTabsPosition(m_position);
-	viewport()->repaint();
+	viewport()->tqrepaint();
 }
 
 
 KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, TQPopupMenu *popup,
-		int id,TQWidget *parent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style)
-	:TQPushButton(TQIconSet(),text,parent),m_style(style)
+		int id,TQWidget *tqparent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style)
+	:TQPushButton(TQIconSet(),text,tqparent),m_style(style)
 {
 	setIconSet(pic);
 	setText(text);
@@ -399,8 +399,8 @@ KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text,
 }
 
 KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup,
-		int id,TQWidget *parent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style)
-	:TQPushButton(TQIconSet(),text,parent),m_style(style)
+		int id,TQWidget *tqparent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style)
+	:TQPushButton(TQIconSet(),text,tqparent),m_style(style)
 {
 	setText(text);
 	m_position=pos;
@@ -435,45 +435,45 @@ void KMultiTabBarButton::slotClicked()
 void KMultiTabBarButton::setPosition(KMultiTabBar::KMultiTabBarPosition pos)
 {
 	m_position=pos;
-	repaint();
+	tqrepaint();
 }
 
 void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style)
 {
 	m_style=style;
-	repaint();
+	tqrepaint();
 }
 
 void KMultiTabBarButton::hideEvent( TQHideEvent* he) {
 	TQPushButton::hideEvent(he);
-	KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget());
+	KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget());
 	if (tb) tb->updateSeparator();
 }
 
 void KMultiTabBarButton::showEvent( TQShowEvent* he) {
 	TQPushButton::showEvent(he);
-	KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget());
+	KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(tqparentWidget());
 	if (tb) tb->updateSeparator();
 }
 
 
-TQSize KMultiTabBarButton::sizeHint() const
+TQSize KMultiTabBarButton::tqsizeHint() const
 {
     constPolish();
 
     int w = 0, h = 0;
 
     // calculate contents size...
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
     if ( iconSet() && !iconSet()->isNull() ) {
         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 );
     }
 #endif
     if ( isMenuButton() )
-        w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+        w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
 
     if ( pixmap() ) {
         TQPixmap *pm = (TQPixmap *)pixmap();
@@ -483,24 +483,24 @@ TQSize KMultiTabBarButton::sizeHint() 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()));
 }
 
 
 KMultiTabBarTab::KMultiTabBarTab(const TQPixmap& pic, const TQString& text,
-		int id,TQWidget *parent,KMultiTabBar::KMultiTabBarPosition pos,
+		int id,TQWidget *tqparent,KMultiTabBar::KMultiTabBarPosition pos,
 		KMultiTabBar::KMultiTabBarStyle style)
-	:KMultiTabBarButton(text,0,id,parent,pos,style),
+	:KMultiTabBarButton(text,0,id,tqparent,pos,style),
  	m_showActiveTabText(false)
 {
 	d=new KMultiTabBarTabPrivate();
@@ -526,7 +526,7 @@ void KMultiTabBarTab::setTabsPosition(KMultiTabBar::KMultiTabBarPosition pos)
 	}
 
 	setPosition(pos);
-//	repaint();
+//	tqrepaint();
 }
 
 void KMultiTabBarTab::setIcon(const TQString& icon)
@@ -567,23 +567,23 @@ void KMultiTabBarTab::setState(bool b)
 void KMultiTabBarTab::updateState()
 {
 
-	if (m_style!=KMultiTabBar::KONQSBC) {
+	if (m_style!=KMultiTabBar::KONTQSBC) {
 		if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
 			TQPushButton::setText(m_text);
 		} else {
 			kdDebug()<<"KMultiTabBarTab::updateState(): setting text to an empty TQString***************"<<endl;
-			TQPushButton::setText(TQString::null);
+			TQPushButton::setText(TQString());
 		}
 
 		if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) {
 			setFixedWidth(24);
 			if ((m_style==KMultiTabBar::KDEV3)  || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
-				setFixedHeight(KMultiTabBarButton::sizeHint().width());
+				setFixedHeight(KMultiTabBarButton::tqsizeHint().width());
 			} else setFixedHeight(36);
 		} else {
 			setFixedHeight(24);
 			if ((m_style==KMultiTabBar::KDEV3)  || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
-				setFixedWidth(KMultiTabBarButton::sizeHint().width());
+				setFixedWidth(KMultiTabBarButton::tqsizeHint().width());
 			} else setFixedWidth(36);
 		}
 	} else {
@@ -623,7 +623,7 @@ void KMultiTabBarTab::drawButtonLabel(TQPainter *p) {
 }
 void KMultiTabBarTab::drawButton(TQPainter *paint)
 {
-	if (m_style!=KMultiTabBar::KONQSBC) drawButtonStyled(paint);
+	if (m_style!=KMultiTabBar::KONTQSBC) drawButtonStyled(paint);
 	else  drawButtonClassic(paint);
 }
 
@@ -634,7 +634,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 	const int height = 24;
 	if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
 		 if ((m_position==KMultiTabBar::Left) || (m_position==KMultiTabBar::Right))
-			sh=TQSize(this->height(),this->width());//KMultiTabBarButton::sizeHint();
+			sh=TQSize(this->height(),this->width());//KMultiTabBarButton::tqsizeHint();
 			else sh=TQSize(this->width(),this->height());
 	}
 	else
@@ -651,8 +651,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 
 	if (isOn()) st|=TQStyle::Style_On;
 
-	style().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
-	style().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+	tqstyle().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
+	tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
 
 	switch (m_position) {
 		case KMultiTabBar::Left:
@@ -668,8 +668,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 			paint->drawPixmap(0,0,pixmap);
 			break;
 	}
-//	style().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
-//		colorGroup(),TQStyle::Style_Enabled);
+//	tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
+//		tqcolorGroup(),TQStyle::Style_Enabled);
 
 
 }
@@ -679,58 +679,58 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
         TQPixmap pixmap;
 	if ( iconSet())
         	pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal );
-	paint->fillRect(0, 0, 24, 24, colorGroup().background());
+	paint->fillRect(0, 0, 24, 24, tqcolorGroup().background());
 
 	if (!isOn())
 	{
 
 		if (m_position==KMultiTabBar::Right)
 		{
-			paint->fillRect(0,0,21,21,TQBrush(colorGroup().background()));
+			paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background()));
 
-			paint->setPen(colorGroup().background().dark(150));
+			paint->setPen(tqcolorGroup().background().dark(150));
 			paint->drawLine(0,22,23,22);
 
 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-			paint->setPen(colorGroup().shadow());
+			paint->setPen(tqcolorGroup().shadow());
 			paint->drawLine(0,0,0,23);
-			paint->setPen(colorGroup().background().dark(120));
+			paint->setPen(tqcolorGroup().background().dark(120));
 			paint->drawLine(1,0,1,23);
 
 		}
 		else
 		if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top))
 		{
-                        paint->fillRect(0,1,23,22,TQBrush(colorGroup().background()));
+                        paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background()));
 
                         paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-                        paint->setPen(colorGroup().background().dark(120));
+                        paint->setPen(tqcolorGroup().background().dark(120));
                         paint->drawLine(23,0,23,23);
 
 
-                        paint->setPen(colorGroup().light());
+                        paint->setPen(tqcolorGroup().light());
                         paint->drawLine(0,22,23,22);
                         paint->drawLine(0,23,23,23);
-                	paint->setPen(colorGroup().shadow());
+                	paint->setPen(tqcolorGroup().shadow());
                 	paint->drawLine(0,0,23,0);
-                        paint->setPen(colorGroup().background().dark(120));
+                        paint->setPen(tqcolorGroup().background().dark(120));
                         paint->drawLine(0,1,23,1);
 
 		}
 		else
 		{
-			paint->setPen(colorGroup().background().dark(120));
+			paint->setPen(tqcolorGroup().background().dark(120));
 			paint->drawLine(0,23,23,23);
-			paint->fillRect(0,0,23,21,TQBrush(colorGroup().background()));
+			paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background()));
 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-			paint->setPen(colorGroup().light());
+			paint->setPen(tqcolorGroup().light());
 			paint->drawLine(23,0,23,23);
 			paint->drawLine(22,0,22,23);
 
-			paint->setPen(colorGroup().shadow());
+			paint->setPen(tqcolorGroup().shadow());
 			paint->drawLine(0,0,0,23);
 
 		}
@@ -741,12 +741,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 	{
 		if (m_position==KMultiTabBar::Right)
 		{
-			paint->setPen(colorGroup().shadow());
+			paint->setPen(tqcolorGroup().shadow());
 			paint->drawLine(0,height()-1,23,height()-1);
 			paint->drawLine(0,height()-2,23,height()-2);
 			paint->drawLine(23,0,23,height()-1);
 			paint->drawLine(22,0,22,height()-1);
-			paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light()));
+			paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 
 			if (m_showActiveTabText)
@@ -756,9 +756,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 				TQPixmap tpixmap(height()-25-3, width()-2);
 				TQPainter painter(&tpixmap);
 
-				painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
+				painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
 
-				painter.setPen(colorGroup().text());
+				painter.setPen(tqcolorGroup().text());
 				painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 
 				paint->rotate(90);
@@ -770,25 +770,25 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 		else
 		if (m_position==KMultiTabBar::Top)
 		{
-			paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light()));
+			paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 			if (m_showActiveTabText)
 			{
-				paint->setPen(colorGroup().text());
+				paint->setPen(tqcolorGroup().text());
 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 			}
 		}
 		else
 		if (m_position==KMultiTabBar::Bottom)
 		{
-			paint->setPen(colorGroup().shadow());
+			paint->setPen(tqcolorGroup().shadow());
 			paint->drawLine(0,23,width()-1,23);
 			paint->drawLine(0,22,width()-1,22);
-			paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light()));
+			paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 			if (m_showActiveTabText)
 			{
-				paint->setPen(colorGroup().text());
+				paint->setPen(tqcolorGroup().text());
 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 			}
 
@@ -797,10 +797,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 		{
 
 
-			paint->setPen(colorGroup().shadow());
+			paint->setPen(tqcolorGroup().shadow());
 			paint->drawLine(0,height()-1,23,height()-1);
 			paint->drawLine(0,height()-2,23,height()-2);
-			paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light()));
+			paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 			if (m_showActiveTabText)
 			{
@@ -810,9 +810,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
                                 TQPixmap tpixmap(height()-25-3, width()-2);
                                 TQPainter painter(&tpixmap);
 
-                                painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
+                                painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
 
-                                painter.setPen(colorGroup().text());
+                                painter.setPen(tqcolorGroup().text());
                                 painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 
                                 paint->rotate(-90);
@@ -833,19 +833,19 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 
 
 
-KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *name):TQWidget(parent,name)
+KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *tqparent,const char *name):TQWidget(tqparent,name)
 {
 	m_buttons.setAutoDelete(false);
 	if (bm==Vertical)
 	{
 		m_l=new TQVBoxLayout(this);
-		setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
+		tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
 //		setFixedWidth(24);
 	}
 	else
 	{
 		m_l=new TQHBoxLayout(this);
-		setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
+		tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
 //		setFixedHeight(24);
 	}
 	m_l->setMargin(0);
@@ -855,7 +855,7 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam
 	setPosition((bm==KMultiTabBar::Vertical)?KMultiTabBar::Right:KMultiTabBar::Bottom);
 	setStyle(VSNET);
 	//	setStyle(KDEV3);
-	//setStyle(KONQSBC);
+	//setStyle(KONTQSBC);
 	m_l->insertWidget(0,m_internal);
 	m_l->insertWidget(0,m_btnTabSep=new TQFrame(this));
 	m_btnTabSep->setFixedHeight(4);
@@ -878,7 +878,7 @@ KMultiTabBar::~KMultiTabBar() {
 int KMultiTabBar::appendButton(const TQPixmap &pic ,int id,TQPopupMenu *popup,const TQString&)
 {
 	KMultiTabBarButton  *btn;
-	m_buttons.append(btn= new KMultiTabBarButton(pic,TQString::null,
+	m_buttons.append(btn= new KMultiTabBarButton(pic,TQString(),
 			popup,id,this,m_position,m_internal->m_style));
 	m_l->insertWidget(0,btn);
 	btn->show();
@@ -980,7 +980,7 @@ void KMultiTabBar::fontChange(const TQFont& /* oldFont */)
 {
 	for (uint i=0;i<tabs()->count();i++)
 		tabs()->at(i)->resize();
-	repaint();
+	tqrepaint();
 }
 
 TQPtrList<KMultiTabBarTab>* KMultiTabBar::tabs() {return m_internal->tabs();}
diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
index 575c3c65..39f701af 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
+++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
@@ -51,22 +51,23 @@ class KMultiTabBarInternal;
  * should be raisable is left to the "user".
  *@author Joseph Wenninger
  */
-class KUTILS_EXPORT KMultiTabBar: public QWidget
+class KUTILS_EXPORT KMultiTabBar: public TQWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	enum KMultiTabBarMode{Horizontal, Vertical};
+	enum KMultiTabBarMode{Horizontal,Vertical};
 	enum KMultiTabBarPosition{Left, Right, Top, Bottom};
 
 	/**
 	 * VSNET == Visual Studio .Net like (only show the text of active tabs
 	 * KDEV3 == Kdevelop 3 like (always show the text)
-	 * KONQSBC == konqy's classic sidebar style (unthemed), this one is disabled
+	 * KONTQSBC == konqy's classic sidebar style (unthemed), this one is disabled
 	 * 	at the moment, but will be renabled soon too
 	 */
-	enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONQSBC=2, KDEV3ICON=3,STYLELAST=0xffff};
+	enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONTQSBC=2, KDEV3ICON=3,STYLELAST=0xffff};
 
-	KMultiTabBar(KMultiTabBarMode bm,TQWidget *parent=0,const char *name=0);
+	KMultiTabBar(KMultiTabBarMode bm,TQWidget *tqparent=0,const char *name=0);
 	virtual ~KMultiTabBar();
 
 	/**
@@ -78,7 +79,7 @@ public:
 	 * @param popup A popup menu which should be displayed if the button is clicked
 	 * @param not_used_yet will be used for a popup text in the future
 	 */
- 	int appendButton(const TQPixmap &pic,int id=-1,TQPopupMenu* popup=0,const TQString& not_used_yet=TQString::null);
+ 	int appendButton(const TQPixmap &pic,int id=-1,TQPopupMenu* popup=0,const TQString& not_used_yet=TQString());
 	/** 
          * remove a button with the given ID
 	 */
@@ -89,7 +90,7 @@ public:
 	 * @param id an arbitrary ID which can be used later on to identify the tab
 	 * @param text if a mode with text is used it will be the tab text, otherwise a mouse over hint
 	 */
-	int appendTab(const TQPixmap &pic,int id=-1,const TQString& text=TQString::null);
+	int appendTab(const TQPixmap &pic,int id=-1,const TQString& text=TQString());
 	/**
 	 * remove a tab with a given ID
 	 */
@@ -151,14 +152,15 @@ private:
 /**
  * This class should never be created except with the appendButton call of KMultiTabBar
  */
-class KUTILS_EXPORT KMultiTabBarButton: public QPushButton
+class KUTILS_EXPORT KMultiTabBarButton: public TQPushButton
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	KMultiTabBarButton(const TQPixmap& pic,const TQString&, TQPopupMenu *popup,
-		int id,TQWidget *parent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
+		int id,TQWidget *tqparent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
 	KMultiTabBarButton(const TQString&, TQPopupMenu *popup,
-		int id,TQWidget *parent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
+		int id,TQWidget *tqparent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
 	virtual  ~KMultiTabBarButton();
 	int id() const;
 
@@ -179,7 +181,7 @@ public slots:
          */
 	void setText(const TQString &);
 
-	TQSize sizeHint() const;
+	TQSize tqsizeHint() const;
 
 protected:
 	KMultiTabBar::KMultiTabBarPosition m_position;
@@ -206,8 +208,9 @@ protected slots:
 class KUTILS_EXPORT KMultiTabBarTab: public KMultiTabBarButton
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *parent,
+	KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *tqparent,
 		KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style);
 	virtual ~KMultiTabBarTab();
 	/**
diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h b/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h
index e4820016..28ae5171 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h
+++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar_p.h
@@ -27,12 +27,13 @@
 #include <tqscrollview.h>
 #include <kmultitabbar.h>
 
-class KMultiTabBarInternal: public QScrollView
+class KMultiTabBarInternal: public TQScrollView
 {
         Q_OBJECT
+  TQ_OBJECT
 public:
-        KMultiTabBarInternal(TQWidget *parent,KMultiTabBar::KMultiTabBarMode bm);
-        int appendTab(const TQPixmap &,int=-1,const TQString& =TQString::null);
+        KMultiTabBarInternal(TQWidget *tqparent,KMultiTabBar::KMultiTabBarMode bm);
+        int appendTab(const TQPixmap &,int=-1,const TQString& =TQString());
         KMultiTabBarTab *tab(int) const;
         void removeTab(int);
         void setPosition(enum KMultiTabBar::KMultiTabBarPosition pos);
@@ -55,9 +56,9 @@ protected:
         virtual void drawContents ( TQPainter *, int, int, int, int);
 
         /**
-         * [contentsM|m]ousePressEvent are reimplemented from QScrollView
+         * [contentsM|m]ousePressEvent are reimplemented from TQScrollView
          * in order to ignore all mouseEvents on the viewport, so that the
-         * parent can handle them.
+         * tqparent can handle them.
          */
         virtual void contentsMousePressEvent(TQMouseEvent *);
         virtual void mousePressEvent(TQMouseEvent *);
diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
index e961fda1..6ca33c2d 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
+++ b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
@@ -33,8 +33,8 @@
 #include "ktabbar.h"
 #include "ktabwidget.h"
 
-KTabBar::KTabBar( TQWidget *parent, const char *name )
-    : TQTabBar( parent, name ), mReorderStartTab( -1 ), mReorderPreviousTab( -1 ),
+KTabBar::KTabBar( TQWidget *tqparent, const char *name )
+    : TQTabBar( tqparent, name ), mReorderStartTab( -1 ), mReorderPreviousTab( -1 ),
       mHoverCloseButtonTab( 0 ), mDragSwitchTab( 0 ), mHoverCloseButton( 0 ),
       mHoverCloseButtonEnabled( false ), mHoverCloseButtonDelayed( true ),
       mTabReorderingEnabled( false ), mTabCloseActivatePrevious( false )
@@ -48,7 +48,7 @@ KTabBar::KTabBar( TQWidget *parent, const char *name )
     mActivateDragSwitchTabTimer = new TQTimer( this );
     connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) );
 
-    connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange()));
+    connect(this, TQT_SIGNAL(tqlayoutChanged()), TQT_SLOT(onLayoutChange()));
 }
 
 KTabBar::~KTabBar()
@@ -76,18 +76,18 @@ void KTabBar::setTabEnabled( int id, bool enabled )
 
                 if ( t->isEnabled() ) {
                     r = r.unite( t->rect() );
-                    tablist->append( tablist->take( tablist->findRef( t ) ) );
+                    tablist->append( tablist->take( tablist->tqfindRef( t ) ) );
                     emit selected( t->identifier() );
                 }
             }
-            repaint( r );
+            tqrepaint( r );
         }
     }
 }
 
 void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e )
 {
-    if( e->button() != LeftButton )
+    if( e->button() != Qt::LeftButton )
         return;
 
     TQTab *tab = selectTab( e->pos() );
@@ -100,11 +100,11 @@ void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e )
 
 void KTabBar::mousePressEvent( TQMouseEvent *e )
 {
-    if( e->button() == LeftButton ) {
+    if( e->button() == Qt::LeftButton ) {
         mEnableCloseButtonTimer->stop();
         mDragStart = e->pos();
     }
-    else if( e->button() == RightButton ) {
+    else if( e->button() == Qt::RightButton ) {
         TQTab *tab = selectTab( e->pos() );
         if( tab ) {
             emit( contextMenu( indexOf( tab->identifier() ), mapToGlobal( e->pos() ) ) );
@@ -116,7 +116,7 @@ void KTabBar::mousePressEvent( TQMouseEvent *e )
 
 void KTabBar::mouseMoveEvent( TQMouseEvent *e )
 {
-    if ( e->state() == LeftButton ) {
+    if ( e->state() == Qt::LeftButton ) {
         TQTab *tab = selectTab( e->pos() );
         if ( mDragSwitchTab && tab != mDragSwitchTab ) {
           mActivateDragSwitchTabTimer->stop();
@@ -134,7 +134,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
            }
        }
     }
-    else if ( e->state() == MidButton ) {
+    else if ( e->state() == Qt::MidButton ) {
         if (mReorderStartTab==-1) {
             int delay = KGlobalSettings::dndEventDelay();
             TQPoint newPos = e->pos();
@@ -172,8 +172,8 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
             int xoff = 0, yoff = 0;
             // The additional offsets were found by try and error, TODO: find the rational behind them
             if ( t == tab( currentTab() ) ) {
-                xoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
-                yoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
+                xoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
+                yoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
             }
             else {
                 xoff = 7;
@@ -181,7 +181,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
             }
             rect.moveLeft( t->rect().left() + 2 + xoff );
             rect.moveTop( t->rect().center().y()-pixmap.height()/2 + yoff );
-            if ( rect.contains( e->pos() ) ) {
+            if ( rect.tqcontains( e->pos() ) ) {
                 if ( mHoverCloseButton ) {
                     if ( mHoverCloseButtonTab == t )
                         return;
@@ -229,7 +229,7 @@ void KTabBar::activateDragSwitchTab()
 
 void KTabBar::mouseReleaseEvent( TQMouseEvent *e )
 {
-    if( e->button() == MidButton ) {
+    if( e->button() == Qt::MidButton ) {
         if ( mReorderStartTab==-1 ) {
             TQTab *tab = selectTab( e->pos() );
             if( tab ) {
@@ -252,7 +252,7 @@ void KTabBar::dragMoveEvent( TQDragMoveEvent *e )
     TQTab *tab = selectTab( e->pos() );
     if( tab ) {
         bool accept = false;
-        // The receivers of the testCanDecode() signal has to adjust
+        // The tqreceivers of the testCanDecode() signal has to adjust
         // 'accept' accordingly.
         emit testCanDecode( e, accept);
         if ( accept && tab != TQTabBar::tab( currentTab() ) ) {
@@ -278,10 +278,10 @@ void KTabBar::dropEvent( TQDropEvent *e )
     TQTabBar::dropEvent( e );
 }
 
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 void KTabBar::wheelEvent( TQWheelEvent *e )
 {
-    if ( e->orientation() == Horizontal )
+    if ( e->orientation() ==Qt::Horizontal )
         return;
 
     emit( wheelDelta( e->delta() ) );
@@ -293,16 +293,16 @@ void KTabBar::setTabColor( int id, const TQColor& color )
     TQTab *t = tab( id );
     if ( t ) {
         mTabColors.insert( id, color );
-        repaint( t->rect(), false );
+        tqrepaint( t->rect(), false );
     }
 }
 
 const TQColor &KTabBar::tabColor( int id  ) const
 {
-    if ( mTabColors.contains( id ) )
+    if ( mTabColors.tqcontains( id ) )
         return mTabColors[id];
 
-    return colorGroup().foreground();
+    return tqcolorGroup().foreground();
 }
 
 int KTabBar::insertTab( TQTab *t, int index )
@@ -311,7 +311,7 @@ int KTabBar::insertTab( TQTab *t, int index )
 
     if ( mTabCloseActivatePrevious && count() > 2 ) {
         TQPtrList<TQTab> *tablist = tabList();
-        tablist->insert( count()-2, tablist->take( tablist->findRef( t ) ) );
+        tablist->insert( count()-2, tablist->take( tablist->tqfindRef( t ) ) );
     }
 
     return res;
@@ -340,8 +340,8 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
         r.setLeft( r.left() + pixw + 4 );
         r.setRight( r.right() + 2 );
 
-        int inactiveXShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
-        int inactiveYShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
+        int inactiveXShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
+        int inactiveYShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
 
         int right = t->text().isEmpty() ? br.right() - pixw : br.left() + 2;
 
@@ -357,12 +357,12 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
     if ( has_focus )
         flags |= TQStyle::Style_HasFocus;
 
-    TQColorGroup cg( colorGroup() );
-    if ( mTabColors.contains( t->identifier() ) )
+    TQColorGroup cg( tqcolorGroup() );
+    if ( mTabColors.tqcontains( t->identifier() ) )
         cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] );
 
-    style().drawControl( TQStyle::CE_TabBarLabel, p, this, r,
-                             t->isEnabled() ? cg : palette().disabled(),
+    tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, r,
+                             t->isEnabled() ? cg : tqpalette().disabled(),
                              flags, TQStyleOption(t) );
 }
 
diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.h b/lib/compatibility/kmdi/qextmdi/ktabbar.h
index a1928aab..44deca5e 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabbar.h
+++ b/lib/compatibility/kmdi/qextmdi/ktabbar.h
@@ -32,12 +32,13 @@ class KTabBarPrivate;
 /**
  * @since 3.2
  */
-class KDEUI_EXPORT KTabBar: public QTabBar
+class KDEUI_EXPORT KTabBar: public TQTabBar
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KTabBar( TQWidget* parent=0, const char* name=0 );
+    KTabBar( TQWidget* tqparent=0, const char* name=0 );
     virtual ~KTabBar();
 
     virtual void setTabEnabled( int, bool );
@@ -69,7 +70,7 @@ signals:
     void receivedDropEvent( int, TQDropEvent * );
     void moveTab( int, int );
     void closeRequest( int );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     void wheelDelta( int );
 #endif
 
@@ -78,7 +79,7 @@ protected:
     virtual void mousePressEvent( TQMouseEvent *e );
     virtual void mouseMoveEvent( TQMouseEvent *e );
     virtual void mouseReleaseEvent( TQMouseEvent *e );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     virtual void wheelEvent( TQWheelEvent *e );
 #endif
 
diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
index 21ed3e82..eab93b48 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
@@ -48,8 +48,8 @@ public:
     }
 };
 
-KTabWidget::KTabWidget( TQWidget *parent, const char *name, WFlags f )
-    : TQTabWidget( parent, name, f )
+KTabWidget::KTabWidget( TQWidget *tqparent, const char *name, WFlags f )
+    : TQTabWidget( tqparent, name, f )
 {
     d = new KTabWidgetPrivate;
     setTabBar( new KTabBar(this, "tabbar") );
@@ -63,7 +63,7 @@ KTabWidget::KTabWidget( TQWidget *parent, const char *name, WFlags f )
     connect(tabBar(), TQT_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQT_SLOT(receivedDropEvent( int, TQDropEvent * )));
     connect(tabBar(), TQT_SIGNAL(moveTab( int, int )), TQT_SLOT(moveTab( int, int )));
     connect(tabBar(), TQT_SIGNAL(closeRequest( int )), TQT_SLOT(closeRequest( int )));
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     connect(tabBar(), TQT_SIGNAL(wheelDelta( int )), TQT_SLOT(wheelDelta( int )));
 #endif
 }
@@ -160,8 +160,8 @@ bool KTabWidget::tabCloseActivatePrevious() const
 unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
 {
     int hframe, overlap;
-    hframe  = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
-    overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
+    hframe  = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
+    overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
 
     TQFontMetrics fm = tabBar()->fontMetrics();
     int x = 0;
@@ -174,8 +174,8 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
         int iw = 0;
         if ( tab->iconSet() )
           iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
-        x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this,
-                   TQSize( QMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ),
+        x += ( tabBar()->tqstyle().tqsizeFromContents( TQStyle::CT_TabBarTab, this,
+                   TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ),
                    TQStyleOption( tab ) ) ).width();
     }
     return x;
@@ -211,7 +211,7 @@ TQString KTabWidget::label( int index ) const
         if ( index >= 0 && index < count() )
             return d->m_tabNames[ index ];
         else
-            return TQString::null;
+            return TQString();
     }
     else
         return TQTabWidget::label( index );
@@ -222,7 +222,7 @@ TQString KTabWidget::tabLabel( TQWidget * w ) const
     if ( d->m_automaticResizeTabs ) {
         int index = indexOf( w );
         if ( index == -1 )
-            return TQString::null;
+            return TQString();
         else
             return d->m_tabNames[ index ];
     }
@@ -250,11 +250,11 @@ void KTabWidget::resizeTabs( int changeTabIndex )
         newMaxLength=d->m_maxLength;
         uint lcw=0, rcw=0;
 
-        int tabBarHeight = tabBar()->sizeHint().height();
+        int tabBarHeight = tabBar()->tqsizeHint().height();
         if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() )
-            lcw = QMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
+            lcw = TQMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
         if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() )
-            rcw = QMAX( cornerWidget( TopRight )->width(), tabBarHeight );
+            rcw = TQMAX( cornerWidget( TopRight )->width(), tabBarHeight );
 
         uint maxTabBarWidth = width() - lcw - rcw;
 
@@ -284,7 +284,7 @@ void KTabWidget::updateTab( int index )
         setTabToolTip( page( index ), title );
 
     title = KStringHandler::rsqueeze( title, d->m_CurrentMaxLength ).leftJustify( d->m_minLength, ' ' );
-    title.replace( '&', "&&" );
+    title.tqreplace( '&', "&&" );
 
     if ( TQTabWidget::label( index ) != title )
         TQTabWidget::setTabLabel( page( index ), title );
@@ -294,7 +294,7 @@ void KTabWidget::dragMoveEvent( TQDragMoveEvent *e )
 {
     if ( isEmptyTabbarSpace( e->pos() ) ) {
         bool accept = false;
-        // The receivers of the testCanDecode() signal has to adjust
+        // The tqreceivers of the testCanDecode() signal has to adjust
         // 'accept' accordingly.
         emit testCanDecode( e, accept);
         e->accept( accept );
@@ -313,10 +313,10 @@ void KTabWidget::dropEvent( TQDropEvent *e )
     TQTabWidget::dropEvent( e );
 }
 
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 void KTabWidget::wheelEvent( TQWheelEvent *e )
 {
-    if ( e->orientation() == Horizontal )
+    if ( e->orientation() ==Qt::Horizontal )
         return;
 
     if ( isEmptyTabbarSpace( e->pos() ) )
@@ -344,7 +344,7 @@ void KTabWidget::wheelDelta( int delta )
 
 void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e )
 {
-    if( e->button() != LeftButton )
+    if( e->button() != Qt::LeftButton )
         return;
 
     if ( isEmptyTabbarSpace( e->pos() ) ) {
@@ -356,12 +356,12 @@ void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e )
 
 void KTabWidget::mousePressEvent( TQMouseEvent *e )
 {
-    if ( e->button() == RightButton ) {
+    if ( e->button() == Qt::RightButton ) {
         if ( isEmptyTabbarSpace( e->pos() ) ) {
             emit( contextMenu( mapToGlobal( e->pos() ) ) );
             return;
         }
-    } else if ( e->button() == MidButton ) {
+    } else if ( e->button() == Qt::MidButton ) {
         if ( isEmptyTabbarSpace( e->pos() ) ) {
             emit( mouseMiddleClick() );
             return;
@@ -413,9 +413,9 @@ void KTabWidget::moveTab( int from, int to )
     TQTabWidget::insertTab( w, t, to );
     if ( d->m_automaticResizeTabs ) {
         if ( to < 0 || to >= count() )
-            d->m_tabNames.append( TQString::null );
+            d->m_tabNames.append( TQString() );
         else
-            d->m_tabNames.insert( d->m_tabNames.at( to ), TQString::null );
+            d->m_tabNames.insert( d->m_tabNames.at( to ), TQString() );
     }
 
     w = page( to );
@@ -445,7 +445,7 @@ void KTabWidget::removePage( TQWidget * w ) {
 bool KTabWidget::isEmptyTabbarSpace( const TQPoint &p ) const
 {
     TQPoint point( p );
-    TQSize size( tabBar()->sizeHint() );
+    TQSize size( tabBar()->tqsizeHint() );
     if ( ( tabPosition()==Top && point.y()< size.height() ) || ( tabPosition()==Bottom && point.y()>(height()-size.height() ) ) ) {
         TQWidget *rightcorner = cornerWidget( TopRight );
         if ( rightcorner ) {
diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.h b/lib/compatibility/kmdi/qextmdi/ktabwidget.h
index 3a686fa3..4db91b1e 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabwidget.h
+++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.h
@@ -33,17 +33,18 @@ class KTabWidgetPrivate;
  *
  * @since 3.2
  */
-class KDEUI_EXPORT KTabWidget : public QTabWidget
+class KDEUI_EXPORT KTabWidget : public TQTabWidget
 {
     Q_OBJECT
-    Q_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled )
-    Q_PROPERTY( bool hoverCloseButton READ hoverCloseButton WRITE setHoverCloseButton )
-    Q_PROPERTY( bool hoverCloseButtonDelayed READ hoverCloseButtonDelayed WRITE setHoverCloseButtonDelayed )
-    Q_PROPERTY( bool tabCloseActivatePrevious READ tabCloseActivatePrevious WRITE setTabCloseActivatePrevious )
-    Q_PROPERTY( bool automaticResizeTabs READ automaticResizeTabs WRITE setAutomaticResizeTabs )
+  TQ_OBJECT
+    TQ_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled )
+    TQ_PROPERTY( bool hoverCloseButton READ hoverCloseButton WRITE setHoverCloseButton )
+    TQ_PROPERTY( bool hoverCloseButtonDelayed READ hoverCloseButtonDelayed WRITE setHoverCloseButtonDelayed )
+    TQ_PROPERTY( bool tabCloseActivatePrevious READ tabCloseActivatePrevious WRITE setTabCloseActivatePrevious )
+    TQ_PROPERTY( bool automaticResizeTabs READ automaticResizeTabs WRITE setAutomaticResizeTabs )
 
 public:
-    KTabWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+    KTabWidget( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 );
     /**
      * Destructor.
      */
@@ -264,7 +265,7 @@ protected:
     virtual void dragMoveEvent( TQDragMoveEvent * );
     virtual void dropEvent( TQDropEvent * );
     unsigned int tabBarWidthForMaxChars( uint maxLength );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     virtual void wheelEvent( TQWheelEvent *e );
 #endif
     virtual void resizeEvent( TQResizeEvent * );
@@ -276,7 +277,7 @@ protected slots:
     virtual void mouseDoubleClick( int );
     virtual void mouseMiddleClick( int );
     virtual void closeRequest( int );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     virtual void wheelDelta( int );
 #endif
 
diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp
index b14ff38b..a4cfca68 100644
--- a/lib/compatibility/knewstuff/downloaddialog.cpp
+++ b/lib/compatibility/knewstuff/downloaddialog.cpp
@@ -49,8 +49,8 @@ using namespace KNS;
 class NumSortListViewItem : public KListViewItem
 {
   public:
-  NumSortListViewItem( TQListView * parent, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null, TQString label5 = TQString::null, TQString label6 = TQString::null, TQString label7 = TQString::null, TQString label8 = TQString::null )  :
-  KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )  
+  NumSortListViewItem( TQListView * tqparent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() )  :
+  KListViewItem( tqparent, label1, label2, label3, label4, label5, label6, label7, label8 )  
   {
   }
 
@@ -287,7 +287,7 @@ void DownloadDialog::slotResult(KIO::Job *job)
 
   kdDebug() << "got data: " << m_data[job] << endl;
 
-  kapp->config()->setGroup("KNewStuffStatus");
+  kapp->config()->setGroup("KNewStufftqStatus");
 
   dom.setContent(m_data[job]);
   knewstuff = dom.documentElement();
@@ -321,13 +321,13 @@ void DownloadDialog::slotResult(KIO::Job *job)
   m_data[job] = "";
 }
 
-int DownloadDialog::installStatus(Entry *entry)
+int DownloadDialog::installtqStatus(Entry *entry)
 {
   TQDate date;
   TQString datestring;
   int installed;
  
-  kapp->config()->setGroup("KNewStuffStatus");
+  kapp->config()->setGroup("KNewStufftqStatus");
   datestring = kapp->config()->readEntry(entry->name());
   if(datestring.isNull()) installed = 0;
   else
@@ -357,16 +357,16 @@ void DownloadDialog::addEntry(Entry *entry)
       slotPage(m_frame);
     }
   }*/
-  installed = installStatus(entry);
+  installed = installtqStatus(entry);
 
   if(installed > 0) pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small);
   else if(installed < 0) pix = KGlobal::iconLoader()->loadIcon("history", KIcon::Small);
   else pix = TQPixmap();
 
   KListViewItem *tmp_r = new KListViewItem(lv_r,
-    entry->name(), entry->version(), TQString("%1").arg(entry->rating()));
+    entry->name(), entry->version(), TQString("%1").tqarg(entry->rating()));
   KListViewItem *tmp_d = new NumSortListViewItem(lv_d,
-    entry->name(), entry->version(), TQString("%1").arg(entry->downloads()));
+    entry->name(), entry->version(), TQString("%1").tqarg(entry->downloads()));
   KListViewItem *tmp_l = new KListViewItem(lv_l,
     entry->name(), entry->version(), KGlobal::locale()->formatDate(entry->releaseDate()));
 
@@ -403,23 +403,23 @@ void DownloadDialog::slotDetails()
     "Downloads: %7\n"
     "Release date: %8\n"
     "Summary: %9\n"
-    ).arg(e->name()
-    ).arg(e->author()
-    ).arg(e->license()
-    ).arg(e->version()
-    ).arg(e->release()
-    ).arg(e->rating()
-    ).arg(e->downloads()
-    ).arg(KGlobal::locale()->formatDate(e->releaseDate())
-    ).arg(e->summary(lang)
+    ).tqarg(e->name()
+    ).tqarg(e->author()
+    ).tqarg(e->license()
+    ).tqarg(e->version()
+    ).tqarg(e->release()
+    ).tqarg(e->rating()
+    ).tqarg(e->downloads()
+    ).tqarg(KGlobal::locale()->formatDate(e->releaseDate())
+    ).tqarg(e->summary(lang)
   );
 
   info.append(i18n
   (
     "Preview: %1\n"
     "Payload: %2\n"
-    ).arg(e->preview().url()
-    ).arg(e->payload().url()
+    ).tqarg(e->preview().url()
+    ).tqarg(e->payload().url()
   ));
 
   KMessageBox::information(this, info, i18n("Details"));
@@ -453,7 +453,7 @@ void DownloadDialog::slotInstall()
 
 void DownloadDialog::install(Entry *e)
 {
-  kapp->config()->setGroup("KNewStuffStatus");
+  kapp->config()->setGroup("KNewStufftqStatus");
   kapp->config()->writeEntry(m_entryname, e->releaseDate().toString(Qt::ISODate));
   kapp->config()->sync();
 
@@ -514,17 +514,17 @@ void DownloadDialog::slotSelected()
   {
     if(!e->preview(lang).isValid())
     {
-      m_rt->setText(TQString("<b>%1</b><br>%2<br>%3<br><br><i>%4</i><br>(%5)").arg(
-        e->name()).arg(e->author()).arg(KGlobal::locale()->formatDate(e->releaseDate())).arg(e->summary(lang)).arg(e->license()));
+      m_rt->setText(TQString("<b>%1</b><br>%2<br>%3<br><br><i>%4</i><br>(%5)").tqarg(
+        e->name()).tqarg(e->author()).tqarg(KGlobal::locale()->formatDate(e->releaseDate())).tqarg(e->summary(lang)).tqarg(e->license()));
     }
     else
     {
       KIO::NetAccess::download(e->preview(lang), tmp, this);
-      m_rt->setText(TQString("<b>%1</b><br>%2<br>%3<br><br><img src='%4'><br><i>%5</i><br>(%6)").arg(
-        e->name()).arg(e->author()).arg(KGlobal::locale()->formatDate(e->releaseDate())).arg(tmp).arg(e->summary(lang)).arg(e->license()));
+      m_rt->setText(TQString("<b>%1</b><br>%2<br>%3<br><br><img src='%4'><br><i>%5</i><br>(%6)").tqarg(
+        e->name()).tqarg(e->author()).tqarg(KGlobal::locale()->formatDate(e->releaseDate())).tqarg(tmp).tqarg(e->summary(lang)).tqarg(e->license()));
     }
 
-    if(installStatus(e) == 1) enabled = false;
+    if(installtqStatus(e) == 1) enabled = false;
     else enabled = true;
 
     TQPushButton *de, *in;
@@ -558,7 +558,7 @@ void DownloadDialog::slotPage(TQWidget *w)
 
   kdDebug() << "changed widget!!!" << endl;
 
-  if(m_map.find(w) == m_map.end()) return;
+  if(m_map.tqfind(w) == m_map.end()) return;
 
   m_page = w;
 
diff --git a/lib/compatibility/knewstuff/downloaddialog.h b/lib/compatibility/knewstuff/downloaddialog.h
index 75fafae4..eea67f6e 100644
--- a/lib/compatibility/knewstuff/downloaddialog.h
+++ b/lib/compatibility/knewstuff/downloaddialog.h
@@ -57,25 +57,26 @@ class Engine;
 class KDE_EXPORT DownloadDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Constructor.
 
       @param engine a pre-built engine object, or NULL if the download
                     dialog should create an engine on its own
-      @param parent the parent window
+      @param tqparent the tqparent window
       @param caption the dialog caption
     */
-    DownloadDialog(Engine *engine, TQWidget *parent, const TQString& caption);
+    DownloadDialog(Engine *engine, TQWidget *tqparent, const TQString& caption);
 
     /**
       Alternative constructor.
       Always uses an internal engine.
 
-      @param parent the parent window
+      @param tqparent the tqparent window
       @param caption the dialog caption
     */
-    DownloadDialog(TQWidget *parent, const TQString& caption);
+    DownloadDialog(TQWidget *tqparent, const TQString& caption);
 
     /**
       Destructor.
@@ -154,19 +155,19 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
 
       @param engine a pre-built engine object, or NULL if the download
                     dialog should create an engine on its own
-      @param parent the parent window
+      @param tqparent the tqparent window
     */
-    DownloadDialog(Engine *engine, TQWidget *parent = 0);
-    // ### KDE 4.0: remove and make caption/parent argument optional
+    DownloadDialog(Engine *engine, TQWidget *tqparent = 0);
+    // ### KDE 4.0: remove and make caption/tqparent argument optional
 
     /**
       Alternative constructor.
       Always uses an internal engine.
 
-      @param parent the parent window
+      @param tqparent the tqparent window
     */
-    DownloadDialog(TQWidget *parent = 0);
-    // ### KDE 4.0: remove and make caption/parent argument optional
+    DownloadDialog(TQWidget *tqparent = 0);
+    // ### KDE 4.0: remove and make caption/tqparent argument optional
 
     /**
       Opens the download dialog.
@@ -177,7 +178,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
       @param type a data type such as "korganizer/calendar"
     */
     static void open(TQString type);
-    // ### KDE 4.0: remove and make caption/parent argument optional
+    // ### KDE 4.0: remove and make caption/tqparent argument optional
 
   public slots:
     /**
@@ -207,7 +208,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
     Entry *getEntry();
     void loadProvider(Provider *p);
     void install(Entry *e);
-    int installStatus(Entry *e);
+    int installtqStatus(Entry *e);
 
     ProviderLoader *m_loader;
     TQString m_entryname;
diff --git a/lib/compatibility/knewstuff/engine.cpp b/lib/compatibility/knewstuff/engine.cpp
index ace0b75e..eaa810c3 100644
--- a/lib/compatibility/knewstuff/engine.cpp
+++ b/lib/compatibility/knewstuff/engine.cpp
@@ -40,8 +40,8 @@
 using namespace KNS;
 
 Engine::Engine( KNewStuff *newStuff, const TQString &type,
-                TQWidget *parentWidget ) :
-  mParentWidget( parentWidget ), mDownloadDialog( 0 ),
+                TQWidget *tqparentWidget ) :
+  mParentWidget( tqparentWidget ), mDownloadDialog( 0 ),
   mUploadDialog( 0 ), mProviderDialog( 0 ), mUploadProvider( 0 ),
   mNewStuff( newStuff ), mType( type )
 {
@@ -51,8 +51,8 @@ Engine::Engine( KNewStuff *newStuff, const TQString &type,
 }
 
 Engine::Engine( KNewStuff *newStuff, const TQString &type,
-                const TQString &providerList, TQWidget *parentWidget ) :
-                mParentWidget( parentWidget ),
+                const TQString &providerList, TQWidget *tqparentWidget ) :
+                mParentWidget( tqparentWidget ),
 		mDownloadDialog( 0 ), mUploadDialog( 0 ),
 		mProviderDialog( 0 ), mUploadProvider( 0 ),
                 mProviderList( providerList ), mNewStuff( newStuff ),
@@ -283,11 +283,11 @@ void Engine::upload( Entry *entry )
   } 
 
   TQString text = i18n("The files to be uploaded have been created at:\n");
-  text.append( i18n("Data file: %1\n").arg( mUploadFile) );
+  text.append( i18n("Data file: %1\n").tqarg( mUploadFile) );
   if (!mPreviewFile.isEmpty()) {
-    text.append( i18n("Preview image: %1\n").arg( mPreviewFile) );
+    text.append( i18n("Preview image: %1\n").tqarg( mPreviewFile) );
   }
-  text.append( i18n("Content information: %1\n").arg( mUploadMetaFile) );
+  text.append( i18n("Content information: %1\n").tqarg( mUploadMetaFile) );
   text.append( i18n("Those files can now be uploaded.\n") );
   text.append( i18n("Beware that any people might have access to them at any time.") );
 
@@ -343,7 +343,7 @@ bool Engine::createMetaFile( Entry *entry )
 
   TQFile f( mUploadMetaFile );
   if ( !f.open( IO_WriteOnly ) ) {
-    mUploadMetaFile = TQString::null;
+    mUploadMetaFile = TQString();
     return false;
   }
 
@@ -401,7 +401,7 @@ void Engine::slotUploadPreviewJobResult( KIO::Job *job )
 
 void Engine::slotUploadMetaJobResult( KIO::Job *job )
 {
-  mUploadMetaFile = TQString::null;
+  mUploadMetaFile = TQString();
   if ( job->error() ) {
     kdDebug(5850) << "Error uploading new stuff metadata." << endl;
     job->showErrorDialog( mParentWidget );
diff --git a/lib/compatibility/knewstuff/engine.h b/lib/compatibility/knewstuff/engine.h
index 42f86e64..a6624d55 100644
--- a/lib/compatibility/knewstuff/engine.h
+++ b/lib/compatibility/knewstuff/engine.h
@@ -48,27 +48,28 @@ class ProviderDialog;
  * \par Maintainer:
  * Josef Spillner (spillner@kde.org)
  */
-class Engine : public QObject
+class Engine : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Constructor.
 
       @param newStuff a KNewStuff object
       @param type the Hotstuff data type such as "korganizer/calendar"
-      @param parentWidget the parent window
+      @param tqparentWidget the tqparent window
     */
-    Engine( KNewStuff *newStuff, const TQString &type, TQWidget *parentWidget = 0 );
+    Engine( KNewStuff *newStuff, const TQString &type, TQWidget *tqparentWidget = 0 );
     /**
       Constructor.
 
       @param newStuff a KNewStuff object
       @param type the Hotstuff data type such as "korganizer/calendar"
       @param providerList the URL of the provider list
-      @param parentWidget the parent window
+      @param tqparentWidget the tqparent window
     */
-    Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 );
+    Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 );
 
     /**
       Destructor.
@@ -83,11 +84,11 @@ class Engine : public QObject
     TQString type() const { return mType; }
 
     /**
-      Returns the previously set parent widget.
+      Returns the previously set tqparent widget.
 
-      @return parent widget
+      @return tqparent widget
     */
-    TQWidget *parentWidget() const { return mParentWidget; }
+    TQWidget *tqparentWidget() const { return mParentWidget; }
 
     /**
       Initiates the download process, retrieving provider lists and invoking
@@ -102,7 +103,7 @@ class Engine : public QObject
       @param fileName name of the payload data file
       @param previewName name of the preview image file
     */
-    void upload( const TQString &fileName = TQString::null, const TQString &previewName = TQString::null );
+    void upload( const TQString &fileName = TQString(), const TQString &previewName = TQString() );
 
     /**
       Downloads the specified data file.
diff --git a/lib/compatibility/knewstuff/entry.cpp b/lib/compatibility/knewstuff/entry.cpp
index ef9d3a88..eb953b0e 100644
--- a/lib/compatibility/knewstuff/entry.cpp
+++ b/lib/compatibility/knewstuff/entry.cpp
@@ -26,7 +26,7 @@
 using namespace KNS;
 
 Entry::Entry() :
-  mRelease( 0 ), mReleaseDate( TQDate::currentDate() ), mRating( 0 ),
+  mRelease( 0 ), mReleaseDate( TQDate::tqcurrentDate() ), mRating( 0 ),
   mDownloads( 0 )
 {
 }
@@ -89,12 +89,12 @@ void Entry::setSummary( const TQString &text, const TQString &lang )
 {
   mSummaryMap.insert( lang, text );
 
-  if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang );
+  if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang );
 }
 
 TQString Entry::summary( const TQString &lang ) const
 {
-  if ( mSummaryMap.isEmpty() ) return TQString::null;
+  if ( mSummaryMap.isEmpty() ) return TQString();
 
   if ( !mSummaryMap[ lang ].isEmpty() ) return mSummaryMap[ lang ];
   else {
@@ -102,7 +102,7 @@ TQString Entry::summary( const TQString &lang ) const
     for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
       if( !mSummaryMap[ *it ].isEmpty() ) return mSummaryMap[ *it ];
   }
-  if ( !mSummaryMap[ TQString::null ].isEmpty() ) return mSummaryMap[ TQString::null ];
+  if ( !mSummaryMap[ TQString() ].isEmpty() ) return mSummaryMap[ TQString() ];
   else return *(mSummaryMap.begin());
 }
 
@@ -144,7 +144,7 @@ void Entry::setPayload( const KURL &url, const TQString &lang )
 {
   mPayloadMap.insert( lang, url );
 
-  if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang );
+  if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang );
 }
 
 KURL Entry::payload( const TQString &lang ) const
@@ -155,7 +155,7 @@ KURL Entry::payload( const TQString &lang ) const
     for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
       if( !mPayloadMap[ *it ].isEmpty() ) return mPayloadMap[ *it ];
   }
-  if ( payload.isEmpty() ) payload = mPayloadMap [ TQString::null ];
+  if ( payload.isEmpty() ) payload = mPayloadMap [ TQString() ];
   if ( payload.isEmpty() && !mPayloadMap.isEmpty() ) {
     payload = *(mPayloadMap.begin());
   }
@@ -167,7 +167,7 @@ void Entry::setPreview( const KURL &url, const TQString &lang )
 {
   mPreviewMap.insert( lang, url );
   
-  if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang );
+  if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang );
 }
 
 KURL Entry::preview( const TQString &lang ) const
@@ -178,7 +178,7 @@ KURL Entry::preview( const TQString &lang ) const
     for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it)
       if( !mPreviewMap[ *it ].isEmpty() ) return mPreviewMap[ *it ];
   }
-  if ( preview.isEmpty() ) preview = mPreviewMap [ TQString::null ];
+  if ( preview.isEmpty() ) preview = mPreviewMap [ TQString() ];
   if ( preview.isEmpty() && !mPreviewMap.isEmpty() ) {
     preview = *(mPreviewMap.begin());
   }
@@ -252,11 +252,11 @@ void Entry::parseDomElement( const TQDomElement &element )
 }
 
 TQDomElement Entry::createDomElement( TQDomDocument &doc,
-                                              TQDomElement &parent )
+                                              TQDomElement &tqparent )
 {
   TQDomElement entry = doc.createElement( "stuff" );
   entry.setAttribute("type", mType);
-  parent.appendChild( entry );
+  tqparent.appendChild( entry );
 
   addElement( doc, entry, "name", name() );
   addElement( doc, entry, "author", author() );
@@ -283,12 +283,12 @@ TQDomElement Entry::createDomElement( TQDomDocument &doc,
   return entry;
 }
 
-TQDomElement Entry::addElement( TQDomDocument &doc, TQDomElement &parent,
+TQDomElement Entry::addElement( TQDomDocument &doc, TQDomElement &tqparent,
                                const TQString &tag, const TQString &value )
 {
   TQDomElement n = doc.createElement( tag );
   n.appendChild( doc.createTextNode( value ) );
-  parent.appendChild( n );
+  tqparent.appendChild( n );
 
   return n;
 }
diff --git a/lib/compatibility/knewstuff/entry.h b/lib/compatibility/knewstuff/entry.h
index a3c816a1..3de9982c 100644
--- a/lib/compatibility/knewstuff/entry.h
+++ b/lib/compatibility/knewstuff/entry.h
@@ -106,15 +106,15 @@ class KDE_EXPORT Entry
     /**
      * Sets a short description on what the object is all about.
      */
-    void setSummary( const TQString &, const TQString &lang = TQString::null );
+    void setSummary( const TQString &, const TQString &lang = TQString() );
 
     /**
      * Retrieve a short description about the object.
      *
-     * @param lang preferred language, or TQString::null for KDE default
+     * @param lang preferred language, or TQString() for KDE default
      * @return object description
      */
-    TQString summary( const TQString &lang = TQString::null ) const;
+    TQString summary( const TQString &lang = TQString() ) const;
 
     /**
      * Sets the version number.
@@ -156,29 +156,29 @@ class KDE_EXPORT Entry
     /**
      * Sets the object's file.
      */
-    void setPayload( const KURL &, const TQString &lang = TQString::null );
+    void setPayload( const KURL &, const TQString &lang = TQString() );
 
     /**
      * Retrieve the file name of the object.
      *
-     * @param lang preferred language, or TQString::null for KDE default
+     * @param lang preferred language, or TQString() for KDE default
      * @return object filename
      */
-    KURL payload( const TQString &lang = TQString::null ) const;
+    KURL payload( const TQString &lang = TQString() ) const;
 
     /**
      * Sets the object's preview file, if available. This should be a
      * picture file.
      */
-    void setPreview( const KURL &, const TQString &lang = TQString::null );
+    void setPreview( const KURL &, const TQString &lang = TQString() );
 
     /**
      * Retrieve the file name of an image containing a preview of the object.
      *
-     * @param lang preferred language, or TQString::null for KDE default
+     * @param lang preferred language, or TQString() for KDE default
      * @return object preview filename
      */
-    KURL preview( const TQString &lang = TQString::null ) const;
+    KURL preview( const TQString &lang = TQString() ) const;
 
     /**
      * Sets the rating between 0 (worst) and 10 (best).
@@ -229,10 +229,10 @@ class KDE_EXPORT Entry
     /**
      * @internal
      */
-    TQDomElement createDomElement( TQDomDocument &, TQDomElement &parent );
+    TQDomElement createDomElement( TQDomDocument &, TQDomElement &tqparent );
 
   protected:
-    TQDomElement addElement( TQDomDocument &doc, TQDomElement &parent,
+    TQDomElement addElement( TQDomDocument &doc, TQDomElement &tqparent,
                             const TQString &tag, const TQString &value );
 
   private:
diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp
index 6a37aa61..8e35c741 100644
--- a/lib/compatibility/knewstuff/knewstuff.cpp
+++ b/lib/compatibility/knewstuff/knewstuff.cpp
@@ -32,21 +32,21 @@ using namespace KNS;
 
 KAction* KNS::standardAction(const TQString& what,
                              const TQObject *recvr,
-                             const char *slot, KActionCollection* parent,
+                             const char *slot, KActionCollection* tqparent,
                              const char *name)
 {
-    return new KAction(i18n("Download New %1").arg(what), "knewstuff",
-                       0, recvr, slot, parent, name);
+    return new KAction(i18n("Download New %1").tqarg(what), "knewstuff",
+                       0, recvr, slot, tqparent, name);
 }
 
-KNewStuff::KNewStuff( const TQString &type, TQWidget *parentWidget )
+KNewStuff::KNewStuff( const TQString &type, TQWidget *tqparentWidget )
 {
-    mEngine = new Engine( this, type, parentWidget );
+    mEngine = new Engine( this, type, tqparentWidget );
 }
 
-KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget )
+KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget )
 {
-  mEngine = new Engine( this, type, providerList, parentWidget );
+  mEngine = new Engine( this, type, providerList, tqparentWidget );
 }
 
 TQString KNewStuff::type() const
@@ -54,9 +54,9 @@ TQString KNewStuff::type() const
   return mEngine->type();
 }
 
-TQWidget *KNewStuff::parentWidget() const
+TQWidget *KNewStuff::tqparentWidget() const
 {
-  return mEngine->parentWidget();
+  return mEngine->tqparentWidget();
 }
 
 KNewStuff::~KNewStuff()
diff --git a/lib/compatibility/knewstuff/knewstuff.h b/lib/compatibility/knewstuff/knewstuff.h
index 455063a3..646b58d9 100644
--- a/lib/compatibility/knewstuff/knewstuff.h
+++ b/lib/compatibility/knewstuff/knewstuff.h
@@ -36,7 +36,7 @@ class Entry;
 KAction* standardAction(const TQString& what,
                         const TQObject *recvr,
                         const char *slot,
-                        KActionCollection* parent,
+                        KActionCollection* tqparent,
                         const char *name = 0);
 }
 
@@ -74,10 +74,10 @@ class KDE_EXPORT KNewStuff
 
       @param type type of data to be handled, should be something like
                   korganizer/calendar, kword/template, kdesktop/wallpaper
-      @param parentWidget parent widget of dialogs opened by the KNewStuff
+      @param tqparentWidget tqparent widget of dialogs opened by the KNewStuff
                           engine
     */
-    KNewStuff( const TQString &type, TQWidget *parentWidget = 0 );
+    KNewStuff( const TQString &type, TQWidget *tqparentWidget = 0 );
     
     /**
       Constructor.
@@ -85,10 +85,10 @@ class KDE_EXPORT KNewStuff
       @param type type of data to be handled, should be something like
                   korganizer/calendar, kword/template, kdesktop/wallpaper
       @param providerList the URL of the provider list
-      @param parentWidget parent widget of dialogs opened by the KNewStuff
+      @param tqparentWidget tqparent widget of dialogs opened by the KNewStuff
                           engine
     */
-    KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 );
+    KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 );
     virtual ~KNewStuff();
 
     /**
@@ -97,9 +97,9 @@ class KDE_EXPORT KNewStuff
     TQString type() const;
 
     /**
-      Return parent widget.
+      Return tqparent widget.
     */
-    TQWidget *parentWidget() const;
+    TQWidget *tqparentWidget() const;
 
     /**
       Start download process.
diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.cpp b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
index 51305f62..5b085a32 100644
--- a/lib/compatibility/knewstuff/knewstuffgeneric.cpp
+++ b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
@@ -37,8 +37,8 @@
 
 using namespace std;
 
-KNewStuffGeneric::KNewStuffGeneric( const TQString &type, TQWidget *parent )
-  : KNewStuff( type, parent )
+KNewStuffGeneric::KNewStuffGeneric( const TQString &type, TQWidget *tqparent )
+  : KNewStuff( type, tqparent )
 {
   mConfig = KGlobal::config();
 }
@@ -70,7 +70,7 @@ bool KNewStuffGeneric::install( const TQString &fileName )
     kdDebug(5850) << "InstallationCommand: " << cmd << endl;
     list = TQStringList::split( " ", cmd );
     for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it) {
-        list2 << (*it).replace("%f", fileName);
+        list2 << (*it).tqreplace("%f", fileName);
     }
     KProcess proc;
     proc << list2;
@@ -110,7 +110,7 @@ TQString KNewStuffGeneric::destinationPath( KNS::Entry *entry )
   }
   if ( res.isEmpty() && path.isEmpty() )
   {
-    if ( !entry ) return TQString::null;
+    if ( !entry ) return TQString();
     else return KNewStuff::downloadDestination( entry );
   }
 
@@ -129,11 +129,11 @@ TQString KNewStuffGeneric::downloadDestination( KNS::Entry *entry )
   TQString file = destinationPath(entry);
 
   if ( KStandardDirs::exists( file ) ) {
-    int result = KMessageBox::warningContinueCancel( parentWidget(),
+    int result = KMessageBox::warningContinueCancel( tqparentWidget(),
         i18n("The file '%1' already exists. Do you want to override it?")
-        .arg( file ),
-        TQString::null, i18n("Overwrite") );
-    if ( result == KMessageBox::Cancel ) return TQString::null;
+        .tqarg( file ),
+        TQString(), i18n("Overwrite") );
+    if ( result == KMessageBox::Cancel ) return TQString();
   }
 
   return file;
diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.h b/lib/compatibility/knewstuff/knewstuffgeneric.h
index 6347bf53..fb75323f 100644
--- a/lib/compatibility/knewstuff/knewstuffgeneric.h
+++ b/lib/compatibility/knewstuff/knewstuffgeneric.h
@@ -46,9 +46,9 @@ class KDE_EXPORT KNewStuffGeneric : public KNewStuff
       Constructor.
 
       @param type a Hotstuff data type such as "korganizer/calendar"
-      @param parent the parent window.
+      @param tqparent the tqparent window.
     */
-    KNewStuffGeneric( const TQString &type, TQWidget *parent = 0 );
+    KNewStuffGeneric( const TQString &type, TQWidget *tqparent = 0 );
     ~KNewStuffGeneric();
 
     /**
diff --git a/lib/compatibility/knewstuff/knewstuffsecure.cpp b/lib/compatibility/knewstuff/knewstuffsecure.cpp
index f68be7ae..3a23c40d 100644
--- a/lib/compatibility/knewstuff/knewstuffsecure.cpp
+++ b/lib/compatibility/knewstuff/knewstuffsecure.cpp
@@ -33,8 +33,8 @@
 
 using namespace KNS;
 
-KNewStuffSecure::KNewStuffSecure(const TQString &type,  TQWidget *parentWidget)
- : KNewStuff(type, parentWidget)
+KNewStuffSecure::KNewStuffSecure(const TQString &type,  TQWidget *tqparentWidget)
+ : KNewStuff(type, tqparentWidget)
 {
   m_tempDir = 0L;
   connect(engine(), TQT_SIGNAL(uploadFinished(bool)), TQT_SLOT(slotUploadFinished(bool)));
@@ -80,7 +80,7 @@ bool KNewStuffSecure::install(const TQString &fileName)
   } else
       ok = false;
   if (!ok)
-    KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded resource tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Resource Installation Error"));
+    KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded resource tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Resource Installation Error"));
   return ok;
 }
 
@@ -128,16 +128,16 @@ void KNewStuffSecure::slotValidated(int result)
           valid = false;
       } else
       {
-          signatureStr = i18n("The resource was signed with key <i>0x%1</i>, belonging to <i>%2 &lt;%3&gt;</i>.").arg(key.id.right(8)).arg(key.name).arg(key.mail);
+          signatureStr = i18n("The resource was signed with key <i>0x%1</i>, belonging to <i>%2 &lt;%3&gt;</i>.").tqarg(key.id.right(8)).tqarg(key.name).tqarg(key.mail);
       }
    }
   if (!valid)
   {
       signatureStr.prepend( "<br>");
-      if (KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>There is a problem with the resource file you have downloaded. The errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not recommended</b>.<br><br>Do you want to proceed with the installation?</qt>").arg(errorString).arg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue)
+      if (KMessageBox::warningContinueCancel(tqparentWidget(), i18n("<qt>There is a problem with the resource file you have downloaded. The errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not recommended</b>.<br><br>Do you want to proceed with the installation?</qt>").tqarg(errorString).tqarg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue)
           valid = true;
   } else
-    KMessageBox::information(parentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").arg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information");
+    KMessageBox::information(tqparentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").tqarg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information");
   if (valid)
   {
      installResource();
@@ -145,8 +145,8 @@ void KNewStuffSecure::slotValidated(int result)
   } else
   {
     KConfig *cfg = KGlobal::config();
-    cfg->deleteGroup("KNewStuffStatus");
-    cfg->setGroup("KNewStuffStatus");
+    cfg->deleteGroup("KNewStufftqStatus");
+    cfg->setGroup("KNewStufftqStatus");
     for (TQMap<TQString, TQString>::ConstIterator it = m_installedResources.constBegin(); it != m_installedResources.constEnd(); ++it)
     {
       cfg->writeEntry(it.key(), it.data());
@@ -160,7 +160,7 @@ void KNewStuffSecure::slotValidated(int result)
 void KNewStuffSecure::downloadResource()
 {
   KConfig *cfg = KGlobal::config();
-  m_installedResources = cfg->entryMap("KNewStuffStatus");
+  m_installedResources = cfg->entryMap("KNewStufftqStatus");
   engine()->ignoreInstallResult(true);
   KNewStuff::download();
 }
@@ -187,12 +187,12 @@ void KNewStuffSecure::slotFileSigned(int result)
 {
   if (result == 0)
   {
-    KMessageBox::error(parentWidget(), i18n("The signing failed for unknown reason."));    
+    KMessageBox::error(tqparentWidget(), i18n("The signing failed for unknown reason."));    
   } else
   {
     if (result & Security::BAD_PASSPHRASE)
     {
-      if (KMessageBox::warningContinueCancel(parentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel)
+      if (KMessageBox::warningContinueCancel(tqparentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel)
       {
         disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
         removeTempDirectory();
@@ -216,7 +216,7 @@ void KNewStuffSecure::slotFileSigned(int result)
     }
     tar.close();
     KIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true);
-    KNewStuff::upload(m_signedFileName, TQString::null);
+    KNewStuff::upload(m_signedFileName, TQString());
     disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
   }
 }
@@ -231,7 +231,7 @@ void KNewStuffSecure::removeTempDirectory()
 {
   if (m_tempDir)
   {
-    KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget());
+    KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), tqparentWidget());
     delete m_tempDir;
     m_tempDir = 0L;
   }
diff --git a/lib/compatibility/knewstuff/knewstuffsecure.h b/lib/compatibility/knewstuff/knewstuffsecure.h
index 1a6bc44a..f648b579 100644
--- a/lib/compatibility/knewstuff/knewstuffsecure.h
+++ b/lib/compatibility/knewstuff/knewstuffsecure.h
@@ -40,16 +40,17 @@ to the standard KNewStuff class.
 class KDE_EXPORT KNewStuffSecure : public  TQObject, public KNewStuff
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
     /** Constructor.
 
       @param type type of data to be handled, should be something like
              korganizer/calendar, kword/template, kdesktop/wallpaper
-      @param parentWidget parent widget of dialogs opened by the KNewStuff
+      @param tqparentWidget tqparent widget of dialogs opened by the KNewStuff
               engine
      */
-    KNewStuffSecure(const TQString &type,  TQWidget *parentWidget=0);
+    KNewStuffSecure(const TQString &type,  TQWidget *tqparentWidget=0);
     virtual ~KNewStuffSecure();
 
     /** Installs the downloaded resource. Do not call or reimplement directly. 
@@ -78,7 +79,7 @@ private slots:
     /** Called when the upload has finished. 
         @param result the result of the upload
         Be careful if you reimplement it, as it deletes the temporary directory
-        m_tempDir used for upload. You must also delete it (call the parent's method)
+        m_tempDir used for upload. You must also delete it (call the tqparent's method)
         if you reimplement it.
     */
     void slotUploadFinished(bool result);  
diff --git a/lib/compatibility/knewstuff/provider.cpp b/lib/compatibility/knewstuff/provider.cpp
index ca7767e0..2224887f 100644
--- a/lib/compatibility/knewstuff/provider.cpp
+++ b/lib/compatibility/knewstuff/provider.cpp
@@ -128,10 +128,10 @@ void Provider::parseDomElement( const TQDomElement &element )
   }
 }
 
-TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &parent )
+TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &tqparent )
 {
   TQDomElement entry = doc.createElement( "stuff" );
-  parent.appendChild( entry );
+  tqparent.appendChild( entry );
 
   TQDomElement n = doc.createElement( "name" );
   n.appendChild( doc.createTextNode( name() ) );
@@ -141,8 +141,8 @@ TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &paren
 }
 
 
-ProviderLoader::ProviderLoader( TQWidget *parentWidget ) :
-  mParentWidget( parentWidget )
+ProviderLoader::ProviderLoader( TQWidget *tqparentWidget ) :
+  mParentWidget( tqparentWidget )
 {
   mProviders.setAutoDelete( true );
 }
diff --git a/lib/compatibility/knewstuff/provider.h b/lib/compatibility/knewstuff/provider.h
index f878175a..43ff5fc2 100644
--- a/lib/compatibility/knewstuff/provider.h
+++ b/lib/compatibility/knewstuff/provider.h
@@ -144,7 +144,7 @@ class Provider
   protected:
     void parseDomElement( const TQDomElement & );
 
-    TQDomElement createDomElement( TQDomDocument &, TQDomElement &parent );
+    TQDomElement createDomElement( TQDomDocument &, TQDomElement &tqparent );
 
   private:
     TQString mName;
@@ -161,16 +161,17 @@ class Provider
  * the main provider database for this specific application.
  * It should probably not be used directly by the application.
  */
-class ProviderLoader : public QObject
+class ProviderLoader : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
      * Constructor.
      *
-     * @param parentWidget the parent widget
+     * @param tqparentWidget the tqparent widget
      */
-    ProviderLoader( TQWidget *parentWidget );
+    ProviderLoader( TQWidget *tqparentWidget );
 
     /**
      * Starts asynchronously loading the list of providers of the
@@ -181,7 +182,7 @@ class ProviderLoader : public QObject
      *    we first try the ProvidersUrl from KGlobal::config, then we
      *    fall back to a hardcoded value.
      */
-    void load( const TQString &type, const TQString &providerList = TQString::null );
+    void load( const TQString &type, const TQString &providerList = TQString() );
 
   signals:
     /**
diff --git a/lib/compatibility/knewstuff/providerdialog.cpp b/lib/compatibility/knewstuff/providerdialog.cpp
index a6625870..97694a34 100644
--- a/lib/compatibility/knewstuff/providerdialog.cpp
+++ b/lib/compatibility/knewstuff/providerdialog.cpp
@@ -37,8 +37,8 @@ using namespace KNS;
 class ProviderItem : public KListViewItem
 {
   public:
-    ProviderItem( KListView *parent, Provider *provider ) :
-      KListViewItem( parent ), mProvider( provider )
+    ProviderItem( KListView *tqparent, Provider *provider ) :
+      KListViewItem( tqparent ), mProvider( provider )
     {
       setText( 0, provider->name() );
     }
@@ -49,9 +49,9 @@ class ProviderItem : public KListViewItem
     Provider *mProvider;
 };
 
-ProviderDialog::ProviderDialog( Engine *engine, TQWidget *parent ) :
+ProviderDialog::ProviderDialog( Engine *engine, TQWidget *tqparent ) :
   KDialogBase( Plain, i18n("Hot New Stuff Providers"), Ok | Cancel, Cancel,
-               parent, 0, false, true ),
+               tqparent, 0, false, true ),
   mEngine( engine )
 {
   TQFrame *topPage = plainPage();
diff --git a/lib/compatibility/knewstuff/providerdialog.h b/lib/compatibility/knewstuff/providerdialog.h
index 3e02e30a..7a9f8884 100644
--- a/lib/compatibility/knewstuff/providerdialog.h
+++ b/lib/compatibility/knewstuff/providerdialog.h
@@ -43,14 +43,15 @@ class Engine;
 class ProviderDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Constructor.
 
       @param engine a KNewStuff engine object
-      @param parent the parent window
+      @param tqparent the tqparent window
     */
-    ProviderDialog( Engine *engine, TQWidget *parent );
+    ProviderDialog( Engine *engine, TQWidget *tqparent );
 
     /**
       Clears the list of providers.
diff --git a/lib/compatibility/knewstuff/security.cpp b/lib/compatibility/knewstuff/security.cpp
index 8ef377b7..3e135e1f 100644
--- a/lib/compatibility/knewstuff/security.cpp
+++ b/lib/compatibility/knewstuff/security.cpp
@@ -125,7 +125,7 @@ void Security::slotDataArrived(KProcIO *procIO)
               key.mail=data.section('<', -1, -1);
               key.mail.truncate(key.mail.length() - 1);
               key.name=data.section('<',0,0);
-              if (key.name.find("(")!=-1)
+              if (key.name.tqfind("(")!=-1)
                   key.name=key.name.section('(',0,0);
               m_keys[shortId] = key;
           }
@@ -137,7 +137,7 @@ void Security::slotDataArrived(KProcIO *procIO)
               m_result &= SIGNED_BAD_CLEAR;
               m_result |= SIGNED_OK;
               TQString id = data.section(" ", 1 , 1).right(8);
-              if (!m_keys.contains(id))
+              if (!m_keys.tqcontains(id))
               {
                   m_result |= UNKNOWN;
               } else
@@ -154,7 +154,7 @@ void Security::slotDataArrived(KProcIO *procIO)
           {
               m_result |= SIGNED_BAD;
               TQString id = data.section(" ", 1 , 1).right(8);
-              if (!m_keys.contains(id))
+              if (!m_keys.tqcontains(id))
               {
                   m_result |= UNKNOWN;
               } else
@@ -170,11 +170,11 @@ void Security::slotDataArrived(KProcIO *procIO)
           break;
 
        case Sign:
-         if (data.find("passphrase.enter") != -1)
+         if (data.tqfind("passphrase.enter") != -1)
          {
            TQCString password;
            KeyStruct key = m_keys[m_secretKey];
-           int result = KPasswordDialog::getPassword(password, i18n("<qt>Enter passphrase for key <b>0x%1</b>, belonging to<br><i>%2&lt;%3&gt;</i>:</qt>").arg(m_secretKey).arg(key.name).arg(key.mail));
+           int result = KPasswordDialog::getPassword(password, i18n("<qt>Enter passphrase for key <b>0x%1</b>, belonging to<br><i>%2&lt;%3&gt;</i>:</qt>").tqarg(m_secretKey).tqarg(key.name).tqarg(key.mail));
            if (result == KPasswordDialog::Accepted)
            {
              procIO->writeStdin(password, true);
@@ -187,7 +187,7 @@ void Security::slotDataArrived(KProcIO *procIO)
              return;
            }
          } else
-         if (data.find("BAD_PASSPHRASE") != -1)
+         if (data.tqfind("BAD_PASSPHRASE") != -1)
          {
            m_result |= BAD_PASSPHRASE;
          }
diff --git a/lib/compatibility/knewstuff/security.h b/lib/compatibility/knewstuff/security.h
index d5e9299c..1e9f2254 100644
--- a/lib/compatibility/knewstuff/security.h
+++ b/lib/compatibility/knewstuff/security.h
@@ -41,9 +41,10 @@ It is a private class, not meant to be used by third party applications.
 
 namespace KNS {
 
-class Security : public QObject
+class Security : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   static Security* const ref()
   {
diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp
index 163ed4ba..9e63386b 100644
--- a/lib/compatibility/knewstuff/uploaddialog.cpp
+++ b/lib/compatibility/knewstuff/uploaddialog.cpp
@@ -42,9 +42,9 @@
 
 using namespace KNS;
 
-UploadDialog::UploadDialog( Engine *engine, TQWidget *parent ) :
+UploadDialog::UploadDialog( Engine *engine, TQWidget *tqparent ) :
   KDialogBase( Plain, i18n("Share Hot New Stuff"), Ok | Cancel, Cancel,
-               parent, 0, false, true ),
+               tqparent, 0, false, true ),
   mEngine( engine )
 {
   mEntryList.setAutoDelete( true );
@@ -113,7 +113,7 @@ UploadDialog::UploadDialog( Engine *engine, TQWidget *parent ) :
 
   if(!name.isNull())
   {
-    int prefill = KMessageBox::questionYesNo(this, i18n("Old upload information found, fill out fields?"), TQString::null, i18n("Fill Out Fields"), i18n("Do Not Fill Out"));
+    int prefill = KMessageBox::questionYesNo(this, i18n("Old upload information found, fill out fields?"), TQString(), i18n("Fill Out Fields"), i18n("Do Not Fill Out"));
     if(prefill == KMessageBox::Yes)
     {
       mNameEdit->setText(name);
diff --git a/lib/compatibility/knewstuff/uploaddialog.h b/lib/compatibility/knewstuff/uploaddialog.h
index cd14cbca..5d7f0e68 100644
--- a/lib/compatibility/knewstuff/uploaddialog.h
+++ b/lib/compatibility/knewstuff/uploaddialog.h
@@ -47,14 +47,15 @@ class Entry;
 class UploadDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /**
       Constructor.
 
       @param engine a KNewStuff engine object to be used for uploads
-      @param parent the parent window
+      @param tqparent the tqparent window
     */
-    UploadDialog( Engine *engine, TQWidget *parent );
+    UploadDialog( Engine *engine, TQWidget *tqparent );
 
     /**
       Destructor.
diff --git a/lib/ksavealldialog.cpp b/lib/ksavealldialog.cpp
index 3b168a4a..0dde858b 100644
--- a/lib/ksavealldialog.cpp
+++ b/lib/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/ksavealldialog.h b/lib/ksavealldialog.h
index c6592b4a..091a3ae0 100644
--- a/lib/ksavealldialog.h
+++ b/lib/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/qextfileinfo.cpp b/lib/qextfileinfo.cpp
index 7ff92c60..28f5a8e1 100644
--- a/lib/qextfileinfo.cpp
+++ b/lib/qextfileinfo.cpp
@@ -32,9 +32,9 @@
 //app includes
 #include "qextfileinfo.h"
 
-TQString QExtFileInfo::lastErrorMsg = "";
+TQString TQExtFileInfo::lastErrorMsg = "";
 
-TQString QExtFileInfo::canonicalPath(const TQString& path)
+TQString TQExtFileInfo::canonicalPath(const TQString& path)
 {
   if (!path.startsWith("/") || path == "/")
     return path;
@@ -52,18 +52,18 @@ TQString QExtFileInfo::canonicalPath(const TQString& path)
     TQString s = u.path(-1) + "/";
     if (s == "//") s = "/";
     TQString s2 = path.mid(s.length());
-    s2 = QExtFileInfo::canonicalPath(s) + s2;
+    s2 = TQExtFileInfo::canonicalPath(s) + s2;
     return s2;
   }
 }
 
-TQString QExtFileInfo::homeDirPath()
+TQString TQExtFileInfo::homeDirPath()
 {
   return TQDir(TQDir::homeDirPath()).canonicalPath();
 }
 
 /** create a relative short url based in baseURL*/
-KURL QExtFileInfo::toRelative(const KURL& _urlToConvert,const KURL& _baseURL, bool resolveSymlinks)
+KURL TQExtFileInfo::toRelative(const KURL& _urlToConvert,const KURL& _baseURL, bool resolveSymlinks)
 {
   KURL urlToConvert = _urlToConvert;
   KURL baseURL = _baseURL;
@@ -74,13 +74,13 @@ KURL QExtFileInfo::toRelative(const KURL& _urlToConvert,const KURL& _baseURL, bo
     {
       TQString path;
       if (resolveSymlinks)
-        path = QExtFileInfo::canonicalPath(urlToConvert.path());
+        path = TQExtFileInfo::canonicalPath(urlToConvert.path());
       else
         path = urlToConvert.path();
       if (!path.isEmpty())
         urlToConvert.setPath(path);
       if (resolveSymlinks)
-        path = QExtFileInfo::canonicalPath(baseURL.path());
+        path = TQExtFileInfo::canonicalPath(baseURL.path());
       else
         path = baseURL.path();
       if (!path.isEmpty())
@@ -98,8 +98,8 @@ KURL QExtFileInfo::toRelative(const KURL& _urlToConvert,const KURL& _baseURL, bo
       int pos1=0;
       for (;;)
       {
-        pos=path.find("/");
-        pos1=basePath.find("/");
+        pos=path.tqfind("/");
+        pos1=basePath.tqfind("/");
         if ( pos<0 || pos1<0 ) break;
         if ( path.left(pos+1 ) == basePath.left(pos1+1) )
         {
@@ -111,7 +111,7 @@ KURL QExtFileInfo::toRelative(const KURL& _urlToConvert,const KURL& _baseURL, bo
       };
 
       if ( basePath == "/" ) basePath="";
-      int level = basePath.contains("/");
+      int level = basePath.tqcontains("/");
       for (int i=0; i<level; i++)
       {
         path="../"+path;
@@ -126,7 +126,7 @@ KURL QExtFileInfo::toRelative(const KURL& _urlToConvert,const KURL& _baseURL, bo
   return resultURL;
 }
 /** convert relative filename to absolute */
-KURL QExtFileInfo::toAbsolute(const KURL& _urlToConvert,const KURL& _baseURL)
+KURL TQExtFileInfo::toAbsolute(const KURL& _urlToConvert,const KURL& _baseURL)
 {
   KURL urlToConvert = _urlToConvert;
   KURL baseURL = _baseURL;
@@ -136,18 +136,18 @@ KURL QExtFileInfo::toAbsolute(const KURL& _urlToConvert,const KURL& _baseURL)
   {
     if (urlToConvert.isLocalFile())
     {
-      TQString path = QExtFileInfo::canonicalPath(baseURL.path());
+      TQString path = TQExtFileInfo::canonicalPath(baseURL.path());
       if (!path.isEmpty())
         baseURL.setPath(path);
     }
     int pos;
     TQString cutname = urlToConvert.path();
     TQString cutdir = baseURL.path(1);
-    while ( (pos = cutname.find("../")) >=0 )
+    while ( (pos = cutname.tqfind("../")) >=0 )
     {
        cutname.remove( 0, pos+3 );
        cutdir.remove( cutdir.length()-1, 1 );
-       cutdir.remove( cutdir.findRev('/')+1 , 1000);
+       cutdir.remove( cutdir.tqfindRev('/')+1 , 1000);
     }
     resultURL.setPath(TQDir::cleanDirPath(cutdir+cutname));
   }
@@ -161,34 +161,34 @@ KURL QExtFileInfo::toAbsolute(const KURL& _urlToConvert,const KURL& _baseURL)
   This is needed for empty directory adding/handling. (Andras)
   Currently works only for local directories
 */
-KURL::List QExtFileInfo::allFiles( const KURL& path, const TQString& mask, TQWidget *window)
+KURL::List TQExtFileInfo::allFiles( const KURL& path, const TQString& tqmask, TQWidget *window)
 {
-  QExtFileInfo internalFileInfo;
-  return internalFileInfo.allFilesInternal(path, mask, window);
+  TQExtFileInfo internalFileInfo;
+  return internalFileInfo.allFilesInternal(path, tqmask, window);
 }
 
-KURL::List QExtFileInfo::allFilesRelative( const KURL& path, const TQString& mask, TQWidget *window, bool resolveSymlinks)
+KURL::List TQExtFileInfo::allFilesRelative( const KURL& path, const TQString& tqmask, TQWidget *window, bool resolveSymlinks)
 {
-  QExtFileInfo internalFileInfo;
-  KURL::List r = internalFileInfo.allFilesInternal(path, mask, window);
+  TQExtFileInfo internalFileInfo;
+  KURL::List r = internalFileInfo.allFilesInternal(path, tqmask, window);
 
   KURL::List::Iterator it;
   for ( it = r.begin(); it != r.end(); ++it )
   {
-    *it = QExtFileInfo::toRelative( *it, path, resolveSymlinks );
+    *it = TQExtFileInfo::toRelative( *it, path, resolveSymlinks );
   }
 
   return r;
 }
 
-TQDict<KFileItem> QExtFileInfo::allFilesDetailed(const KURL& path, const TQString& mask, TQWidget *window)
+TQDict<KFileItem> TQExtFileInfo::allFilesDetailed(const KURL& path, const TQString& tqmask, TQWidget *window)
 {
-  QExtFileInfo internalFileInfo;
-  return internalFileInfo.allFilesDetailedInternal(path, mask, window);
+  TQExtFileInfo internalFileInfo;
+  return internalFileInfo.allFilesDetailedInternal(path, tqmask, window);
 }
 
 
-bool QExtFileInfo::createDir(const KURL& path, TQWidget *window)
+bool TQExtFileInfo::createDir(const KURL& path, TQWidget *window)
 {
   int i = 0;
   bool result;
@@ -223,7 +223,7 @@ bool QExtFileInfo::createDir(const KURL& path, TQWidget *window)
  return result;
 }
 
-KURL QExtFileInfo::cdUp(const KURL &url)
+KURL TQExtFileInfo::cdUp(const KURL &url)
 {
   KURL u = url;
   TQString dir = u.path(-1);
@@ -235,19 +235,19 @@ KURL QExtFileInfo::cdUp(const KURL &url)
   return u;
 }
 
-TQString QExtFileInfo::shortName(const TQString &fname)
+TQString TQExtFileInfo::shortName(const TQString &fname)
 {
   return fname.section("/", -1);
 }
 
-KURL QExtFileInfo::path( const KURL &url )
+KURL TQExtFileInfo::path( const KURL &url )
 {
   KURL result = url;
   result.setPath(result.directory(false,false));
   return result;
 }
 
-KURL QExtFileInfo::home()
+KURL TQExtFileInfo::home()
 {
   KURL url;
   url.setPath(TQDir::currentDirPath()+"/");
@@ -255,7 +255,7 @@ KURL QExtFileInfo::home()
 }
 
 
-bool QExtFileInfo::exists(const KURL& a_url, bool readingOnly, TQWidget *window)
+bool TQExtFileInfo::exists(const KURL& a_url, bool readingOnly, TQWidget *window)
 {
 // Andras: Don't use it now, as it brings up an extra dialog and need manual
 // intervention when usign fish
@@ -267,24 +267,24 @@ bool QExtFileInfo::exists(const KURL& a_url, bool readingOnly, TQWidget *window)
    return TQFile::exists(a_url.path());
  } else
  {
-   QExtFileInfo internalFileInfo;
+   TQExtFileInfo internalFileInfo;
    return internalFileInfo.internalExists(a_url, readingOnly, window);
  }
 }
 
 /* Synchronous copy, like NetAccess::file_copy in KDE 3.2 */
-bool QExtFileInfo::copy( const KURL& src, const KURL& target, int permissions,
+bool TQExtFileInfo::copy( const KURL& src, const KURL& target, int permissions,
  bool overwrite, bool resume, TQWidget* window )
 {
-  QExtFileInfo internalFileInfo;
+  TQExtFileInfo internalFileInfo;
   return internalFileInfo.internalCopy( src, target, permissions, overwrite, resume, window );
 }
 
 /** No descriptions */
-KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& mask, TQWidget *window)
+KURL::List TQExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& tqmask, TQWidget *window)
 {
   if (startURL.isLocalFile())
-    return allLocalFiles(startURL.path(-1), mask);
+    return allLocalFiles(startURL.path(-1), tqmask);
 
   dirListItems.clear();
   if (internalExists(startURL, true, window))
@@ -292,7 +292,7 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString&
     lstFilters.setAutoDelete(true);
     lstFilters.clear();
     // Split on white space
-    TQStringList list = TQStringList::split( ' ', mask );
+    TQStringList list = TQStringList::split( ' ', tqmask );
     for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
        lstFilters.append( new TQRegExp(*it, false, true ) );
 
@@ -320,7 +320,7 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString&
 }
 
 /** No descriptions */
-TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, const TQString& mask, TQWidget *window)
+TQDict<KFileItem> TQExtFileInfo::allFilesDetailedInternal(const KURL& startURL, const TQString& tqmask, TQWidget *window)
 {
   detailedDirListItems.setAutoDelete(true);
   detailedDirListItems.clear();
@@ -330,7 +330,7 @@ TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, c
     lstFilters.setAutoDelete(true);
     lstFilters.clear();
     // Split on white space
-    TQStringList list = TQStringList::split( ' ', mask );
+    TQStringList list = TQStringList::split( ' ', tqmask );
     for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
        lstFilters.append( new TQRegExp(*it, false, true ) );
 
@@ -356,10 +356,10 @@ TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, c
   return detailedDirListItems;
 }
 
-KURL::List QExtFileInfo::allLocalFiles(const TQString& startPath, const TQString& mask)
+KURL::List TQExtFileInfo::allLocalFiles(const TQString& startPath, const TQString& tqmask)
 {
   KURL::List list;
-  TQDir d(startPath, mask);
+  TQDir d(startPath, tqmask);
   TQStringList l = d.entryList();
   TQStringList::ConstIterator end = l.constEnd();
   TQString path;
@@ -379,7 +379,7 @@ KURL::List QExtFileInfo::allLocalFiles(const TQString& startPath, const TQString
   for (TQStringList::ConstIterator it = l.constBegin(); it != end; ++it)
   {
     if ((*it) != "." && (*it) != "..")
-      list += allLocalFiles(startPath + "/" + (*it), mask);
+      list += allLocalFiles(startPath + "/" + (*it), tqmask);
   }
   return list;
 }
@@ -387,12 +387,12 @@ KURL::List QExtFileInfo::allLocalFiles(const TQString& startPath, const TQString
 
 //Some hackery from KIO::NetAccess as they do not do exactly what we want
 /* return true if the url exists*/
-bool QExtFileInfo::internalExists(const KURL& url, bool readingOnly, TQWidget *window)
+bool TQExtFileInfo::internalExists(const KURL& url, bool readingOnly, TQWidget *window)
 {
   bJobOK = true;
   KURL url2 = url;
   url2.adjustPath(-1);
- // kdDebug(24000)<<"QExtFileInfo::internalExists"<<endl;
+ // kdDebug(24000)<<"TQExtFileInfo::internalExists"<<endl;
   KIO::StatJob * job = KIO::stat(url2, false);
   job->setWindow(window);
   job->setDetails(0);
@@ -402,13 +402,13 @@ bool QExtFileInfo::internalExists(const KURL& url, bool readingOnly, TQWidget *w
 
   //To avoid lock-ups, start a timer.
   TQTimer::singleShot(60*1000, this,TQT_SLOT(slotTimeout()));
-  //kdDebug(24000)<<"QExtFileInfo::internalExists:before enter_loop"<<endl;
+  //kdDebug(24000)<<"TQExtFileInfo::internalExists:before enter_loop"<<endl;
   enter_loop();
-  //kdDebug(24000)<<"QExtFileInfo::internalExists:after enter_loop"<<endl;
+  //kdDebug(24000)<<"TQExtFileInfo::internalExists:after enter_loop"<<endl;
   return bJobOK;
 }
 
-bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permissions,
+bool TQExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permissions,
                                 bool overwrite, bool resume, TQWidget* window)
 {
   bJobOK = true; // success unless further error occurs
@@ -437,27 +437,27 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss
 void qt_enter_modal( TQWidget *widget );
 void qt_leave_modal( TQWidget *widget );
 
-void QExtFileInfo::enter_loop()
+void TQExtFileInfo::enter_loop()
 {
   TQWidget dummy(0,0,WType_Dialog | WShowModal);
-  dummy.setFocusPolicy( TQWidget::NoFocus );
+  dummy.setFocusPolicy( TQ_NoFocus );
   qt_enter_modal(&dummy);
-  //kdDebug(24000)<<"QExtFileInfo::enter_loop:before qApp->enter_loop()"<< endl;
-  qApp->enter_loop();
-//  kdDebug(24000)<<"QExtFileInfo::enter_loop:after qApp->enter_loop()"<<endl;
+  //kdDebug(24000)<<"TQExtFileInfo::enter_loop:before tqApp->enter_loop()"<< endl;
+  tqApp->enter_loop();
+//  kdDebug(24000)<<"TQExtFileInfo::enter_loop:after tqApp->enter_loop()"<<endl;
   qt_leave_modal(&dummy);
 }
 
-void QExtFileInfo::slotListResult(KIO::Job *job)
+void TQExtFileInfo::slotListResult(KIO::Job *job)
 {
   m_listJobCount--;
   if (m_listJobCount == 0)
     slotResult(job);
 }
 
-void QExtFileInfo::slotResult(KIO::Job *job)
+void TQExtFileInfo::slotResult(KIO::Job *job)
 {
-   //kdDebug(24000)<<"QExtFileInfo::slotResult"<<endl;
+   //kdDebug(24000)<<"TQExtFileInfo::slotResult"<<endl;
  bJobOK = !job->error();
   if ( !bJobOK )
   {
@@ -466,14 +466,14 @@ void QExtFileInfo::slotResult(KIO::Job *job)
   }
   if ( job->isA("KIO::StatJob") )
     m_entry = static_cast<KIO::StatJob *>(job)->statResult();
-  qApp->exit_loop();
+  tqApp->exit_loop();
 }
 
-void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList)
+void TQExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsList)
 {
   KURL url = static_cast<KIO::ListJob *>(job)->url();
   url.adjustPath(-1);
-  // avoid creating these QStrings again and again
+  // avoid creating these TQStrings again and again
   static const TQString& dot = KGlobal::staticQString(".");
   static const TQString& dotdot = KGlobal::staticQString("..");
 
@@ -511,7 +511,7 @@ void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsLis
         else
           u.setPath(linkDest);
         u.adjustPath(+1);
-        if (!dirListItems.contains(u) && u.url() != m_listStartURL && !u.isParentOf(item->url()))
+        if (!dirListItems.tqcontains(u) && u.url() != m_listStartURL && !u.isParentOf(item->url()))
         {
           linkItems.append(new KFileItem(*item));
         } else
@@ -543,11 +543,11 @@ void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsLis
   }
 }
 
-void QExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList& udsList)
+void TQExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList& udsList)
 {
   KURL url = static_cast<KIO::ListJob *>(job)->url();
   url.adjustPath(-1);
-  // avoid creating these QStrings again and again
+  // avoid creating these TQStrings again and again
   static const TQString& dot = KGlobal::staticQString(".");
   static const TQString& dotdot = KGlobal::staticQString("..");
 
@@ -577,7 +577,7 @@ void QExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList
         KURL u = item->url();
         u.setPath(item->linkDest());
         TQString urlStr = u.url();
-        if (detailedDirListItems.find(urlStr) == 0L &&
+        if (detailedDirListItems.tqfind(urlStr) == 0L &&
             (urlStr != m_listStartURL))
         {
           linkItems.append(new KFileItem(*item));
@@ -611,9 +611,9 @@ void QExtFileInfo::slotNewDetailedEntries(KIO::Job *job, const KIO::UDSEntryList
 }
 
 /** Timeout occurred while waiting for some network function to return. */
-void QExtFileInfo::slotTimeout()
+void TQExtFileInfo::slotTimeout()
 {
   bJobOK = false;
-  qApp->exit_loop();
+  tqApp->exit_loop();
 }
 #include "qextfileinfo.moc"
diff --git a/lib/qextfileinfo.h b/lib/qextfileinfo.h
index 96d418fb..ca51123b 100644
--- a/lib/qextfileinfo.h
+++ b/lib/qextfileinfo.h
@@ -9,8 +9,8 @@
     (at your option) any later version.
 */
 
-#ifndef _QEXTFILEINFO_H_
-#define _QEXTFILEINFO_H_
+#ifndef _TQEXTFILEINFO_H_
+#define _TQEXTFILEINFO_H_
 
 #include <kio/global.h>
 #include <kio/job.h>
@@ -22,12 +22,13 @@
 #include <tqdict.h>
 #include <tqregexp.h>
 
-class QExtFileInfo:public QObject
+class TQExtFileInfo:public TQObject
 {
  Q_OBJECT
+  TQ_OBJECT
 public:
-  QExtFileInfo() {};
-  ~QExtFileInfo() {};
+  TQExtFileInfo() {};
+  ~TQExtFileInfo() {};
 
   /**
    * Works like TQDir::canonicalPath, but it does not return an empty
@@ -37,7 +38,7 @@ public:
    * Example:
    * /home/user/foo points to /mnt/foo
    * /home/user/foo/foo2 does not exists
-   * QExtFileInfo::canonicalPath("/home/user/foo/foo2/") will return
+   * TQExtFileInfo::canonicalPath("/home/user/foo/foo2/") will return
    * /mnt/foo/foo2/ .
    * @param path the path to resolve
    * @return the canonical path (symlinks resolved)
@@ -54,21 +55,21 @@ public:
   static KURL toRelative(const KURL& urlToConvert, const KURL& baseURL, bool resolveSymlinks = true);
   /** Convert relative url to absolute, based on baseURL. */
   static KURL toAbsolute(const KURL& urlToConvert, const KURL& baseURL);
-  /** Returns a recursive list of files under path, matching the specified file mask. */
-  static KURL::List allFiles( const KURL& path, const TQString &mask, TQWidget *window);
-  /** Returns a recursive list of files under path, matching the specified file mask.
+  /** Returns a recursive list of files under path, matching the specified file tqmask. */
+  static KURL::List allFiles( const KURL& path, const TQString &tqmask, TQWidget *window);
+  /** Returns a recursive list of files under path, matching the specified file tqmask.
       The returned urls are relative to path.
   */
-  static KURL::List allFilesRelative( const KURL& path, const TQString &mask, TQWidget *window, bool resolveSymlinks = true);
-  /** Returns a recursive list of files under path, matching the specified file mask.
+  static KURL::List allFilesRelative( const KURL& path, const TQString &tqmask, TQWidget *window, bool resolveSymlinks = true);
+  /** Returns a recursive list of files under path, matching the specified file tqmask.
       The returned list contains detailed information about each url.
       The user should delete the KFileItems and clear the dict
       after they are not needed.
   */
-  static TQDict<KFileItem> allFilesDetailed(const KURL& path, const TQString &mask, TQWidget *window);
+  static TQDict<KFileItem> allFilesDetailed(const KURL& path, const TQString &tqmask, TQWidget *window);
   /** Creates a dir if don't exists. */
   static bool createDir(const KURL & path, TQWidget *window);
-  /** Returns the parent directory of dir. */
+  /** Returns the tqparent directory of dir. */
   static KURL cdUp(const KURL &dir);
   /** Returns the filename from a path string. */
   static TQString shortName(const TQString &fname );
@@ -83,7 +84,7 @@ public:
   /** Synchronous copy, like NetAccess::file_copy in KDE 3.2, just that it doesn't show a progress dialog */
   static bool copy( const KURL& src, const KURL& dest, int permissions=-1,
                     bool overwrite=false, bool resume=false, TQWidget* window = 0L );
-  /** Reenters the event loop. You must call qApp->exit_loop() to exit it. */
+  /** Reenters the event loop. You must call tqApp->exit_loop() to exit it. */
   void enter_loop();
 
 private:
@@ -92,9 +93,9 @@ private:
   bool internalExists(const KURL& url, bool readingOnly, TQWidget *window);
   bool internalCopy(const KURL& src, const KURL& target, int permissions,
                     bool overwrite, bool resume, TQWidget* window);
-  KURL::List allFilesInternal(const KURL& startURL, const TQString& mask, TQWidget *window);
-  TQDict<KFileItem> allFilesDetailedInternal(const KURL& startURL, const TQString& mask, TQWidget *window);
-  KURL::List allLocalFiles(const TQString& startPath, const TQString& mask);
+  KURL::List allFilesInternal(const KURL& startURL, const TQString& tqmask, TQWidget *window);
+  TQDict<KFileItem> allFilesDetailedInternal(const KURL& startURL, const TQString& tqmask, TQWidget *window);
+  KURL::List allLocalFiles(const TQString& startPath, const TQString& tqmask);
 
   bool bJobOK;
   static TQString lastErrorMsg;
diff --git a/quanta/Quanta-3.3-plan.kno b/quanta/Quanta-3.3-plan.kno
index fc22ca65..eb2837b7 100644
--- a/quanta/Quanta-3.3-plan.kno
+++ b/quanta/Quanta-3.3-plan.kno
@@ -22,24 +22,24 @@
 
 \NewEntry 1 Toolbars
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif">
-<p>Toolbars need serious attention!<br />Phase 1:<br />1) Clean up for current usage<br />2) Create quick &quot;add this tag to a toolbar&quot; RMB function<br />3) Make toolbars abide by tag relationships like auto complete<br /><br />Phase 2:<br />1) Add drop down icon group ability to manage larger sets (like on file folder icons) This will require a new type on the action dialog with a new sub dialog to list tags<br />2) Create toolbar modalities. Allow for recognition of edting type like tables, forms, data, layout and user defined tasks where entering a portion of a document, opening a view or directly selecting the mode changes selected toolbar or even toolbars and groupings. <br /><br />The idea is that the user could teach Quanta how to provide optimal tools for various tasks and instead of a static layout the layout and presentation become dynamic. This will require balance and good icons to be more productive.</p>
+<p>Toolbars need serious attention!<br />Phase 1:<br />1) Clean up for current usage<br />2) Create quick &quot;add this tag to a toolbar&quot; RMB function<br />3) Make toolbars abide by tag relationships like auto complete<br /><br />Phase 2:<br />1) Add drop down icon group ability to manage larger sets (like on file folder icons) This will require a new type on the action dialog with a new sub dialog to list tags<br />2) Create toolbar modalities. Allow for recognition of edting type like tables, forms, data, tqlayout and user defined tasks where entering a portion of a document, opening a view or directly selecting the mode changes selected toolbar or even toolbars and groupings. <br /><br />The idea is that the user could teach Quanta how to provide optimal tools for various tasks and instead of a static tqlayout the tqlayout and presentation become dynamic. This will require balance and good icons to be more productive.</p>
 </body></html>
 
 \NewEntry 2 Phase 2 explanation
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif">
 <p><span style="font-style:italic;color:#3300ff">&gt;       - Phase 2/2 sounds a little complicated to me and I'm also not sure that I understood it completely.</span></p>
 <p>Think of it as personalities. The idea is that Quanta could interpret some aspects of what I am doing and offer toolbar presentations based on that. How to best go about it is not totally clear. Initially I had thought to have Quanta offer the relevent toolbar so the user didn't have to select it, but this is not completely effective it you think about it. Another possibility is to construct a toolbar on the fly from relevent tags... intriguing but probably not very fast or fluid. The advantage to the toolbars we have is that you know where the icons are. The disadvantage is you could end up switching between 3-4 of them building a formatted data form, which is not intuitive.</p>
-<p>In balancing these several concepts seem to offer counterpoints.<br />familiar layout &lt;-&gt; specifically applicable actions<br />pre-made toolbars &lt;-&gt; dynamicly created toolbars<br />feature oriented toolbars &lt;-&gt; task oriented toolbars</p>
+<p>In balancing these several concepts seem to offer counterpoints.<br />familiar tqlayout &lt;-&gt; specifically applicable actions<br />pre-made toolbars &lt;-&gt; dynamicly created toolbars<br />feature oriented toolbars &lt;-&gt; task oriented toolbars</p>
 <p>Currently Quanta is solidly to the left and only to the left on all three of these points. I began considering adding task oriented toolbars. Which is better? If you could be certain that the toolbar would do the following you would have perfection:</p>
-<p>1) orient correctly to every task<br />2) retain familiarity of layout for variations and segue to next task<br />3) offer only proper tag relationships</p>
-<p>Inherently some tasks cannot be discerned from context but could be defined by the user. Selecting a task modality could convert all toolbars to the applicable tagging, not just one. However you may want to be in a standard layout in one situation (certainly in a blank page) but assume modal personalities in others (common data design scenarios).</p>
+<p>1) orient correctly to every task<br />2) retain familiarity of tqlayout for variations and segue to next task<br />3) offer only proper tag relationships</p>
+<p>Inherently some tasks cannot be discerned from context but could be defined by the user. Selecting a task modality could convert all toolbars to the applicable tagging, not just one. However you may want to be in a standard tqlayout in one situation (certainly in a blank page) but assume modal personalities in others (common data design scenarios).</p>
 <p>So we can say this about the ultimate solution:</p>
 <p>1) I don't think anybody is really anal enough to already be doing it.</p>
 <p>2) If it could be accomplished it would be very very cool and get a lot of press.</p>
 <p>3) It cannot be a single solution, thus it's multiple &quot;personalities&quot;</p>
-<p>4) Basic structure and layout will take experimentation, and user feedback. In fact it would take a fair amount of study and refinement.</p>
+<p>4) Basic structure and tqlayout will take experimentation, and user feedback. In fact it would take a fair amount of study and refinement.</p>
 <p>5) No single solution is possible so it must allow for easy user extensibility</p>
-<p>Because we hope to be able to make VPL play a larger role we cannot discount the importance of good toolbar layout. Making toolbars load with a DTEP is a good start as are user toolbars. Extending intelligent context sensitive task extentions will make a big difference, especially when dealing with the huge diversity of tasks and preponderance of tags out there.</p>
+<p>Because we hope to be able to make VPL play a larger role we cannot discount the importance of good toolbar tqlayout. Making toolbars load with a DTEP is a good start as are user toolbars. Extending intelligent context sensitive task extentions will make a big difference, especially when dealing with the huge diversity of tasks and preponderance of tags out there.</p>
 <p>My vision is not just someone saving a toolbar for a task, but saving a whole personality. Imagine these as dowloadable resources. ;-)</p>
 <p></p>
 </body></html>
@@ -56,7 +56,7 @@
 
 \NewEntry 1 VPL
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif">
-<p>Undoubtably there will be many things we want to do here. I'll start the list... This is not really prioritized.<br /><br />1) Visual Table editor<br />2) Integration of visual CSS using our dialogs and tools<br />3) XSLT translation layer for XML<br />4) Script integration edit mode - very tricky but we should conceptually explore being able to interpret and edit elements of PHP in a loop for instance to create a visual mode for editing the layout or CSS visually in data layout. I'm suggesting merely exploring what is possible here as something exceptional if we had any degree of success.</p>
+<p>Undoubtably there will be many things we want to do here. I'll start the list... This is not really prioritized.<br /><br />1) Visual Table editor<br />2) Integration of visual CSS using our dialogs and tools<br />3) XSLT translation layer for XML<br />4) Script integration edit mode - very tricky but we should conceptually explore being able to interpret and edit elements of PHP in a loop for instance to create a visual mode for editing the tqlayout or CSS visually in data tqlayout. I'm suggesting merely exploring what is possible here as something exceptional if we had any degree of success.</p>
 </body></html>
 
 \NewEntry 0 New Features
@@ -94,7 +94,7 @@
 
 \NewEntry 1 RAD Site
 <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif">
-<p>This has largely been under wraps except a few teasers. It's going to be my baby.<br /><br />RAD design has not come to web development because of the diverse approaches. It's rather difficult to even use code other people build in PHP because it's largely built with the assumption that it's the only systematic approach on your site intstead of a good object model as a part of what exists that abstracts well and plays together well. If I build it you won't use it because it's not your style and vice versa. That's where this is different.<br /><br />1) Based on templates - this allows the user to develop the framework in layers<br />2) User defines abstractions - when you have a modular element in your design you define what the public and private interface is to it<br />3) Learning ability - because creating something like this is complex and involved the burden is lessened by enabling the system to assist in creation by learning<br />4) New abstract interface - the key to integrate this is an interface that uses &quot;set&quot;definitions starting with a page and defined elements in the page where the user defines relationships. Then there are the physical aspects in directory relationships (which are tracked) and group set assignments for style or layout which assist in painting an even interface. <br />5) The interface can be viewed panning various levels and perspectives and remembering view arrangements. Perspective would be things such as<br />- physical layout<br />- conceptual group<br />- style grouping<br />- layout grouping<br />Level views would include<br />- overview<br />- concept/style/layout group<br />- page elements/relationships<br />- element definitions<br />- various configuration dialogs<br /><br />The concept here is that extremely anal content management can be done with tight control of abstrated design elements... or you could ease particular elements of a basic site design with nominal effort. Results would be up to the user and their design base.<br /><br />Some aspects:<br />* moving files automatically manages links<br />* Minimal application speeds development and manages framework<br />* Page component templates function dynamically<br />* Would use comment system and or generated file to manage elements<br />* would be able to offer limited functionaliy directly importing existing sites<br />* Extreme application could completely manage an abstracted site where a site manager could request elements from contributors - combined with group projects and versioning a good manager can take skilled crafts people and clueless fools and weave a quality project. ;-)</p>
+<p>This has largely been under wraps except a few teasers. It's going to be my baby.<br /><br />RAD design has not come to web development because of the diverse approaches. It's rather difficult to even use code other people build in PHP because it's largely built with the assumption that it's the only systematic approach on your site intstead of a good object model as a part of what exists that abstracts well and plays together well. If I build it you won't use it because it's not your style and vice versa. That's where this is different.<br /><br />1) Based on templates - this allows the user to develop the framework in layers<br />2) User defines abstractions - when you have a modular element in your design you define what the public and private interface is to it<br />3) Learning ability - because creating something like this is complex and involved the burden is lessened by enabling the system to assist in creation by learning<br />4) New abstract interface - the key to integrate this is an interface that uses &quot;set&quot;definitions starting with a page and defined elements in the page where the user defines relationships. Then there are the physical aspects in directory relationships (which are tracked) and group set assignments for style or tqlayout which assist in painting an even interface. <br />5) The interface can be viewed panning various levels and perspectives and remembering view arrangements. Perspective would be things such as<br />- physical tqlayout<br />- conceptual group<br />- style grouping<br />- tqlayout grouping<br />Level views would include<br />- overview<br />- concept/style/tqlayout group<br />- page elements/relationships<br />- element definitions<br />- various configuration dialogs<br /><br />The concept here is that extremely anal content management can be done with tight control of abstrated design elements... or you could ease particular elements of a basic site design with nominal effort. Results would be up to the user and their design base.<br /><br />Some aspects:<br />* moving files automatically manages links<br />* Minimal application speeds development and manages framework<br />* Page component templates function dynamically<br />* Would use comment system and or generated file to manage elements<br />* would be able to offer limited functionaliy directly importing existing sites<br />* Extreme application could completely manage an abstracted site where a site manager could request elements from contributors - combined with group projects and versioning a good manager can take skilled crafts people and clueless fools and weave a quality project. ;-)</p>
 </body></html>
 
 \NewEntry 0 Plug Ins
diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp
index d2164b06..fc4399bb 100644
--- a/quanta/components/csseditor/colorrequester.cpp
+++ b/quanta/components/csseditor/colorrequester.cpp
@@ -34,7 +34,7 @@ class colorRequester::colorRequesterPrivate{
     void connectSignals( TQObject *receiver ) { connect( edit, TQT_SIGNAL( textChanged( const TQString& )),receiver, TQT_SIGNAL( textChanged( const TQString& ))); }
 };
 
-colorRequester::colorRequester(TQWidget *parent, const char* name) : miniEditor(parent,name){
+colorRequester::colorRequester(TQWidget *tqparent, const char* name) : miniEditor(tqparent,name){
   d = new colorRequesterPrivate;
   init();
 }
@@ -56,7 +56,7 @@ void colorRequester::init()
      d->edit = new KLineEdit( this, "line edit" );
 
      myButton = new KPushButton( this, "kfile button");
-     TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("colorize"));
+     TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("colorize"));
      TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
      myButton->setIconSet( iconSet );
      myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
@@ -67,12 +67,12 @@ void colorRequester::init()
      TQWidget *widget = (TQWidget*) d->edit;
      setFocusProxy( widget );
 
-     d->connectSignals( this );
+     d->connectSignals( TQT_TQOBJECT(this) );
      connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( openColorDialog() ));
      connect( d->edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( setInitialValue(/*const TQString&*/ ) ));
 
      KAccel *accel = new KAccel( this );
-     accel->insert( KStdAccel::Open, this, TQT_SLOT( openColorDialog() ));
+     accel->insert( KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( openColorDialog() ));
      accel->readSettings();
  }
 
@@ -93,7 +93,7 @@ KLineEdit * colorRequester::lineEdit() const{
 void colorRequester::setInitialValue(/*const TQString& s*/){
   TQString temp = d->edit->text();
   temp.remove(" ");
- if( temp.contains("#") != 0){
+ if( temp.tqcontains("#") != 0){
    temp.remove("#");
    if(temp.length() == 3) {
      TQString temp2;
@@ -113,7 +113,7 @@ void colorRequester::setInitialValue(/*const TQString& s*/){
  }
  else
 
-   if( temp.contains("rgb(") != 0){
+   if( temp.tqcontains("rgb(") != 0){
      temp.remove("rgb(").remove(")");
      TQStringList rgbValues = TQStringList::split(",",temp);
 //      bool ok;
diff --git a/quanta/components/csseditor/colorrequester.h b/quanta/components/csseditor/colorrequester.h
index baf95d86..ceb28f6b 100644
--- a/quanta/components/csseditor/colorrequester.h
+++ b/quanta/components/csseditor/colorrequester.h
@@ -25,8 +25,9 @@ class KLineEdit;
 class KColorDialog;
 class colorRequester : public miniEditor{
     Q_OBJECT
+  TQ_OBJECT
   public:
-    colorRequester(TQWidget *parent, const char* name=0);
+    colorRequester(TQWidget *tqparent, const char* name=0);
     ~colorRequester();
     KLineEdit * lineEdit() const;
     KPushButton * button() const { return myButton; }
diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp
index 98019f23..b57649bd 100644
--- a/quanta/components/csseditor/colorslider.cpp
+++ b/quanta/components/csseditor/colorslider.cpp
@@ -29,7 +29,7 @@
 
   
 
-colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c,const TQString& r,TQWidget *parent, const char *name) : miniEditor(parent,name)  { 
+colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c,const TQString& r,TQWidget *tqparent, const char *name) : miniEditor(tqparent,name)  { 
   m_functionName = fn;
   TQVBox *leftBox = new TQVBox(this);
   TQVBox *centerBox = new TQVBox(this);
@@ -37,12 +37,12 @@ colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c,
   TQLabel *leftLabel = new TQLabel("<b>" +  l +"</b>",leftBox);
   TQLabel *centerLabel = new TQLabel(("<b>" +  c +"</b>"),centerBox);
   TQLabel *rightLabel = new TQLabel(("<b>" +  r +"</b>"),rightBox);
-  leftLabel->setAlignment(Qt::AlignHCenter);
-  centerLabel->setAlignment(Qt::AlignHCenter);
-  rightLabel->setAlignment(Qt::AlignHCenter);  
-  leftLabel->setTextFormat (Qt::RichText ) ;
-  centerLabel->setTextFormat ( Qt::RichText ) ;
-  rightLabel->setTextFormat (Qt::RichText  ) ;
+  leftLabel->tqsetAlignment(TQt::AlignHCenter);
+  centerLabel->tqsetAlignment(TQt::AlignHCenter);
+  rightLabel->tqsetAlignment(TQt::AlignHCenter);  
+  leftLabel->setTextFormat (TQt::RichText ) ;
+  centerLabel->setTextFormat ( TQt::RichText ) ;
+  rightLabel->setTextFormat (TQt::RichText  ) ;
   m_leftValue = new TQSlider ( 0, 255, 1, 0, Qt::Horizontal , leftBox);
   m_centerValue = new TQSlider ( 0, 255, 1, 0, Qt::Horizontal , centerBox);
   m_rightValue = new TQSlider ( 0, 255, 1, 0, Qt::Horizontal , rightBox);
@@ -74,11 +74,11 @@ void colorSlider::convertRightValue(int i){
   emit valueChanged(m_functionName + "(" + TQString::number(m_leftValue->value(),10) + "," + TQString::number(m_centerValue->value(),10) + "," + TQString::number(i,10) +")");
 }
 
-RGBcolorSlider::RGBcolorSlider(TQWidget *parent, const char *name) : colorSlider("rgb",i18n("Red"),i18n("Green"),i18n("Blue"),parent,name){
+RGBcolorSlider::RGBcolorSlider(TQWidget *tqparent, const char *name) : colorSlider("rgb",i18n("Red"),i18n("Green"),i18n("Blue"),tqparent,name){
 }
 
 //FOR CSS3
-/*HSLcolorSlider::HSLcolorSlider(TQWidget *parent, const char *name) : colorSlider("hsl",i18n("Hue"),i18n("Saturation"),i18n("Lightness"),parent,name){
+/*HSLcolorSlider::HSLcolorSlider(TQWidget *tqparent, const char *name) : colorSlider("hsl",i18n("Hue"),i18n("Saturation"),i18n("Lightness"),tqparent,name){
 }
 */
 
diff --git a/quanta/components/csseditor/colorslider.h b/quanta/components/csseditor/colorslider.h
index d2e0b11b..202020a6 100644
--- a/quanta/components/csseditor/colorslider.h
+++ b/quanta/components/csseditor/colorslider.h
@@ -30,6 +30,7 @@
 
 class colorSlider : public miniEditor  {
      Q_OBJECT
+  TQ_OBJECT
    private :
     TQString m_functionName;  
    protected:
@@ -37,7 +38,7 @@ class colorSlider : public miniEditor  {
                   *m_centerValue,
                   *m_rightValue;
    public:
-           colorSlider(const TQString& functionName,const TQString& l=TQString::null,const TQString& c=TQString::null,const TQString& r=TQString::null,TQWidget *parent=0, const char *name=0);
+           colorSlider(const TQString& functionName,const TQString& l=TQString(),const TQString& c=TQString(),const TQString& r=TQString(),TQWidget *tqparent=0, const char *name=0);
            virtual ~colorSlider();
            virtual void connectToPropertySetter(propertySetter* p);
   
@@ -52,16 +53,18 @@ class colorSlider : public miniEditor  {
 
 class RGBcolorSlider : public colorSlider  {
      Q_OBJECT
+  TQ_OBJECT
    public:
-           RGBcolorSlider(TQWidget *parent=0, const char *name=0);
+           RGBcolorSlider(TQWidget *tqparent=0, const char *name=0);
            ~RGBcolorSlider(){}         
 };
 
 //FOR CSS3
 /*class HSLcolorSlider : public colorSlider  {
      Q_OBJECT
+  TQ_OBJECT
    public:
-           HSLcolorSlider(TQWidget *parent=0, const char *name=0);
+           HSLcolorSlider(TQWidget *tqparent=0, const char *name=0);
            ~HSLcolorSlider();             
 };*/
   
diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp
index 5393d875..afe90315 100644
--- a/quanta/components/csseditor/csseditor.cpp
+++ b/quanta/components/csseditor/csseditor.cpp
@@ -47,11 +47,11 @@
 
 
 
-myCheckListItem::myCheckListItem(TQListView * parent, const TQString & text):TQCheckListItem(parent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){
+myCheckListItem::myCheckListItem(TQListView * tqparent, const TQString & text):TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){
   m_sig = new TQSignal;
 }
 
-myCheckListItem::myCheckListItem(TQCheckListItem * parent, const TQString & text):TQCheckListItem(parent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){
+myCheckListItem::myCheckListItem(TQCheckListItem * tqparent, const TQString & text):TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){
   m_sig = new TQSignal;
 }
 
@@ -85,8 +85,8 @@ void myCheckListItem::stateChange (bool b){
        m_checkedChildren = 0;
      }
      else {
-       if(parent()){
-         myCheckListItem *p = static_cast<myCheckListItem*>(parent());
+       if(tqparent()){
+         myCheckListItem *p = static_cast<myCheckListItem*>(tqparent());
          while( p ) {
            if( p->m_checkedChildren != 1) {
              p->m_checkedChildren--;
@@ -99,7 +99,7 @@ void myCheckListItem::stateChange (bool b){
              m_sig->activate();
              p->setOn(false);
            }
-           p = static_cast<myCheckListItem*>(p->parent());
+           p = static_cast<myCheckListItem*>(p->tqparent());
          }
        }
        else {
@@ -109,7 +109,7 @@ void myCheckListItem::stateChange (bool b){
      }
    }
     else {
-      if(parent()) static_cast<myCheckListItem*>(parent())->addCheckedChild();
+      if(tqparent()) static_cast<myCheckListItem*>(tqparent())->addCheckedChild();
     }
 }
 
@@ -117,7 +117,7 @@ void CSSEditor::appendSub(TQDomNodeList l, myCheckListItem *cli){
   unsigned int i;
   for(i=0;i<l.length();i++) {
     myCheckListItem *item  = new myCheckListItem(cli,l.item(i).toElement().tagName());
-    item->connect(this,TQT_SLOT(removeProperty(const TQVariant&)));
+    item->connect(TQT_TQOBJECT(this),TQT_SLOT(removeProperty(const TQVariant&)));
     if(l.item(i).toElement().attribute("hasSub") == "yes")
       appendSub(l.item(i).childNodes(),item);
   }
@@ -127,7 +127,7 @@ void CSSEditor::buildListView(TQDomNodeList l, TQListView *lv){
   unsigned int i;
   for(i=0;i<l.length();i++) {
     myCheckListItem *item = new myCheckListItem(lv,l.item(i).toElement().tagName());
-    item->connect(this,TQT_SLOT(removeProperty(const TQVariant&)));
+    item->connect(TQT_TQOBJECT(this),TQT_SLOT(removeProperty(const TQVariant&)));
     if(l.item(i).toElement().attribute("hasSub") == "yes") {
       TQDomNodeList listSub = l.item(i).childNodes();
       appendSub(listSub,item);
@@ -136,26 +136,26 @@ void CSSEditor::buildListView(TQDomNodeList l, TQListView *lv){
 }
 
 void CSSEditor::setCurrentPropOn(const TQString& s){
- if( (m_currentProp = static_cast<myCheckListItem*>(lvVisual->findItem( s,0 )) ))
+ if( (m_currentProp = static_cast<myCheckListItem*>(lvVisual->tqfindItem( s,0 )) ))
     m_currentProp->setOn(true);
   else
-  if( (m_currentProp = static_cast<myCheckListItem*>(lvAll->findItem( s,0 )) ))
+  if( (m_currentProp = static_cast<myCheckListItem*>(lvAll->tqfindItem( s,0 )) ))
     m_currentProp->setOn(true);
   else
-  if( (m_currentProp = static_cast<myCheckListItem*>(lvAural->findItem( s,0 )) ))
+  if( (m_currentProp = static_cast<myCheckListItem*>(lvAural->tqfindItem( s,0 )) ))
     m_currentProp->setOn(true);
   else
-  if( (m_currentProp = static_cast<myCheckListItem*>(lvInteractive->findItem( s,0 )) ))
+  if( (m_currentProp = static_cast<myCheckListItem*>(lvInteractive->tqfindItem( s,0 )) ))
     m_currentProp->setOn(true);
   else
-  if( (m_currentProp = static_cast<myCheckListItem*>(lvPaged->findItem( s,0 )) ))
+  if( (m_currentProp = static_cast<myCheckListItem*>(lvPaged->tqfindItem( s,0 )) ))
     m_currentProp->setOn(true);
 
   if( m_currentProp && m_currentProp->depth() ) {
-    myCheckListItem *p = static_cast<myCheckListItem*>(m_currentProp->parent());
+    myCheckListItem *p = static_cast<myCheckListItem*>(m_currentProp->tqparent());
     while(p) {
       p->setOn(true);
-      p=static_cast<myCheckListItem*>(p->parent());
+      p=static_cast<myCheckListItem*>(p->tqparent());
     }
   }
 }
@@ -167,14 +167,14 @@ void CSSEditor::setCurrentPropOn(const TQString& s){
  }
 
  void CSSEditor::setSidesOfPropertyBorderOn(const TQString& s){
-   static_cast<myCheckListItem*>(lvVisual->findItem( "border-top",0 ))->setOn(true);
-   static_cast<myCheckListItem*>(lvVisual->findItem( "border-right",0 ))->setOn(true);
-   static_cast<myCheckListItem*>(lvVisual->findItem( "border-bottom",0 ))->setOn(true);
-   static_cast<myCheckListItem*>(lvVisual->findItem( "border-left",0 ))->setOn(true);
-   static_cast<myCheckListItem*>(lvVisual->findItem( "border-top-"+s,0 ))->setOn(true);
-   static_cast<myCheckListItem*>(lvVisual->findItem( "border-right-"+s,0 ))->setOn(true);
-   static_cast<myCheckListItem*>(lvVisual->findItem( "border-bottom-"+s,0 ))->setOn(true);
-   static_cast<myCheckListItem*>(lvVisual->findItem( "border-left-"+s,0 ))->setOn(true);
+   static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-top",0 ))->setOn(true);
+   static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-right",0 ))->setOn(true);
+   static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-bottom",0 ))->setOn(true);
+   static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-left",0 ))->setOn(true);
+   static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-top-"+s,0 ))->setOn(true);
+   static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-right-"+s,0 ))->setOn(true);
+   static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-bottom-"+s,0 ))->setOn(true);
+   static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-left-"+s,0 ))->setOn(true);
  }
 
 void CSSEditor::hidePreviewer(){
@@ -190,7 +190,7 @@ void CSSEditor::initialize(){
 
   TQString configFile = locate("appdata", "csseditor/config.xml");
 
-  m_myhi = new QMyHighlighter(display);
+  m_myhi = new TQMyHighlighter(display);
 
   TQBoxLayout *fPreviewLayout = new TQBoxLayout(fPreview,TQBoxLayout::LeftToRight);
   m_previewer=new KHTMLPart(fPreview);
@@ -266,7 +266,7 @@ void CSSEditor::initialize(){
        const TQString propertyName((*it).section(":",0,0).stripWhiteSpace());
        const TQString propertyValue((*it).section(":",1));
 
-      if( ShorthandFormer::SHFormList().contains(propertyName)==0 ) {
+      if( ShorthandFormer::SHFormList().tqcontains(propertyName)==0 ) {
          temp+= propertyName + " : " + propertyValue +";\n\t";
          addAndSetPropertyOn(propertyName,propertyValue);
       }
@@ -296,7 +296,7 @@ void CSSEditor::toggleShortendForm()
  m_config->sync();
 }
 
-CSSEditor::CSSEditor(TQListViewItem *i, TQWidget *parent, const char *name) : CSSEditorS(parent, name){
+CSSEditor::CSSEditor(TQListViewItem *i, TQWidget *tqparent, const char *name) : CSSEditorS(tqparent, name){
   m_selectorName = i->text(0);
   m_initialProperties = i->text(1);
 }
@@ -323,12 +323,12 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){
         m_ps->setComboBox();
         TQStringList values = TQStringList::split(",",curr.attribute("value"));
         m_ps->ComboBox()->insertStringList(values);
-        if(m_properties.contains(m_currentProp->text(0)) !=0 )
-          if( values.contains(m_currentProp->text(0)))
+        if(m_properties.tqcontains(m_currentProp->text(0)) !=0 )
+          if( values.tqcontains(m_currentProp->text(0)))
             m_ps->ComboBox()->setCurrentText(m_properties[m_currentProp->text(0)]);
         if(curr.attribute("editable") == "yes"){
           m_ps->ComboBox()->setEditable(true);
-          /*if(m_properties.contains(m_currentProp->text(0)) !=0 )
+          /*if(m_properties.tqcontains(m_currentProp->text(0)) !=0 )
             m_ps->ComboBox()->setEditText(m_properties[m_currentProp->text(0)]); */
         }
       }
@@ -344,7 +344,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){
       if( valueTypeName == "number") m_ps->setLineEdit();
       else
       if( valueTypeName == "integer") {
-        if(m_properties.contains(m_currentProp->text(0)) !=0 ) {
+        if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) {
           if(!curr.attribute("minValue").isNull())
             m_ps->setSpinBox(m_properties[m_currentProp->text(0)],curr.attribute("minValue"));
           else
@@ -359,15 +359,15 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){
       else
       if( valueTypeName == "length") {
         lengthEditor *editor = new lengthEditor(m_ps);
-        if(m_properties.contains(m_currentProp->text(0)) !=0 )
+        if(m_properties.tqcontains(m_currentProp->text(0)) !=0 )
           editor->setInitialValue(m_properties[m_currentProp->text(0)]);
         else
-          editor->setInitialValue(TQString::null);
+          editor->setInitialValue(TQString());
         m_ps->installMiniEditor(editor);
       }
       else
       if( valueTypeName == "percentage") {
-        if(m_properties.contains(m_currentProp->text(0)) !=0 ){
+        if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){
           percentageEditor *editor = new percentageEditor(m_properties[m_currentProp->text(0)],m_ps);
           m_ps->installMiniEditor(editor);
         }
@@ -380,55 +380,55 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){
       if( valueTypeName == "doubleLength") {
         doubleLengthEditor *editor = new doubleLengthEditor(m_ps);
 
-        if(m_properties.contains(m_currentProp->text(0)) !=0 ){
+        if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){
           TQString temp(m_properties[m_currentProp->text(0)].simplifyWhiteSpace()),
                        sx(temp.section(" ",0,0)),
                        dx(temp.section(" ",1,1));
 
           editor->setInitialValue(sx,dx);
         }
-        else editor->setInitialValue(TQString::null,TQString::null);
+        else editor->setInitialValue(TQString(),TQString());
         m_ps->installMiniEditor(editor);
       }
       else
       if( valueTypeName == "doublePercentage") {
         doublePercentageEditor *editor = new doublePercentageEditor(m_ps);
 
-        if(m_properties.contains(m_currentProp->text(0)) !=0 ){
+        if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){
           TQString temp(m_properties[m_currentProp->text(0)].simplifyWhiteSpace()),
                        sx(temp.section(" ",0,0)),
                        dx(temp.section(" ",1,1));
 
           editor->setInitialValue(sx,dx);
         }
-        else editor->setInitialValue(TQString::null,TQString::null);
+        else editor->setInitialValue(TQString(),TQString());
         m_ps->installMiniEditor(editor);
       }
       else
       if( valueTypeName == "frequency") {
         frequencyEditor *editor = new frequencyEditor(m_ps);
-        if(m_properties.contains(m_currentProp->text(0)) !=0 )
+        if(m_properties.tqcontains(m_currentProp->text(0)) !=0 )
           editor->setInitialValue(m_properties[m_currentProp->text(0)]);
         else
-          editor->setInitialValue(TQString::null);
+          editor->setInitialValue(TQString());
         m_ps->installMiniEditor(editor);
       }
       else
       if( valueTypeName == "time") {
         timeEditor *editor = new timeEditor(m_ps);
-        if(m_properties.contains(m_currentProp->text(0)) !=0 )
+        if(m_properties.tqcontains(m_currentProp->text(0)) !=0 )
           editor->setInitialValue(m_properties[m_currentProp->text(0)]);
         else
-          editor->setInitialValue(TQString::null);
+          editor->setInitialValue(TQString());
         m_ps->installMiniEditor(editor);
       }
       else
       if( valueTypeName == "angle") {
         angleEditor *editor = new angleEditor(m_ps);
-        if(m_properties.contains(m_currentProp->text(0)) !=0 )
+        if(m_properties.tqcontains(m_currentProp->text(0)) !=0 )
          editor->setInitialValue(m_properties[m_currentProp->text(0)]);
         else
-          editor->setInitialValue(TQString::null);
+          editor->setInitialValue(TQString());
         m_ps->installMiniEditor(editor);
       }
       else
@@ -454,7 +454,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){
       if( valueTypeName == "colors") {
         RGBcolorSlider *RGBeditor = new RGBcolorSlider(m_ps);
         colorRequester *CReditor = new colorRequester(m_ps);
-        if(m_properties.contains(m_currentProp->text(0)) !=0 ){
+        if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){
           CReditor->lineEdit()->setText(m_properties[m_currentProp->text(0)]);
           CReditor->setInitialValue();
 
@@ -474,10 +474,10 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){
       else
         if( valueTypeName == "fontDialog" ){
           fontEditor *editor = new fontEditor(m_ps);
-          if(m_properties.contains(m_currentProp->text(0)) !=0 ){
+          if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){
             editor->setInitialValue(m_properties[m_currentProp->text(0)]);
           }
-          else editor->setInitialValue(TQString::null);
+          else editor->setInitialValue(TQString());
           m_ps->installMiniEditor(editor);
         }
     }
@@ -491,10 +491,10 @@ void CSSEditor::checkProperty(const TQString& v){
     m_currentProp->setOn(true);
 
   if( m_currentProp->depth() ){
-    myCheckListItem *p = static_cast<myCheckListItem*>(m_currentProp->parent());
+    myCheckListItem *p = static_cast<myCheckListItem*>(m_currentProp->tqparent());
     while(p){
       p->setOn(true);
-      p=static_cast<myCheckListItem*>(p->parent());
+      p=static_cast<myCheckListItem*>(p->tqparent());
     }
   }
 
diff --git a/quanta/components/csseditor/csseditor.h b/quanta/components/csseditor/csseditor.h
index e54667f5..d1f2ec7f 100644
--- a/quanta/components/csseditor/csseditor.h
+++ b/quanta/components/csseditor/csseditor.h
@@ -31,18 +31,18 @@ class KHTMLPart;
 class TQListViewItem;
 class TQDomNodeList;
 class TQVariant;
-class QMyHighlighter;
+class TQMyHighlighter;
 
 
-class myCheckListItem : public QCheckListItem
+class myCheckListItem : public TQCheckListItem
 {
   private:
     TQSignal *m_sig;
     unsigned int m_checkedChildren;
 
   public :
-    myCheckListItem(TQCheckListItem * parent, const TQString & text);
-    myCheckListItem(TQListView * parent, const TQString & text);
+    myCheckListItem(TQCheckListItem * tqparent, const TQString & text);
+    myCheckListItem(TQListView * tqparent, const TQString & text);
     ~myCheckListItem();
     void connect( TQObject *receiver, const char *member );
     void addCheckedChild();
@@ -56,8 +56,9 @@ class myCheckListItem : public QCheckListItem
 class CSSEditor : public CSSEditorS
 {
   Q_OBJECT
+  TQ_OBJECT
   private:
-    QMyHighlighter *m_myhi;
+    TQMyHighlighter *m_myhi;
     propertySetter *m_ps;
     myCheckListItem *m_currentProp;
     KHTMLPart *m_previewer;
@@ -97,8 +98,8 @@ class CSSEditor : public CSSEditorS
     
   public:
     
-    CSSEditor(TQWidget* parent=0, const char *name=0): CSSEditorS(parent, name), m_config(0L){}
-    CSSEditor( TQListViewItem * i, TQWidget* parent=0, const char *name=0);
+    CSSEditor(TQWidget* tqparent=0, const char *name=0): CSSEditorS(tqparent, name), m_config(0L){}
+    CSSEditor( TQListViewItem * i, TQWidget* tqparent=0, const char *name=0);
     ~CSSEditor(); 
     void initialize();
     void setSelectors( const TQString& s) { m_Selectors = s; }
diff --git a/quanta/components/csseditor/csseditor_globals.cpp b/quanta/components/csseditor/csseditor_globals.cpp
index c2be79c0..3e9e1ca2 100644
--- a/quanta/components/csseditor/csseditor_globals.cpp
+++ b/quanta/components/csseditor/csseditor_globals.cpp
@@ -18,12 +18,12 @@
 #include <tqlineedit.h>
 #include "csseditor_globals.h"
 
-mySpinBox::mySpinBox(TQWidget * parent , const char * name ) : TQSpinBox (parent, name){
+mySpinBox::mySpinBox(TQWidget * tqparent , const char * name ) : TQSpinBox (tqparent, name){
   connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(checkSuffix( const TQString & )));
   connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged( const TQString & )));
 }
 
-mySpinBox::mySpinBox( int minValue, int maxValue, int step, TQWidget * parent, const char * name ) : TQSpinBox( minValue, maxValue, step, parent,name ){
+mySpinBox::mySpinBox( int minValue, int maxValue, int step, TQWidget * tqparent, const char * name ) : TQSpinBox( minValue, maxValue, step, tqparent,name ){
   connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(checkSuffix( const TQString & )));
   connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged( const TQString & )));
 }
@@ -34,12 +34,12 @@ void mySpinBox::checkSuffix(const TQString&){// check if the suffix is present a
   if(!suffix().isEmpty()){
     const TQString suf(suffix());
     TQString t(editor()->text()); 
-    if( t.contains(suf) ==0 ) {
+    if( t.tqcontains(suf) ==0 ) {
       editor()->setText( t + suf);
       editor()->setCursorPosition(editor()->cursorPosition() - 1);
     }
     else 
-    if( t.contains(suf) >1 ) {
+    if( t.tqcontains(suf) >1 ) {
       editor()->setText( t.remove(suf) + suf);
       editor()->setCursorPosition(editor()->cursorPosition() - 1);
     }  
diff --git a/quanta/components/csseditor/csseditor_globals.h b/quanta/components/csseditor/csseditor_globals.h
index b577981e..edf9add3 100644
--- a/quanta/components/csseditor/csseditor_globals.h
+++ b/quanta/components/csseditor/csseditor_globals.h
@@ -34,7 +34,7 @@ const TQStringList HTMLColors(TQStringList::split(",",TQString("aliceblue,antiqu
                                    "lightskyblue,lightslategray,lightsteelblue,lightyellow,lime,limegreen,linen,magenta,"
                                    "maroon,mediumaquamarine,mediumblue,mediumorchid,mediumpurple,mediumseagreen,"
                                    "mediumslateblue,mediumspringgreen,mediumturquoise,mediumvioletred,midnightblue,"
-                                   "mintcream,mistyrose,moccasin,navajowhite,navy,oldlace,olive,olivedrab,orange,"
+                                   "mintcream,mistyrose,tqmoccasin,navajowhite,navy,oldlace,olive,olivedrab,orange,"
                                    "orangered,orchid,palegoldenrod,palegreen,paleturquoise,palevioletred,papayawhip,"
                                    "peachpuff,peru,pink,plum,powderblue,purple,red,rosybrown,royalblue,saddlebrown,"
                                    "salmon,sandybrown,seagreen,seashell,sienna,silver,skyblue,slateblue,slategray,snow,"
@@ -49,11 +49,12 @@ const TQStringList HTMLColors(TQStringList::split(",",TQString("aliceblue,antiqu
 }
 
                                                                    
-class mySpinBox : public QSpinBox{
+class mySpinBox : public TQSpinBox{
     Q_OBJECT
+  TQ_OBJECT
   public:
-    mySpinBox(TQWidget * parent = 0, const char * name = 0 );
-    mySpinBox( int minValue, int maxValue, int step = 1, TQWidget * parent = 0, const char * name = 0 );
+    mySpinBox(TQWidget * tqparent = 0, const char * name = 0 );
+    mySpinBox( int minValue, int maxValue, int step = 1, TQWidget * tqparent = 0, const char * name = 0 );
     ~mySpinBox();
   public slots:
     void checkSuffix(const TQString&);  
diff --git a/quanta/components/csseditor/csseditors.ui b/quanta/components/csseditor/csseditors.ui
index de99118f..cc7f94f3 100644
--- a/quanta/components/csseditor/csseditors.ui
+++ b/quanta/components/csseditor/csseditors.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>CSSEditorS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CSSEditorS</cstring>
     </property>
@@ -32,22 +32,22 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>280</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="2" column="2">
+        <widget class="TQLayoutWidget" row="2" column="2">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pbOk</cstring>
                     </property>
@@ -63,7 +63,7 @@
                         <string>&amp;OK</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pbCancel</cstring>
                     </property>
@@ -81,7 +81,7 @@
                 </widget>
             </hbox>
         </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>SHckb</cstring>
             </property>
@@ -92,7 +92,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QSplitter" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQSplitter" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>splitter3</cstring>
             </property>
@@ -105,7 +105,7 @@
             <property name="orientation">
                 <enum>Horizontal</enum>
             </property>
-            <widget class="QTabWidget">
+            <widget class="TQTabWidget">
                 <property name="name">
                     <cstring>twMediaGroup</cstring>
                 </property>
@@ -117,19 +117,19 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>33</width>
                         <height>7</height>
                     </size>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>290</width>
                         <height>32767</height>
                     </size>
                 </property>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>tab</cstring>
                     </property>
@@ -143,7 +143,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QListView" row="0" column="0">
+                        <widget class="TQListView" row="0" column="0">
                             <column>
                                 <property name="text">
                                     <string>Properties</string>
@@ -167,7 +167,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>tab</cstring>
                     </property>
@@ -181,7 +181,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QListView" row="0" column="0">
+                        <widget class="TQListView" row="0" column="0">
                             <column>
                                 <property name="text">
                                     <string>Properties</string>
@@ -202,7 +202,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>tab</cstring>
                     </property>
@@ -216,7 +216,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QListView" row="0" column="0">
+                        <widget class="TQListView" row="0" column="0">
                             <column>
                                 <property name="text">
                                     <string>Properties</string>
@@ -237,7 +237,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>tab</cstring>
                     </property>
@@ -251,7 +251,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QListView" row="0" column="0">
+                        <widget class="TQListView" row="0" column="0">
                             <column>
                                 <property name="text">
                                     <string>Properties</string>
@@ -272,7 +272,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QWidget">
+                <widget class="TQWidget">
                     <property name="name">
                         <cstring>tab</cstring>
                     </property>
@@ -286,7 +286,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QListView" row="0" column="0">
+                        <widget class="TQListView" row="0" column="0">
                             <column>
                                 <property name="text">
                                     <string>Properties</string>
@@ -308,14 +308,14 @@
                     </grid>
                 </widget>
             </widget>
-            <widget class="QSplitter">
+            <widget class="TQSplitter">
                 <property name="name">
                     <cstring>splitter3</cstring>
                 </property>
                 <property name="orientation">
                     <enum>Vertical</enum>
                 </property>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>fEditing</cstring>
                     </property>
@@ -326,7 +326,7 @@
                         <enum>Raised</enum>
                     </property>
                 </widget>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>fPreview</cstring>
                     </property>
@@ -338,7 +338,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>200</height>
@@ -351,7 +351,7 @@
                         <enum>Raised</enum>
                     </property>
                 </widget>
-                <widget class="QTextEdit">
+                <widget class="TQTextEdit">
                     <property name="name">
                         <cstring>display</cstring>
                     </property>
@@ -363,7 +363,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32766</width>
                             <height>32766</height>
@@ -404,7 +404,7 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp
index 458c8d13..2598336c 100644
--- a/quanta/components/csseditor/cssselector.cpp
+++ b/quanta/components/csseditor/cssselector.cpp
@@ -39,7 +39,7 @@
 #include "stylesheetparser.h"
 
 
-CSSSelector::CSSSelector(TQWidget *parent, const char* name) : CSSSelectorS (parent,name),m_orderNumber(0),m_stopProcessingStylesheet(false) {
+CSSSelector::CSSSelector(TQWidget *tqparent, const char* name) : CSSSelectorS (tqparent,name),m_orderNumber(0),m_stopProcessingStylesheet(false) {
 
   m_currentItem = 0L;
 
@@ -174,7 +174,7 @@ void CSSSelector::addTag(){
   TQListViewItem *item = new TQListViewItem(lvTags);
   if(!cbTag->currentText().isEmpty()){
     item->setText(0,cbTag->currentText());
-    QPair<TQString, unsigned int> tmp(TQString::null,++m_orderNumber);
+    TQPair<TQString, unsigned int> tmp(TQString(),++m_orderNumber);
     m_currentStylesheetStructure[item->text(0)]=tmp;
   }
 }
@@ -183,7 +183,7 @@ void CSSSelector::addClass(){
   TQListViewItem *item = new TQListViewItem(lvClasses);
   if(!leClass->text().isEmpty()){
     item->setText(0,leClass->text());
-    QPair<TQString, unsigned int> tmp(TQString::null,++m_orderNumber);
+    TQPair<TQString, unsigned int> tmp(TQString(),++m_orderNumber);
     m_currentStylesheetStructure[item->text(0)]=tmp;
   }
 }
@@ -192,7 +192,7 @@ void CSSSelector::addID(){
   TQListViewItem *item = new TQListViewItem(lvIDs);
   if(!leID->text().isEmpty()){
     item->setText(0,leID->text());
-    QPair<TQString, unsigned int> tmp(TQString::null,++m_orderNumber);
+    TQPair<TQString, unsigned int> tmp(TQString(),++m_orderNumber);
     m_currentStylesheetStructure[item->text(0)]=tmp;
   }
 }
@@ -200,7 +200,7 @@ void CSSSelector::addID(){
 void CSSSelector::addPseudo(){
   TQListViewItem *item = new TQListViewItem(lvPseudo);
   item->setText(0,(lePseudoSelector->text()+":"+cbPseudo->currentText()).stripWhiteSpace());
-  QPair<TQString, unsigned int> tmp(TQString::null,++m_orderNumber);
+  TQPair<TQString, unsigned int> tmp(TQString(),++m_orderNumber);
   m_currentStylesheetStructure[item->text(0)]=tmp;
 }
 
@@ -283,7 +283,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){
 
     if(dlg.exec())  {
       i->setText(1,dlg.generateProperties());
-      QPair<TQString, unsigned int> tmp(m_currentStylesheetStructure[i->text(0)]);
+      TQPair<TQString, unsigned int> tmp(m_currentStylesheetStructure[i->text(0)]);
       tmp.first = dlg.generateProperties();
       m_currentStylesheetStructure[i->text(0)] = tmp;
     }
@@ -292,7 +292,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){
 
 void CSSSelector::setCurrentListView(TQWidget* w){
   TQObjectList *l = w->queryList( TQLISTVIEW_OBJECT_NAME_STRING );
-  m_currentListView = static_cast<TQListView*>(l->first());
+  m_currentListView = static_cast<TQListView*>(TQT_TQWIDGET(l->first()));
 }
 
 void CSSSelector::removeAll(){
@@ -319,20 +319,20 @@ void CSSSelector::loadCSSContent(const TQString& s){
   p.parse();
   m_orderNumber = p.orderNumber();
 
-  TQMap<TQString, QPair<TQString,unsigned int> >::Iterator it;
+  TQMap<TQString, TQPair<TQString,unsigned int> >::Iterator it;
   m_currentStylesheetStructure = p.stylesheetStructure();
   for ( it = m_currentStylesheetStructure.begin(); it != m_currentStylesheetStructure.end(); ++it ) {
     if(!it.key().startsWith("@rule") && !it.key().startsWith("/*")){
       TQListViewItem *item;
-      if(it.key().contains(":")){
+      if(it.key().tqcontains(":")){
         item = new TQListViewItem(lvPseudo);
       }
       else
-      if(it.key().contains("#")){
+      if(it.key().tqcontains("#")){
         item = new TQListViewItem(lvIDs);
       }
       else
-      if(it.key().contains(".")){
+      if(it.key().tqcontains(".")){
         item = new TQListViewItem(lvClasses);
       }
       else {
@@ -347,7 +347,7 @@ void CSSSelector::loadCSSContent(const TQString& s){
 }
 
 TQString CSSSelector::generateFormattedStyleSection(){
-  TQMap< TQString,QPair<TQString,unsigned int> >::Iterator it;
+  TQMap< TQString,TQPair<TQString,unsigned int> >::Iterator it;
   TQString styleSection,tmpStr;
   unsigned int indentWidth,
                       indentDisplacement = 2;
@@ -374,7 +374,7 @@ TQString CSSSelector::generateFormattedStyleSection(){
                   }
                   indentStr.fill(' ', indentDisplacement);
                   styleSection += tmpStr + indentStr + "}\n\n";
-                  tmpStr = TQString::null;
+                  tmpStr = TQString();
               }
       }
     }
diff --git a/quanta/components/csseditor/cssselector.h b/quanta/components/csseditor/cssselector.h
index 2c0fe426..7d5c40da 100644
--- a/quanta/components/csseditor/cssselector.h
+++ b/quanta/components/csseditor/cssselector.h
@@ -30,6 +30,7 @@ class TQStringList;
 
 class CSSSelector : public CSSSelectorS {
   Q_OBJECT
+  TQ_OBJECT
 
   private:
     TQListViewItem *m_currentItem;
@@ -38,14 +39,14 @@ class CSSSelector : public CSSSelectorS {
                  m_footer,
                  m_callingFrom,
                  m_fileToPreview;
-    TQMap<TQString, QPair<TQString,unsigned int> > m_currentStylesheetStructure;
+    TQMap<TQString, TQPair<TQString,unsigned int> > m_currentStylesheetStructure;
     unsigned int m_orderNumber;
     bool m_stopProcessingStylesheet;
 
     void Connect();
 
   public:
-    CSSSelector(TQWidget *parent=0, const char* name=0);
+    CSSSelector(TQWidget *tqparent=0, const char* name=0);
     ~CSSSelector();
     void loadCSSContent(const TQString& s);
     void setHeader(const TQString& h) { m_header = h; }
diff --git a/quanta/components/csseditor/cssselectors.ui b/quanta/components/csseditor/cssselectors.ui
index 1119ccdb..09356a70 100644
--- a/quanta/components/csseditor/cssselectors.ui
+++ b/quanta/components/csseditor/cssselectors.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>CSSSelectorS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CSSSelectorS</cstring>
     </property>
@@ -22,15 +22,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <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>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>tlApplyToFile</cstring>
                     </property>
@@ -61,22 +61,22 @@
             <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="QLayoutWidget" row="3" column="2">
+        <widget class="TQLayoutWidget" row="3" column="2">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pbOk</cstring>
                     </property>
@@ -84,7 +84,7 @@
                         <string>&amp;OK</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pbCancel</cstring>
                     </property>
@@ -94,11 +94,11 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQTabWidget" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>twSelectors</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -109,9 +109,9 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLayoutWidget" row="0" column="2">
+                    <widget class="TQLayoutWidget" row="0" column="2">
                         <property name="name">
-                            <cstring>layout13</cstring>
+                            <cstring>tqlayout13</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -127,14 +127,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="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>groupBox1</cstring>
                                 </property>
@@ -153,7 +153,7 @@
                                     <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>pbRemoveSelectedTag</cstring>
                                         </property>
@@ -165,7 +165,7 @@
                                             <string>Selected</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton" row="1" column="0">
+                                    <widget class="TQPushButton" row="1" column="0">
                                         <property name="name">
                                             <cstring>pbRemoveAllTags</cstring>
                                         </property>
@@ -185,14 +185,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="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>groupBox2</cstring>
                                 </property>
@@ -203,7 +203,7 @@
                                     <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>cbDTD</cstring>
                                         </property>
@@ -220,14 +220,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>24</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>groupBox3</cstring>
                                 </property>
@@ -238,7 +238,7 @@
                                     <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>cbTag</cstring>
                                         </property>
@@ -246,7 +246,7 @@
                                             <bool>true</bool>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton" row="1" column="0">
+                                    <widget class="TQPushButton" row="1" column="0">
                                         <property name="name">
                                             <cstring>pbAddTag</cstring>
                                         </property>
@@ -266,7 +266,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -275,7 +275,7 @@
                             </spacer>
                         </vbox>
                     </widget>
-                    <widget class="QListView" row="0" column="0">
+                    <widget class="TQListView" row="0" column="0">
                         <column>
                             <property name="text">
                                 <string>Selector</string>
@@ -329,7 +329,7 @@
                         <property name="sizeType">
                             <enum>Minimum</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>40</width>
                                 <height>20</height>
@@ -338,7 +338,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -349,7 +349,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>Selector</string>
@@ -403,16 +403,16 @@
                         <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="QLayoutWidget" row="0" column="2">
+                    <widget class="TQLayoutWidget" row="0" column="2">
                         <property name="name">
-                            <cstring>layout14</cstring>
+                            <cstring>tqlayout14</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -428,14 +428,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="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>groupBox4_2</cstring>
                                 </property>
@@ -446,7 +446,7 @@
                                     <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>pbRemoveSelectedID</cstring>
                                         </property>
@@ -458,7 +458,7 @@
                                             <string>Selected</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton" row="1" column="0">
+                                    <widget class="TQPushButton" row="1" column="0">
                                         <property name="name">
                                             <cstring>pbRemoveAllIDs</cstring>
                                         </property>
@@ -478,14 +478,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="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>groupBox7_2</cstring>
                                 </property>
@@ -496,12 +496,12 @@
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLineEdit" row="0" column="0">
+                                    <widget class="TQLineEdit" row="0" column="0">
                                         <property name="name">
                                             <cstring>leID</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton" row="1" column="0">
+                                    <widget class="TQPushButton" row="1" column="0">
                                         <property name="name">
                                             <cstring>pbAddID</cstring>
                                         </property>
@@ -521,7 +521,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -532,7 +532,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -543,7 +543,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>Selector</string>
@@ -597,16 +597,16 @@
                         <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="QLayoutWidget" row="0" column="2">
+                    <widget class="TQLayoutWidget" row="0" column="2">
                         <property name="name">
-                            <cstring>layout13</cstring>
+                            <cstring>tqlayout13</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -622,14 +622,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="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>groupBox4_3</cstring>
                                 </property>
@@ -640,7 +640,7 @@
                                     <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>pbRemoveSelectedClass</cstring>
                                         </property>
@@ -652,7 +652,7 @@
                                             <string>Selected</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton" row="1" column="0">
+                                    <widget class="TQPushButton" row="1" column="0">
                                         <property name="name">
                                             <cstring>pbRemoveAllClasses</cstring>
                                         </property>
@@ -672,14 +672,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="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>groupBox7</cstring>
                                 </property>
@@ -690,12 +690,12 @@
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLineEdit" row="0" column="0">
+                                    <widget class="TQLineEdit" row="0" column="0">
                                         <property name="name">
                                             <cstring>leClass</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton" row="1" column="0">
+                                    <widget class="TQPushButton" row="1" column="0">
                                         <property name="name">
                                             <cstring>pbAddClass</cstring>
                                         </property>
@@ -715,7 +715,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -726,7 +726,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -737,7 +737,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>Selector</string>
@@ -791,16 +791,16 @@
                         <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="QLayoutWidget" row="0" column="2">
+                    <widget class="TQLayoutWidget" row="0" column="2">
                         <property name="name">
-                            <cstring>layout17</cstring>
+                            <cstring>tqlayout17</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -816,14 +816,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="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>groupBox4</cstring>
                                 </property>
@@ -834,7 +834,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>pbRemoveAllPseudo</cstring>
                                         </property>
@@ -842,7 +842,7 @@
                                             <string>All</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton" row="0" column="0">
+                                    <widget class="TQPushButton" row="0" column="0">
                                         <property name="name">
                                             <cstring>pbRemoveSelectedPseudo</cstring>
                                         </property>
@@ -866,14 +866,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="QGroupBox">
+                            <widget class="TQGroupBox">
                                 <property name="name">
                                     <cstring>groupBox7_3</cstring>
                                 </property>
@@ -884,12 +884,12 @@
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLineEdit" row="0" column="0">
+                                    <widget class="TQLineEdit" row="0" column="0">
                                         <property name="name">
                                             <cstring>lePseudoSelector</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QComboBox" row="1" column="0">
+                                    <widget class="TQComboBox" row="1" column="0">
                                         <property name="name">
                                             <cstring>cbPseudo</cstring>
                                         </property>
@@ -897,7 +897,7 @@
                                             <bool>true</bool>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton" row="2" column="0">
+                                    <widget class="TQPushButton" row="2" column="0">
                                         <property name="name">
                                             <cstring>pbAddPseudo</cstring>
                                         </property>
@@ -917,7 +917,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -939,7 +939,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>380</width>
                     <height>20</height>
@@ -975,7 +975,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/quanta/components/csseditor/cssshpropertyparser.cpp b/quanta/components/csseditor/cssshpropertyparser.cpp
index d117b5f5..b523a1b4 100644
--- a/quanta/components/csseditor/cssshpropertyparser.cpp
+++ b/quanta/components/csseditor/cssshpropertyparser.cpp
@@ -61,7 +61,7 @@ TQString CSSSHPropertyParser::extractQuotedStringList(){
   unsigned int i=0;
   while(!stop && i<m_propertyToParse.length() ){
     if( m_propertyToParse[i] == ' ' ){
-      if( ( temp.contains("\"") + temp.contains("\'") )%2 == 0 ) stop = true;
+      if( ( temp.tqcontains("\"") + temp.tqcontains("\'") )%2 == 0 ) stop = true;
       else temp += m_propertyToParse[i];
     }
     else temp += m_propertyToParse[i];
@@ -89,32 +89,32 @@ TQStringList CSSSHPropertyParser::parse(){
       temp+=m_propertyToParse[i];
     }
 
-    if(temp.contains("url(") !=0 ){
+    if(temp.tqcontains("url(") !=0 ){
       TQString foundURIList = extractURIList();
       m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(foundURIList));
       tokenList.append(foundURIList);
     }
     else
-    if(temp.contains("(")!=0){
+    if(temp.tqcontains("(")!=0){
       TQString foundFunctionList = extractFunctionList();
       m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(foundFunctionList));
       tokenList.append(foundFunctionList);
     }
     else
-    if(temp.contains("'")!=0 || temp.contains("\"")!=0 || temp.contains(",")!=0){
+    if(temp.tqcontains("'")!=0 || temp.tqcontains("\"")!=0 || temp.tqcontains(",")!=0){
       TQString foundQuotedStringList = extractQuotedStringList();
       m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(foundQuotedStringList));
       tokenList.append(foundQuotedStringList);
     }
     else
-    if(temp.contains("/")!=0){ //treat the presence of line-height in font shorthand form
+    if(temp.tqcontains("/")!=0){ //treat the presence of line-height in font shorthand form
       m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(temp));
       tokenList.append(temp.section("/",0,0));
       tokenList.append("/"+temp.section("/",1,1));
     }
     else {
       tokenList.append(temp);
-      int tempPos = m_propertyToParse.find(temp);
+      int tempPos = m_propertyToParse.tqfind(temp);
       m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(tempPos,temp.length()));
     }
     if( m_propertyToParse.isEmpty() ) stop = true;
diff --git a/quanta/components/csseditor/data/config.xml b/quanta/components/csseditor/data/config.xml
index 15fd659f..988041ca 100644
--- a/quanta/components/csseditor/data/config.xml
+++ b/quanta/components/csseditor/data/config.xml
@@ -469,9 +469,9 @@
     <freeedit/>
   </right>
     
-  <table-layout>
+  <table-tqlayout>
     <list value="auto,fixed,inherit"/>     
-  </table-layout>
+  </table-tqlayout>
    
   <text-align>
     <list value="center,justify,right,left,inherit"/>         
@@ -503,9 +503,9 @@
     <freeedit/>
   </top> 
     
-  <unicode-bidi>
+  <tqunicode-bidi>
     <list value="normal,embed,bidi-override,inherit"/>     
-  </unicode-bidi> 
+  </tqunicode-bidi> 
    
   <vertical-align>     
     <list value="baseline,inherit,sub,super,top,text-top,middle,bottom,text-bottom"/>      
diff --git a/quanta/components/csseditor/doubleeditors.cpp b/quanta/components/csseditor/doubleeditors.cpp
index e877e2ac..0bc85eee 100644
--- a/quanta/components/csseditor/doubleeditors.cpp
+++ b/quanta/components/csseditor/doubleeditors.cpp
@@ -23,7 +23,7 @@
 
 
 
-doubleEditorBase::doubleEditorBase(TQWidget *parent, const char *name) : miniEditor(parent,name){
+doubleEditorBase::doubleEditorBase(TQWidget *tqparent, const char *name) : miniEditor(tqparent,name){
 }
 
 void doubleEditorBase::sxValueSlot(const TQString& v){
@@ -36,7 +36,7 @@ void doubleEditorBase::dxValueSlot(const TQString& v){
   emit valueChanged( m_sxValue +" " + m_dxValue);
 }
 
- doubleLengthEditor::doubleLengthEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){
+ doubleLengthEditor::doubleLengthEditor(TQWidget *tqparent, const char *name) : doubleEditorBase(tqparent,name){
 
   m_ssbSx = new specialSB(this);
   m_ssbSx->insertItem("cm");
@@ -76,7 +76,7 @@ void doubleLengthEditor::setInitialValue(const TQString& sx, const TQString& dx)
   m_ssbDx->setInitialValue(dx);
 }
 
-doubleComboBoxEditor::doubleComboBoxEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){
+doubleComboBoxEditor::doubleComboBoxEditor(TQWidget *tqparent, const char *name) : doubleEditorBase(tqparent,name){
   m_cbSx = new TQComboBox(this);
   m_cbDx = new TQComboBox(this);
   connect(m_cbSx, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(sxValueSlot(const TQString&)));
@@ -92,7 +92,7 @@ void doubleComboBoxEditor::connectToPropertySetter(propertySetter* p){
   connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&)));
 }
 
-doublePercentageEditor::doublePercentageEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){
+doublePercentageEditor::doublePercentageEditor(TQWidget *tqparent, const char *name) : doubleEditorBase(tqparent,name){
   m_sbSx = new mySpinBox(this);
   m_sbDx = new mySpinBox(this);
   m_sbSx->setSuffix("%");
diff --git a/quanta/components/csseditor/doubleeditors.h b/quanta/components/csseditor/doubleeditors.h
index 4797f7c7..3bae8456 100644
--- a/quanta/components/csseditor/doubleeditors.h
+++ b/quanta/components/csseditor/doubleeditors.h
@@ -25,12 +25,13 @@
 
 class doubleEditorBase : public miniEditor {
     Q_OBJECT
+  TQ_OBJECT
   protected:
     TQString   m_sxValue,
                    m_dxValue;
 
   public:
-    doubleEditorBase(TQWidget *parent=0, const char *name=0);
+    doubleEditorBase(TQWidget *tqparent=0, const char *name=0);
     virtual ~doubleEditorBase(){}
     virtual void setInitialValue(){}
     virtual void connectToPropertySetter(propertySetter* /*p*/){}
@@ -45,12 +46,13 @@ class doubleEditorBase : public miniEditor {
 
 class doublePercentageEditor : public doubleEditorBase {
     Q_OBJECT
+  TQ_OBJECT
   private:
     mySpinBox  *m_sbSx,
                       *m_sbDx;
 
   public:
-    doublePercentageEditor(TQWidget *parent=0, const char *name=0);
+    doublePercentageEditor(TQWidget *tqparent=0, const char *name=0);
     virtual ~doublePercentageEditor();
     virtual void setInitialValue(const TQString& sx, const TQString& dx);
     virtual void connectToPropertySetter(propertySetter* p);
@@ -58,12 +60,13 @@ class doublePercentageEditor : public doubleEditorBase {
 
 class doubleComboBoxEditor : public doubleEditorBase {
     Q_OBJECT
+  TQ_OBJECT
   private:
     TQComboBox *m_cbSx,
                          *m_cbDx;
 
   public:
-    doubleComboBoxEditor(TQWidget *parent=0, const char *name=0);
+    doubleComboBoxEditor(TQWidget *tqparent=0, const char *name=0);
     virtual ~doubleComboBoxEditor();
     TQComboBox* cbSx() const { return m_cbSx;}
     TQComboBox* cbDx() const { return m_cbDx;}
@@ -72,12 +75,13 @@ class doubleComboBoxEditor : public doubleEditorBase {
 
 class doubleLengthEditor : public doubleEditorBase {
     Q_OBJECT
+  TQ_OBJECT
   private:
     specialSB *m_ssbSx,
                      *m_ssbDx;
 
   public:
-    doubleLengthEditor(TQWidget *parent=0, const char *name=0);
+    doubleLengthEditor(TQWidget *tqparent=0, const char *name=0);
     virtual ~doubleLengthEditor();
     virtual void setInitialValue(const TQString& sx, const TQString& dx);
     virtual void connectToPropertySetter(propertySetter* p);
diff --git a/quanta/components/csseditor/encodingselector.cpp b/quanta/components/csseditor/encodingselector.cpp
index f8ba4ac6..fb0272a0 100644
--- a/quanta/components/csseditor/encodingselector.cpp
+++ b/quanta/components/csseditor/encodingselector.cpp
@@ -26,7 +26,7 @@
   *@author gulmini luciano
   */
 
-encodingSelector::encodingSelector(TQWidget *parent, const char* name) :  encodingSelectorS(parent,name){
+encodingSelector::encodingSelector(TQWidget *tqparent, const char* name) :  encodingSelectorS(tqparent,name){
   TQStringList encodings (KGlobal::charsets()->availableEncodingNames());
   int insert = 0;
   for (uint i=0; i < encodings.count(); i++) {
diff --git a/quanta/components/csseditor/encodingselector.h b/quanta/components/csseditor/encodingselector.h
index f53dca27..9c2db48c 100644
--- a/quanta/components/csseditor/encodingselector.h
+++ b/quanta/components/csseditor/encodingselector.h
@@ -28,9 +28,10 @@
 
 class encodingSelector : public encodingSelectorS {
   Q_OBJECT
+  TQ_OBJECT
                  
   public: 
-    encodingSelector(TQWidget *parent=0, const char* name=0);
+    encodingSelector(TQWidget *tqparent=0, const char* name=0);
     ~encodingSelector();
     TQString encodingSet() const { return cbEncoding->currentText();}
 
diff --git a/quanta/components/csseditor/encodingselectors.ui b/quanta/components/csseditor/encodingselectors.ui
index 45d269de..532cc137 100644
--- a/quanta/components/csseditor/encodingselectors.ui
+++ b/quanta/components/csseditor/encodingselectors.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>encodingSelectorS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>encodingSelectorS</cstring>
     </property>
@@ -19,23 +19,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>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <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>
@@ -43,22 +43,22 @@
                                 <string>Select encoding:</string>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <property name="name">
                                 <cstring>cbEncoding</cstring>
                             </property>
                         </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="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>pbOk</cstring>
                             </property>
@@ -76,14 +76,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>pbCancel</cstring>
                             </property>
@@ -111,5 +111,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp
index 9f8da65d..08f24ed5 100644
--- a/quanta/components/csseditor/fontfamilychooser.cpp
+++ b/quanta/components/csseditor/fontfamilychooser.cpp
@@ -32,40 +32,40 @@
 
 #include<kdebug.h>
 
-fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontFamilyChooserS(parent,name){
+fontFamilyChooser::fontFamilyChooser(TQWidget* tqparent, const char *name) : fontFamilyChooserS(tqparent,name){
 
   TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black );
   lePreview->setMinimumHeight( lePreview->fontMetrics().lineSpacing() );
-  lePreview->setAlignment(Qt::AlignCenter);
+  lePreview->tqsetAlignment(TQt::AlignCenter);
   TQFont font;
   font.setPointSize(20);
   lePreview->setFont(font);
   lePreview->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog"));
   
   TQFontDatabase fdb;
-  TQStringList families = fdb.families();
+  TQStringList families = fdb.tqfamilies();
   for ( TQStringList::Iterator it = families.begin(); it != families.end(); ++it ) {
-    if( (*it).contains('[') !=0  ) 
+    if( (*it).tqcontains('[') !=0  ) 
       it = families.remove(it);
   }
   
   if( families.count() != 0 ) lbAvailable->insertStringList(families);
   
        
-  TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("forward"));
+  TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("forward"));
   TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
   pbAdd->setIconSet(iconSet);
   pbAdd->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
   
-  iconSet = SmallIconSet(TQString::fromLatin1("back"));
+  iconSet = SmallIconSet(TQString::tqfromLatin1("back"));
   pbRemove->setIconSet(iconSet);
   pbRemove->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
   
-   iconSet = SmallIconSet(TQString::fromLatin1("up"));
+   iconSet = SmallIconSet(TQString::tqfromLatin1("up"));
   pbMoveUp->setIconSet(iconSet);
   pbMoveUp->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
   
-  iconSet = SmallIconSet(TQString::fromLatin1("down"));
+  iconSet = SmallIconSet(TQString::tqfromLatin1("down"));
   pbMoveDown->setIconSet(iconSet);
   pbMoveDown->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
 
@@ -100,9 +100,9 @@ void fontFamilyChooser::updatePreview(const TQString& s){
 void fontFamilyChooser::addFont(){
   lbSelected->insertItem( m_currentSelectedFont );
   switch(m_fontOrigin) {
-    case available: lbAvailable->removeItem(lbAvailable->index(lbAvailable->findItem(m_currentSelectedFont)));
+    case available: lbAvailable->removeItem(lbAvailable->index(lbAvailable->tqfindItem(m_currentSelectedFont)));
                              break;
-    case generic : lbGeneric->removeItem(lbGeneric->index(lbGeneric->findItem(m_currentSelectedFont)));
+    case generic : lbGeneric->removeItem(lbGeneric->index(lbGeneric->tqfindItem(m_currentSelectedFont)));
                              break;
   }
 }
@@ -156,7 +156,7 @@ TQStringList fontFamilyChooser::fontList(){
   TQStringList list;
   TQListBoxItem *item = lbSelected->firstItem();
   while( item != 0 ){
-    if( item->text().contains( TQRegExp("\\W") ) ) list.append( "'" + item->text() + "'" );
+    if( item->text().tqcontains( TQRegExp("\\W") ) ) list.append( "'" + item->text() + "'" );
     else list.append( item->text() );
     item = item->next();  
   }
diff --git a/quanta/components/csseditor/fontfamilychooser.h b/quanta/components/csseditor/fontfamilychooser.h
index d67ce92d..9cb8af54 100644
--- a/quanta/components/csseditor/fontfamilychooser.h
+++ b/quanta/components/csseditor/fontfamilychooser.h
@@ -24,6 +24,7 @@ class TQStringList;
 class fontFamilyChooser : public fontFamilyChooserS
 {
   Q_OBJECT
+  TQ_OBJECT
   private:
     enum FontOrigin { available, generic };
     TQString m_currentSelectedFont;
@@ -43,7 +44,7 @@ class fontFamilyChooser : public fontFamilyChooserS
     void moveFontDown();
     
   public:    
-    fontFamilyChooser(TQWidget* parent, const char *name=0);
+    fontFamilyChooser(TQWidget* tqparent, const char *name=0);
     ~fontFamilyChooser(); 
     TQStringList fontList();
     void setInitialValue(const TQString& s);
diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui
index 1b846446..11d3bfe8 100644
--- a/quanta/components/csseditor/fontfamilychoosers.ui
+++ b/quanta/components/csseditor/fontfamilychoosers.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>fontFamilyChooserS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>fontFamilyChooserS</cstring>
     </property>
@@ -30,47 +30,47 @@
         <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>layout42</cstring>
+                <cstring>tqlayout42</cstring>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout40</cstring>
+                        <cstring>tqlayout40</cstring>
                     </property>
                     <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout39</cstring>
+                                <cstring>tqlayout39</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLayoutWidget">
+                                <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout36</cstring>
+                                        <cstring>tqlayout36</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
-                                        <widget class="QLayoutWidget">
+                                        <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>layout20</cstring>
+                                                <cstring>tqlayout20</cstring>
                                             </property>
                                             <vbox>
                                                 <property name="name">
                                                     <cstring>unnamed</cstring>
                                                 </property>
-                                                <widget class="QLabel">
+                                                <widget class="TQLabel">
                                                     <property name="name">
                                                         <cstring>textLabel1</cstring>
                                                     </property>
@@ -78,22 +78,22 @@
                                                         <string>Available system font families:</string>
                                                     </property>
                                                 </widget>
-                                                <widget class="QListBox">
+                                                <widget class="TQListBox">
                                                     <property name="name">
                                                         <cstring>lbAvailable</cstring>
                                                     </property>
                                                 </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>textLabel3</cstring>
                                                     </property>
@@ -101,7 +101,7 @@
                                                         <string>Generic family:</string>
                                                     </property>
                                                 </widget>
-                                                <widget class="QListBox">
+                                                <widget class="TQListBox">
                                                     <item>
                                                         <property name="text">
                                                             <string>cursive</string>
@@ -143,9 +143,9 @@
                                         </widget>
                                     </vbox>
                                 </widget>
-                                <widget class="QLayoutWidget">
+                                <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout38</cstring>
+                                        <cstring>tqlayout38</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -164,14 +164,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="QButtonGroup">
+                                        <widget class="TQButtonGroup">
                                             <property name="name">
                                                 <cstring>buttonGroup1</cstring>
                                             </property>
@@ -193,7 +193,7 @@
                                             <property name="title">
                                                 <string></string>
                                             </property>
-                                            <property name="alignment">
+                                            <property name="tqalignment">
                                                 <set>AlignCenter</set>
                                             </property>
                                             <property name="flat">
@@ -219,13 +219,13 @@
                                                     <property name="name">
                                                         <cstring>pbMoveUp</cstring>
                                                     </property>
-                                                    <property name="minimumSize">
+                                                    <property name="tqminimumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
                                                         </size>
                                                     </property>
-                                                    <property name="maximumSize">
+                                                    <property name="tqmaximumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
@@ -239,13 +239,13 @@
                                                     <property name="name">
                                                         <cstring>pbAdd</cstring>
                                                     </property>
-                                                    <property name="minimumSize">
+                                                    <property name="tqminimumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
                                                         </size>
                                                     </property>
-                                                    <property name="maximumSize">
+                                                    <property name="tqmaximumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
@@ -259,13 +259,13 @@
                                                     <property name="name">
                                                         <cstring>pbRemove</cstring>
                                                     </property>
-                                                    <property name="minimumSize">
+                                                    <property name="tqminimumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
                                                         </size>
                                                     </property>
-                                                    <property name="maximumSize">
+                                                    <property name="tqmaximumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
@@ -279,13 +279,13 @@
                                                     <property name="name">
                                                         <cstring>pbMoveDown</cstring>
                                                     </property>
-                                                    <property name="minimumSize">
+                                                    <property name="tqminimumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
                                                         </size>
                                                     </property>
-                                                    <property name="maximumSize">
+                                                    <property name="tqmaximumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
@@ -307,7 +307,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="sizeHint">
+                                            <property name="tqsizeHint">
                                                 <size>
                                                     <width>20</width>
                                                     <height>40</height>
@@ -316,15 +316,15 @@
                                         </spacer>
                                     </vbox>
                                 </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="QLabel">
+                                        <widget class="TQLabel">
                                             <property name="name">
                                                 <cstring>textLabel2</cstring>
                                             </property>
@@ -332,7 +332,7 @@
                                                 <string>Selected font families:</string>
                                             </property>
                                         </widget>
-                                        <widget class="QListBox">
+                                        <widget class="TQListBox">
                                             <property name="name">
                                                 <cstring>lbSelected</cstring>
                                             </property>
@@ -349,16 +349,16 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>lePreview</cstring>
                             </property>
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout41</cstring>
+                        <cstring>tqlayout41</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -374,16 +374,16 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>313</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout9</cstring>
+                                <cstring>tqlayout9</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -429,7 +429,7 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/quanta/components/csseditor/minieditor.h b/quanta/components/csseditor/minieditor.h
index 1f5c25ef..0d668529 100644
--- a/quanta/components/csseditor/minieditor.h
+++ b/quanta/components/csseditor/minieditor.h
@@ -26,9 +26,9 @@
 
 class propertySetter;  
   
-class miniEditor : public QHBox{
+class miniEditor : public TQHBox{
   public:
-    miniEditor(TQWidget *parent=0, const char *name=0):TQHBox(parent,name){}
+    miniEditor(TQWidget *tqparent=0, const char *name=0):TQHBox(tqparent,name){}
     ~miniEditor(){}
     virtual void connectToPropertySetter(propertySetter* p)=0;
 };
diff --git a/quanta/components/csseditor/percentageeditor.cpp b/quanta/components/csseditor/percentageeditor.cpp
index b02a1615..cd0eec23 100644
--- a/quanta/components/csseditor/percentageeditor.cpp
+++ b/quanta/components/csseditor/percentageeditor.cpp
@@ -17,7 +17,7 @@
 #include "percentageeditor.h"
 #include "propertysetter.h"
 
-percentageEditor::percentageEditor(const TQString& initialValue, TQWidget *parent, const char *name) : miniEditor(parent,name)
+percentageEditor::percentageEditor(const TQString& initialValue, TQWidget *tqparent, const char *name) : miniEditor(tqparent,name)
 {
   TQString temp(initialValue);
   m_sb = new mySpinBox(0,9999,1,this);
diff --git a/quanta/components/csseditor/percentageeditor.h b/quanta/components/csseditor/percentageeditor.h
index a6aecb8c..31a0d6ef 100644
--- a/quanta/components/csseditor/percentageeditor.h
+++ b/quanta/components/csseditor/percentageeditor.h
@@ -38,10 +38,11 @@ class propertySetter;
    
 class percentageEditor : public miniEditor {
      Q_OBJECT
+  TQ_OBJECT
    private:
      mySpinBox *m_sb;
    public:
-           percentageEditor(const TQString& initialValue="0",TQWidget *parent=0, const char *name=0);
+           percentageEditor(const TQString& initialValue="0",TQWidget *tqparent=0, const char *name=0);
            ~percentageEditor();
            virtual void connectToPropertySetter(propertySetter* p);
    signals:
diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp
index 922c7dbe..894a9562 100644
--- a/quanta/components/csseditor/propertysetter.cpp
+++ b/quanta/components/csseditor/propertysetter.cpp
@@ -36,7 +36,7 @@
 #include "csseditor_globals.h"
 #include "minieditor.h"
 
-propertySetter::propertySetter(TQWidget *parent, const char *name ) : TQHBox(parent,name) {
+propertySetter::propertySetter(TQWidget *tqparent, const char *name ) : TQHBox(tqparent,name) {
   m_ind = 0;
   m_cb = 0L;
   m_list.setAutoDelete(true);
@@ -113,7 +113,7 @@ void propertySetter::addButton(){
 
   m_pb = new KPushButton(this);
   TQToolTip::add(m_pb, i18n( "More..." ));
-  TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("2rightarrow"));
+  TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("2rightarrow"));
   TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
   m_pb->setIconSet(iconSet);
   m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
diff --git a/quanta/components/csseditor/propertysetter.h b/quanta/components/csseditor/propertysetter.h
index 2f0a90af..df9c29bc 100644
--- a/quanta/components/csseditor/propertysetter.h
+++ b/quanta/components/csseditor/propertysetter.h
@@ -33,6 +33,7 @@ class KPushButton;
   
 class propertySetter : public TQHBox  {
   Q_OBJECT
+  TQ_OBJECT
 
   private:
     unsigned int m_ind;
@@ -41,13 +42,13 @@ class propertySetter : public TQHBox  {
     KPushButton *m_pb;
 
   public:
-    propertySetter(TQWidget *parent=0, const char *name=0);
+    propertySetter(TQWidget *tqparent=0, const char *name=0);
     ~propertySetter();
     
     void installMiniEditor(miniEditor *m); 
     
     void setComboBox();
-    void setSpinBox(const TQString& initialValue="0", const TQString& min="0", const TQString& max="9999", const TQString& s=TQString::null);
+    void setSpinBox(const TQString& initialValue="0", const TQString& min="0", const TQString& max="9999", const TQString& s=TQString());
     void setLineEdit();
     void setPredefinedColorListEditor();
     void reset();
diff --git a/quanta/components/csseditor/qmyhighlighter.cpp b/quanta/components/csseditor/qmyhighlighter.cpp
index dad1fe24..ce81aedc 100644
--- a/quanta/components/csseditor/qmyhighlighter.cpp
+++ b/quanta/components/csseditor/qmyhighlighter.cpp
@@ -17,14 +17,14 @@
 
 #include "qmyhighlighter.h"
 #include <tqregexp.h>
-QMyHighlighter::QMyHighlighter(TQTextEdit* Qtxt):TQSyntaxHighlighter(Qtxt){
+TQMyHighlighter::TQMyHighlighter(TQTextEdit* TQtxt):TQSyntaxHighlighter(TQtxt){
 }
 /*****************************************************************************/
-QMyHighlighter::~QMyHighlighter(){
+TQMyHighlighter::~TQMyHighlighter(){
 }
 
 /*****************************************************************************/
-int QMyHighlighter::highlightParagraph( const TQString & text, int /*endStateOfLastPara*/ )
+int TQMyHighlighter::highlightParagraph( const TQString & text, int /*endStateOfLastPara*/ )
 {
   //TQRegExp pattern("\\s*\\{([\\w\\s\\d:;-\"]*)\\}\\s*");
   TQRegExp pattern("([#:\\.\\w]*)\\s*\\{");
diff --git a/quanta/components/csseditor/qmyhighlighter.h b/quanta/components/csseditor/qmyhighlighter.h
index 60e767f5..8d7b6a67 100644
--- a/quanta/components/csseditor/qmyhighlighter.h
+++ b/quanta/components/csseditor/qmyhighlighter.h
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QMYHIGHLIGHTER_H
-#define QMYHIGHLIGHTER_H
+#ifndef TQMYHIGHLIGHTER_H
+#define TQMYHIGHLIGHTER_H
 
 #include <tqsyntaxhighlighter.h>
 
@@ -24,11 +24,11 @@
   *@author Emiliano Gulmini
   */
 
-class QMyHighlighter : public TQSyntaxHighlighter  {
+class TQMyHighlighter : public TQSyntaxHighlighter  {
 public: 
-	QMyHighlighter(TQTextEdit* Qtxt);
+	TQMyHighlighter(TQTextEdit* TQtxt);
 
-	~QMyHighlighter();
+	~TQMyHighlighter();
   int highlightParagraph ( const TQString & text, int endStateOfLastPara ); 
 
 };
diff --git a/quanta/components/csseditor/shorthandformer.cpp b/quanta/components/csseditor/shorthandformer.cpp
index 08acc819..4843986c 100644
--- a/quanta/components/csseditor/shorthandformer.cpp
+++ b/quanta/components/csseditor/shorthandformer.cpp
@@ -52,167 +52,167 @@ static const TQStringList backgroundRepeatValueList = TQStringList::split(",",ba
 ShorthandFormer::ShorthandFormer( TQMap<TQString,TQString> m){
 
   m_properties = m;
-  if(m_properties.contains("cue-after")){
+  if(m_properties.tqcontains("cue-after")){
     cue_after= m_properties["cue-after"];
     m_properties.remove("cue-after");
   }
-  if(m_properties.contains("cue-before")){
+  if(m_properties.tqcontains("cue-before")){
     cue_before = m_properties["cue-before"];
     m_properties.remove("cue-before");
   }
-  if(m_properties.contains("pause-before")){
+  if(m_properties.tqcontains("pause-before")){
     pause_before= m_properties["pause-before"];
     m_properties.remove("pause-before");
   }
-  if(m_properties.contains("pause-after")){
+  if(m_properties.tqcontains("pause-after")){
     pause_after = m_properties["pause-after"];
     m_properties.remove("pause-after");
   }
-  if(m_properties.contains("background-color")){
+  if(m_properties.tqcontains("background-color")){
     background_color = m_properties["background-color"];
     m_properties.remove("background-color");
   }
-  if(m_properties.contains("background-image")){
+  if(m_properties.tqcontains("background-image")){
     background_image = m_properties["background-image"];
     m_properties.remove("background-image");
   }
-  if(m_properties.contains("background-repeat")){
+  if(m_properties.tqcontains("background-repeat")){
     background_repeat = m_properties["background-repeat"];
     m_properties.remove("background-repeat");
   }
-  if(m_properties.contains("background-attachment")){
+  if(m_properties.tqcontains("background-attachment")){
     background_attachment = m_properties["background-attachment"];
     m_properties.remove("background-attachment");
   }
-  if(m_properties.contains("background-position")){
+  if(m_properties.tqcontains("background-position")){
     background_position = m_properties["background-position"];
     m_properties.remove("background-position");
   }
-  if(m_properties.contains("border-top-style")){
+  if(m_properties.tqcontains("border-top-style")){
     border_top_style = m_properties["border-top-style"];
     m_properties.remove("border-top-style");
   }
-  if(m_properties.contains("border-top-color")){
+  if(m_properties.tqcontains("border-top-color")){
     border_top_color = m_properties["border-top-color"];
     m_properties.remove("border-top-color");
   }
-  if(m_properties.contains("border-top-width")){
+  if(m_properties.tqcontains("border-top-width")){
     border_top_width = m_properties["border-top-width"];
     m_properties.remove("border-top-width");
   }
-  if(m_properties.contains("border-left-style")){
+  if(m_properties.tqcontains("border-left-style")){
     border_left_style = m_properties["border-left-style"];
     m_properties.remove("border-left-style");
   }
-  if(m_properties.contains("border-left-color")){
+  if(m_properties.tqcontains("border-left-color")){
     border_left_color = m_properties["border-left-color"];
     m_properties.remove("border-left-color");
   }
-  if(m_properties.contains("border-left-width")){
+  if(m_properties.tqcontains("border-left-width")){
     border_left_width = m_properties["border-left-width"];
     m_properties.remove("border-left-width");
   }
-  if(m_properties.contains("border-right-style")){
+  if(m_properties.tqcontains("border-right-style")){
     border_right_style = m_properties["border-right-style"];
     m_properties.remove("border-right-style");
   }
-  if(m_properties.contains("border-right-color")){
+  if(m_properties.tqcontains("border-right-color")){
     border_right_color = m_properties["border-right-color"];
     m_properties.remove("border-right-color");
   }
-  if(m_properties.contains("border-right-width")){
+  if(m_properties.tqcontains("border-right-width")){
     border_right_width= m_properties["border-right-width"];
     m_properties.remove("border-right-width");
   }
-  if(m_properties.contains("border-bottom-style")){
+  if(m_properties.tqcontains("border-bottom-style")){
     border_bottom_style = m_properties["border-bottom-style"];
     m_properties.remove("border-bottom-style");
   }
-  if(m_properties.contains("border-bottom-color")){
+  if(m_properties.tqcontains("border-bottom-color")){
     border_bottom_color = m_properties["border-bottom-color"];
     m_properties.remove("border-bottom-color");
   }
-  if(m_properties.contains("border-bottom-width")){
+  if(m_properties.tqcontains("border-bottom-width")){
     border_bottom_width = m_properties["border-bottom-width"];
     m_properties.remove("border-bottom-width");
   }
-  if(m_properties.contains("outline-style")){
+  if(m_properties.tqcontains("outline-style")){
     outline_style = m_properties["outline-style"];
     m_properties.remove("outline-style");
   }
-  if(m_properties.contains("outline-color")){
+  if(m_properties.tqcontains("outline-color")){
     outline_color = m_properties["outline-color"];
     m_properties.remove("outline-color");
   }
-  if(m_properties.contains("outline-width")){
+  if(m_properties.tqcontains("outline-width")){
     outline_width = m_properties["outline-width"];
     m_properties.remove("outline-width");
   }
-  if(m_properties.contains("list-style-type")){
+  if(m_properties.tqcontains("list-style-type")){
     list_style_type= m_properties["list-style-type"];
     m_properties.remove("list-style-type");
   }
-  if(m_properties.contains("list-style-image")){
+  if(m_properties.tqcontains("list-style-image")){
     list_style_image = m_properties["list-style-image"];
     m_properties.remove("list-style-image");
   }
-  if(m_properties.contains("list-style-position")){
+  if(m_properties.tqcontains("list-style-position")){
     list_style_position = m_properties["list-style-position"];
     m_properties.remove("list-style-position");
   }
-  if(m_properties.contains("font-style")){
+  if(m_properties.tqcontains("font-style")){
     font_style = m_properties["font-style"];
     m_properties.remove("font-style");
   }
-  if(m_properties.contains("font-variant")){
+  if(m_properties.tqcontains("font-variant")){
     font_variant = m_properties["font-variant"];
     m_properties.remove("font-variant");
   }
-  if(m_properties.contains("font-weight")){
+  if(m_properties.tqcontains("font-weight")){
     font_weight = m_properties["font-weight"];
     m_properties.remove("font-weight");
   }
-  if(m_properties.contains("font-size")){
+  if(m_properties.tqcontains("font-size")){
     font_size = m_properties["font-size"];
     m_properties.remove("font-size");
   }
-  if(m_properties.contains("line-height")){
+  if(m_properties.tqcontains("line-height")){
     line_height= m_properties["line-height"];
     m_properties.remove("line-height");
   }
-  if(m_properties.contains("font-family")){
+  if(m_properties.tqcontains("font-family")){
     font_family = m_properties["font-family"];
     m_properties.remove("font-family");
   }
-  if(m_properties.contains("margin-top")){
+  if(m_properties.tqcontains("margin-top")){
     margin_top = m_properties["margin-top"];
     m_properties.remove("margin-top");
   }
-  if(m_properties.contains("margin-bottom")){
+  if(m_properties.tqcontains("margin-bottom")){
     margin_bottom = m_properties["margin-bottom"];
     m_properties.remove("margin-bottom");
   }
-  if(m_properties.contains("margin-left")){
+  if(m_properties.tqcontains("margin-left")){
     margin_left = m_properties["margin-left"];
     m_properties.remove("margin-left");
   }
-  if(m_properties.contains("margin-right")){
+  if(m_properties.tqcontains("margin-right")){
     margin_right = m_properties["margin-right"];
     m_properties.remove("margin-right");
   }
-  if(m_properties.contains("padding-top")){
+  if(m_properties.tqcontains("padding-top")){
     padding_top = m_properties["padding-top"];
     m_properties.remove("padding-top");
   }
-  if(m_properties.contains("padding-bottom")){
+  if(m_properties.tqcontains("padding-bottom")){
     padding_bottom = m_properties["padding-bottom"];
     m_properties.remove("padding-bottom");
   }
-  if(m_properties.contains("padding-left")){
+  if(m_properties.tqcontains("padding-left")){
     padding_left = m_properties["padding-left"];
     m_properties.remove("padding-left");
   }
-  if(m_properties.contains("padding-right")){
+  if(m_properties.tqcontains("padding-right")){
     padding_right = m_properties["padding-right"];
     m_properties.remove("padding-right");
   }
@@ -384,7 +384,7 @@ TQString ShorthandFormer::compressBackgroundProp(){
   if( !background_attachment.isEmpty() ) backgroundProp += (" " + background_attachment );
   if( !background_position.isEmpty() ) backgroundProp += (" " + background_position );
   if( !backgroundProp.isEmpty() ) return ( "background :" + backgroundProp + "; ");
-  return TQString::null;
+  return TQString();
 }
 
 TQString ShorthandFormer::compressPaddingProp(){
@@ -408,7 +408,7 @@ TQString ShorthandFormer::compressImplementation3( const TQString& prop, const T
   if( !p2.isEmpty() ) props += (" " + p2 );
   if( !p3.isEmpty() ) props += (" " + p3 );
   if( !props.isEmpty() ) return ( prop + " :" + props + "; ");
-  return TQString::null;
+  return TQString();
 }
 
 TQString ShorthandFormer::compressImplementation2( const TQString& prop, const TQString& after, const TQString& before, const TQString& defValue){
@@ -440,7 +440,7 @@ TQString ShorthandFormer::compressImplementation( const TQString& prop, const TQ
 
 
   if( top == defValue && bottom == defValue && right == defValue && left == defValue)
-  return TQString::null;
+  return TQString();
 
   if( top == bottom && bottom == right && right == left )
   return ( prop +" : " + top + "; ");
@@ -517,11 +517,11 @@ TQMap<TQString,TQString>  ShorthandFormer::expandBackgroundProp(const TQStringLi
 
     while (  it != l.end() ) {
       TQString temp((*it).stripWhiteSpace());
-      if( (*it).contains("url(") || temp == "none" || temp == "inherit" ){
+      if( (*it).tqcontains("url(") || temp == "none" || temp == "inherit" ){
         expandedProps["background-image"] = (*it);
       }
       else
-      if( backgroundRepeatValueList.contains(temp)!=0 ) {
+      if( backgroundRepeatValueList.tqcontains(temp)!=0 ) {
         expandedProps["background-repeat"] = (*it);
       }
       else
@@ -529,12 +529,12 @@ TQMap<TQString,TQString>  ShorthandFormer::expandBackgroundProp(const TQStringLi
         expandedProps["background-attachment"] = (*it);
       }
       else
-      if( (*it).contains("rgb(") || (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "transparent" || temp == "inherit" ){
+      if( (*it).tqcontains("rgb(") || (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "transparent" || temp == "inherit" ){
         expandedProps["background-color"] = (*it);
       }
       else
-      if( temp == "top" || temp == "center" || temp == "bottom" || temp == "left" || temp == "right" || (*it).contains(globalPercentagePattern) || (*it).contains(globalLengthPattern) || temp == "inherit"){
-        if( expandedProps.contains("background-position") )
+      if( temp == "top" || temp == "center" || temp == "bottom" || temp == "left" || temp == "right" || (*it).tqcontains(globalPercentagePattern) || (*it).tqcontains(globalLengthPattern) || temp == "inherit"){
+        if( expandedProps.tqcontains("background-position") )
           expandedProps["background-position"] = ( expandedProps["background-position"] + " " + (*it) );
         else
           expandedProps["background-position"] = (*it);
@@ -590,7 +590,7 @@ TQMap<TQString,TQString>  ShorthandFormer::expandFontProp(const TQStringList& l)
    fontPseudoSHFormValues.append("message-box");
    fontPseudoSHFormValues.append("small-caption");
    fontPseudoSHFormValues.append("status-bar");
-  if( l.count()==1 && fontPseudoSHFormValues.contains(l[0]) != 0) {
+  if( l.count()==1 && fontPseudoSHFormValues.tqcontains(l[0]) != 0) {
     expandedProps["font"] = l[0];
     return expandedProps;
   }
@@ -599,18 +599,18 @@ TQMap<TQString,TQString>  ShorthandFormer::expandFontProp(const TQStringList& l)
       while (  it != l.end() ) {
         TQString currentIt = (*it);
         TQString temp(currentIt.stripWhiteSpace());
-        if( fontStyleValueList.contains(temp)!=0  ) expandedProps["font-style"] = (*it);
+        if( fontStyleValueList.tqcontains(temp)!=0  ) expandedProps["font-style"] = (*it);
         else
-          if( fontVariantValueList.contains(temp)!=0 ) expandedProps["font-variant"] = currentIt ;
+          if( fontVariantValueList.tqcontains(temp)!=0 ) expandedProps["font-variant"] = currentIt ;
           else
-            if( fontWeightValueList.contains(temp)!=0) expandedProps["font-weight"] = currentIt;
+            if( fontWeightValueList.tqcontains(temp)!=0) expandedProps["font-weight"] = currentIt;
             else
-              if( (fontSizeValueList.contains(temp)!=0 || currentIt.contains(globalPercentagePattern)!=0  || currentIt.contains(globalLengthPattern)!=0) && expandedProps["font-size"].isEmpty() )
+              if( (fontSizeValueList.tqcontains(temp)!=0 || currentIt.tqcontains(globalPercentagePattern)!=0  || currentIt.tqcontains(globalLengthPattern)!=0) && expandedProps["font-size"].isEmpty() )
               {
                 expandedProps["font-size"] = currentIt;
               }
               else
-                if( currentIt.contains(percentagePattern)!=0 || currentIt.contains(numberPattern)!=0 || currentIt.contains(lengthPattern)!=0 || temp == "/normal" || temp == "/inherit" )
+                if( currentIt.tqcontains(percentagePattern)!=0 || currentIt.tqcontains(numberPattern)!=0 || currentIt.tqcontains(lengthPattern)!=0 || temp == "/normal" || temp == "/inherit" )
                 {
                   expandedProps["line-height"] = (currentIt.remove('/'));
                 }
@@ -640,7 +640,7 @@ TQMap<TQString,TQString> ShorthandFormer::expandListstyleProp( const TQStringLis
   TQStringList::ConstIterator it = l.begin();
   while (  it != l.end() ) {
       TQString temp((*it).stripWhiteSpace());
-      if( listTypeValueList.contains(temp)!=0) {
+      if( listTypeValueList.tqcontains(temp)!=0) {
         expandedProps["list-style-type"] = (*it) ;
       }
       else
@@ -648,7 +648,7 @@ TQMap<TQString,TQString> ShorthandFormer::expandListstyleProp( const TQStringLis
           expandedProps["list-style-position"] = (*it);
         }
         else
-          if( (*it).contains("url(") || temp == "none" || temp == "inherit" )
+          if( (*it).tqcontains("url(") || temp == "none" || temp == "inherit" )
             expandedProps["list-style-image"] = (*it);
 
       ++it;
@@ -661,12 +661,12 @@ TQMap<TQString,TQString>  ShorthandFormer::expandOutlineProp( const TQStringList
   TQStringList::ConstIterator it = l.begin();
     while (  it != l.end() ) {
       TQString temp((*it).stripWhiteSpace());
-      if( borderStyleValueList.contains(temp)!=0 ) expandedProps["outline-style"] = (*it);
+      if( borderStyleValueList.tqcontains(temp)!=0 ) expandedProps["outline-style"] = (*it);
       else
-      if(  (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "invert" || temp == "inherit")
+      if(  (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "invert" || temp == "inherit")
           expandedProps["outline-color"] = (*it) ;
       else
-      if( (*it).contains(globalLengthPattern) || widthValueList.contains(temp)!=0)
+      if( (*it).tqcontains(globalLengthPattern) || widthValueList.tqcontains(temp)!=0)
         expandedProps["outline-width"] = (*it);
       ++it;
     }
@@ -679,12 +679,12 @@ TQMap<TQString,TQString>  ShorthandFormer::expandBoxSide(const TQString& subProp
   TQStringList::ConstIterator it = l.begin();
      while (  it != l.end() ) {
        TQString temp((*it).stripWhiteSpace());
-      if( borderStyleValueList.contains(temp)!=0 ) expandedProps[subPropName + "-style"] = (*it);
+      if( borderStyleValueList.tqcontains(temp)!=0 ) expandedProps[subPropName + "-style"] = (*it);
       else
-      if(  (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "transparent" || temp == "inherit")
+      if(  (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "transparent" || temp == "inherit")
           expandedProps[subPropName + "-color"] = (*it) ;
       else
-      if( (*it).contains(globalLengthPattern) || widthValueList.contains(temp)!=0)
+      if( (*it).tqcontains(globalLengthPattern) || widthValueList.tqcontains(temp)!=0)
         expandedProps[subPropName + "-width"] = (*it);
       ++it;
     }
@@ -696,21 +696,21 @@ TQMap<TQString,TQString>  ShorthandFormer::expandBorderProp(const TQStringList&
   TQStringList::ConstIterator it = l.begin();
      while (  it != l.end() ) {
        TQString temp((*it).stripWhiteSpace());
-      if( borderStyleValueList.contains(temp)!=0 ){
+      if( borderStyleValueList.tqcontains(temp)!=0 ){
         expandedProps["border-top-style"] = (*it);
         expandedProps["border-left-style"] = (*it);
         expandedProps["border-right-style"] = (*it);
         expandedProps["border-bottom-style"] = (*it);
       }
       else
-      if(  (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "transparent" || temp == "inherit"){
+      if(  (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "transparent" || temp == "inherit"){
         expandedProps["border-top-color"] = (*it);
         expandedProps["border-left-color"] = (*it);
         expandedProps["border-right-color"] = (*it);
         expandedProps["border-bottom-color"] = (*it);
       }
       else
-      if( (*it).contains(globalLengthPattern) || widthValueList.contains(temp)!=0){
+      if( (*it).tqcontains(globalLengthPattern) || widthValueList.tqcontains(temp)!=0){
         expandedProps["border-top-width"] = (*it);
         expandedProps["border-left-width"] = (*it);
         expandedProps["border-right-width"] = (*it);
diff --git a/quanta/components/csseditor/specialsb.cpp b/quanta/components/csseditor/specialsb.cpp
index 6edf110c..e59fca51 100644
--- a/quanta/components/csseditor/specialsb.cpp
+++ b/quanta/components/csseditor/specialsb.cpp
@@ -21,7 +21,7 @@
 
 #include <klineedit.h>
 
-specialSB::specialSB(TQWidget *parent, const char *name, bool useLineEdit ) : miniEditor(parent,name) {
+specialSB::specialSB(TQWidget *tqparent, const char *name, bool useLineEdit ) : miniEditor(tqparent,name) {
   if (useLineEdit)
   {
     m_lineEdit = new KLineEdit(this);
@@ -87,13 +87,13 @@ TQStringList specialSB::cbValueList(){
   return l;
 }
 
-frequencyEditor::frequencyEditor(TQWidget *parent, const char *name ) : specialSB(parent,name) {
+frequencyEditor::frequencyEditor(TQWidget *tqparent, const char *name ) : specialSB(tqparent,name) {
   m_cb->insertItem("Hz");
   m_cb->insertItem("kHz");
   m_sb->setMaxValue(9999);
 }
 
-angleEditor::angleEditor(TQWidget *parent, const char *name) : specialSB(parent,name){
+angleEditor::angleEditor(TQWidget *tqparent, const char *name) : specialSB(tqparent,name){
   m_cb->insertItem("deg");
   m_cb->insertItem("grad");
   m_cb->insertItem("rad");
@@ -101,13 +101,13 @@ angleEditor::angleEditor(TQWidget *parent, const char *name) : specialSB(parent,
   m_sb->setMaxValue(400);
 }
 
-timeEditor::timeEditor(TQWidget *parent, const char *name ) : specialSB(parent,name) {
+timeEditor::timeEditor(TQWidget *tqparent, const char *name ) : specialSB(tqparent,name) {
   m_cb->insertItem("ms");
   m_cb->insertItem("s");
   m_sb->setMaxValue(99999);
 }
 
-lengthEditor::lengthEditor(TQWidget *parent, const char *name ) : specialSB(parent,name, true) {
+lengthEditor::lengthEditor(TQWidget *tqparent, const char *name ) : specialSB(tqparent,name, true) {
   m_cb->insertItem("px");
   m_cb->insertItem("em");
   m_cb->insertItem("ex");
diff --git a/quanta/components/csseditor/specialsb.h b/quanta/components/csseditor/specialsb.h
index bca3d9fa..6df3fc9d 100644
--- a/quanta/components/csseditor/specialsb.h
+++ b/quanta/components/csseditor/specialsb.h
@@ -29,13 +29,14 @@ class KLineEdit;
 
 class specialSB : public miniEditor {
     Q_OBJECT
+  TQ_OBJECT
   protected:
     TQComboBox *m_cb;
     mySpinBox *m_sb;
     KLineEdit *m_lineEdit;
 
    public:
-     specialSB(TQWidget *parent=0, const char *name=0, bool useLineEdit = false);
+     specialSB(TQWidget *tqparent=0, const char *name=0, bool useLineEdit = false);
      ~specialSB();
      void insertItem(const TQString& s){ m_cb->insertItem(s); }
      void setInitialValue(const TQString& s);
@@ -54,26 +55,30 @@ class specialSB : public miniEditor {
 
 class angleEditor : public specialSB {
      Q_OBJECT
+  TQ_OBJECT
    public:
-           angleEditor(TQWidget *parent=0, const char *name=0);
+           angleEditor(TQWidget *tqparent=0, const char *name=0);
 };
 
 class frequencyEditor : public specialSB {
      Q_OBJECT
+  TQ_OBJECT
    public:
-           frequencyEditor(TQWidget *parent=0, const char *name=0);
+           frequencyEditor(TQWidget *tqparent=0, const char *name=0);
 };
 
 class timeEditor : public specialSB {
      Q_OBJECT
+  TQ_OBJECT
    public:
-           timeEditor(TQWidget *parent=0, const char *name=0);
+           timeEditor(TQWidget *tqparent=0, const char *name=0);
 };
 
 class lengthEditor : public specialSB {
      Q_OBJECT
+  TQ_OBJECT
    public:
-           lengthEditor(TQWidget *parent=0, const char *name=0);
+           lengthEditor(TQWidget *tqparent=0, const char *name=0);
 };
 
 #endif
diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp
index 31f6788b..fff108d1 100644
--- a/quanta/components/csseditor/styleeditor.cpp
+++ b/quanta/components/csseditor/styleeditor.cpp
@@ -39,10 +39,10 @@
 #include "viewmanager.h"
 #include "csseditor.h"
 
-StyleEditor::StyleEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){
+StyleEditor::StyleEditor(TQWidget *tqparent, const char* name) : TLPEditor(tqparent,name){
   connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openCSSEditor()));
   setToolTip(i18n("Open css dialog"));
-  TQIconSet iconSet =  SmallIconSet(TQString::fromLatin1("stylesheet"));
+  TQIconSet iconSet =  SmallIconSet(TQString::tqfromLatin1("stylesheet"));
   TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
   m_pb->setIconSet(iconSet);
   m_iconWidth = pixMap.width();
@@ -92,7 +92,7 @@ void StyleEditor::openCSSEditor(){
       temp = tempTag.toString();
     }
     else {
-      dlg->setInlineStyleContent(TQString::null);
+      dlg->setInlineStyleContent(TQString());
       temp = styleNode->tag->toString();
     }
 
diff --git a/quanta/components/csseditor/styleeditor.h b/quanta/components/csseditor/styleeditor.h
index bef9146f..49f4fd3c 100644
--- a/quanta/components/csseditor/styleeditor.h
+++ b/quanta/components/csseditor/styleeditor.h
@@ -25,11 +25,12 @@
 class propertySetter;
 class StyleEditor : public TLPEditor{
   Q_OBJECT
+  TQ_OBJECT
   private:
     int m_iconWidth,
         m_iconHeight;
 public:
-    StyleEditor(TQWidget *parent=0, const char* name=0);
+    StyleEditor(TQWidget *tqparent=0, const char* name=0);
     virtual void setButtonIcon(int width, int height);
 
 public slots:
diff --git a/quanta/components/csseditor/stylesheetparser.cpp b/quanta/components/csseditor/stylesheetparser.cpp
index db36ea4c..7374ce9a 100644
--- a/quanta/components/csseditor/stylesheetparser.cpp
+++ b/quanta/components/csseditor/stylesheetparser.cpp
@@ -20,7 +20,7 @@
 #include <kdebug.h>
 
 static const TQString msg1(i18n("has not been closed")),
-                     msg2(i18n("needs an opening parenthesis "));
+                     msg2(i18n("needs an opening tqparenthesis "));
 
 stylesheetParser::stylesheetParser(const TQString& s){ 
   m_styleSheet = s;
@@ -74,7 +74,7 @@ void stylesheetParser::parseComment(){
   
   if(stopProcessingComment){
     int ws=whiteSpaces(k);
-    QPair<TQString,unsigned int> tmp(m_styleSheet.left(k+ws),++m_orderNumber);
+    TQPair<TQString,unsigned int> tmp(m_styleSheet.left(k+ws),++m_orderNumber);
     m_stylesheetStructure["/*"+TQString::number(m_orderNumber,10)]=tmp;
     m_styleSheet=m_styleSheet.right(m_styleSheet.length()-k-ws);
     parse(); 
@@ -87,7 +87,7 @@ void stylesheetParser::parseComment(){
     }
 }
 
-unsigned int stylesheetParser::numberOfParenthesisInAParenthesisBlock(parenthesisKind p, const TQString& b){
+unsigned int stylesheetParser::numberOfParenthesisInAParenthesisBlock(tqparenthesisKind p, const TQString& b){
   TQChar searchFor = '{';
   if (p == closed)
     searchFor = '}';
@@ -151,24 +151,24 @@ void stylesheetParser::parseSelector(){
    int closingParentheses = 1,
         openingParentheses = 0;
   while(true){ 
-    openingParentheses = numberOfParenthesisInAParenthesisBlock(closed,m_styleSheet.left(closingParenthesisPos+1)); //m_styleSheet.left(closingParenthesisPos+1).contains("{");
+    openingParentheses = numberOfParenthesisInAParenthesisBlock(closed,m_styleSheet.left(closingParenthesisPos+1)); //m_styleSheet.left(closingParenthesisPos+1).tqcontains("{");
         
     if(openingParentheses==closingParentheses){
-      TQString selectorName=m_styleSheet.left(findParanthesis(m_styleSheet, '{')/*m_styleSheet.find("{")*/).stripWhiteSpace(),
-                   selectorValue=m_styleSheet.mid(findParanthesis(m_styleSheet, '{')/*m_styleSheet.find("{")*/+1, closingParenthesisPos - m_styleSheet.find("{") -1);    
+      TQString selectorName=m_styleSheet.left(findParanthesis(m_styleSheet, '{')/*m_styleSheet.tqfind("{")*/).stripWhiteSpace(),
+                   selectorValue=m_styleSheet.mid(findParanthesis(m_styleSheet, '{')/*m_styleSheet.tqfind("{")*/+1, closingParenthesisPos - m_styleSheet.tqfind("{") -1);    
         
       selectorName.remove("\n").remove("\t");
       selectorValue.remove("\n").remove("\t");
-      QPair<TQString,unsigned int> tmp(selectorValue,++m_orderNumber);
+      TQPair<TQString,unsigned int> tmp(selectorValue,++m_orderNumber);
             
-      if (m_stylesheetStructure.contains(selectorName))
+      if (m_stylesheetStructure.tqcontains(selectorName))
       {
         uint i = 2;
-        TQString s = selectorName + TQString("-v%1").arg(i);
-        while (m_stylesheetStructure.contains(s))
+        TQString s = selectorName + TQString("-v%1").tqarg(i);
+        while (m_stylesheetStructure.tqcontains(s))
         {          
          i++;
-         s = selectorName + TQString("-v%1").arg(i);
+         s = selectorName + TQString("-v%1").tqarg(i);
         }
         selectorName = s;
       }
@@ -176,7 +176,7 @@ void stylesheetParser::parseSelector(){
       break;
     } 
     else {
-      closingParenthesisPos = findParanthesis(m_styleSheet, '{',closingParenthesisPos+1)/*m_styleSheet.find("}",closingParenthesisPos+1)*/;
+      closingParenthesisPos = findParanthesis(m_styleSheet, '{',closingParenthesisPos+1)/*m_styleSheet.tqfind("}",closingParenthesisPos+1)*/;
       closingParentheses++;
     } 
   }
@@ -188,13 +188,13 @@ void stylesheetParser::parseSelector(){
 
 void stylesheetParser::parseAtRules1(){
 //TODO this needs to be fixed : in case the at rule is not properly closed the parser hangs
-  if(m_styleSheet.find("{") == -1) {
+  if(m_styleSheet.tqfind("{") == -1) {
     m_stopProcessing = true;
     emit errorOccurred(m_styleSheet.mid(0,20) + "...\n " + msg2);      
     return;
   }
 
-  int closingParenthesisPos = m_styleSheet.find("}"),
+  int closingParenthesisPos = m_styleSheet.tqfind("}"),
        closingParentheses = 0;
       
   if(closingParenthesisPos==-1) return;
@@ -202,12 +202,12 @@ void stylesheetParser::parseAtRules1(){
 
   int openingParentheses=0;
   while(true){
-   openingParentheses = m_styleSheet.left(closingParenthesisPos+1).contains("{");
+   openingParentheses = m_styleSheet.left(closingParenthesisPos+1).tqcontains("{");
 
     if(openingParentheses==closingParentheses) 
       break;   
     else {
-      closingParenthesisPos = m_styleSheet.find("}",closingParenthesisPos+1);
+      closingParenthesisPos = m_styleSheet.tqfind("}",closingParenthesisPos+1);
       if( closingParenthesisPos!= -1 )
         closingParentheses++;
       else {
@@ -219,7 +219,7 @@ void stylesheetParser::parseAtRules1(){
   }
 
   int ws=whiteSpaces(closingParenthesisPos+1);
-  QPair<TQString,unsigned int> tmp(m_styleSheet.left(closingParenthesisPos+1+ws),++m_orderNumber);
+  TQPair<TQString,unsigned int> tmp(m_styleSheet.left(closingParenthesisPos+1+ws),++m_orderNumber);
   m_stylesheetStructure["@rule"+TQString::number(m_orderNumber,10)]=tmp;
   m_styleSheet=m_styleSheet.right(m_styleSheet.length()-closingParenthesisPos-1-ws);
   parse(); 
@@ -227,7 +227,7 @@ void stylesheetParser::parseAtRules1(){
 
 void stylesheetParser::parseAtRules2(){
 //TODO this needs to be fixed : in case the at rule is not properly closed the parser hangs
-  int semicolonPos = m_styleSheet.find(";");
+  int semicolonPos = m_styleSheet.tqfind(";");
       
   if(semicolonPos==-1) {
     m_stopProcessing = true;
@@ -236,7 +236,7 @@ void stylesheetParser::parseAtRules2(){
   }
  
   int ws=whiteSpaces(semicolonPos+1);
-  QPair<TQString,unsigned int> tmp(m_styleSheet.left(semicolonPos+1+ws),++m_orderNumber);
+  TQPair<TQString,unsigned int> tmp(m_styleSheet.left(semicolonPos+1+ws),++m_orderNumber);
   m_stylesheetStructure["@rule"+TQString::number(m_orderNumber,10)]=tmp;
   m_styleSheet=m_styleSheet.right(m_styleSheet.length()-semicolonPos-1-ws);
   parse(); 
diff --git a/quanta/components/csseditor/stylesheetparser.h b/quanta/components/csseditor/stylesheetparser.h
index 06ad1f86..9fc0716d 100644
--- a/quanta/components/csseditor/stylesheetparser.h
+++ b/quanta/components/csseditor/stylesheetparser.h
@@ -26,28 +26,29 @@
   *@author gulmini luciano
   */
 
-class stylesheetParser : public QObject{
+class stylesheetParser : public TQObject{
   Q_OBJECT
+  TQ_OBJECT
   private:
     
-    enum parenthesisKind { opened, closed };
+    enum tqparenthesisKind { opened, closed };
     TQString m_styleSheet;
     bool m_stopProcessing;
     unsigned int m_orderNumber;
-    TQMap<TQString, QPair<TQString,unsigned int> > m_stylesheetStructure; 
+    TQMap<TQString, TQPair<TQString,unsigned int> > m_stylesheetStructure; 
     void parseComment();  
     void parseSelector();
     void parseAtRules1();
     void parseAtRules2();
     int whiteSpaces(int);
-    unsigned int numberOfParenthesisInAParenthesisBlock(parenthesisKind p, const TQString& b);
+    unsigned int numberOfParenthesisInAParenthesisBlock(tqparenthesisKind p, const TQString& b);
     
   public:
     stylesheetParser(const TQString& s);
     ~stylesheetParser(){}
     void parse();
 
-    TQMap<TQString, QPair<TQString,unsigned int> > stylesheetStructure() { return m_stylesheetStructure; }
+    TQMap<TQString, TQPair<TQString,unsigned int> > stylesheetStructure() { return m_stylesheetStructure; }
     unsigned int orderNumber() const {return m_orderNumber; }
     
   signals:
diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp
index 057083e1..6b796cf7 100644
--- a/quanta/components/csseditor/tlpeditors.cpp
+++ b/quanta/components/csseditor/tlpeditors.cpp
@@ -34,7 +34,7 @@
 #include "fontfamilychooser.h"
 #include "project.h"
     
-TLPEditor::TLPEditor(TQWidget *parent, const char* name) : miniEditor(parent,name){
+TLPEditor::TLPEditor(TQWidget *tqparent, const char* name) : miniEditor(tqparent,name){
   m_label = new TQLabel(this);
   m_le = new TQLineEdit(this);
   m_pb = new KPushButton(this);
@@ -48,7 +48,7 @@ TLPEditor::~TLPEditor(){
 }
 
 void TLPEditor::setButtonIcon(TQString s){
-  TQIconSet iconSet =  SmallIconSet(TQString::fromLatin1(s.ascii()));
+  TQIconSet iconSet =  SmallIconSet(TQString::tqfromLatin1(s.ascii()));
   TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
   m_pb->setIconSet(iconSet);
   m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
@@ -66,7 +66,7 @@ void TLPEditor::setWhatsThis(TQString s){
   TQWhatsThis::add(m_le,s);
 }
 
-URIEditor::URIEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){
+URIEditor::URIEditor(TQWidget *tqparent, const char* name) : TLPEditor(tqparent,name){
   TQString whatsthis =i18n("With this line edit you can insert the URI of the resource you want to reach");  
   setWhatsThis(whatsthis);
   setLabelText(" Uri  :");
@@ -92,7 +92,7 @@ void URIEditor::setMode(const mode& m) {
 void URIEditor::selectedURI(const TQString & s){
    KURL u;
    u.setPath(s);
-   emit valueChanged("url(\'" + QExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')");
+   emit valueChanged("url(\'" + TQExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')");
 }
 
 void URIEditor::selectedURIs(const TQStringList& s){
@@ -101,7 +101,7 @@ void URIEditor::selectedURIs(const TQStringList& s){
                      selectedFilesWithURLFormat;
   for ( TQStringList::Iterator it = selectedFiles.begin(); it != selectedFiles.end(); ++it ){      
     u.setPath(*it);   
-    selectedFilesWithURLFormat.append( "url(\'" + QExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')");
+    selectedFilesWithURLFormat.append( "url(\'" + TQExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')");
   }
   emit valueChanged(selectedFilesWithURLFormat.join(","));
 }
@@ -143,14 +143,14 @@ void URIEditor::openFileDialog(){
       KURL u;
       for ( TQStringList::Iterator it = selectedFiles.begin(); it != selectedFiles.end(); ++it ){      
         u.setPath(*it);   
-      m_sFiles.append( "url(\'" + QExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')");
+      m_sFiles.append( "url(\'" + TQExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')");
       }
       emit valueChanged(m_sFiles.join(","));*/
     }
   }
 }
 
-fontEditor::fontEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name), m_initialValue(TQString::null){
+fontEditor::fontEditor(TQWidget *tqparent, const char* name) : TLPEditor(tqparent,name), m_initialValue(TQString()){
   TQString whatsthis =i18n("With this line edit you can insert the name of the font you want to use");  
   setWhatsThis(whatsthis);
   setLabelText(i18n("Font family:"));
diff --git a/quanta/components/csseditor/tlpeditors.h b/quanta/components/csseditor/tlpeditors.h
index 8388c6b6..80d5899b 100644
--- a/quanta/components/csseditor/tlpeditors.h
+++ b/quanta/components/csseditor/tlpeditors.h
@@ -31,6 +31,7 @@ class TQLabel;
 
 class TLPEditor : public miniEditor { //editor with a line text and a button calling a dialog
   Q_OBJECT
+  TQ_OBJECT
 
   protected:
     TQLineEdit *m_le;
@@ -38,7 +39,7 @@ class TLPEditor : public miniEditor { //editor with a line text and a button cal
     KPushButton *m_pb;
 
   public:
-    TLPEditor(TQWidget *parent, const char* name=0);
+    TLPEditor(TQWidget *tqparent, const char* name=0);
     virtual ~TLPEditor();
     virtual void setButtonIcon(TQString);
     void setToolTip(TQString);
@@ -55,11 +56,12 @@ class TLPEditor : public miniEditor { //editor with a line text and a button cal
 
 class fontEditor : public TLPEditor{
   Q_OBJECT
+  TQ_OBJECT
   private:
     TQString m_initialValue;
     
   public:
-    fontEditor(TQWidget *parent, const char* name=0);
+    fontEditor(TQWidget *tqparent, const char* name=0);
     virtual void setInitialValue(const TQString& s) { m_initialValue = s; }
     virtual void connectToPropertySetter(propertySetter* p);
 
@@ -69,6 +71,7 @@ class fontEditor : public TLPEditor{
 
 class URIEditor : public TLPEditor {
   Q_OBJECT
+  TQ_OBJECT
   public:
     enum mode{ Multi, Single };
     enum URIResourceType{ audio, image, mousePointer };
@@ -78,7 +81,7 @@ class URIEditor : public TLPEditor {
     URIResourceType m_resourceType;
 
   public:
-    URIEditor(TQWidget *parent, const char* name=0);
+    URIEditor(TQWidget *tqparent, const char* name=0);
     void setMode(const mode& m);
     void setResourceType(const  URIResourceType& r) { m_resourceType = r ; }
     virtual void setInitialValue(const TQString& /*s*/){}
diff --git a/quanta/components/cvsservice/Makefile.am b/quanta/components/cvsservice/Makefile.am
index 79429348..eb381581 100644
--- a/quanta/components/cvsservice/Makefile.am
+++ b/quanta/components/cvsservice/Makefile.am
@@ -1,3 +1,5 @@
+INCLUDES = $(all_includes) -I$(kde_includes)/kde
+
 noinst_LTLIBRARIES = libcvsservice.la
 
 libcvsservice_la_SOURCES = cvsservice.cpp cvscommitdlgs.ui \
diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui
index ce2c9fd0..a2ce167e 100644
--- a/quanta/components/cvsservice/cvscommitdlgs.ui
+++ b/quanta/components/cvsservice/cvscommitdlgs.ui
@@ -9,7 +9,7 @@
 ***************************************************************************/
 </comment>
 <author>(C) 2004 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CVSCommitDlgS</cstring>
     </property>
@@ -33,7 +33,7 @@
                 <cstring>fileList</cstring>
             </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>
@@ -49,7 +49,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -60,7 +60,7 @@
                 <cstring>messageCombo</cstring>
             </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 @@
                 <cstring>logEdit</cstring>
             </property>
         </widget>
-        <widget class="QTextEdit" row="5" column="0" rowspan="1" colspan="4">
+        <widget class="TQTextEdit" row="5" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>logEdit</cstring>
             </property>
@@ -105,7 +105,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>80</width>
                     <height>20</height>
@@ -143,7 +143,7 @@
     <tabstop>okButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistbox.h</includehint>
 </includehints>
diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp
index 4849ea72..33386cb3 100644
--- a/quanta/components/cvsservice/cvsservice.cpp
+++ b/quanta/components/cvsservice/cvsservice.cpp
@@ -176,11 +176,11 @@ void CVSService::slotUpdateToTag(const TQStringList &files)
     if (m_updateToDlg->tagRadioButton->isChecked())
     {
       extraOpts = "-r " + m_updateToDlg->tagCombo->currentText();
-      commandStr = i18n("Updating to revision %1 ...").arg(m_updateToDlg->tagCombo->currentText());
+      commandStr = i18n("Updating to revision %1 ...").tqarg(m_updateToDlg->tagCombo->currentText());
     } else
     {
       extraOpts = "-D " + m_updateToDlg->dateLineEdit->text();
-      commandStr = i18n("Updating to the version from %1 ...").arg(+ m_updateToDlg->dateLineEdit->text());
+      commandStr = i18n("Updating to the version from %1 ...").tqarg(+ m_updateToDlg->dateLineEdit->text());
     }
     emit clearMessages();
     emit showMessage(commandStr + "\n", false);
@@ -430,7 +430,7 @@ void CVSService::slotAddToCVSIgnore()
           line = str.readLine().stripWhiteSpace();
           if (line == fInfo.fileName())
           {
-            emit showMessage(i18n("\"%1\" is already in the CVS ignore list.").arg(fInfo.fileName()) + "\n", false);
+            emit showMessage(i18n("\"%1\" is already in the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false);
             found = true;
             break;
           }
@@ -438,7 +438,7 @@ void CVSService::slotAddToCVSIgnore()
         if (!found)
         {
           str << fInfo.fileName() << endl;
-          emit showMessage(i18n("\"%1\" added to the CVS ignore list.").arg(fInfo.fileName()) + "\n", false);
+          emit showMessage(i18n("\"%1\" added to the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false);
         }
         f.close();
       }
@@ -477,7 +477,7 @@ void CVSService::slotRemoveFromCVSIgnore()
         }       
         if (!found)
         {
-          emit showMessage(i18n("\"%1\" is not in the CVS ignore list.").arg(fInfo.fileName()) + "\n", false);
+          emit showMessage(i18n("\"%1\" is not in the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false);
         }
         f.close();
       }
@@ -486,7 +486,7 @@ void CVSService::slotRemoveFromCVSIgnore()
         TQTextStream str(&f);
         str.setEncoding(TQTextStream::UnicodeUTF8);
         str << content;
-        emit showMessage(i18n("\"%1\" removed from the CVS ignore list.").arg(fInfo.fileName()) + "\n", false);
+        emit showMessage(i18n("\"%1\" removed from the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false);
         f.close();
       }
       
@@ -501,7 +501,7 @@ void CVSService::slotJobExited(bool normalExit, int exitStatus)
 {
     if (!normalExit)
     {
-        KMessageBox::sorry(0, i18n("<qt>The CVS command <b>%1</b> has failed. The error code was <i>%2</i>.</qt>").arg(m_cvsCommand).arg(exitStatus), i18n("Command Failed"));
+        KMessageBox::sorry(0, i18n("<qt>The CVS command <b>%1</b> has failed. The error code was <i>%2</i>.</qt>").tqarg(m_cvsCommand).tqarg(exitStatus), i18n("Command Failed"));
     }
     if (exitStatus == 0)
     {
@@ -529,7 +529,7 @@ void CVSService::slotReceivedStderr(TQString output)
 void CVSService::notInRepository()
 {
   emit clearMessages();
-  emit showMessage(i18n("Error: \"%1\" is not part of the\n\"%2\" repository.").arg(m_defaultFile).arg(m_repositoryPath) + "\n", false);
+  emit showMessage(i18n("Error: \"%1\" is not part of the\n\"%2\" repository.").tqarg(m_defaultFile).tqarg(m_repositoryPath) + "\n", false);
 }
 
 void CVSService::startService()
diff --git a/quanta/components/cvsservice/cvsservice.h b/quanta/components/cvsservice/cvsservice.h
index 9cfc1328..e9f0945c 100644
--- a/quanta/components/cvsservice/cvsservice.h
+++ b/quanta/components/cvsservice/cvsservice.h
@@ -41,6 +41,7 @@ class CVSUpdateToDlgS;
 class CVSService : public TQObject, public CVSServiceDCOPIf
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/quanta/components/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui
index ef646f92..d5e116a4 100644
--- a/quanta/components/cvsservice/cvsupdatetodlgs.ui
+++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui
@@ -9,7 +9,7 @@
 ***************************************************************************/
 </comment>
 <author>(C) 2005 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CVSUpdateToDlgS</cstring>
     </property>
@@ -28,7 +28,7 @@
         <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>buttonGroup1</cstring>
             </property>
@@ -45,7 +45,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <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>dateRadioButton</cstring>
                     </property>
@@ -53,7 +53,7 @@
                         <string>Update to &amp;date ('yyyy-mm-dd'):</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>tagRadioButton</cstring>
                     </property>
@@ -82,7 +82,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -113,9 +113,9 @@
                 </spacer>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -147,7 +147,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>295</width>
                             <height>20</height>
@@ -194,5 +194,5 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp
index 202e86e0..6c2d8679 100644
--- a/quanta/components/debugger/backtracelistview.cpp
+++ b/quanta/components/debugger/backtracelistview.cpp
@@ -49,8 +49,8 @@ BacktraceListviewItem::BacktraceListviewItem(BacktraceListview* view)
 }
 
 
-BacktraceListview::BacktraceListview(TQWidget *parent, const char *name)
-  : KListView(parent, name)
+BacktraceListview::BacktraceListview(TQWidget *tqparent, const char *name)
+  : KListView(tqparent, name)
 {
   int charwidth = this->fontMetrics().width("0");
   // If you change the order here, change the BacktraceListviewColumns enums above
@@ -91,7 +91,7 @@ void BacktraceListview::backtraceShow(int level, BacktraceType type, const TQStr
 
 void BacktraceListview::keyPressEvent(TQKeyEvent *e)
 {
-  if(e->key() != Qt::Key_Enter)
+  if(e->key() != TQt::Key_Enter)
   {
     e->ignore();
     return;
diff --git a/quanta/components/debugger/backtracelistview.h b/quanta/components/debugger/backtracelistview.h
index 21b72d3d..495130f0 100644
--- a/quanta/components/debugger/backtracelistview.h
+++ b/quanta/components/debugger/backtracelistview.h
@@ -71,10 +71,11 @@ class BacktraceListviewItem : public KListViewItem
 class BacktraceListview : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
 
-    BacktraceListview(TQWidget *parent = 0, const char *name = 0);
+    BacktraceListview(TQWidget *tqparent = 0, const char *name = 0);
     ~BacktraceListview();
 
     void backtraceShow(int level, BacktraceType type, const TQString& filename, long line, const TQString& func);
diff --git a/quanta/components/debugger/conditionalbreakpointdialog.cpp b/quanta/components/debugger/conditionalbreakpointdialog.cpp
index 055512da..9dfeb5a6 100644
--- a/quanta/components/debugger/conditionalbreakpointdialog.cpp
+++ b/quanta/components/debugger/conditionalbreakpointdialog.cpp
@@ -56,7 +56,7 @@ ConditionalBreakpointDialog::~ConditionalBreakpointDialog()
 void ConditionalBreakpointDialog::slotExpressionChanged()
 {
 
-  if(comboExpression->currentText().find( TQRegExp("[^=!]=[^=]"), 0 ) >= 0)
+  if(comboExpression->currentText().tqfind( TQRegExp("[^=!]=[^=]"), 0 ) >= 0)
     ledWarning->on();
   else
     ledWarning->off();
diff --git a/quanta/components/debugger/conditionalbreakpointdialog.h b/quanta/components/debugger/conditionalbreakpointdialog.h
index cad4adeb..ca67814e 100644
--- a/quanta/components/debugger/conditionalbreakpointdialog.h
+++ b/quanta/components/debugger/conditionalbreakpointdialog.h
@@ -23,6 +23,7 @@
 class ConditionalBreakpointDialog : public ConditionalBreakpointDialogS
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum Break
diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui
index 8e4a1bf2..9c397431 100644
--- a/quanta/components/debugger/conditionalbreakpointdialogs.ui
+++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>ConditionalBreakpointDialogS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ConditionalBreakpointDialogS</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>lblExpression</cstring>
             </property>
@@ -38,7 +38,7 @@
                 <string>Expression:</string>
             </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>Layout1</cstring>
             </property>
@@ -62,14 +62,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>
@@ -86,7 +86,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -102,7 +102,7 @@
                 </widget>
             </hbox>
         </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>
@@ -113,7 +113,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>radioOnTrue</cstring>
                     </property>
@@ -121,7 +121,7 @@
                         <string>When expression is true</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>radioOnChange</cstring>
                     </property>
@@ -144,7 +144,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>30</width>
                     <height>20</height>
@@ -163,13 +163,13 @@
             <property name="name">
                 <cstring>ledWarning</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>22</width>
                     <height>22</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>22</width>
                     <height>22</height>
@@ -189,7 +189,7 @@
                 <string>Lit when a finding a single equal sign in expression (common error)</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>groupBox10</cstring>
             </property>
@@ -200,7 +200,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>lblValue</cstring>
                     </property>
@@ -215,11 +215,11 @@
                     <property name="text">
                         <string>File:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>lblValue_2</cstring>
                     </property>
@@ -234,11 +234,11 @@
                     <property name="text">
                         <string>Objects of class:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>lblValue_3</cstring>
                     </property>
@@ -253,21 +253,21 @@
                     <property name="text">
                         <string>Function:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1">
+                <widget class="TQLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>lineFile</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="1">
+                <widget class="TQLineEdit" row="2" column="1">
                     <property name="name">
                         <cstring>lineFunction</cstring>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="2">
+                <widget class="TQPushButton" row="0" column="2">
                     <property name="name">
                         <cstring>buttonClearFile</cstring>
                     </property>
@@ -275,7 +275,7 @@
                         <string>x</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="2">
+                <widget class="TQPushButton" row="2" column="2">
                     <property name="name">
                         <cstring>buttonClearFunction</cstring>
                     </property>
@@ -283,7 +283,7 @@
                         <string>x</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="2">
+                <widget class="TQPushButton" row="1" column="2">
                     <property name="name">
                         <cstring>buttonClearClass</cstring>
                     </property>
@@ -291,7 +291,7 @@
                         <string>x</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>lineClass</cstring>
                     </property>
@@ -320,7 +320,7 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp
index 62b0daa0..d5ce7b86 100644
--- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp
+++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp
@@ -71,14 +71,14 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt
       if(m_server->listen())
       {
         emit active(true);
-        emit networkError(i18n("Listening on port %1").arg(service), true);
+        emit networkError(i18n("Listening on port %1").tqarg(service), true);
       }
       else
       {
         delete m_server;
         m_server = NULL;
         emit active(false);
-        emit networkError(i18n("Unable to listen on port %1").arg(service), true);
+        emit networkError(i18n("Unable to listen on port %1").tqarg(service), true);
       }
     }
   }
@@ -118,7 +118,7 @@ void DBGpNetwork::slotError(int)
   kdDebug(24002) << k_funcinfo << ", m_server: " << m_server << ", m_socket" << m_socket << endl;
   if(m_socket)
   {
-    kdDebug(24002) << k_funcinfo << ", " << m_socket->errorString() << endl;
+    kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl;
     if(m_socket->error() == KNetwork::KSocketBase::RemotelyDisconnected)
     {
        slotConnectionClosed();
@@ -128,7 +128,7 @@ void DBGpNetwork::slotError(int)
 
     if(m_socket->error())
     {      
-      emit networkError(m_socket->errorString(), true);
+      emit networkError(m_socket->KSocketBase::errorString(), true);
     }
   }
 
@@ -262,7 +262,7 @@ void DBGpNetwork::slotReadyRead()
       // If datalen == -1, we didnt read the size yet, otherwise we're reading data.
       if(m_datalen == -1)
       {
-        bytes = m_fifo.find('\0');
+        bytes = m_fifo.tqfind('\0');
         if(bytes < 0)
           break;
 
@@ -293,7 +293,7 @@ long DBGpNetwork::sendCommand(const TQString & command, const TQString & argumen
     return false;
 
   m_transaction_id++;
-  TQString commandline = command + TQString(" -i %1").arg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments;
+  TQString commandline = command + TQString(" -i %1").tqarg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments;
 
   kdDebug(24002) << k_funcinfo << ", sending: " << commandline << endl;
 
@@ -304,7 +304,7 @@ long DBGpNetwork::sendCommand(const TQString & command, const TQString & argumen
 
 long DBGpNetwork::sendCommand( const TQString & command, const TQString & arguments, const TQString & data )
 {
-  QByteArrayFifo buffer;
+  TQByteArrayFifo buffer;
   buffer.append(data.ascii(), data.length());
   return sendCommand(command, arguments + " -- " + buffer.base64Encoded());
 }
diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.h b/quanta/components/debugger/dbgp/dbgpnetwork.h
index 96faca06..a6f64a69 100644
--- a/quanta/components/debugger/dbgp/dbgpnetwork.h
+++ b/quanta/components/debugger/dbgp/dbgpnetwork.h
@@ -28,14 +28,15 @@
 //using namespace KNetwork;
 class KResolverEntry;
 
-class DBGpNetwork : public QObject
+class DBGpNetwork : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
   private:
     KNetwork::KStreamSocket *m_socket;
     KNetwork::KServerSocket *m_server;
-    QByteArrayFifo m_fifo;
+    TQByteArrayFifo m_fifo;
     bool m_useproxy;
     long m_datalen;
     long  m_transaction_id;
diff --git a/quanta/components/debugger/dbgp/dbgpsettings.cpp b/quanta/components/debugger/dbgp/dbgpsettings.cpp
index e9bbc249..c76e00c2 100644
--- a/quanta/components/debugger/dbgp/dbgpsettings.cpp
+++ b/quanta/components/debugger/dbgp/dbgpsettings.cpp
@@ -23,7 +23,7 @@
 DBGpSettings::DBGpSettings(const TQString &protocolversion)
     : DBGpSettingsS(0, "DBGpSettings", false, 0)
 {
-  textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion));
+  textAbout->setText(textAbout->text().tqreplace("%PROTOCOLVERSION%", protocolversion));
   connect(checkLocalProject, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotLocalProjectToggle(bool)));
 }
 
diff --git a/quanta/components/debugger/dbgp/dbgpsettings.h b/quanta/components/debugger/dbgp/dbgpsettings.h
index bdf8c2f0..6ec8e73b 100644
--- a/quanta/components/debugger/dbgp/dbgpsettings.h
+++ b/quanta/components/debugger/dbgp/dbgpsettings.h
@@ -22,6 +22,7 @@
 class DBGpSettings : public DBGpSettingsS
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     DBGpSettings(const TQString &protocolversion);
diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui
index 2b846a7e..98da70f1 100644
--- a/quanta/components/debugger/dbgp/dbgpsettingss.ui
+++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>DBGpSettingsS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>DBGpSettingsS</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>
@@ -83,7 +83,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>tabWidget2</cstring>
             </property>
@@ -98,7 +98,7 @@
                     <verstretch>1</verstretch>
                 </sizepolicy>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -109,7 +109,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>
@@ -120,7 +120,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>lblDebuggerServerListenPort</cstring>
                                 </property>
@@ -136,7 +136,7 @@
                                     <string>Listen port:</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="0" column="1">
+                            <widget class="TQLineEdit" row="0" column="1">
                                 <property name="name">
                                     <cstring>lineServerListenPort</cstring>
                                 </property>
@@ -149,7 +149,7 @@
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>lblRequest</cstring>
                                 </property>
@@ -165,7 +165,7 @@
                                     <string>Request URL:</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="1" column="1">
+                            <widget class="TQLineEdit" row="1" column="1">
                                 <property name="name">
                                     <cstring>lineStartSession</cstring>
                                 </property>
@@ -207,14 +207,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>40</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>
@@ -225,7 +225,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLineEdit" row="2" column="1">
+                            <widget class="TQLineEdit" row="2" column="1">
                                 <property name="name">
                                     <cstring>lineServerBasedir</cstring>
                                 </property>
@@ -238,7 +238,7 @@
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>lblDebuggerServerBasedir</cstring>
                                 </property>
@@ -254,7 +254,7 @@
                                     <string>Server basedir:</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="1" column="1">
+                            <widget class="TQLineEdit" row="1" column="1">
                                 <property name="name">
                                     <cstring>lineLocalBasedir</cstring>
                                 </property>
@@ -270,7 +270,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="1">
+                            <widget class="TQCheckBox" row="0" column="1">
                                 <property name="name">
                                     <cstring>checkLocalProject</cstring>
                                 </property>
@@ -289,7 +289,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>lblDebuggerLocalBasedir</cstring>
                                 </property>
@@ -305,7 +305,7 @@
                                     <string>Local basedir:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>lblLocalProject</cstring>
                                 </property>
@@ -323,7 +323,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="2" column="0">
+                    <widget class="TQGroupBox" row="2" column="0">
                         <property name="name">
                             <cstring>groupBox3_2</cstring>
                         </property>
@@ -334,7 +334,7 @@
                             <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>lineProfilerFilename</cstring>
                                 </property>
@@ -355,7 +355,7 @@
 %c - CRC32 of the initial filepath</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>lblRequest_2</cstring>
                                 </property>
@@ -371,7 +371,7 @@
                                     <string>Profiler output:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>lblLocalProject_2</cstring>
                                 </property>
@@ -387,7 +387,7 @@
                                     <string>Map profiler output:</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="1">
+                            <widget class="TQCheckBox" row="1" column="1">
                                 <property name="name">
                                     <cstring>checkProfilerMapFilename</cstring>
                                 </property>
@@ -409,7 +409,7 @@
                                     <string>If this checkbox is checked, the profiler output filename will be mapped using the basedirs just like the remote script files.</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>lblLocalProject_2_2</cstring>
                                 </property>
@@ -425,7 +425,7 @@
                                     <string>Open automatically:</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="1">
+                            <widget class="TQCheckBox" row="2" column="1">
                                 <property name="name">
                                     <cstring>checkProfilerAutoOpen</cstring>
                                 </property>
@@ -451,7 +451,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -462,7 +462,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>groupBox4</cstring>
                         </property>
@@ -473,7 +473,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox" row="4" column="1">
+                            <widget class="TQCheckBox" row="4" column="1">
                                 <property name="name">
                                     <cstring>checkBreakOnUserError</cstring>
                                 </property>
@@ -489,18 +489,18 @@
                                     <string>User errors</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0" rowspan="5" colspan="1">
+                            <widget class="TQLabel" row="0" column="0" rowspan="5" colspan="1">
                                 <property name="name">
                                     <cstring>lblBreakOn</cstring>
                                 </property>
                                 <property name="text">
                                     <string>Break on:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="3" column="1">
+                            <widget class="TQCheckBox" row="3" column="1">
                                 <property name="name">
                                     <cstring>checkBreakOnUserWarning</cstring>
                                 </property>
@@ -516,7 +516,7 @@
                                     <string>User warnings</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="1">
+                            <widget class="TQCheckBox" row="2" column="1">
                                 <property name="name">
                                     <cstring>checkBreakOnUserNotice</cstring>
                                 </property>
@@ -532,7 +532,7 @@
                                     <string>User notices</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="1">
+                            <widget class="TQCheckBox" row="0" column="1">
                                 <property name="name">
                                     <cstring>checkBreakOnNotice</cstring>
                                 </property>
@@ -548,7 +548,7 @@
                                     <string>Notices</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="1">
+                            <widget class="TQCheckBox" row="1" column="1">
                                 <property name="name">
                                     <cstring>checkBreakOnWarning</cstring>
                                 </property>
@@ -566,7 +566,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>groupBox5</cstring>
                         </property>
@@ -577,7 +577,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="3">
+                            <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="3">
                                 <item>
                                     <property name="text">
                                         <string>Pause</string>
@@ -598,14 +598,14 @@
                                     <cstring>comboDefaultExecutionState</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>lblDefaultExecutionMode</cstring>
                                 </property>
                                 <property name="text">
                                     <string>Default mode:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter</set>
                                 </property>
                             </widget>
@@ -621,7 +621,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>40</height>
@@ -630,7 +630,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -641,7 +641,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>
@@ -716,12 +716,12 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>slotLocalProjectToggled(bool)</slot>
     <slot>checkLocalProject_toggled(bool)</slot>
     <slot>slotLocalProjectToggle(bool)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextbrowser.h</includehint>
 </includehints>
diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp
index 4f8e72d8..6a52ac39 100644
--- a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp
+++ b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp
@@ -21,13 +21,13 @@
 #include <tqcstring.h>
 #include <kmdcodec.h>
 
-QByteArrayFifo::QByteArrayFifo( )
+TQByteArrayFifo::TQByteArrayFifo( )
 {
   m_size = 0;
   m_array.resize(0);
 }
 
-TQString QByteArrayFifo::retrieve( )
+TQString TQByteArrayFifo::retrieve( )
 {
   // See if there's a null teminator somewhere
   TQString str(m_array);
@@ -38,16 +38,16 @@ TQString QByteArrayFifo::retrieve( )
   for(size_t cnt = 0; cnt < m_size; cnt++)
     m_array[cnt] = m_array[cnt + size];
 
-  // Resize array, needed for find() to work
+  // Resize array, needed for tqfind() to work
   m_array.resize(m_size);
 
   return str;
 }
 
-bool QByteArrayFifo::append(const char * chars, size_t size )
+bool TQByteArrayFifo::append(const char * chars, size_t size )
 {
   // Resize the array, fail if not possible
-  if(!m_array.resize(m_size + size ))
+  if(!m_array.tqresize(m_size + size ))
     return false;
 
   // Copy the elements
@@ -60,16 +60,16 @@ bool QByteArrayFifo::append(const char * chars, size_t size )
   return true;
 }
 
-long QByteArrayFifo::find( char character )
+long TQByteArrayFifo::tqfind( char character )
 {
-  // If size is 0, find() outputs a warning for some reason
+  // If size is 0, tqfind() outputs a warning for some reason
   if(m_size == 0)
     return -1;
 
-  return m_array.find(character);
+  return m_array.tqfind(character);
 }
 
-TQString QByteArrayFifo::base64Encoded()
+TQString TQByteArrayFifo::base64Encoded()
 {
   return KCodecs::base64Encode(m_array);
 }
diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.h b/quanta/components/debugger/dbgp/qbytearrayfifo.h
index 851c7f34..2f46df76 100644
--- a/quanta/components/debugger/dbgp/qbytearrayfifo.h
+++ b/quanta/components/debugger/dbgp/qbytearrayfifo.h
@@ -23,15 +23,15 @@
 #include <tqstring.h>
 #include <tqcstring.h>
 
-class QByteArrayFifo
+class TQByteArrayFifo
 {
 
   public:
-    QByteArrayFifo();
+    TQByteArrayFifo();
     bool append(const char * chars, size_t size);
     TQString retrieve();
     TQString base64Encoded();
-    long find(char character);
+    long tqfind(char character);
     size_t length() { return m_size; }
 
   private:
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
index 481c8d61..ba1c7c44 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
@@ -49,15 +49,15 @@ K_EXPORT_COMPONENT_FACTORY( quantadebuggerdbgp,
 
 const char QuantaDebuggerDBGp::protocolversion[] = "1.0";
 
-QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQStringList&)
-    : DebuggerClient (parent, "DBGp")
+QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *tqparent, const char*, const TQStringList&)
+    : DebuggerClient (tqparent, "DBGp")
 {
   // Create a socket object and set up its signals
-  m_errormask = 1794;
+  m_errortqmask = 1794;
   m_supportsasync = false;
   m_defaultExecutionState = Starting;
   setExecutionState(m_defaultExecutionState);
-  emit updateStatus(DebuggerUI::NoSession);
+  emit updatetqStatus(DebuggerUI::NoSession);
   
   connect(&m_network, TQT_SIGNAL(command(const TQString&)), this, TQT_SLOT(processCommand(const TQString&)));
   connect(&m_network, TQT_SIGNAL(active(bool)), this, TQT_SLOT(slotNetworkActive(bool)));
@@ -88,9 +88,9 @@ void QuantaDebuggerDBGp::slotNetworkActive(bool active)
   setExecutionState(m_defaultExecutionState);
   
   if(active)
-    emit updateStatus(DebuggerUI::AwaitingConnection);
+    emit updatetqStatus(DebuggerUI::AwaitingConnection);
   else
-    emit updateStatus(DebuggerUI::NoSession);
+    emit updatetqStatus(DebuggerUI::NoSession);
 
 }
 
@@ -113,11 +113,11 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected)
 
   debuggerInterface()->setActiveLine("", 0);
   if(connected)
-    emit updateStatus(DebuggerUI::Connected);
+    emit updatetqStatus(DebuggerUI::Connected);
   else
   {
     setExecutionState(m_defaultExecutionState);
-    emit updateStatus(DebuggerUI::AwaitingConnection);
+    emit updatetqStatus(DebuggerUI::AwaitingConnection);
 
     profilerOpen(false);
   }
@@ -126,7 +126,7 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected)
 
 void QuantaDebuggerDBGp::slotNetworkError(const TQString &errormsg, bool log)
 {
-  debuggerInterface()->showStatus(errormsg, log);
+  debuggerInterface()->showtqStatus(errormsg, log);
 }
 
 
@@ -194,29 +194,29 @@ void QuantaDebuggerDBGp::setExecutionState(const TQString &state)
   if(state == "starting")
   {
     setExecutionState(Starting);
-    emit updateStatus(DebuggerUI::Paused);
+    emit updatetqStatus(DebuggerUI::Paused);
   }
   else if(state == "stopping")
   {
     setExecutionState(Stopping);
-    emit updateStatus(DebuggerUI::Paused);
+    emit updatetqStatus(DebuggerUI::Paused);
     m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket
   }
   else if(state == "stopped")
   {
     setExecutionState(Stopped);
-    emit updateStatus(DebuggerUI::Paused);
+    emit updatetqStatus(DebuggerUI::Paused);
     m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket
   }
   else if(state == "running")
   {
     setExecutionState(Running);
-    emit updateStatus(DebuggerUI::Running);
+    emit updatetqStatus(DebuggerUI::Running);
   }
   else if(state == "break")
   {
     setExecutionState(Break);
-    emit updateStatus(DebuggerUI::Paused);
+    emit updatetqStatus(DebuggerUI::Paused);
   }
 
 }
@@ -263,7 +263,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas)
     TQDomNode response = data.elementsByTagName("response").item(0);
     TQString command = attribute(response, "command");
 
-    // Status command
+    // tqStatus command
     if(command == "status")
       setExecutionState(attribute(response, "status"));
       
@@ -327,7 +327,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas)
   }
   else
   {
-    debuggerInterface()->showStatus(i18n("Unrecognized package: '%1%2'").arg(datas.left(50)).arg(datas.length() > 50 ? "..." : ""), true);
+    debuggerInterface()->showtqStatus(i18n("Unrecognized package: '%1%2'").tqarg(datas.left(50)).tqarg(datas.length() > 50 ? "..." : ""), true);
 
     kdDebug(24002) << datas << endl;
   }
@@ -338,10 +338,10 @@ void QuantaDebuggerDBGp::initiateSession(const TQDomNode& initpacket)
 {
   if(attribute(initpacket, "protocol_version") != protocolversion)
   {
-    debuggerInterface()->showStatus(
+    debuggerInterface()->showtqStatus(
       i18n("The debugger for %1 uses an unsupported protocol version (%2)")
-            .arg(attribute(initpacket, "language"))
-            .arg(attribute(initpacket, "protocol_version"))
+            .tqarg(attribute(initpacket, "language"))
+            .tqarg(attribute(initpacket, "protocol_version"))
           , true);
 
     endSession();
@@ -384,7 +384,7 @@ void QuantaDebuggerDBGp::stackShow(const TQDomNode&node)
     // Type isnt currently correct with xdebug
 //     type = (attribute(child, "type") == "file" ? File : Eval);
     typestr = attribute(child, "filename");
-    if(typestr.find(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0)
+    if(typestr.tqfind(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0)
       type = Eval;
     else
       type = File;
@@ -540,7 +540,7 @@ void QuantaDebuggerDBGp::addBreakpoint (DebuggerBreakpoint* breakpoint)
                         " -n " + TQString::number(breakpoint->line() + 1)
                         , breakpoint->condition());
 
-  breakpoint->setKey(TQString("id %1").arg(id));
+  breakpoint->setKey(TQString("id %1").tqarg(id));
 }
 
 void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response )
@@ -550,7 +550,7 @@ void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response )
   id = attribute(response, "transaction_id").toLong();
   if(id > 0)
   {
-    TQString oldkey = TQString("id %1").arg(id);
+    TQString oldkey = TQString("id %1").tqarg(id);
     DebuggerBreakpoint *bp = debuggerInterface()->findDebuggerBreakpoint(oldkey);
     if(bp)
       debuggerInterface()->updateBreakpointKey(*bp, attribute(response, "id"));
@@ -573,15 +573,15 @@ void QuantaDebuggerDBGp::fileOpened(const TQString&)
 // Watch a variable
 void QuantaDebuggerDBGp::addWatch(const TQString & variable)
 {
-  if(m_watchlist.find(variable) == m_watchlist.end())
+  if(m_watchlist.tqfind(variable) == m_watchlist.end())
     m_watchlist.append(variable);
   m_network.sendCommand("property_get", "-n " + variable);
 }
 // Remove watch
 void QuantaDebuggerDBGp::removeWatch(DebuggerVariable *variable)
 {
-  if(m_watchlist.find(variable->name()) != m_watchlist.end())
-    m_watchlist.remove(m_watchlist.find(variable->name()));
+  if(m_watchlist.tqfind(variable->name()) != m_watchlist.end())
+    m_watchlist.remove(m_watchlist.tqfind(variable->name()));
 }
 
 // Show conditional breakpoint state
@@ -649,9 +649,9 @@ void QuantaDebuggerDBGp::readConfig(TQDomNode node)
   valuenode = node.namedItem("useproxy");
   m_useproxy = valuenode.firstChild().nodeValue() == "1";
 
-  valuenode = node.namedItem("errormask");
-  m_errormask = valuenode.firstChild().nodeValue().toLong();
-  kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl;
+  valuenode = node.namedItem("errortqmask");
+  m_errortqmask = valuenode.firstChild().nodeValue().toLong();
+  kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl;
   
   // Profiler
   valuenode = node.namedItem("profilerfilename");
@@ -687,11 +687,11 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
   else
     set.comboDefaultExecutionState->setCurrentItem(1);
 
-  set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errormask);
-  set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errormask);
-  set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errormask);
-  set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errormask);
-  set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errormask);
+  set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errortqmask);
+  set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errortqmask);
+  set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errortqmask);
+  set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errortqmask);
+  set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errortqmask);
 
   set.lineProfilerFilename->setText(m_profilerFilename);
   if(m_profilerAutoOpen)
@@ -705,7 +705,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("localproject").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("localproject");
     node.appendChild( el );
     if(set.checkLocalProject->isChecked())
@@ -725,7 +725,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("localbasedir").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("localbasedir");
     node.appendChild( el );
     el.appendChild( node.ownerDocument().createTextNode(m_localBasedir) );
@@ -734,7 +734,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("serverbasedir").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("serverbasedir");
     node.appendChild( el );
     if(debuggerInterface())
@@ -743,7 +743,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("listenport").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("listenport");
     node.appendChild( el );
     m_listenPort = set.lineServerListenPort->text();
@@ -751,7 +751,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("startsession").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("startsession");
     node.appendChild( el );
     m_startsession = set.lineStartSession->text();
@@ -759,7 +759,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("defaultexecutionstate").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("defaultexecutionstate");
     node.appendChild( el );
     if(set.comboDefaultExecutionState->currentItem() == 0)
@@ -774,23 +774,23 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     }
 
-    el = node.namedItem("errormask").toElement();
+    el = node.namedItem("errortqmask").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
-    el = node.ownerDocument().createElement("errormask");
+      el.tqparentNode().removeChild(el);
+    el = node.ownerDocument().createElement("errortqmask");
     node.appendChild( el );
-    m_errormask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0)
+    m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0)
                   + (set.checkBreakOnWarning->isChecked() ? QuantaDebuggerDBGp::Warning : 0)
                   + (set.checkBreakOnUserNotice->isChecked() ? QuantaDebuggerDBGp::User_Notice : 0)
                   + (set.checkBreakOnUserWarning->isChecked() ? QuantaDebuggerDBGp::User_Warning : 0)
                   + (set.checkBreakOnUserError->isChecked() ? QuantaDebuggerDBGp::User_Error : 0);
-    kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl;
-    el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errormask)));
+    kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl;
+    el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errortqmask)));
 
     // Profiler
     el = node.namedItem("profilerfilename").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("profilerfilename");
     node.appendChild( el );
     m_profilerFilename = set.lineProfilerFilename->text();
@@ -798,7 +798,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("profilerfilename_map").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("profilerfilename_map");
     node.appendChild( el );
     m_profilerMapFilename = (set.checkProfilerMapFilename->isChecked() ? true : false);
@@ -806,7 +806,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node)
 
     el = node.namedItem("profiler_autoopen").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("profiler_autoopen");
     node.appendChild( el );
     m_profilerAutoOpen = (set.checkProfilerAutoOpen->isChecked() ? true : false);
@@ -850,8 +850,8 @@ void QuantaDebuggerDBGp::profilerOpen()
 void QuantaDebuggerDBGp::profilerOpen(bool forceopen)
 {
   TQString profileroutput = m_profilerFilename;
-  profileroutput.replace("%a", m_appid);
-  profileroutput.replace("%c", m_initialscript);
+  profileroutput.tqreplace("%a", m_appid);
+  profileroutput.tqreplace("%c", m_initialscript);
 
   if(m_profilerMapFilename)
     profileroutput = mapServerPathToLocal( profileroutput);
@@ -867,9 +867,9 @@ void QuantaDebuggerDBGp::profilerOpen(bool forceopen)
     else
     {
       if(forceopen)
-        KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").arg(profileroutput), i18n("Profiler File Error"));
+        KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").tqarg(profileroutput), i18n("Profiler File Error"));
       else
-        debuggerInterface()->showStatus(i18n("Unable to open profiler output (%1)").arg(profileroutput), false);
+        debuggerInterface()->showtqStatus(i18n("Unable to open profiler output (%1)").tqarg(profileroutput), false);
     }
   }
   else
@@ -923,7 +923,7 @@ void QuantaDebuggerDBGp::propertySetResponse( const TQDomNode & setnode)
 {
   if(attribute(setnode, "success") == "0")
   {
-    debuggerInterface()->showStatus(i18n("Unable to set value of variable."), true);
+    debuggerInterface()->showtqStatus(i18n("Unable to set value of variable."), true);
   }
 }
 
@@ -932,11 +932,11 @@ DebuggerVariable* QuantaDebuggerDBGp::buildVariable( const TQDomNode & variablen
 {
   /*
     Sample:
-    <property name="$arrayVar" fullname="$arrayVar" address="-1073754976" type="hash" children="1" numchildren="4">
+    <property name="$arrayVar" fullname="$arrayVar" address="-1073754976" type="hash" tqchildren="1" numtqchildren="4">
       <property name="birthyear" fullname="$arrayVar['birthyear']" address="135522364" type="int">
         <![CDATA[1949]]>
       </property>
-      <property name="songs" fullname="$arrayVar['songs']" address="135522236" type="hash" children="1" numchildren="3">
+      <property name="songs" fullname="$arrayVar['songs']" address="135522236" type="hash" tqchildren="1" numtqchildren="3">
         <property name="0" fullname="$arrayVar['songs'][0]" address="135522332" type="string" encoding="base64">
           <![CDATA[SW5ub2NlbnQgV2hlbiBZb3UgRHJlYW0=]]>
         </property>
@@ -1015,22 +1015,22 @@ void QuantaDebuggerDBGp::handleError(const TQDomNode & statusnode )
         {
           // Managable error
           long error = attribute(errornode, "code").toLong();
-          if(!(error & m_errormask))
+          if(!(error & m_errortqmask))
           {
             setExecutionState(Running);
           }
           else
           {
-            emit updateStatus(DebuggerUI::HaltedOnError);
-            debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true);
+            emit updatetqStatus(DebuggerUI::HaltedOnError);
+            debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true);
           }
           break; 
         }
         else
         {
           // Fatal error
-          emit updateStatus(DebuggerUI::HaltedOnError);
-          debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true);
+          emit updatetqStatus(DebuggerUI::HaltedOnError);
+          debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true);
         }
       }
       errornode = errornode.nextSibling();
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h
index 7c9601ad..52ec17bc 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h
@@ -32,9 +32,10 @@ typedef TQMap<TQString, TQString> StringMap;
 class QuantaDebuggerDBGp : public DebuggerClient
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    QuantaDebuggerDBGp(TQObject *parent, const char* name, const TQStringList&);
+    QuantaDebuggerDBGp(TQObject *tqparent, const char* name, const TQStringList&);
     ~QuantaDebuggerDBGp();
 
     // Execution states
@@ -121,7 +122,7 @@ class QuantaDebuggerDBGp : public DebuggerClient
     bool    m_profilerAutoOpen;
     bool    m_profilerMapFilename;
     State   m_executionState, m_defaultExecutionState;
-    long    m_errormask;
+    long    m_errortqmask;
     long    m_displaydelay;
     bool    m_supportsasync;
     
@@ -160,7 +161,7 @@ class QuantaDebuggerDBGp : public DebuggerClient
     void processCommand(const TQString&);
     
   signals:
-    void updateStatus(DebuggerUI::DebuggerStatus);
+    void updatetqStatus(DebuggerUI::DebuggertqStatus);
 };
 
 #endif
diff --git a/quanta/components/debugger/debuggerbreakpointlist.cpp b/quanta/components/debugger/debuggerbreakpointlist.cpp
index 6a47d296..2d18309f 100644
--- a/quanta/components/debugger/debuggerbreakpointlist.cpp
+++ b/quanta/components/debugger/debuggerbreakpointlist.cpp
@@ -50,7 +50,7 @@ void DebuggerBreakpointList::add(DebuggerBreakpoint* bp)
 
 void DebuggerBreakpointList::remove(DebuggerBreakpoint* bp)
 {
-  BreakpointList_t::iterator it = find(*bp);
+  BreakpointList_t::iterator it = tqfind(*bp);
   if(it == m_breakpointList->end())
     return;
 
@@ -113,7 +113,7 @@ void DebuggerBreakpointList::clear()
 
 bool DebuggerBreakpointList::exists(DebuggerBreakpoint* bp)
 {
-  BreakpointList_t::iterator it = find(*bp);
+  BreakpointList_t::iterator it = tqfind(*bp);
   if(it == m_breakpointList->end())
     return false;
 
@@ -124,7 +124,7 @@ bool DebuggerBreakpointList::exists(DebuggerBreakpoint* bp)
 }
 
 
-BreakpointList_t::iterator DebuggerBreakpointList::find(const DebuggerBreakpoint &bp)
+BreakpointList_t::iterator DebuggerBreakpointList::tqfind(const DebuggerBreakpoint &bp)
 {
   BreakpointList_t::iterator it;
 
@@ -180,7 +180,7 @@ void DebuggerBreakpointList::updateBreakpointKey( const DebuggerBreakpoint & bp,
 {
   //DebuggerBreakpoint *bpp = new DebuggerBreakpoint(bp);
   BreakpointList_t::iterator it;
-  it = find(bp);
+  it = tqfind(bp);
   if(it != m_breakpointList->end())
   {
     (*it)->setKey(newkey);
diff --git a/quanta/components/debugger/debuggerbreakpointlist.h b/quanta/components/debugger/debuggerbreakpointlist.h
index aa6cd803..ef9233bc 100644
--- a/quanta/components/debugger/debuggerbreakpointlist.h
+++ b/quanta/components/debugger/debuggerbreakpointlist.h
@@ -31,7 +31,7 @@ class DebuggerBreakpointList
   private:
     BreakpointList_t* m_breakpointList;
     BreakpointList_t::iterator m_current;
-    BreakpointList_t::iterator find(const DebuggerBreakpoint &bp);
+    BreakpointList_t::iterator tqfind(const DebuggerBreakpoint &bp);
 
   public:
     DebuggerBreakpointList();
diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp
index 8614bc28..bf4911ad 100644
--- a/quanta/components/debugger/debuggerbreakpointview.cpp
+++ b/quanta/components/debugger/debuggerbreakpointview.cpp
@@ -52,8 +52,8 @@ DebuggerBreakpointViewItem::DebuggerBreakpointViewItem(DebuggerBreakpointView* v
 }
 
 
-DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *name)
-    : KListView(parent, name)
+DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *tqparent, const char *name)
+    : KListView(tqparent, name)
 {
   // If you change here, change the DebuggerBreakpointViewColumns enums above
   addColumn(i18n("Expression"));
@@ -154,7 +154,7 @@ void DebuggerBreakpointView::slotRemoveSelected()
 
 void DebuggerBreakpointView::keyPressEvent(TQKeyEvent *e)
 {
-  if(e->key() != Qt::Key_Delete)
+  if(e->key() != TQt::Key_Delete)
   {
     e->ignore();
     return;
diff --git a/quanta/components/debugger/debuggerbreakpointview.h b/quanta/components/debugger/debuggerbreakpointview.h
index 196cd451..e593a815 100644
--- a/quanta/components/debugger/debuggerbreakpointview.h
+++ b/quanta/components/debugger/debuggerbreakpointview.h
@@ -44,9 +44,10 @@ class DebuggerBreakpointViewItem : public KListViewItem
 class DebuggerBreakpointView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    DebuggerBreakpointView(TQWidget *parent = 0, const char *name = 0);
+    DebuggerBreakpointView(TQWidget *tqparent = 0, const char *name = 0);
     ~DebuggerBreakpointView();
 
     void showBreakpoint(const DebuggerBreakpoint& bp);
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp
index b62b3e3b..60fd68ef 100644
--- a/quanta/components/debugger/debuggermanager.cpp
+++ b/quanta/components/debugger/debuggermanager.cpp
@@ -49,8 +49,8 @@
 // dialogs
 #include "debuggervariablesets.h"
 
-DebuggerManager::DebuggerManager(TQObject *myparent)
-    : TQObject(myparent)
+DebuggerManager::DebuggerManager(TQObject *mytqparent)
+    : TQObject(mytqparent)
 {
   initActions();
 
@@ -67,7 +67,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU
   if(m_client)
   {
     
-    disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
+    disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus)));
 
     delete m_client;
     m_client = NULL;
@@ -108,7 +108,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU
         if(!m_client)
         {
           emit hideSplash();
-          KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").arg(errCode).arg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error"));
+          KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error"));
         }
         break;
       }
@@ -143,7 +143,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU
 
     // recreate UI
     m_debuggerui = new DebuggerUI(this, "debuggerui");
-    connect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
+    connect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus)));
     
     // Load saved breakpoints
     if(Project::ref()->debuggerPersistentBreakpoints())
@@ -212,7 +212,7 @@ void DebuggerManager::initActions()
     return;
 
   //Debugger, breakpoint
-  newaction = new KAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), Qt::CTRL+Qt::SHIFT+Qt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle");
+  newaction = new KAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle");
   newaction->setToolTip(i18n("Toggles a breakpoint at the current cursor location"));
   
   newaction = new KAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear");
@@ -299,7 +299,7 @@ DebuggerManager::~DebuggerManager()
   if(m_client)
   {
         
-    disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
+    disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus)));
 
     delete m_client;
     m_client = 0L;
@@ -601,11 +601,11 @@ bool DebuggerManager::setActiveLine (const TQString& file, int line )
     return true;
 
   // Find new position in editor
-  if(ViewManager::ref()->isOpened(filename) || QExtFileInfo::exists(filename, true, 0L))
+  if(ViewManager::ref()->isOpened(filename) || TQExtFileInfo::exists(filename, true, 0L))
     quantaApp->gotoFileAndLine(filename, line, 0);
   else
   {
-    showStatus(i18n("Unable to open file %1, check your basedirs and mappings.").arg(filename), true);
+    showtqStatus(i18n("Unable to open file %1, check your basedirs and mappings.").tqarg(filename), true);
   }
 
   // Add new active line mark
@@ -659,7 +659,7 @@ void DebuggerManager::disconnectBreakpointSignals(Document* qdoc)
 }
 
 // Show a status message and optionally put it on the log
-bool DebuggerManager::showStatus(const TQString& a_message, bool log)
+bool DebuggerManager::showtqStatus(const TQString& a_message, bool log)
 {
   TQString message = a_message;
   quantaApp->slotStatusMsg(m_client->getName() + ": " + message);
@@ -781,7 +781,7 @@ void DebuggerManager::saveProperties( )
       // (Re)create breakpoints section
       TQDomNode nodeBreakpoints = nodeDbg.namedItem("breakpoints");
       if(!nodeBreakpoints.isNull())
-        nodeBreakpoints.parentNode().removeChild(nodeBreakpoints);
+        nodeBreakpoints.tqparentNode().removeChild(nodeBreakpoints);
       
       if(m_breakpointList->count() > 0)
       {
@@ -818,7 +818,7 @@ void DebuggerManager::saveProperties( )
       // (Re)create watches section
       TQDomNode nodeWatches = nodeDbg.namedItem("watches");
       if(!nodeWatches.isNull())
-        nodeWatches.parentNode().removeChild(nodeWatches);
+        nodeWatches.tqparentNode().removeChild(nodeWatches);
       
       if(m_debuggerui->watches()->first())
       {
diff --git a/quanta/components/debugger/debuggermanager.h b/quanta/components/debugger/debuggermanager.h
index 5a88b156..ad3c8739 100644
--- a/quanta/components/debugger/debuggermanager.h
+++ b/quanta/components/debugger/debuggermanager.h
@@ -30,9 +30,10 @@ class DebuggerBreakpoint;
 class PathMapper;
 class Document;
 
-class DebuggerManager : public QObject
+class DebuggerManager : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
   private:
     // client
     DebuggerClient *m_client;
@@ -53,7 +54,7 @@ class DebuggerManager : public QObject
     long m_currentLine;
 
   public:
-    DebuggerManager(TQObject *myparent);
+    DebuggerManager(TQObject *mytqparent);
     ~DebuggerManager();
 
     // Access to memebers
@@ -70,7 +71,7 @@ class DebuggerManager : public QObject
     void updateBreakpointKey(const DebuggerBreakpoint &bp, const TQString& newkey);
 
     // Public help functions
-    bool showStatus(const TQString& message, bool log);
+    bool showtqStatus(const TQString& message, bool log);
     bool setActiveLine (const TQString& file, int line);
     void setMark(const TQString& filename, long line, bool set, int mark);
 
diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp
index fdf32a5c..ae88b3e9 100644
--- a/quanta/components/debugger/debuggerui.cpp
+++ b/quanta/components/debugger/debuggerui.cpp
@@ -36,8 +36,8 @@
 #include "resource.h"
 #include "whtmlpart.h"
 
-DebuggerUI::DebuggerUI(TQObject *parent, const char *name)
-    : TQObject(parent, name), m_variablesListView(0)
+DebuggerUI::DebuggerUI(TQObject *tqparent, const char *name)
+    : TQObject(tqparent, name), m_variablesListView(0)
 {
 
   // Variable watch tree
@@ -69,9 +69,9 @@ DebuggerUI::DebuggerUI(TQObject *parent, const char *name)
   // Show debugger toolbar
   quantaApp->toolBar("debugger_toolbar")->show();
 
-  connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), parent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* )));
+  connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), tqparent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* )));
 
-  connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), parent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* )));
+  connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), tqparent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* )));
   showMenu();
 }
 
@@ -109,7 +109,7 @@ void DebuggerUI::showMenu()
   else
     m_debuggerMenuID  = 0;
 
-  // Status indicator
+  // tqStatus indicator
   quantaApp->statusBar()->insertFixedItem(i18n("Debugger Inactive"), IDS_STATUS_DEBUGGER);
 
 }
@@ -124,7 +124,7 @@ void DebuggerUI::hideMenu()
   }
   m_debuggerMenuID = 0;
 
-  // Status indicator
+  // tqStatus indicator
   quantaApp->statusBar()->removeItem(IDS_STATUS_DEBUGGER);
 
 }
@@ -148,7 +148,7 @@ void DebuggerUI::sendRequest(const KURL &url)
   m_preview->openURL(url);
 }
 
-void DebuggerUI::slotStatus( DebuggerStatus status )
+void DebuggerUI::slottqStatus( DebuggertqStatus status )
 {
   switch(status)
   {
diff --git a/quanta/components/debugger/debuggerui.h b/quanta/components/debugger/debuggerui.h
index 767facad..3a438f11 100644
--- a/quanta/components/debugger/debuggerui.h
+++ b/quanta/components/debugger/debuggerui.h
@@ -32,12 +32,13 @@ class DebuggerVariable;
 class WHTMLPart;
 class KURL;
 
-class DebuggerUI : public QObject
+class DebuggerUI : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    enum DebuggerStatus
+    enum DebuggertqStatus
     {
       NoSession = 0,
       AwaitingConnection,
@@ -49,7 +50,7 @@ class DebuggerUI : public QObject
       HaltedOnBreakpoint
     };
 
-    DebuggerUI(TQObject *parent = 0, const char *name = 0);
+    DebuggerUI(TQObject *tqparent = 0, const char *name = 0);
     ~DebuggerUI();
 
     // Watches
@@ -82,8 +83,8 @@ class DebuggerUI : public QObject
     WHTMLPart *m_preview;
 
   public slots:
-    // Status indication 
-    void slotStatus(DebuggerUI::DebuggerStatus status);
+    // tqStatus indication 
+    void slottqStatus(DebuggerUI::DebuggertqStatus status);
 
 };
 
diff --git a/quanta/components/debugger/debuggervariable.cpp b/quanta/components/debugger/debuggervariable.cpp
index 390290a7..46f827cb 100644
--- a/quanta/components/debugger/debuggervariable.cpp
+++ b/quanta/components/debugger/debuggervariable.cpp
@@ -258,17 +258,17 @@ DebuggerVariable* DebuggerVariable::findItem( TQListViewItem * item, bool traver
   return NULL;
 }
 
-void DebuggerVariable::copy( DebuggerVariable * v, bool copychildren )
+void DebuggerVariable::copy( DebuggerVariable * v, bool copytqchildren )
 {
   m_name = v->name();
-  m_size = (v->isScalar() || copychildren ? v->size() : m_valueList.count());
+  m_size = (v->isScalar() || copytqchildren ? v->size() : m_valueList.count());
   m_value = v->value();
   m_type = v->type();
   m_isReference = v->isReference();
 
   // We cant just assign m_valuelist to v->values(), it would make a shallow copy...
 //   
-  if(copychildren)
+  if(copytqchildren)
   {
     m_valueList.clear();
     for(DebuggerVariable * v2 = v->values().first(); v2; v2 = v->values().next())
diff --git a/quanta/components/debugger/debuggervariablesets.ui b/quanta/components/debugger/debuggervariablesets.ui
index 70440ff4..76689e57 100644
--- a/quanta/components/debugger/debuggervariablesets.ui
+++ b/quanta/components/debugger/debuggervariablesets.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>DebuggerVariableSetS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>DebuggerVariableSetS</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <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>
@@ -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="QLineEdit" row="0" column="1">
+        <widget class="TQLineEdit" row="0" column="1">
             <property name="name">
                 <cstring>lineVariable</cstring>
             </property>
@@ -94,7 +94,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>lblVariable</cstring>
             </property>
@@ -110,7 +110,7 @@
                 <string>Variable:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>lblValue</cstring>
             </property>
@@ -125,7 +125,7 @@
             <property name="text">
                 <string>New value:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop</set>
             </property>
         </widget>
@@ -139,14 +139,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="QLineEdit" row="1" column="1">
+        <widget class="TQLineEdit" row="1" column="1">
             <property name="name">
                 <cstring>lineValue</cstring>
             </property>
@@ -181,5 +181,5 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/components/debugger/gubed/gubedsettings.cpp b/quanta/components/debugger/gubed/gubedsettings.cpp
index 9464dc81..b6df9b25 100644
--- a/quanta/components/debugger/gubed/gubedsettings.cpp
+++ b/quanta/components/debugger/gubed/gubedsettings.cpp
@@ -22,7 +22,7 @@
 GubedSettings::GubedSettings(const TQString &protocolversion)
     : GubedSettingsS(0, "GubedSettings", false, 0)
 {
-  textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion));
+  textAbout->setText(textAbout->text().tqreplace("%PROTOCOLVERSION%", protocolversion));
 }
 
 GubedSettings::~GubedSettings()
diff --git a/quanta/components/debugger/gubed/gubedsettings.h b/quanta/components/debugger/gubed/gubedsettings.h
index 73232e06..b8fef421 100644
--- a/quanta/components/debugger/gubed/gubedsettings.h
+++ b/quanta/components/debugger/gubed/gubedsettings.h
@@ -22,6 +22,7 @@
 class GubedSettings : public GubedSettingsS
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public slots:
     virtual void slotUseProxyToggle( bool useproxy);
diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui
index 12125c93..7697a337 100644
--- a/quanta/components/debugger/gubed/gubedsettingss.ui
+++ b/quanta/components/debugger/gubed/gubedsettingss.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>GubedSettingsS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>GubedSettingsS</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>
@@ -83,7 +83,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>tabWidget2</cstring>
             </property>
@@ -95,7 +95,7 @@
                     <verstretch>1</verstretch>
                 </sizepolicy>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -116,14 +116,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>40</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>
@@ -134,7 +134,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>lblDebuggerServerBasedir</cstring>
                                 </property>
@@ -150,7 +150,7 @@
                                     <string>Server basedir:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>lblDebuggerLocalBasedir</cstring>
                                 </property>
@@ -166,12 +166,12 @@
                                     <string>Local basedir:</string>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="1" column="1">
+                            <widget class="TQLineEdit" row="1" column="1">
                                 <property name="name">
                                     <cstring>lineServerBasedir</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="0" column="1">
+                            <widget class="TQLineEdit" row="0" column="1">
                                 <property name="name">
                                     <cstring>lineLocalBasedir</cstring>
                                 </property>
@@ -181,7 +181,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>groupBox2</cstring>
                         </property>
@@ -192,7 +192,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QLineEdit" row="3" column="1">
+                            <widget class="TQLineEdit" row="3" column="1">
                                 <property name="name">
                                     <cstring>lineServerListenPort</cstring>
                                 </property>
@@ -205,7 +205,7 @@
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="2" column="1">
+                            <widget class="TQLineEdit" row="2" column="1">
                                 <property name="name">
                                     <cstring>lineServerPort</cstring>
                                 </property>
@@ -221,7 +221,7 @@
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="1" column="1">
+                            <widget class="TQLineEdit" row="1" column="1">
                                 <property name="name">
                                     <cstring>lineServerHost</cstring>
                                 </property>
@@ -229,7 +229,7 @@
                                     <bool>false</bool>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="1">
+                            <widget class="TQCheckBox" row="0" column="1">
                                 <property name="name">
                                     <cstring>checkUseProxy</cstring>
                                 </property>
@@ -237,7 +237,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>lblDebuggerUseProxe</cstring>
                                 </property>
@@ -253,7 +253,7 @@
                                     <string>Use proxy</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>lblDebuggerServerHost</cstring>
                                 </property>
@@ -269,7 +269,7 @@
                                     <string>Proxy host:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>lblDebuggerServerPort</cstring>
                                 </property>
@@ -285,7 +285,7 @@
                                     <string>Proxy port:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="3" column="0">
+                            <widget class="TQLabel" row="3" column="0">
                                 <property name="name">
                                     <cstring>lblDebuggerServerListenPort</cstring>
                                 </property>
@@ -303,7 +303,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>
@@ -314,7 +314,7 @@
                             <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>lineStartSession</cstring>
                                 </property>
@@ -336,7 +336,7 @@
 %add - Document root of current script</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="1" column="0">
+                            <widget class="TQRadioButton" row="1" column="0">
                                 <property name="name">
                                     <cstring>optAddInclude</cstring>
                                 </property>
@@ -347,7 +347,7 @@
                                     <string>&amp;Add include</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="0" column="0">
+                            <widget class="TQRadioButton" row="0" column="0">
                                 <property name="name">
                                     <cstring>optStartSession</cstring>
                                 </property>
@@ -362,7 +362,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -373,7 +373,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>groupBox4</cstring>
                         </property>
@@ -384,7 +384,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox" row="4" column="1">
+                            <widget class="TQCheckBox" row="4" column="1">
                                 <property name="name">
                                     <cstring>checkBreakOnUserError</cstring>
                                 </property>
@@ -400,18 +400,18 @@
                                     <string>User errors</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0" rowspan="5" colspan="1">
+                            <widget class="TQLabel" row="0" column="0" rowspan="5" colspan="1">
                                 <property name="name">
                                     <cstring>lblBreakOn</cstring>
                                 </property>
                                 <property name="text">
                                     <string>Break on:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="3" column="1">
+                            <widget class="TQCheckBox" row="3" column="1">
                                 <property name="name">
                                     <cstring>checkBreakOnUserWarning</cstring>
                                 </property>
@@ -427,7 +427,7 @@
                                     <string>User warnings</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="1">
+                            <widget class="TQCheckBox" row="2" column="1">
                                 <property name="name">
                                     <cstring>checkBreakOnUserNotice</cstring>
                                 </property>
@@ -443,7 +443,7 @@
                                     <string>User notices</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="0" column="1">
+                            <widget class="TQCheckBox" row="0" column="1">
                                 <property name="name">
                                     <cstring>checkBreakOnNotice</cstring>
                                 </property>
@@ -459,7 +459,7 @@
                                     <string>Notices</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="1" column="1">
+                            <widget class="TQCheckBox" row="1" column="1">
                                 <property name="name">
                                     <cstring>checkBreakOnWarning</cstring>
                                 </property>
@@ -487,14 +487,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>50</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>groupBox5</cstring>
                         </property>
@@ -505,7 +505,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>lblDelayFast</cstring>
                                 </property>
@@ -526,11 +526,11 @@
                                     <string>Fast</string>
                                 </property>
                             </widget>
-                            <widget class="QSlider" row="1" column="2">
+                            <widget class="TQSlider" row="1" column="2">
                                 <property name="name">
                                     <cstring>sliderDisplayDelay</cstring>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>27</height>
@@ -546,7 +546,7 @@
                                     <enum>Below</enum>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="3">
+                            <widget class="TQLabel" row="1" column="3">
                                 <property name="name">
                                     <cstring>lblDelaySlow</cstring>
                                 </property>
@@ -566,11 +566,11 @@
                                 <property name="text">
                                     <string>Slow</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
-                            <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="3">
+                            <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="3">
                                 <item>
                                     <property name="text">
                                         <string>Pause</string>
@@ -599,25 +599,25 @@
                                     <cstring>comboDefaultExecutionState</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>lblDefaultExecutionMode</cstring>
                                 </property>
                                 <property name="text">
                                     <string>Default mode:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter</set>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>lblDisplayDelay</cstring>
                                 </property>
                                 <property name="text">
                                     <string>Run speed:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignVCenter</set>
                                 </property>
                             </widget>
@@ -625,7 +625,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -636,7 +636,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>textLabel1</cstring>
                         </property>
@@ -652,7 +652,7 @@
                             <string>&lt;h4&gt;Gubed PHP Debugger Plugin for Quanta +&lt;/h4&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>pixmapLabel1</cstring>
                         </property>
@@ -670,7 +670,7 @@
                         <property name="scaledContents">
                             <bool>false</bool>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -752,10 +752,10 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot specifier="pure virtual">slotUseProxyToggle( bool )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextbrowser.h</includehint>
 </includehints>
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
index 8c2ab1b5..58f949a1 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
@@ -47,17 +47,17 @@ K_EXPORT_COMPONENT_FACTORY( quantadebuggergubed,
 
 const char QuantaDebuggerGubed::protocolversion[] = "0.0.12";
 
-QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *parent, const char* name, const TQStringList&)
-    : DebuggerClient (parent, name)
+QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *tqparent, const char* name, const TQStringList&)
+    : DebuggerClient (tqparent, name)
 {
   // Create a socket object and set up its signals
   m_socket = NULL;
   m_server = NULL;
-  m_errormask = 1794;
+  m_errortqmask = 1794;
   m_defaultExecutionState = Pause;
   setExecutionState(m_defaultExecutionState);
 
-  emit updateStatus(DebuggerUI::NoSession);
+  emit updatetqStatus(DebuggerUI::NoSession);
   m_datalen = -1;
 }
 
@@ -80,7 +80,7 @@ QuantaDebuggerGubed::~QuantaDebuggerGubed ()
     delete m_server;
     m_server = NULL;
   }
-  emit updateStatus(DebuggerUI::NoSession);
+  emit updatetqStatus(DebuggerUI::NoSession);
 }
 
 // Try to make a connection to the gubed server
@@ -109,7 +109,7 @@ void QuantaDebuggerGubed::startSession()
       debuggerInterface()->enableAction("debug_request", false);
       kdDebug(24002) << k_funcinfo << ", proxy:" << m_serverHost << ", " << m_serverPort.toUInt() << endl;
 
-      emit updateStatus(DebuggerUI::AwaitingConnection);
+      emit updatetqStatus(DebuggerUI::AwaitingConnection);
     }
   }
   else
@@ -123,14 +123,14 @@ void QuantaDebuggerGubed::startSession()
 
       if(m_server->listen())
       {
-        emit updateStatus(DebuggerUI::AwaitingConnection);
+        emit updatetqStatus(DebuggerUI::AwaitingConnection);
         debuggerInterface()->enableAction("debug_connect", false);
         debuggerInterface()->enableAction("debug_disconnect", true);
         debuggerInterface()->enableAction("debug_request", true);
       }
       else
       {
-        emit updateStatus(DebuggerUI::NoSession);
+        emit updatetqStatus(DebuggerUI::NoSession);
         delete m_server;
         m_server = NULL;
         debuggerInterface()->enableAction("debug_connect", true);
@@ -174,7 +174,7 @@ void QuantaDebuggerGubed::endSession()
   debuggerInterface()->enableAction("debug_leap", false);
   debuggerInterface()->enableAction("debug_pause", false);
 
-  emit updateStatus(DebuggerUI::NoSession);
+  emit updatetqStatus(DebuggerUI::NoSession);
 }
 
 // Change executionstate of the script
@@ -185,7 +185,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate)
     sendCommand("pause", (char*)0L);
     sendCommand("sendactiveline", (char*)0L);
     if(isActive())
-      emit updateStatus(DebuggerUI::Paused);
+      emit updatetqStatus(DebuggerUI::Paused);
   }
   else if(newstate == Run)
   {
@@ -194,7 +194,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate)
 
     sendCommand("run", (char*)0L);
     if(isActive())
-      emit updateStatus(DebuggerUI::Running);
+      emit updatetqStatus(DebuggerUI::Running);
   }
   else if(newstate == Trace)
   {
@@ -203,7 +203,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate)
 
     sendCommand("trace", (char*)0L);
     if(isActive())
-      emit updateStatus(DebuggerUI::Tracing);
+      emit updatetqStatus(DebuggerUI::Tracing);
   }
 
   m_executionState = newstate;
@@ -258,15 +258,15 @@ void QuantaDebuggerGubed::slotError(int)
 
     if(m_socket->error())
     {
-      kdDebug(24002) << k_funcinfo << ", " << m_socket->errorString() << endl;
-      debuggerInterface()->showStatus(m_socket->errorString(), false);
+      kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl;
+      debuggerInterface()->showtqStatus(m_socket->KSocketBase::errorString(), false);
     }
   }
 
   if(m_server && m_server->error())
   {
     kdDebug(24002) << k_funcinfo << ", " << m_server->errorString() << endl;
-    debuggerInterface()->showStatus(m_server->errorString(), false);
+    debuggerInterface()->showtqStatus(m_server->errorString(), false);
   }
 
 }
@@ -294,7 +294,7 @@ void QuantaDebuggerGubed::slotReadyAccept()
       connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()));
       connected();
 
-      emit updateStatus(DebuggerUI::Connected);
+      emit updatetqStatus(DebuggerUI::Connected);
     }
     else
     {
@@ -307,7 +307,7 @@ void QuantaDebuggerGubed::slotReadyAccept()
 // Connection established
 void QuantaDebuggerGubed::slotConnected(const KNetwork::KResolverEntry &)
 {
-  emit updateStatus(DebuggerUI::Connected);
+  emit updatetqStatus(DebuggerUI::Connected);
   connected();
 }
 
@@ -353,7 +353,7 @@ void QuantaDebuggerGubed::slotConnectionClosed()
 
   debuggerInterface()->setActiveLine("", 0);
 
-  emit updateStatus(DebuggerUI::AwaitingConnection);
+  emit updatetqStatus(DebuggerUI::AwaitingConnection);
   m_active = false;
 }
 
@@ -383,13 +383,13 @@ void QuantaDebuggerGubed::slotReadyRead()
       // If datalen == -1, we didnt read the command yet, otherwise were reading data.
       if(m_datalen == -1)
       {
-        bytes = m_buffer.find(";");
+        bytes = m_buffer.tqfind(";");
         if(bytes < 0)
           break;
 
         data = m_buffer.left(bytes);
         m_buffer.remove(0, bytes + 1);
-        bytes = data.find(":");
+        bytes = data.tqfind(":");
         m_command = data.left(bytes);
         data.remove(0, bytes + 1);
         m_datalen = data.toLong();
@@ -437,7 +437,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
     else if(m_executionState == Trace)
       sendCommand("trace", (char*)0L);
 
-    sendCommand("seterrormask", "errormask", TQString::number(m_errormask).ascii(), (char*)0L);
+    sendCommand("seterrortqmask", "errortqmask", TQString::number(m_errortqmask).ascii(), (char*)0L);
   }
   // Just some status info, display on status line
   else if(m_command == "status")
@@ -445,9 +445,9 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
     long argcnt = args["args"].toLong();
     TQString msg = i18n(args["message"].ascii());  // How will we get these messages throught to the translators?
     for(int cnt = 1; cnt <= argcnt; cnt++)
-      msg.replace("%" + TQString("%1").arg(cnt) + "%", args[TQString("arg%1").arg(cnt)]);
+      msg.tqreplace("%" + TQString("%1").tqarg(cnt) + "%", args[TQString("arg%1").tqarg(cnt)]);
 
-    debuggerInterface()->showStatus(msg, false);
+    debuggerInterface()->showtqStatus(msg, false);
   }
   // New current line
   else if(m_command == "setactiveline")
@@ -462,7 +462,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
   // Parsing failed
   else if(m_command == "parsefailed")
   {
-    debuggerInterface()->showStatus(i18n("Syntax or parse error in %1)").arg(args["filenme"]), true);
+    debuggerInterface()->showtqStatus(i18n("Syntax or parse error in %1)").tqarg(args["filenme"]), true);
     return;
   }
   // A debugging session is running
@@ -479,11 +479,11 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
   else if(m_command == "error")
   {
     // Put the line number first so double clicking will jump to the corrrect line
-    debuggerInterface()->showStatus(i18n("Error occurred: Line %1, Code %2 (%3) in  %4").arg(args["line"]).arg(args["errnum"]).arg(args["errmsg"]).arg(args["filename"]), true);
+    debuggerInterface()->showtqStatus(i18n("Error occurred: Line %1, Code %2 (%3) in  %4").tqarg(args["line"]).tqarg(args["errnum"]).tqarg(args["errmsg"]).tqarg(args["filename"]), true);
 
-    // Filter to get error code only and match it with out mask
+    // Filter to get error code only and match it with out tqmask
     long error = args["errnum"].toLong();
-    if(m_errormask & error)
+    if(m_errortqmask & error)
       setExecutionState(Pause);
     else if(m_executionState == Trace)
       setExecutionState(Trace);
@@ -492,21 +492,21 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
     else
       setExecutionState(Pause);
 
-    emit updateStatus(DebuggerUI::HaltedOnError);
+    emit updatetqStatus(DebuggerUI::HaltedOnError);
   }
   // We came across  a hard coded breakpoint
   else if(m_command == "forcebreak")
   {
     setExecutionState(Pause);
-    emit updateStatus(DebuggerUI::HaltedOnBreakpoint);
-    debuggerInterface()->showStatus(i18n("Breakpoint reached"), true);
+    emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint);
+    debuggerInterface()->showtqStatus(i18n("Breakpoint reached"), true);
   }
   // A conditional breakpoint was fulfilled
   else if(m_command == "conditionalbreak")
   {
     setExecutionState(Pause);
-    emit updateStatus(DebuggerUI::HaltedOnBreakpoint);
-    debuggerInterface()->showStatus(i18n("Conditional breakpoint fulfilled"), true);
+    emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint);
+    debuggerInterface()->showtqStatus(i18n("Conditional breakpoint fulfilled"), true);
   }
   // There is a breakpoint set in this file/line
   else if(m_command == "removebreakpoint")
@@ -516,7 +516,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
   // We're about to debug a file..
   else if(m_command == "initialize")
   {
-    debuggerInterface()->showStatus(i18n("Established connection to %1").arg(args["filename"]), false);
+    debuggerInterface()->showtqStatus(i18n("Established connection to %1").tqarg(args["filename"]), false);
     sendCommand("sendprotocolversion", (char*)0L);
 
     debuggerInterface()->setActiveLine(mapServerPathToLocal(args["filename"]), 0);
@@ -549,7 +549,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
   // Reached en of an include
   else if(m_command == "end")
   {
-    //debuggerInterface()->showStatus(i18n("At end of include %1").arg(data), true);
+    //debuggerInterface()->showtqStatus(i18n("At end of include %1").tqarg(data), true);
     return;
   }
   // Check protocol version
@@ -557,7 +557,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
   {
     if(args["version"] != protocolversion)
     {
-      debuggerInterface()->showStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true);
+      debuggerInterface()->showtqStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true);
       sendCommand("die", (char*)0L);
     }
     return;
@@ -603,7 +603,7 @@ bool QuantaDebuggerGubed::sendCommand(const TQString& command, StringMap args)
 
   TQString buffer = phpSerialize(args);
 
-  buffer = TQString(command + ":%1;" + buffer).arg(buffer.length());
+  buffer = TQString(command + ":%1;" + buffer).tqarg(buffer.length());
   m_socket->writeBlock(buffer.ascii(), buffer.length());
   return true;
 }
@@ -768,15 +768,15 @@ void QuantaDebuggerGubed::fileOpened(const TQString&)
 // Watch a variable
 void QuantaDebuggerGubed::addWatch(const TQString &variable)
 {
-  if(m_watchlist.find(variable) == m_watchlist.end())
+  if(m_watchlist.tqfind(variable) == m_watchlist.end())
     m_watchlist.append(variable);
   sendCommand("getwatch", "variable", variable.ascii(), (char*)0L);
 }
 // Remove watch
 void QuantaDebuggerGubed::removeWatch(DebuggerVariable *variable)
 {
-  if(m_watchlist.find(variable->name()) != m_watchlist.end())
-    m_watchlist.remove(m_watchlist.find(variable->name()));
+  if(m_watchlist.tqfind(variable->name()) != m_watchlist.end())
+    m_watchlist.remove(m_watchlist.tqfind(variable->name()));
   //sendCommand("unwatchvariable", var->name());
 }
 
@@ -843,9 +843,9 @@ void QuantaDebuggerGubed::readConfig(TQDomNode node)
   valuenode = node.namedItem("displaydelay");
   m_displaydelay = valuenode.firstChild().nodeValue().toLong();
 
-  valuenode = node.namedItem("errormask");
-  m_errormask = valuenode.firstChild().nodeValue().toLong();
-  kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl;
+  valuenode = node.namedItem("errortqmask");
+  m_errortqmask = valuenode.firstChild().nodeValue().toLong();
+  kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl;
 }
 
 
@@ -866,11 +866,11 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
   set.lineStartSession->setText(m_startsession);
   set.comboDefaultExecutionState->setCurrentItem((int)m_defaultExecutionState);
 
-  set.checkBreakOnNotice->setChecked(QuantaDebuggerGubed::Notice & m_errormask);
-  set.checkBreakOnWarning->setChecked(QuantaDebuggerGubed::Warning & m_errormask);
-  set.checkBreakOnUserNotice->setChecked(QuantaDebuggerGubed::User_Notice & m_errormask);
-  set.checkBreakOnUserWarning->setChecked(QuantaDebuggerGubed::User_Warning & m_errormask);
-  set.checkBreakOnUserError->setChecked(QuantaDebuggerGubed::User_Error & m_errormask);
+  set.checkBreakOnNotice->setChecked(QuantaDebuggerGubed::Notice & m_errortqmask);
+  set.checkBreakOnWarning->setChecked(QuantaDebuggerGubed::Warning & m_errortqmask);
+  set.checkBreakOnUserNotice->setChecked(QuantaDebuggerGubed::User_Notice & m_errortqmask);
+  set.checkBreakOnUserWarning->setChecked(QuantaDebuggerGubed::User_Warning & m_errortqmask);
+  set.checkBreakOnUserError->setChecked(QuantaDebuggerGubed::User_Error & m_errortqmask);
 
   if(set.exec() == TQDialog::Accepted )
   {
@@ -878,7 +878,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("serverhost").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("serverhost");
     node.appendChild( el );
     m_serverHost = set.lineServerHost->text();
@@ -886,7 +886,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("serverport").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("serverport");
     node.appendChild( el );
     m_serverPort = set.lineServerPort->text();
@@ -894,7 +894,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("localbasedir").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("localbasedir");
     node.appendChild( el );
     m_localBasedir = set.lineLocalBasedir->text();
@@ -904,7 +904,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("serverbasedir").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("serverbasedir");
     node.appendChild( el );
     m_serverBasedir = set.lineServerBasedir->text();
@@ -914,7 +914,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("useproxy").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("useproxy");
     node.appendChild( el );
     m_useproxy = set.checkUseProxy->isChecked();
@@ -922,7 +922,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("listenport").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("listenport");
     node.appendChild( el );
     m_listenPort = set.lineServerListenPort->text();
@@ -930,7 +930,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("startsession").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("startsession");
     node.appendChild( el );
     m_startsession = set.lineStartSession->text();
@@ -938,7 +938,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("defaultexecutionstate").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("defaultexecutionstate");
     node.appendChild( el );
     m_defaultExecutionState = (State)set.comboDefaultExecutionState->currentItem();
@@ -947,24 +947,24 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node)
 
     el = node.namedItem("displaydelay").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     el = node.ownerDocument().createElement("displaydelay");
     node.appendChild( el );
     m_displaydelay = set.sliderDisplayDelay->value();
     el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_displaydelay)));
 
-    el = node.namedItem("errormask").toElement();
+    el = node.namedItem("errortqmask").toElement();
     if (!el.isNull())
-      el.parentNode().removeChild(el);
-    el = node.ownerDocument().createElement("errormask");
+      el.tqparentNode().removeChild(el);
+    el = node.ownerDocument().createElement("errortqmask");
     node.appendChild( el );
-    m_errormask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerGubed::Notice : 0)
+    m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerGubed::Notice : 0)
                   + (set.checkBreakOnWarning->isChecked() ? QuantaDebuggerGubed::Warning : 0)
                   + (set.checkBreakOnUserNotice->isChecked() ? QuantaDebuggerGubed::User_Notice : 0)
                   + (set.checkBreakOnUserWarning->isChecked() ? QuantaDebuggerGubed::User_Warning : 0)
                   + (set.checkBreakOnUserError->isChecked() ? QuantaDebuggerGubed::User_Error : 0);
-    kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl;
-    el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errormask)));
+    kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl;
+    el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errortqmask)));
 
   }
 }
@@ -995,7 +995,7 @@ TQString QuantaDebuggerGubed::phpSerialize(StringMap args)
 {
   StringMap::Iterator it;
   // a:2:{s:4:"name";s:7:"Jessica";s:3:"age";s:2:"26";s:4:"test";i:1;}
-  TQString ret = TQString("a:%1:{").arg(args.size());
+  TQString ret = TQString("a:%1:{").tqarg(args.size());
   for( it = args.begin(); it != args.end(); ++it )
   {
     bool isNumber;
@@ -1003,15 +1003,15 @@ TQString QuantaDebuggerGubed::phpSerialize(StringMap args)
     it.data().toInt(&isNumber);
     if(isNumber && !it.data().isEmpty())
       ret += TQString("s:%1:\"%2\";i:%3;")
-                    .arg(it.key().length())
-                    .arg(it.key())
-                    .arg(it.data());
+                    .tqarg(it.key().length())
+                    .tqarg(it.key())
+                    .tqarg(it.data());
     else
       ret += TQString("s:%1:\"%2\";s:%3:\"%4\";")
-                    .arg(it.key().length())
-                    .arg(it.key())
-                    .arg(it.data().length())
-                    .arg(it.data());
+                    .tqarg(it.key().length())
+                    .tqarg(it.key())
+                    .tqarg(it.data().length())
+                    .tqarg(it.data());
 
   }
 
@@ -1038,13 +1038,13 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args)
     return ca;
   }
 
-  cnt = args.mid(2, args.find("{") - 3).toLong();
-  TQString data = args.mid(args.find("{") + 1);
+  cnt = args.mid(2, args.tqfind("{") - 3).toLong();
+  TQString data = args.mid(args.tqfind("{") + 1);
 
   TQString tmp, func;
   while(cnt > 0)
   {
-    tmp = data.left(data.find("\""));
+    tmp = data.left(data.tqfind("\""));
     length = tmp.mid(2, tmp.length() - 3).toLong();
 
     func = data.mid(tmp.length() + 1, length);
@@ -1053,8 +1053,8 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args)
     if(data.left(1) == "i")
     {
       // Integer data
-      tmp = data.mid(data.find(":") + 1);
-      tmp = tmp.left(tmp.find(";"));
+      tmp = data.mid(data.tqfind(":") + 1);
+      tmp = tmp.left(tmp.tqfind(";"));
       ca[func] = tmp;
       data = data.mid(tmp.length() + 3);
 //       kdDebug(24002) << k_funcinfo << "**i " << func << ": " << ca[func] << endl;
@@ -1062,7 +1062,7 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args)
     else
     {
       // String data
-      tmp = data.left(data.find("\""));
+      tmp = data.left(data.tqfind("\""));
       length = tmp.mid(2, tmp.length() - 3).toLong();
 
       ca[func] = data.mid(tmp.length() + 1, length);
@@ -1098,8 +1098,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
   if(type == "s")
   {
     // Get length of key
-    tempstring = str.left(str.find(':'));
-    str.remove(0, str.find(':') + 1);
+    tempstring = str.left(str.tqfind(':'));
+    str.remove(0, str.tqfind(':') + 1);
     length = tempstring.toUInt();
 
     key = str.left(length + 1);
@@ -1108,8 +1108,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
   }
   else if(type == "i")
   {
-    key = str.left(str.find(';'));
-    str.remove(0, str.find(';') + 1);
+    key = str.left(str.tqfind(';'));
+    str.remove(0, str.tqfind(';') + 1);
 
   }
 
@@ -1122,8 +1122,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
     /* Example:
     s:4:"$row";i:6;
     */
-    data = str.left(str.find(';'));
-    str.remove(0, str.find(';') + 1);
+    data = str.left(str.tqfind(';'));
+    str.remove(0, str.tqfind(';') + 1);
     debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Integer);
 
   }
@@ -1132,9 +1132,9 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
     /* Example:
     s:8:"$boolvar";b:1;
     */
-    data = str.left(str.find(';'));
+    data = str.left(str.tqfind(';'));
     data = (data == "0" ? i18n("False"): i18n("True"));
-    str.remove(0, str.find(';') + 1);
+    str.remove(0, str.tqfind(';') + 1);
     debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Boolean);
   }
   else if(type == "N")
@@ -1151,8 +1151,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
     */
 
     // Get length of string
-    tempstring = str.left(str.find(':'));
-    str.remove(0, str.find(':') + 1);
+    tempstring = str.left(str.tqfind(':'));
+    str.remove(0, str.tqfind(':') + 1);
     length = tempstring.toUInt();
 
     data = str.left(length + 1);
@@ -1168,8 +1168,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
     */
 
     // Get length of array
-    tempstring = str.left(str.find(':'));
-    str.remove(0, str.find(':') + 2);
+    tempstring = str.left(str.tqfind(':'));
+    str.remove(0, str.tqfind(':') + 2);
     length = tempstring.toUInt();
 
     TQPtrList<DebuggerVariable> vars ;
@@ -1193,13 +1193,13 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
     */
 
     // Get length of array
-    tempstring = str.left(str.find(':'));
-    str.remove(0, str.find(':') + 2);
-    tempstring = str.mid(str.find(':') + 1);
-    tempstring = tempstring.left(tempstring.find(':'));
+    tempstring = str.left(str.tqfind(':'));
+    str.remove(0, str.tqfind(':') + 2);
+    tempstring = str.mid(str.tqfind(':') + 1);
+    tempstring = tempstring.left(tempstring.tqfind(':'));
     length = tempstring.toUInt();
 
-    str.remove(0, str.find('{') + 1);
+    str.remove(0, str.tqfind('{') + 1);
     
     TQPtrList<DebuggerVariable> vars ;
     while(length > 0)
@@ -1220,8 +1220,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str)
     /* Example:
     s:9:"$floatvar";d:12.5600000000000004973799150320701301097869873046875;"
     */
-    data = str.left(str.find(';'));
-    str.remove(0, str.find(';') + 1);
+    data = str.left(str.tqfind(';'));
+    str.remove(0, str.tqfind(';') + 1);
     debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Float);
 
   }
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h
index 624a8ae8..b30bbe5c 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.h
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.h
@@ -31,9 +31,10 @@ typedef TQMap<TQString, TQString> StringMap;
 class QuantaDebuggerGubed : public DebuggerClient
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    QuantaDebuggerGubed(TQObject *parent, const char* name, const TQStringList&);
+    QuantaDebuggerGubed(TQObject *tqparent, const char* name, const TQStringList&);
     ~QuantaDebuggerGubed();
 
     // Execution states
@@ -109,7 +110,7 @@ class QuantaDebuggerGubed : public DebuggerClient
     TQString m_listenPort;
     bool    m_useproxy;
     State   m_executionState, m_defaultExecutionState;
-    long    m_errormask;
+    long    m_errortqmask;
     long    m_displaydelay;
 
     WatchList m_watchlist;
@@ -147,7 +148,7 @@ class QuantaDebuggerGubed : public DebuggerClient
     void slotReadyAccept();
 
   signals:
-    void updateStatus(DebuggerUI::DebuggerStatus);
+    void updatetqStatus(DebuggerUI::DebuggertqStatus);
 };
 
 #endif
diff --git a/quanta/components/debugger/interfaces/debuggerclient.cpp b/quanta/components/debugger/interfaces/debuggerclient.cpp
index 97140dbb..03b024f0 100644
--- a/quanta/components/debugger/interfaces/debuggerclient.cpp
+++ b/quanta/components/debugger/interfaces/debuggerclient.cpp
@@ -23,8 +23,8 @@
 
 
 // CTor
-DebuggerClient::DebuggerClient(TQObject *parent, const char* name)
- : TQObject(parent, name)
+DebuggerClient::DebuggerClient(TQObject *tqparent, const char* name)
+ : TQObject(tqparent, name)
 {
   m_active = false;
 }
@@ -32,7 +32,7 @@ DebuggerClient::DebuggerClient(TQObject *parent, const char* name)
 
 DebuggerInterface* DebuggerClient::debuggerInterface()
 {
-  return static_cast<DebuggerInterface*>( parent()->child( 0, "DebuggerInterface" ) );
+  return static_cast<DebuggerInterface*>( tqparent()->child( 0, "DebuggerInterface" ) );
 }
 
 // Active state of session
@@ -43,7 +43,7 @@ bool DebuggerClient::isActive()
 
 void DebuggerClient::unSupportedAction(const TQString &action)
 {
-  KMessageBox::error(NULL, i18n("The current debugger, %1, does not support the \"%2\" instruction.").arg(this->getName()).arg(action), i18n("Unsupported Debugger Function"));
+  KMessageBox::error(NULL, i18n("The current debugger, %1, does not support the \"%2\" instruction.").tqarg(this->getName()).tqarg(action), i18n("Unsupported Debugger Function"));
 
 }
 
@@ -129,7 +129,7 @@ void DebuggerClient::removeBreakpoint(DebuggerBreakpoint*)
 // Unimplemented defaults
 void DebuggerClient::showConfig(TQDomNode)
 {
-   KMessageBox::error(NULL, i18n("%1 does not have any specific settings.").arg(this->getName()), i18n("Settings"));
+   KMessageBox::error(NULL, i18n("%1 does not have any specific settings.").tqarg(this->getName()), i18n("Settings"));
 }
 
 // Unimplemented defaults
@@ -141,20 +141,20 @@ void DebuggerClient::readConfig(TQDomNode)
 //  Unimplemented defaults: add watch
 void DebuggerClient::addWatch(const TQString &)
 {
-  KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(this->getName()), i18n("Unsupported Debugger Function"));
+  KMessageBox::error(NULL, i18n("%1 does not support watches.").tqarg(this->getName()), i18n("Unsupported Debugger Function"));
 }
 
 //  Unimplemented defaults: Remove watch
 void DebuggerClient::removeWatch(DebuggerVariable *)
 {
   // Giving an error seems pointless, since you shouldnt be able to add a watch in the first place...
-  KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(this->getName()), i18n("Unsupported Debugger Function"));
+  KMessageBox::error(NULL, i18n("%1 does not support watches.").tqarg(this->getName()), i18n("Unsupported Debugger Function"));
 }
 
 // Unimplemented defaults: set value of varialbe
 void DebuggerClient::variableSetValue(const DebuggerVariable &)
 {
-  KMessageBox::error(NULL, i18n("%1 does not support setting the value of variables.").arg(this->getName()), i18n("Unsupported Debugger Function"));
+  KMessageBox::error(NULL, i18n("%1 does not support setting the value of variables.").tqarg(this->getName()), i18n("Unsupported Debugger Function"));
 }
 
 #include "debuggerclient.moc"
diff --git a/quanta/components/debugger/interfaces/debuggerclient.h b/quanta/components/debugger/interfaces/debuggerclient.h
index 1966039f..20d5b604 100644
--- a/quanta/components/debugger/interfaces/debuggerclient.h
+++ b/quanta/components/debugger/interfaces/debuggerclient.h
@@ -60,13 +60,14 @@ namespace DebuggerClientCapabilities
   };
 }
 
-class DebuggerClient : public QObject
+class DebuggerClient : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   private:
   protected:
-    DebuggerClient(TQObject *parent, const char* name);
+    DebuggerClient(TQObject *tqparent, const char* name);
 
     bool m_active;
 
@@ -108,7 +109,7 @@ class DebuggerClient : public QObject
     DebuggerInterface *debuggerInterface();
 
   signals:
-    void updateStatus(DebuggerUI::DebuggerStatus);
+    void updatetqStatus(DebuggerUI::DebuggertqStatus);
 
 };
 
diff --git a/quanta/components/debugger/interfaces/debuggerinterface.cpp b/quanta/components/debugger/interfaces/debuggerinterface.cpp
index 4d7beda6..013aeb15 100644
--- a/quanta/components/debugger/interfaces/debuggerinterface.cpp
+++ b/quanta/components/debugger/interfaces/debuggerinterface.cpp
@@ -17,8 +17,8 @@
 
 #include "debuggerinterface.h"
 
-DebuggerInterface::DebuggerInterface (TQObject *parent, const char* name)
-    : TQObject(parent, name)
+DebuggerInterface::DebuggerInterface (TQObject *tqparent, const char* name)
+    : TQObject(tqparent, name)
 {
 }
 
diff --git a/quanta/components/debugger/interfaces/debuggerinterface.h b/quanta/components/debugger/interfaces/debuggerinterface.h
index 1540a616..a93fee50 100644
--- a/quanta/components/debugger/interfaces/debuggerinterface.h
+++ b/quanta/components/debugger/interfaces/debuggerinterface.h
@@ -28,22 +28,23 @@
 
 class PathMapper;
 
-class DebuggerInterface : public QObject
+class DebuggerInterface : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
   private:
 
 
   public:
-    DebuggerInterface(TQObject *parent, const char* name);
+    DebuggerInterface(TQObject *tqparent, const char* name);
 
     // Breakpoints
     virtual void haveBreakpoint (const TQString& file, int line) = 0;
     virtual void havenoBreakpoint (const TQString& file, int line) = 0;
 
     // Public help functions
-    virtual bool showStatus(const TQString& message, bool log) = 0;
+    virtual bool showtqStatus(const TQString& message, bool log) = 0;
     virtual bool setActiveLine (const TQString& file, int line) = 0;
 
     virtual void enableAction(const TQString& action, bool enable) = 0;
diff --git a/quanta/components/debugger/pathmapper.cpp b/quanta/components/debugger/pathmapper.cpp
index c38e2fec..e1d74875 100644
--- a/quanta/components/debugger/pathmapper.cpp
+++ b/quanta/components/debugger/pathmapper.cpp
@@ -27,8 +27,8 @@
 #include <qextfileinfo.h>
 #include <tqdom.h>
 
-PathMapper::PathMapper(TQObject *parent, const char *name)
-    : TQObject(parent, name)
+PathMapper::PathMapper(TQObject *tqparent, const char *name)
+    : TQObject(tqparent, name)
 {
 
 }
@@ -43,7 +43,7 @@ TQString PathMapper::translate(const TQString & path, const TQString & from, con
   TQString translated = path;
   
   // Check if this dir is matched by the maps
-  if(path.startsWith(from, false))
+  if(path.tqstartsWith(from, false))
   {
     translated.remove(0, from.length());
     translated = to + translated;
@@ -110,21 +110,21 @@ TQString PathMapper::mapServerPathToLocal(const TQString &serverpath)
   newpath = translate(serverpath, m_serverBasedir, m_localBasedir);
   
   // Check if this dir is matched by the basedirs
-  if(QExtFileInfo::exists(newpath, true, 0L))
+  if(TQExtFileInfo::exists(newpath, true, 0L))
     return newpath;
 
   // Check if any previous mappings fit...
   for (unsigned int cnt = 0; cnt < m_serverlist.count(); cnt++ )
   {
     newpath = translate(serverpath, m_serverlist[cnt], m_locallist[cnt]);
-    if(QExtFileInfo::exists(newpath, true, 0L))
+    if(TQExtFileInfo::exists(newpath, true, 0L))
       return newpath;
   }
   
   // If the basedirs didnt match, check if the file exists,
   // otherwise scan through the mapping history or show the
   // mapping dialog
-  if(!QExtFileInfo::exists(serverpath, true, 0L))
+  if(!TQExtFileInfo::exists(serverpath, true, 0L))
   {
     PathMapperDialog pmdlg(serverpath, PathMapperDialog::ServerToLocal);
     for (unsigned int cnt = 0; cnt < m_serverlist.count(); cnt++ )
diff --git a/quanta/components/debugger/pathmapper.h b/quanta/components/debugger/pathmapper.h
index fd48e3ab..92a761ac 100644
--- a/quanta/components/debugger/pathmapper.h
+++ b/quanta/components/debugger/pathmapper.h
@@ -25,12 +25,13 @@
 
 class KURL;
 
-class PathMapper : public QObject
+class PathMapper : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    PathMapper(TQObject *parent = 0, const char *name = 0);
+    PathMapper(TQObject *tqparent = 0, const char *name = 0);
     PathMapper();
     virtual TQString mapLocalPathToServer(const TQString &localpath);
     virtual TQString mapServerPathToLocal(const TQString &serverpath);
diff --git a/quanta/components/debugger/pathmapperdialog.cpp b/quanta/components/debugger/pathmapperdialog.cpp
index 74e01956..8cc385d5 100644
--- a/quanta/components/debugger/pathmapperdialog.cpp
+++ b/quanta/components/debugger/pathmapperdialog.cpp
@@ -69,7 +69,7 @@ void PathMapperDialog::slotPathsChanged()
   translated = m_path;
   
   // Check if this dir is matched by the maps
-  if(m_path.startsWith(from, false))
+  if(m_path.tqstartsWith(from, false))
   {
     translated.remove(0, from.length());
     translated = to + translated;
@@ -78,10 +78,10 @@ void PathMapperDialog::slotPathsChanged()
   // Indicate wether local file exists
   if(m_direction == ServerToLocal)
   {
-    if(QExtFileInfo::exists(translated, true, this))
-      ledTranslationExists->setColor(Qt::green);
+    if(TQExtFileInfo::exists(translated, true, this))
+      ledTranslationExists->setColor(TQt::green);
     else
-      ledTranslationExists->setColor(Qt::red);
+      ledTranslationExists->setColor(TQt::red);
     ledTranslationExists->on();
   }
 
diff --git a/quanta/components/debugger/pathmapperdialog.h b/quanta/components/debugger/pathmapperdialog.h
index 39eb4600..e8d6b8c4 100644
--- a/quanta/components/debugger/pathmapperdialog.h
+++ b/quanta/components/debugger/pathmapperdialog.h
@@ -22,6 +22,7 @@
 class PathMapperDialog : public PathMapperDialogS
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum Direction
diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui
index fc7486d4..933d003a 100644
--- a/quanta/components/debugger/pathmapperdialogs.ui
+++ b/quanta/components/debugger/pathmapperdialogs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>PathMapperDialogS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PathMapperDialogS</cstring>
     </property>
@@ -22,7 +22,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>groupBox6</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>lblDebuggerLocalBasedir</cstring>
                     </property>
@@ -49,7 +49,7 @@
                         <string>Local basedir:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>lblDebuggerServerBasedir</cstring>
                     </property>
@@ -65,7 +65,7 @@
                         <string>Server basedir:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1">
+                <widget class="TQLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>lineLocalPath</cstring>
                     </property>
@@ -74,7 +74,7 @@
 The quanta will know that files starting with "/home/user/project/" on the local computer, will start with "/var/www/" on the remote computer.</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>lineServerPath</cstring>
                     </property>
@@ -85,7 +85,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="4" column="0">
+        <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -109,14 +109,14 @@ The quanta will know that files starting with "/home/user/project/" on the local
                     <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>
@@ -133,7 +133,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -149,7 +149,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox" row="2" column="0">
+        <widget class="TQGroupBox" row="2" column="0">
             <property name="name">
                 <cstring>groupBox7</cstring>
             </property>
@@ -160,7 +160,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QListView">
+                <widget class="TQListView">
                     <column>
                         <property name="text">
                             <string>Local Directory</string>
@@ -204,7 +204,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>groupBox8</cstring>
             </property>
@@ -215,7 +215,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
                 <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>lblTranslates</cstring>
                     </property>
@@ -231,7 +231,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
                         <string>Translates to:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>lblOriginal</cstring>
                     </property>
@@ -251,13 +251,13 @@ The quanta will know that files starting with "/home/user/project/" on the local
                     <property name="name">
                         <cstring>ledTranslationExists</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
@@ -279,7 +279,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
                         <string>This indicator tells you whether the translated path exists on local disk or not.</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>lineTranslated</cstring>
                     </property>
@@ -297,7 +297,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
                         <string>This field shows what the "original path" above will look like after translation.</string>
                     </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>linePath</cstring>
                     </property>
@@ -335,10 +335,10 @@ The quanta will know that files starting with "/home/user/project/" on the local
         <slot>reject()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>slotHistoryclicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kled.h</includehint>
 </includehints>
diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp
index af70da0a..be930d17 100644
--- a/quanta/components/debugger/quantadebuggerinterface.cpp
+++ b/quanta/components/debugger/quantadebuggerinterface.cpp
@@ -32,10 +32,10 @@
 
 class DebuggerBreakpoint;
 
-QuantaDebuggerInterface::QuantaDebuggerInterface (TQObject *myparent, const char* name)
-    : DebuggerInterface(myparent, name)
+QuantaDebuggerInterface::QuantaDebuggerInterface (TQObject *mytqparent, const char* name)
+    : DebuggerInterface(mytqparent, name)
 {
-  m_manager = static_cast<DebuggerManager*>(parent());
+  m_manager = static_cast<DebuggerManager*>(tqparent());
 }
 
 QuantaDebuggerInterface::~QuantaDebuggerInterface ()
@@ -52,9 +52,9 @@ void QuantaDebuggerInterface::havenoBreakpoint (const TQString& file, int line)
 }
 
 // Public help functions
-bool QuantaDebuggerInterface::showStatus(const TQString& message, bool log)
+bool QuantaDebuggerInterface::showtqStatus(const TQString& message, bool log)
 {
-  return m_manager->showStatus(message, log);
+  return m_manager->showtqStatus(message, log);
 }
 
 bool QuantaDebuggerInterface::setActiveLine(const TQString& file, int line)
@@ -86,20 +86,20 @@ const TQString QuantaDebuggerInterface::activeFileParts(const TQString & str)
   // n/d/p = name/dir/path
 
   // Filename, filedir and filepath
-  newstr.replace("%afn", ViewManager::ref()->activeDocument()->url().fileName());
-  newstr.replace("%afd", ViewManager::ref()->activeDocument()->url().directory());
-  newstr.replace("%afp", ViewManager::ref()->activeDocument()->url().path());
+  newstr.tqreplace("%afn", ViewManager::ref()->activeDocument()->url().fileName());
+  newstr.tqreplace("%afd", ViewManager::ref()->activeDocument()->url().directory());
+  newstr.tqreplace("%afp", ViewManager::ref()->activeDocument()->url().path());
 
   // filedir and filepath relative to project root
-  newstr.replace("%rfpp", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().path()));
-  newstr.replace("%rfpd", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().directory()));
+  newstr.tqreplace("%rfpp", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().path()));
+  newstr.tqreplace("%rfpd", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().directory()));
 
   // filedir and filepath relative to document root
-  newstr.replace("%rfdp", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().path()));
-  newstr.replace("%rfdd", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().directory()));
+  newstr.tqreplace("%rfdp", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().path()));
+  newstr.tqreplace("%rfdd", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().directory()));
 
-  newstr.replace("%apd", Project::ref()->projectBaseURL().path());
-  newstr.replace("%add", Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory());
+  newstr.tqreplace("%apd", Project::ref()->projectBaseURL().path());
+  newstr.tqreplace("%add", Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory());
 
   kdDebug(24002) << k_funcinfo << ", BaseURL " << Project::ref()->projectBaseURL().path() << ", active doc : " << ViewManager::ref()->activeDocument()->url().path() << ", documentFolderForURL" << Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()) << ", newstr" << newstr << endl;
 
diff --git a/quanta/components/debugger/quantadebuggerinterface.h b/quanta/components/debugger/quantadebuggerinterface.h
index d18fd1cd..ba637307 100644
--- a/quanta/components/debugger/quantadebuggerinterface.h
+++ b/quanta/components/debugger/quantadebuggerinterface.h
@@ -28,12 +28,13 @@ class DebuggerManager;
 class QuantaDebuggerInterface : public DebuggerInterface
 {
     Q_OBJECT
+  TQ_OBJECT
 
   private:
     DebuggerManager *m_manager;
 
   public:
-    QuantaDebuggerInterface(TQObject *myparent, const char* name);
+    QuantaDebuggerInterface(TQObject *mytqparent, const char* name);
     ~QuantaDebuggerInterface();
 
     // Breakpoints
@@ -42,7 +43,7 @@ class QuantaDebuggerInterface : public DebuggerInterface
     void refreshBreakpoints();
 
     // Public help functions
-    bool showStatus(const TQString& message, bool log);
+    bool showtqStatus(const TQString& message, bool log);
     bool setActiveLine (const TQString& file, int line) ;
 
     void enableAction(const TQString& action, bool enable);
diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp
index 03ddd7d3..9c7263bb 100644
--- a/quanta/components/debugger/variableslistview.cpp
+++ b/quanta/components/debugger/variableslistview.cpp
@@ -39,7 +39,7 @@ namespace VariablesListViewColumns
   enum Columns
   {
     Name = 0,
-    Status,
+    tqStatus,
     Value,
     Type,
     Size
@@ -47,12 +47,12 @@ namespace VariablesListViewColumns
   };
 }
 
-VariablesListView::VariablesListView(TQWidget *parent, const char *name)
-    : KListView(parent, name)
+VariablesListView::VariablesListView(TQWidget *tqparent, const char *name)
+    : KListView(tqparent, name)
 {
   // If you change here, change the VariablesListViewColumns enums above
   addColumn(i18n("Name"));
-  addColumn(TQString::null);
+  addColumn(TQString());
   addColumn(i18n("Value"));
   addColumn(i18n("Type"));
   addColumn(i18n("Size"));
@@ -106,7 +106,7 @@ void VariablesListView::slotRemoveSelected()
 
 void VariablesListView::keyPressEvent(TQKeyEvent *e)
 {
-  if(e->key() != Qt::Key_Delete)
+  if(e->key() != TQt::Key_Delete)
   {
     e->ignore();
     return;
@@ -160,7 +160,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab
 { 
   KListViewItem * item;
   
-  // Remove children that doesen't exist anymore
+  // Remove tqchildren that doesen't exist anymore
   TQPtrList<DebuggerVariable> oldlist = oldvar->values();
   for(DebuggerVariable* oldchild = oldlist.last(); oldchild; oldchild = oldlist.prev())
   {
@@ -178,7 +178,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab
       oldvar->deleteChild(oldchild);
   }
 
-  // Update and add children
+  // Update and add tqchildren
   TQPtrList<DebuggerVariable> newlist = newvar->values();
   for(DebuggerVariable* newchild = newlist.last(); newchild; newchild = newlist.prev())
   {
@@ -206,9 +206,9 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab
   item = oldvar->item();
   
   if(oldvar->value() != newvar->value())
-    item->setPixmap(VariablesListViewColumns::Status, SmallIcon("ok"));
+    item->setPixmap(VariablesListViewColumns::tqStatus, SmallIcon("ok"));
   else
-    item->setPixmap(VariablesListViewColumns::Status, KPixmap());
+    item->setPixmap(VariablesListViewColumns::tqStatus, KPixmap());
   
   oldvar->copy(newvar, false);
   
@@ -274,7 +274,7 @@ void VariablesListView::slotVariableDump( )
   if(!v)
     return;
 
-  quantaApp->messageOutput()->showMessage(i18n("Contents of variable %1:\n>>>\n").arg(v->name()));
+  quantaApp->messageOutput()->showMessage(i18n("Contents of variable %1:\n>>>\n").tqarg(v->name()));
   quantaApp->messageOutput()->showMessage(v->value());
   quantaApp->messageOutput()->showMessage("<<<\n");
 }
@@ -284,7 +284,7 @@ void VariablesListView::slotVariableCopyToClipboard( )
   DebuggerVariable *v = selected(true);
   if(!v)
     return;
-  TQApplication::clipboard()->setText(v->value());
+  TQApplication::tqclipboard()->setText(v->value());
 }
 
 #include "variableslistview.moc"
diff --git a/quanta/components/debugger/variableslistview.h b/quanta/components/debugger/variableslistview.h
index 729aa8d8..b4f3d9bc 100644
--- a/quanta/components/debugger/variableslistview.h
+++ b/quanta/components/debugger/variableslistview.h
@@ -28,6 +28,7 @@ class DebuggerVariable;
 class VariablesListView : public KListView
 {
   Q_OBJECT
+  TQ_OBJECT
 
   enum menuitems 
   {
@@ -38,7 +39,7 @@ class VariablesListView : public KListView
   };
       
   public:
-    VariablesListView(TQWidget *parent = 0, const char *name = 0);
+    VariablesListView(TQWidget *tqparent = 0, const char *name = 0);
     ~VariablesListView();
 
     void addVariable(DebuggerVariable* variable);
diff --git a/quanta/components/framewizard/areaattributedb.h b/quanta/components/framewizard/areaattributedb.h
index 6dbe92d1..528da3ea 100644
--- a/quanta/components/framewizard/areaattributedb.h
+++ b/quanta/components/framewizard/areaattributedb.h
@@ -24,11 +24,12 @@
   *@author gulmini luciano
   */
 
-class areaAttribute : public QObject{
+class areaAttribute : public TQObject{
     Q_OBJECT
+  TQ_OBJECT
 
     private:
-      TQRect m_geometry;
+      TQRect m_tqgeometry;
       TQMap<TQString,TQString> m_attributeMap;     //tag specific attributes
 
     public:
@@ -37,13 +38,13 @@ class areaAttribute : public QObject{
       void setAttribute(const TQString& name, const TQString& value){ m_attributeMap[name] = value; }
       void setAllAttributes(TQMap<TQString,TQString> map){ m_attributeMap = map; }
       void resetAttributes();
-      TQRect geometry() const { return m_geometry; }
+      TQRect tqgeometry() const { return m_tqgeometry; }
       TQString src() const{ return m_attributeMap["src"]; }
       TQString attributeValue(TQString l) const { return attributeMap()[l];}
       TQMap<TQString,TQString> attributeMap() const { return m_attributeMap; }
 
     public slots:
-      void setGeometry(TQRect g) { m_geometry = g; }
+      void setGeometry(TQRect g) { m_tqgeometry = g; }
 };
 
 #endif
diff --git a/quanta/components/framewizard/fmfpeditor.h b/quanta/components/framewizard/fmfpeditor.h
index 1a89f0c8..2fc52e64 100644
--- a/quanta/components/framewizard/fmfpeditor.h
+++ b/quanta/components/framewizard/fmfpeditor.h
@@ -26,6 +26,7 @@
 
 class fmFPeditor : public fmFPeditorS  {
   Q_OBJECT
+  TQ_OBJECT
   
   public: 
     fmFPeditor();
diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui
index ef8990a9..bcfb43c1 100644
--- a/quanta/components/framewizard/fmfpeditors.ui
+++ b/quanta/components/framewizard/fmfpeditors.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>fmFPeditorS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>fmFPeditorS</cstring>
     </property>
@@ -19,7 +19,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>Layout8</cstring>
             </property>
@@ -43,14 +43,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>55</width>
                             <height>0</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pbOk</cstring>
                     </property>
@@ -58,7 +58,7 @@
                         <string>&amp;OK</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pbCancel</cstring>
                     </property>
@@ -68,11 +68,11 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>tw</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -83,7 +83,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QButtonGroup" row="4" column="0">
+                    <widget class="TQButtonGroup" row="4" column="0">
                         <property name="name">
                             <cstring>bgBorder</cstring>
                         </property>
@@ -100,7 +100,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>rbBorderYes</cstring>
                                 </property>
@@ -111,7 +111,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="0" column="1">
+                            <widget class="TQRadioButton" row="0" column="1">
                                 <property name="name">
                                     <cstring>rbBorderNo</cstring>
                                 </property>
@@ -124,7 +124,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QGroupBox" row="2" column="0">
+                    <widget class="TQGroupBox" row="2" column="0">
                         <property name="name">
                             <cstring>gbMargins</cstring>
                         </property>
@@ -141,7 +141,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>Layout8</cstring>
                                 </property>
@@ -155,7 +155,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
                                             <cstring>Layout4</cstring>
                                         </property>
@@ -169,7 +169,7 @@
                                             <property name="spacing">
                                                 <number>6</number>
                                             </property>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>TextLabel2_3</cstring>
                                                 </property>
@@ -177,7 +177,7 @@
                                                     <string>From left:</string>
                                                 </property>
                                             </widget>
-                                            <widget class="QSpinBox">
+                                            <widget class="TQSpinBox">
                                                 <property name="name">
                                                     <cstring>sbLeft</cstring>
                                                 </property>
@@ -190,7 +190,7 @@
                                             </widget>
                                         </hbox>
                                     </widget>
-                                    <widget class="QLayoutWidget">
+                                    <widget class="TQLayoutWidget">
                                         <property name="name">
                                             <cstring>Layout3</cstring>
                                         </property>
@@ -204,7 +204,7 @@
                                             <property name="spacing">
                                                 <number>6</number>
                                             </property>
-                                            <widget class="QLabel">
+                                            <widget class="TQLabel">
                                                 <property name="name">
                                                     <cstring>TextLabel1_3</cstring>
                                                 </property>
@@ -212,7 +212,7 @@
                                                     <string>From top:</string>
                                                 </property>
                                             </widget>
-                                            <widget class="QSpinBox">
+                                            <widget class="TQSpinBox">
                                                 <property name="name">
                                                     <cstring>sbTop</cstring>
                                                 </property>
@@ -229,7 +229,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QButtonGroup" row="3" column="0">
+                    <widget class="TQButtonGroup" row="3" column="0">
                         <property name="name">
                             <cstring>bgScrolling</cstring>
                         </property>
@@ -246,7 +246,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>rbScrollingYes</cstring>
                                 </property>
@@ -254,7 +254,7 @@
                                     <string>Yes</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="0" column="2">
+                            <widget class="TQRadioButton" row="0" column="2">
                                 <property name="name">
                                     <cstring>rbScrollingAuto</cstring>
                                 </property>
@@ -265,7 +265,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="0" column="1">
+                            <widget class="TQRadioButton" row="0" column="1">
                                 <property name="name">
                                     <cstring>rbScrollingNo</cstring>
                                 </property>
@@ -275,7 +275,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QButtonGroup" row="1" column="0">
+                    <widget class="TQButtonGroup" row="1" column="0">
                         <property name="name">
                             <cstring>bgNoresize</cstring>
                         </property>
@@ -295,7 +295,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>rbResizeYes</cstring>
                                 </property>
@@ -303,7 +303,7 @@
                                     <string>Yes</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="0" column="1">
+                            <widget class="TQRadioButton" row="0" column="1">
                                 <property name="name">
                                     <cstring>rbResizeNo</cstring>
                                 </property>
@@ -316,7 +316,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QLayoutWidget" row="0" column="0">
+                    <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
                             <cstring>Layout10</cstring>
                         </property>
@@ -330,7 +330,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>Layout9</cstring>
                                 </property>
@@ -344,7 +344,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>tlFrameSource</cstring>
                                         </property>
@@ -352,7 +352,7 @@
                                             <string>Frame source:</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>tlFrameName</cstring>
                                         </property>
@@ -362,7 +362,7 @@
                                     </widget>
                                 </vbox>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>Layout8</cstring>
                                 </property>
@@ -381,7 +381,7 @@
                                             <cstring>fc</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLineEdit">
+                                    <widget class="TQLineEdit">
                                         <property name="name">
                                             <cstring>leName</cstring>
                                         </property>
@@ -392,7 +392,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -403,7 +403,7 @@
                     <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>Layout11</cstring>
                         </property>
@@ -417,7 +417,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>tlId</cstring>
                                 </property>
@@ -425,7 +425,7 @@
                                     <string>Id:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>TextLabel2_2</cstring>
                                 </property>
@@ -433,7 +433,7 @@
                                     <string>Class:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>TextLabel3</cstring>
                                 </property>
@@ -441,7 +441,7 @@
                                     <string>Style:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>TextLabel4</cstring>
                                 </property>
@@ -449,7 +449,7 @@
                                     <string>Title:</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>TextLabel6</cstring>
                                 </property>
@@ -459,7 +459,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="0" column="1">
+                    <widget class="TQLayoutWidget" row="0" column="1">
                         <property name="name">
                             <cstring>Layout10</cstring>
                         </property>
@@ -473,27 +473,27 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLineEdit">
+                            <widget class="TQLineEdit">
                                 <property name="name">
                                     <cstring>leId</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit">
+                            <widget class="TQLineEdit">
                                 <property name="name">
                                     <cstring>leClass</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit">
+                            <widget class="TQLineEdit">
                                 <property name="name">
                                     <cstring>leStyle</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit">
+                            <widget class="TQLineEdit">
                                 <property name="name">
                                     <cstring>leTitle</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit">
+                            <widget class="TQLineEdit">
                                 <property name="name">
                                     <cstring>leLongdesc</cstring>
                                 </property>
@@ -510,7 +510,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -537,5 +537,5 @@
     </connection>
 </connections>
 <pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/components/framewizard/fmrceditor.h b/quanta/components/framewizard/fmrceditor.h
index 254f1cc5..ab33d5b4 100644
--- a/quanta/components/framewizard/fmrceditor.h
+++ b/quanta/components/framewizard/fmrceditor.h
@@ -26,6 +26,7 @@
 
 class fmRCeditor : public fmRCeditorS  {
   Q_OBJECT
+  TQ_OBJECT
   public: 
     fmRCeditor();
     ~fmRCeditor();
diff --git a/quanta/components/framewizard/fmrceditors.ui b/quanta/components/framewizard/fmrceditors.ui
index 25cd41bd..d85bb0da 100644
--- a/quanta/components/framewizard/fmrceditors.ui
+++ b/quanta/components/framewizard/fmrceditors.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>fmRCeditorS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>fmRCeditorS</cstring>
     </property>
@@ -20,13 +20,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>300</width>
             <height>150</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>300</width>
             <height>150</height>
@@ -45,7 +45,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>Layout11</cstring>
             </property>
@@ -59,7 +59,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>tl</cstring>
                     </property>
@@ -67,7 +67,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QSpinBox">
+                <widget class="TQSpinBox">
                     <property name="name">
                         <cstring>sb</cstring>
                     </property>
@@ -80,7 +80,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -104,14 +104,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>31</width>
                             <height>0</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pbOk</cstring>
                     </property>
@@ -119,7 +119,7 @@
                         <string>&amp;OK</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pbCancel</cstring>
                     </property>
@@ -145,5 +145,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/components/framewizard/framewizard.cpp b/quanta/components/framewizard/framewizard.cpp
index e0e7d5d9..0eabb061 100644
--- a/quanta/components/framewizard/framewizard.cpp
+++ b/quanta/components/framewizard/framewizard.cpp
@@ -28,7 +28,7 @@
 static const TQString info1=i18n("You must select an area."),
                      info2=i18n("Before editing a frame you must save the file.");
 
-FrameWizard::FrameWizard(TQWidget *parent, const char *name) : FrameWizardS(parent, name),
+FrameWizard::FrameWizard(TQWidget *tqparent, const char *name) : FrameWizardS(tqparent, name),
 m_hasSelected(false),m_saved(false)
 {
   m_hasSelected = false;
@@ -44,7 +44,7 @@ m_hasSelected(false),m_saved(false)
 }
 
 FrameWizard::~FrameWizard(){
-#define QT_CHECK_NULL
+#define TQT_CHECK_NULL
 Q_CHECK_PTR( vfe );
 }
 
@@ -57,7 +57,7 @@ void FrameWizard::split(){
   if(m_hasSelected) {
     int split = 0;
     TQString currNodeLabel = m_currSA;
-    TQString senderName=sender()->name();
+    TQString senderName=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
     if(senderName=="pbHorizontal"){
       split = showRCeditorDlg(i18n("Enter the desired number of rows:"));
       if(split>=2) vfe->split(currNodeLabel,split,HORIZONTAL);
diff --git a/quanta/components/framewizard/framewizard.h b/quanta/components/framewizard/framewizard.h
index 42386982..177c6c6b 100644
--- a/quanta/components/framewizard/framewizard.h
+++ b/quanta/components/framewizard/framewizard.h
@@ -26,6 +26,7 @@ class TQStringList;
 class FrameWizard : public FrameWizardS
 {
   Q_OBJECT
+  TQ_OBJECT
   private:
     bool m_hasSelected,
             m_saved; // if saved = false the the file containing the frameset structure
@@ -35,7 +36,7 @@ class FrameWizard : public FrameWizardS
     TQString m_currSA;
 
   public:
-    FrameWizard( TQWidget* parent=0, const char *name=0);
+    FrameWizard( TQWidget* tqparent=0, const char *name=0);
     ~FrameWizard();
 
   private slots:
diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui
index a06d321b..6f3d030e 100644
--- a/quanta/components/framewizard/framewizards.ui
+++ b/quanta/components/framewizard/framewizards.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>FrameWizardS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FrameWizardS</cstring>
     </property>
@@ -20,13 +20,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>
@@ -45,7 +45,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -59,7 +59,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>pbHelp</cstring>
                     </property>
@@ -77,14 +77,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout1</cstring>
                     </property>
@@ -98,7 +98,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>pbOk</cstring>
                             </property>
@@ -106,7 +106,7 @@
                                 <string>&amp;OK</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>pbCancel</cstring>
                             </property>
@@ -118,7 +118,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>Layout11</cstring>
             </property>
@@ -132,7 +132,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout9</cstring>
                     </property>
@@ -146,7 +146,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>tl</cstring>
                             </property>
@@ -161,14 +161,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>30</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QButtonGroup">
+                        <widget class="TQButtonGroup">
                             <property name="name">
                                 <cstring>ButtonGroup4</cstring>
                             </property>
@@ -193,7 +193,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QPushButton" row="1" column="0">
+                                <widget class="TQPushButton" row="1" column="0">
                                     <property name="name">
                                         <cstring>pbVertical</cstring>
                                     </property>
@@ -201,7 +201,7 @@
                                         <string>Vertical</string>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton" row="0" column="0">
+                                <widget class="TQPushButton" row="0" column="0">
                                     <property name="name">
                                         <cstring>pbHorizontal</cstring>
                                     </property>
@@ -221,14 +221,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>16</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QButtonGroup">
+                        <widget class="TQButtonGroup">
                             <property name="name">
                                 <cstring>ButtonGroup5</cstring>
                             </property>
@@ -253,7 +253,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QPushButton" row="2" column="0">
+                                <widget class="TQPushButton" row="2" column="0">
                                     <property name="name">
                                         <cstring>pbEditFrame</cstring>
                                     </property>
@@ -261,7 +261,7 @@
                                         <string>Edit Frame</string>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton" row="1" column="0">
+                                <widget class="TQPushButton" row="1" column="0">
                                     <property name="name">
                                         <cstring>pbDelete</cstring>
                                     </property>
@@ -272,7 +272,7 @@
                                         <string>Delete</string>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton" row="0" column="0">
+                                <widget class="TQPushButton" row="0" column="0">
                                     <property name="name">
                                         <cstring>pbReset</cstring>
                                     </property>
@@ -295,7 +295,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>30</height>
@@ -362,7 +362,7 @@
     </connection>
 </connections>
 <pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>visualframeeditor.h</includehint>
 </includehints>
diff --git a/quanta/components/framewizard/selectablearea.cpp b/quanta/components/framewizard/selectablearea.cpp
index c168e323..40f76ae2 100644
--- a/quanta/components/framewizard/selectablearea.cpp
+++ b/quanta/components/framewizard/selectablearea.cpp
@@ -20,7 +20,7 @@
 //#include <kdebug.h>
 #include "fwglobal.h"
 
-SelectableArea::SelectableArea(TQWidget *parent, const char *name ) : KHTMLPart(parent,name) {
+SelectableArea::SelectableArea(TQWidget *tqparent, const char *name ) : KHTMLPart(tqparent,name) {
   view()->setFrameShape(TQFrame::NoFrame);
   view()->setMinimumSize(TQSize(1,1));
   view()->installEventFilter(this);
@@ -44,7 +44,7 @@ bool SelectableArea::eventFilter(TQObject *o, TQEvent *event){
                                              }
                                              break;
     case TQEvent::Resize : {
-                                          emit Resized( view()->geometry() );
+                                          emit Resized( view()->tqgeometry() );
                                           view()->hide();
                                           view()->show();
                                           return true;
diff --git a/quanta/components/framewizard/selectablearea.h b/quanta/components/framewizard/selectablearea.h
index 8de351a9..3df3200a 100644
--- a/quanta/components/framewizard/selectablearea.h
+++ b/quanta/components/framewizard/selectablearea.h
@@ -29,9 +29,10 @@
 
 class SelectableArea : public KHTMLPart  {
    Q_OBJECT
+  TQ_OBJECT
 
    public :
-     SelectableArea(TQWidget *parent=0, const char *name=0);
+     SelectableArea(TQWidget *tqparent=0, const char *name=0);
      ~SelectableArea();
      TQString idLabel() const { return m_idLabel; }
      void setIdLabel(const TQString &i) { m_idLabel = i; }
diff --git a/quanta/components/framewizard/treenode.cpp b/quanta/components/framewizard/treenode.cpp
index fd1f187f..0ff7cf74 100644
--- a/quanta/components/framewizard/treenode.cpp
+++ b/quanta/components/framewizard/treenode.cpp
@@ -20,7 +20,7 @@
 static const int SIZE = 101;
 
 treeNode::treeNode(const TQString &l, const TQString &pl) : m_label(l), m_parentLabel(pl), m_splitType(NONE){
-  m_childrenList.setAutoDelete(true);
+  m_tqchildrenList.setAutoDelete(true);
   m_atts = new areaAttribute;
 }
 
@@ -29,16 +29,16 @@ treeNode::~treeNode(){
 }
 
 void treeNode::addChildNode(const TQString &l) {
-  m_childrenList.append( new treeNode(l,m_label) );
+  m_tqchildrenList.append( new treeNode(l,m_label) );
 }
 
 void treeNode::removeChildNode(const TQString &l,bool autoDelete) {
-  m_childrenList.setAutoDelete(autoDelete);
-  m_childrenList.remove(findChild(l));
+  m_tqchildrenList.setAutoDelete(autoDelete);
+  m_tqchildrenList.remove(findChild(l));
 }
 
 treeNode* treeNode::findChild(const TQString &l){
-  TQPtrListIterator<treeNode> it( m_childrenList );
+  TQPtrListIterator<treeNode> it( m_tqchildrenList );
   treeNode *node;
   while ( (node = it.current()) != 0 ) {
     ++it;
@@ -68,25 +68,25 @@ void tree::refreshGeometries(treeNode *n){
       n->nextChild();
     }
 
-    TQPtrList<treeNode> list = n->childrenList();
+    TQPtrList<treeNode> list = n->tqchildrenList();
     TQPtrListIterator<treeNode> it( list );
     treeNode *node= it.current();
-    TQRect newGeometry = n->atts()->geometry();
+    TQRect newGeometry = n->atts()->tqgeometry();
     if(n->splitType()==VERTICAL){
-      newGeometry.setHeight(node->atts()->geometry().height());
+      newGeometry.setHeight(node->atts()->tqgeometry().height());
       while ( (node = it.current()) != 0 ) {
         ++it;
-        dim += node->atts()->geometry().width();
+        dim += node->atts()->tqgeometry().width();
         dim += 6;
       }
       newGeometry.setWidth(dim);
     }
     else
     if(n->splitType()==HORIZONTAL){
-      newGeometry.setWidth(node->atts()->geometry().width());
+      newGeometry.setWidth(node->atts()->tqgeometry().width());
       while ( (node = it.current()) != 0 ) {
         ++it;
-        dim += node->atts()->geometry().height();
+        dim += node->atts()->tqgeometry().height();
         dim += 6;
       }
       newGeometry.setHeight(dim);
@@ -98,7 +98,7 @@ void tree::refreshGeometries(treeNode *n){
 
 treeNode* tree::findNode(const TQString &l){
   if(l==m_root->label()) return m_root;
-  return m_nodeList.find(l);
+  return m_nodeList.tqfind(l);
 }
 
 TQString tree::addChildNode(const TQString &l){
@@ -114,13 +114,13 @@ TQString tree::addChildNode(const TQString &l){
 }
 
 bool tree::insertChildNode(const TQString &l){
-  TQString parent = findNode(l)->parentLabel();
-  int pos=findNode( parent )->childPosition( findNode(l) );
+  TQString tqparent = findNode(l)->tqparentLabel();
+  int pos=findNode( tqparent )->childPosition( findNode(l) );
   ++nodeId;
-  treeNode *newNode = new treeNode(TQString::number(nodeId,10),parent);
+  treeNode *newNode = new treeNode(TQString::number(nodeId,10),tqparent);
   newNode->atts()->setAttribute( "src",findNode(l)->atts()->src() );
   m_nodeList.insert(TQString::number(nodeId,10),newNode);
-  return findNode( parent )->insertChild(pos,newNode);
+  return findNode( tqparent )->insertChild(pos,newNode);
 }
 
 void tree::reset(){
diff --git a/quanta/components/framewizard/treenode.h b/quanta/components/framewizard/treenode.h
index 0d686630..6680e443 100644
--- a/quanta/components/framewizard/treenode.h
+++ b/quanta/components/framewizard/treenode.h
@@ -33,36 +33,36 @@ class treeNode {
       TQString m_label,
                    m_parentLabel;
       SplitType m_splitType;
-      TQPtrList<treeNode> m_childrenList;
+      TQPtrList<treeNode> m_tqchildrenList;
       areaAttribute *m_atts;
 
    public:
-     treeNode(const TQString &l=TQString::null, const TQString &pl=TQString::null);
+     treeNode(const TQString &l=TQString(), const TQString &pl=TQString());
       ~treeNode();
       void addChildNode(const TQString &L);
-      void addChildNode(treeNode *n){ m_childrenList.append(n); }
+      void addChildNode(treeNode *n){ m_tqchildrenList.append(n); }
       void removeChildNode(const TQString &l, bool autoDelete);
       void setSplitType(SplitType s) { m_splitType = s; }
       void setLabel(const TQString &l) { m_label = l; }
-      void removeChildren() { m_childrenList.clear(); }
+      void removeChildren() { m_tqchildrenList.clear(); }
       void setParentLabel(const TQString &s){ m_parentLabel = s;}
-      int  childPosition(treeNode* n){ return m_childrenList.find(n); }
-      bool insertChild(unsigned int pos, treeNode* n) { return m_childrenList.insert( pos, n); }
+      int  childPosition(treeNode* n){ return m_tqchildrenList.tqfind(n); }
+      bool insertChild(unsigned int pos, treeNode* n) { return m_tqchildrenList.insert( pos, n); }
       TQString label() const { return m_label; }
-      TQString parentLabel() const { return m_parentLabel; }
+      TQString tqparentLabel() const { return m_parentLabel; }
       SplitType splitType() const { return m_splitType; }
-      TQPtrList<treeNode> childrenList() { return m_childrenList; }
+      TQPtrList<treeNode> tqchildrenList() { return m_tqchildrenList; }
 
-      treeNode* firstChild() { return m_childrenList.first(); }
-      treeNode* nextChild() { return m_childrenList.next(); }
-      treeNode* lastChild() { return m_childrenList.last(); }
-      treeNode* currentChild()  { return m_childrenList.current(); }
+      treeNode* firstChild() { return m_tqchildrenList.first(); }
+      treeNode* nextChild() { return m_tqchildrenList.next(); }
+      treeNode* lastChild() { return m_tqchildrenList.last(); }
+      treeNode* currentChild()  { return m_tqchildrenList.current(); }
       treeNode* findChild(const TQString &L);
 
       areaAttribute* atts() { return m_atts; }
 
-      int countChildren() const { return m_childrenList.count(); }
-      bool hasChildren() const { return !m_childrenList.isEmpty(); }
+      int countChildren() const { return m_tqchildrenList.count(); }
+      bool hasChildren() const { return !m_tqchildrenList.isEmpty(); }
 };
 
 class tree{
@@ -77,7 +77,7 @@ class tree{
       treeNode* root() const { return m_root; }
       TQString addChildNode(const TQString &l);
       bool insertChildNode(const TQString &L);
-      void removeChildNode(const TQString &pl,const TQString &l,bool autoDelete);//parent node,child node
+      void removeChildNode(const TQString &pl,const TQString &l,bool autoDelete);//tqparent node,child node
       treeNode* findNode(const TQString &L);
       areaAttribute* findAreaAttribute(const TQString &l){ return findNode(l)->atts(); };
       void reset();
diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp
index a11dae84..d75074bd 100644
--- a/quanta/components/framewizard/visualframeeditor.cpp
+++ b/quanta/components/framewizard/visualframeeditor.cpp
@@ -32,7 +32,7 @@ TQMap<TQString, TQValueList< int > > SIZES;
 static int splitterIdNumber = 0;
 
 
-VisualFrameEditor::VisualFrameEditor(TQWidget * parent, const char * name) : TQHBox(parent,name){
+VisualFrameEditor::VisualFrameEditor(TQWidget * tqparent, const char * name) : TQHBox(tqparent,name){
   m_internalTree = new tree;
   m_internalTree->root()->atts()->setGeometry(TQRect(0,0,510,422));
   m_firstInsertedSA = 0L;
@@ -46,12 +46,12 @@ VisualFrameEditor::~VisualFrameEditor(){
 
 void VisualFrameEditor::setGeometries(const TQString &l){
   int cP = cancelledPixels(m_internalTree->findNode(l)->countChildren());
-  TQRect newGeometry(m_internalTree->findNode(l)->atts()->geometry());
-  TQPtrList<treeNode> list=m_internalTree->findNode(l)->childrenList();
+  TQRect newGeometry(m_internalTree->findNode(l)->atts()->tqgeometry());
+  TQPtrList<treeNode> list=m_internalTree->findNode(l)->tqchildrenList();
   TQPtrListIterator<treeNode> it( list );
   treeNode *node;
   if(m_internalTree->findNode(l)->splitType() == VERTICAL){
-    int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().width()-cP;
+    int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().width()-cP;
     while ( (node = it.current()) != 0 ) {
       ++it;
       newGeometry.setWidth( int(dummyDimension/m_internalTree->findNode(l)->countChildren()) );
@@ -60,7 +60,7 @@ void VisualFrameEditor::setGeometries(const TQString &l){
   }
   else
   if(m_internalTree->findNode(l)->splitType() == HORIZONTAL){
-    int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().height()-cP;
+    int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().height()-cP;
     while ( (node = it.current()) != 0 ) {
       ++it;
       newGeometry.setHeight( int(dummyDimension/m_internalTree->findNode(l)->countChildren()) );
@@ -76,17 +76,17 @@ void VisualFrameEditor::split(const TQString &l, int n, SplitType type) {
     setGeometries(l);
   }
   else {
-    TQString parentLabel=m_internalTree->findNode(l)->parentLabel();
-    SplitType parentSplit=m_internalTree->findNode(parentLabel)->splitType();
-    if( parentSplit != type ) {
+    TQString tqparentLabel=m_internalTree->findNode(l)->tqparentLabel();
+    SplitType tqparentSplit=m_internalTree->findNode(tqparentLabel)->splitType();
+    if( tqparentSplit != type ) {
       m_internalTree->findNode(l)->setSplitType(type);
       for(int i = 1; i<=n; i++) m_internalTree->addChildNode(l);
       setGeometries(l);
     }
     else {
       for(int i = 1; i<=n; i++) m_internalTree->insertChildNode(l);
-      m_internalTree->findNode(parentLabel)->removeChildNode(l,true);
-      setGeometries(m_internalTree->findNode(parentLabel)->label());
+      m_internalTree->findNode(tqparentLabel)->removeChildNode(l,true);
+      setGeometries(m_internalTree->findNode(tqparentLabel)->label());
     }
   }
 }
@@ -109,9 +109,9 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){
    // then every asterisk must be assigned a percentage of 10% so the real percentage
    // notation is cols="40%,50%,10%"
   for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
-    if(!(*it).contains("%") && !(*it).contains("*")) leftPercentage -= ( (*it).toInt()*100 )/d;
-    if((*it).contains("%")) leftPercentage -= (*it).section("%",0,0).toInt();
-    if((*it).contains("*")) {
+    if(!(*it).tqcontains("%") && !(*it).tqcontains("*")) leftPercentage -= ( (*it).toInt()*100 )/d;
+    if((*it).tqcontains("%")) leftPercentage -= (*it).section("%",0,0).toInt();
+    if((*it).tqcontains("*")) {
       int weight= (*it).section("*",0,0).toInt();
       if( weight==0 ) weight=1;
       weightAsteriskCounter += weight;
@@ -125,7 +125,7 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){
    // a quelli effettivamente generati dal metodo build che opera un'altra normalizzazione.
    // In genere la differenza �dell' 1%
   for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
-    if((*it).contains("*")){
+    if((*it).tqcontains("*")){
       int weight= (*it).section("*",0,0).toInt();
       if(weight==0) weight=1;
       int newPercentage = weight*leftPercentageDistributedAmongAsterisks;
@@ -136,28 +136,28 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){
   return list;
 }
 
-void VisualFrameEditor::buildInternalTree(const TQString &parent){
+void VisualFrameEditor::buildInternalTree(const TQString &tqparent){
   TQString line = m_existingStructure.first();
-  if(line.contains("<frameset")) {
-    if(line.contains("rows")) {
-      split(parent,(line.contains(",")+1),HORIZONTAL);
+  if(line.tqcontains("<frameset")) {
+    if(line.tqcontains("rows")) {
+      split(tqparent,(line.tqcontains(",")+1),HORIZONTAL);
 
       TQRegExp pattern("rows\\s*=\"([\\s\\d%,\\*]*)\"");
       pattern.search(line);
 
-      TQRect dummy=m_internalTree->findNode(parent)->atts()->geometry();
+      TQRect dummy=m_internalTree->findNode(tqparent)->atts()->tqgeometry();
       TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.height());
 
-      int dummyDimension=dummy.height()-cancelledPixels(line.contains(",")+1);
+      int dummyDimension=dummy.height()-cancelledPixels(line.tqcontains(",")+1);
 
-      TQPtrList<treeNode> list=m_internalTree->findNode(parent)->childrenList();
+      TQPtrList<treeNode> list=m_internalTree->findNode(tqparent)->tqchildrenList();
       TQPtrListIterator<treeNode> it( list );
       treeNode *node;
       while ( (node = it.current()) != 0 ) {
         ++it;
         TQRect newGeometry(dummy);
         double   newDimension;
-        if(percentages.first().contains("%"))
+        if(percentages.first().tqcontains("%"))
           newDimension=(dummyDimension*(percentages.first().remove("%").toInt()))/100.0;
         else newDimension=(double)percentages.first().toInt();
           newGeometry.setHeight( proxInt(newDimension) );
@@ -166,24 +166,24 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){
       }
     }
     else
-    if(line.contains("cols")) {
-      split(parent,(line.contains(",")+1),VERTICAL);
+    if(line.tqcontains("cols")) {
+      split(tqparent,(line.tqcontains(",")+1),VERTICAL);
       TQRegExp pattern("cols\\s*=\"([\\s\\d%,\\*]*)\"");
       pattern.search(line);
 
-      TQRect dummy=m_internalTree->findNode(parent)->atts()->geometry();
+      TQRect dummy=m_internalTree->findNode(tqparent)->atts()->tqgeometry();
       TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.width());
 
-      int dummyDimension=dummy.width()-cancelledPixels(line.contains(",")+1);
+      int dummyDimension=dummy.width()-cancelledPixels(line.tqcontains(",")+1);
 
-      TQPtrList<treeNode> list=m_internalTree->findNode(parent)->childrenList();
+      TQPtrList<treeNode> list=m_internalTree->findNode(tqparent)->tqchildrenList();
       TQPtrListIterator<treeNode> it( list );
       treeNode *node;
       while ( (node = it.current()) != 0 ) {
         ++it;
         TQRect newGeometry(dummy);
         double   newDimension;
-        if(percentages.first().contains("%"))
+        if(percentages.first().tqcontains("%"))
           newDimension=(dummyDimension*(percentages.first().remove("%").toInt()))/100.0;
         else newDimension=(double)percentages.first().toInt();
           newGeometry.setWidth( proxInt(newDimension) );
@@ -193,23 +193,23 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){
     }
 
     m_existingStructure.pop_front();
-    m_internalTree->findNode(parent)->firstChild();
-    while(m_internalTree->findNode(parent)->currentChild()) {
-      buildInternalTree(m_internalTree->findNode(parent)->currentChild()->label());
-      m_internalTree->findNode(parent)->nextChild();
+    m_internalTree->findNode(tqparent)->firstChild();
+    while(m_internalTree->findNode(tqparent)->currentChild()) {
+      buildInternalTree(m_internalTree->findNode(tqparent)->currentChild()->label());
+      m_internalTree->findNode(tqparent)->nextChild();
     }
   }
   else {
     TQMap<TQString,TQString> attributeMap;
-    if( line.contains( TQRegExp("\\s+noresize") ) ) attributeMap["noresize"] = "noresize";
-    else attributeMap["noresize"] = TQString::null;
+    if( line.tqcontains( TQRegExp("\\s+noresize") ) ) attributeMap["noresize"] = "noresize";
+    else attributeMap["noresize"] = TQString();
 
     TQRegExp srcPattern("\\s+src\\s*=\\s*\"([%-\\w\\s\\./_\\+\\d]*)\"");  //search for files
     if(srcPattern.search(line) !=-1 ) {
       KURL pathToConvert, basePath;
       pathToConvert.setPath(srcPattern.cap(1));
       basePath.setPath( Project::ref()->projectBaseURL().path() );
-      attributeMap["src"] = QExtFileInfo::toAbsolute( pathToConvert, basePath ).path();
+      attributeMap["src"] = TQExtFileInfo::toAbsolute( pathToConvert, basePath ).path();
       line.remove(srcPattern);//we don't need to operate on this anymore
     }
 
@@ -221,7 +221,7 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){
       attributeMap[ pattern.cap(1).section( TQRegExp("=\\s*\"") ,0,0) ] = pattern.cap(1).section(TQRegExp("=\\s*\""),1,1).remove("\"");
       if ( pos >= 0 ) pos += pattern.matchedLength();
     }
-    m_internalTree->findNode(parent)->atts()->setAllAttributes(attributeMap);
+    m_internalTree->findNode(tqparent)->atts()->setAllAttributes(attributeMap);
     m_existingStructure.pop_front();
   }
 }
@@ -246,23 +246,23 @@ void VisualFrameEditor::paintEvent ( TQPaintEvent * ){
 void VisualFrameEditor::removeNode(const TQString &l){
   if( l == m_internalTree->root()->label() ) m_internalTree->reset();//trying to remove root node is equivalent to reinitialize
   else {
-    TQString parentLabel=m_internalTree->findNode(l)->parentLabel();
-    if(m_internalTree->findNode(parentLabel)->countChildren()>=3)
-      m_internalTree->removeChildNode(parentLabel,l,true);
+    TQString tqparentLabel=m_internalTree->findNode(l)->tqparentLabel();
+    if(m_internalTree->findNode(tqparentLabel)->countChildren()>=3)
+      m_internalTree->removeChildNode(tqparentLabel,l,true);
     else {
-      m_internalTree->removeChildNode(parentLabel,l,true);
-      if( !m_internalTree->findNode(parentLabel)->firstChild()->hasChildren() ){ //final nodes
-        TQMap<TQString,TQString> map = m_internalTree->findNode(parentLabel)->firstChild()->atts()->attributeMap();
-        m_internalTree->findNode(parentLabel)->removeChildren();
-        m_internalTree->findNode(parentLabel)->atts()->setAllAttributes( map ) ;
-        m_internalTree->findNode(parentLabel)->setSplitType(NONE);
+      m_internalTree->removeChildNode(tqparentLabel,l,true);
+      if( !m_internalTree->findNode(tqparentLabel)->firstChild()->hasChildren() ){ //final nodes
+        TQMap<TQString,TQString> map = m_internalTree->findNode(tqparentLabel)->firstChild()->atts()->attributeMap();
+        m_internalTree->findNode(tqparentLabel)->removeChildren();
+        m_internalTree->findNode(tqparentLabel)->atts()->setAllAttributes( map ) ;
+        m_internalTree->findNode(tqparentLabel)->setSplitType(NONE);
       }
       else {
-        TQPtrList<treeNode> list = m_internalTree->findNode(parentLabel)->firstChild()->childrenList();
-        if( parentLabel != m_internalTree->root()->label() ) {
-          TQString grandParentLabel = m_internalTree->findNode(parentLabel)->parentLabel();
-          m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false );
-          m_internalTree->removeChildNode( grandParentLabel ,parentLabel, true );
+        TQPtrList<treeNode> list = m_internalTree->findNode(tqparentLabel)->firstChild()->tqchildrenList();
+        if( tqparentLabel != m_internalTree->root()->label() ) {
+          TQString grandParentLabel = m_internalTree->findNode(tqparentLabel)->tqparentLabel();
+          m_internalTree->removeChildNode( tqparentLabel,m_internalTree->findNode(tqparentLabel)->firstChild()->label(),false );
+          m_internalTree->removeChildNode( grandParentLabel ,tqparentLabel, true );
           treeNode *node;
           for ( node = list.first(); node; node = list.next() ) {
             node->setParentLabel(grandParentLabel);
@@ -270,12 +270,12 @@ void VisualFrameEditor::removeNode(const TQString &l){
           }
         }
         else {
-          m_internalTree->findNode(parentLabel)->setSplitType( m_internalTree->findNode(parentLabel)->firstChild()->splitType() );
-          m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false );
+          m_internalTree->findNode(tqparentLabel)->setSplitType( m_internalTree->findNode(tqparentLabel)->firstChild()->splitType() );
+          m_internalTree->removeChildNode( tqparentLabel,m_internalTree->findNode(tqparentLabel)->firstChild()->label(),false );
           treeNode *node;
           for ( node = list.first(); node; node = list.next() ) {
-            node->setParentLabel(parentLabel);
-            m_internalTree->findNode(parentLabel)->addChildNode(node);
+            node->setParentLabel(tqparentLabel);
+            m_internalTree->findNode(tqparentLabel)->addChildNode(node);
           }
         }
       }
@@ -283,14 +283,14 @@ void VisualFrameEditor::removeNode(const TQString &l){
   }
 }
 
-void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){
+void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* tqparent){
   if(n->hasChildren()) {
     TQString splitterName("splitter"+TQString::number(++splitterIdNumber,10));
-    TQSplitter *splitter = new TQSplitter(parent,splitterName.ascii());
-    if(SIZES.contains(splitterName)) splitter->setSizes( SIZES[splitterName] );
+    TQSplitter *splitter = new TQSplitter(tqparent,splitterName.ascii());
+    if(SIZES.tqcontains(splitterName)) splitter->setSizes( SIZES[splitterName] );
     switch( n->splitType() ){
-      case VERTICAL : splitter->setOrientation(TQSplitter::Horizontal);break;
-      case HORIZONTAL : splitter->setOrientation(TQSplitter::Vertical);break;
+      case VERTICAL : splitter->setOrientation(Qt::Horizontal);break;
+      case HORIZONTAL : splitter->setOrientation(Qt::Vertical);break;
       default:break;
     }
     n->firstChild();
@@ -300,11 +300,11 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){
     }
   }
   else {
-    SelectableArea *sa=new SelectableArea(parent,n->label().ascii());
-    if(parent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast<TQSplitter *>(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize );
+    SelectableArea *sa=new SelectableArea(tqparent,n->label().ascii());
+    if(tqparent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast<TQSplitter *>(tqparent)->setResizeMode(sa->view(),TQSplitter::KeepSize );
     else
     if(!m_firstInsertedSA) m_firstInsertedSA = sa;
-    sa->view()->setGeometry(n->atts()->geometry());
+    sa->view()->setGeometry(n->atts()->tqgeometry());
     sa->setIdLabel( n->label() );
     sa->setSource( n->atts()->src() );
     connect(sa, TQT_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQT_SLOT(setGeometry(TQRect)));
@@ -335,7 +335,7 @@ TQString VisualFrameEditor::createFrameTag(areaAttribute *a){
     base.setPath( Project::ref()->projectBaseURL().path() );
     KURL u;
     u.setPath(Src);
-    tagMiddle+= (" src=\"" + QExtFileInfo::toRelative( u, base).path() + "\"");
+    tagMiddle+= (" src=\"" + TQExtFileInfo::toRelative( u, base).path() + "\"");
   }
 
   if( !Longdesc.isEmpty() )
@@ -371,11 +371,11 @@ TQString VisualFrameEditor::RCvalue(treeNode *n) {
   int lostPixels = (6*(child_number-1)); // 6 pixels are lost every time a splitter is drawn
 
   switch( n->splitType() ) {
-    case VERTICAL: percentage/=n->atts()->geometry().width();
-                                 for(int i=1;i<=child_number;++i) dimMap[i]=n->childrenList().at(i-1)->atts()->geometry().width();
+    case VERTICAL: percentage/=n->atts()->tqgeometry().width();
+                                 for(int i=1;i<=child_number;++i) dimMap[i]=n->tqchildrenList().at(i-1)->atts()->tqgeometry().width();
                                  break;
-    case HORIZONTAL: percentage/=n->atts()->geometry().height();
-                                      for(int i=1;i<=child_number;++i) dimMap[i]=n->childrenList().at(i-1)->atts()->geometry().height();
+    case HORIZONTAL: percentage/=n->atts()->tqgeometry().height();
+                                      for(int i=1;i<=child_number;++i) dimMap[i]=n->tqchildrenList().at(i-1)->atts()->tqgeometry().height();
                                       break;
     default:break;
   }
@@ -421,9 +421,9 @@ TQString VisualFrameEditor::formatStructure(){
   TQString s;
   int tabNum = 0;
   for ( TQStringList::Iterator it = nonFormattedStructure.begin(); it != nonFormattedStructure.end(); ++it ) {
-    if((*it).contains("<frameset")) tabNum++;
+    if((*it).tqcontains("<frameset")) tabNum++;
     else
-    if((*it).contains("</frameset>")) {
+    if((*it).tqcontains("</frameset>")) {
       tabNum--;
       s.truncate(s.length()-1);
     }
@@ -441,9 +441,9 @@ TQString VisualFrameEditor::framesetStructure() {
 }
 
 void VisualFrameEditor::setMarkupLanguage(const TQString& s){
-  if( s.contains("xhtml",false)!=0 ) m_markupLanguage = XHTML;
+  if( s.tqcontains("xhtml",false)!=0 ) m_markupLanguage = XHTML;
   else
-  if( s.contains("html",false)!=0 ) m_markupLanguage = HTML;
+  if( s.tqcontains("html",false)!=0 ) m_markupLanguage = HTML;
 }
 
 #include "visualframeeditor.moc"
diff --git a/quanta/components/framewizard/visualframeeditor.h b/quanta/components/framewizard/visualframeeditor.h
index 27cef614..c3b28b7b 100644
--- a/quanta/components/framewizard/visualframeeditor.h
+++ b/quanta/components/framewizard/visualframeeditor.h
@@ -29,6 +29,7 @@
 
 class VisualFrameEditor : public TQHBox  {
    Q_OBJECT
+  TQ_OBJECT
    private:
       enum MarkupLanguage{XHTML,HTML};
       tree *m_internalTree;
@@ -36,9 +37,9 @@ class VisualFrameEditor : public TQHBox  {
       TQStringList m_existingStructure;
       MarkupLanguage m_markupLanguage;
 
-      void buildInternalTree(const TQString &parent);
+      void buildInternalTree(const TQString &tqparent);
       void setGeometries(const TQString &l);
-      void drawGUI(treeNode *n, TQWidget* parent);
+      void drawGUI(treeNode *n, TQWidget* tqparent);
       TQStringList convertAsterisks(const TQString &s, int d);
 
       TQString createFrameTag(areaAttribute *a);
@@ -47,9 +48,9 @@ class VisualFrameEditor : public TQHBox  {
       void createStructure(treeNode* n);
 
    public:
-      VisualFrameEditor( TQWidget * parent = 0, const char * name = 0);
+      VisualFrameEditor( TQWidget * tqparent = 0, const char * name = 0);
       ~VisualFrameEditor();
-      void draw() { repaint(); }
+      void draw() { tqrepaint(); }
       void loadExistingStructure(const TQStringList &list);
       TQString framesetStructure();
       void removeNode(const TQString &l);
diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp
index bb581859..e9475242 100644
--- a/quanta/components/tableeditor/tableeditor.cpp
+++ b/quanta/components/tableeditor/tableeditor.cpp
@@ -48,8 +48,8 @@
 
 int newNum;
 
-TableEditor::TableEditor(TQWidget* parent, const char* name)
-  : TableEditorS(parent, name)
+TableEditor::TableEditor(TQWidget* tqparent, const char* name)
+  : TableEditorS(tqparent, name)
 {
   m_popup = new KPopupMenu();
   m_cellEditId = m_popup->insertItem(i18n("&Edit Cell Properties"), this ,TQT_SLOT(slotEditCell()));
@@ -152,7 +152,7 @@ void TableEditor::slotContextMenuRequested( int row, int col, const TQPoint & po
     TQTableSelection selection = m_dataTable->selection(m_dataTable->currentSelection());
     TQRect rect(TQPoint(selection.topRow(), selection.leftCol()) ,
                TQPoint(selection.bottomRow(), selection.rightCol()));
-    if (rect.isValid() && (rect.width() > 1 || rect.height() > 1) && rect.contains(m_row, m_col)) {
+    if (rect.isValid() && (rect.width() > 1 || rect.height() > 1) && rect.tqcontains(m_row, m_col)) {
        m_popup->setItemVisible(m_mergeCellsId, true);
        m_popup->setItemVisible(m_mergeSeparatorId, true);
     }
@@ -204,7 +204,7 @@ void TableEditor::slotEditRow()
 
 void TableEditor::slotEditCol()
 {
-  KMessageBox::information(this, i18n("Edit col: %1").arg(m_col + 1));
+  KMessageBox::information(this, i18n("Edit col: %1").tqarg(m_col + 1));
   TagDialog dlg(QuantaCommon::tagFromDTD(m_dtd,"col"));
   dlg.exec();
 }
@@ -411,7 +411,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser
                 m_colSpin->setValue(col);
             TableNode tableN = mergeMatrix[nRow - 1][col];
             Node *n = tableN.node;
-            setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(tableN.mergedCol + 1));
+            setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1));
             m_dataTable->item(nRow-1, col)->setEnabled(false);
             tableNode.node = new Node(0L);
             tableNode.node->tag = new Tag(*(n->tag));
@@ -451,7 +451,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser
               m_colSpin->setValue(col);
           TableNode tableN = mergeMatrix[nRow - 1][col];
           Node *n = tableN.node;
-          setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(tableN.mergedCol + 1));
+          setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1));
           m_dataTable->item(nRow-1, col)->setEnabled(false);
           tableNode.node = new Node(0L);
           tableNode.node->tag = new Tag(*(n->tag));
@@ -496,7 +496,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser
               m_colSpin->setValue(nCol);
             for (int i = 0; i < colValue - 1; i++)
             {
-              setCellText(m_dataTable, nRow - 1, lastCol + i, i18n("Merged with (%1, %2).").arg(nRow).arg(lastCol));
+              setCellText(m_dataTable, nRow - 1, lastCol + i, i18n("Merged with (%1, %2).").tqarg(nRow).tqarg(lastCol));
               m_dataTable->item(nRow-1, lastCol + i)->setEnabled(false);
               tableNode.node = new Node(0L);
               tableNode.node->tag = new Tag(*(n->tag));
@@ -713,11 +713,11 @@ TQString TableEditor::indent( int n )
 TQString TableEditor::cellValue( int row, int col )
 {
  if (!m_dataTable)
-    return TQString::null;
+    return TQString();
  TQString str;
  Node *node = (*m_tableTags)[row][col].node;
  if (!node)
-   return TQString::null;
+   return TQString();
  str = node->tag->toString();
  str += m_dataTable->text(row, col);
  str += "</" + QuantaCommon::tagCase(node->tag->name) + ">";
@@ -758,7 +758,7 @@ TQString TableEditor::tableToString()
 TQString TableEditor::tagContent(Node *node)
 {
   if (!node)
-    return TQString::null;
+    return TQString();
   TQString content;
   int bl, bc, el, ec;
   node->tag->endPos(bl, bc);
@@ -775,7 +775,7 @@ TQString TableEditor::tagContent(Node *node)
       n->tag->beginPos(el, ec);
       ec--;
     } else {
-      return TQString::null;
+      return TQString();
     }
   }
  content = m_write->text(bl, bc, el, ec);
@@ -919,12 +919,12 @@ void TableEditor::slotRemoveRow()
     if ((*it3).merged)
     {
       TableNode *mainTableNode = &((*m_tableTags)[(*it3).mergedRow][(*it3).mergedCol]);
-      if (mainTableNode->node && !updatedMainNodes.contains(mainTableNode))
+      if (mainTableNode->node && !updatedMainNodes.tqcontains(mainTableNode))
       {
         int rowspan =  mainTableNode->node->tag->attributeValue("rowspan", true).toInt();
         rowspan--;
         if (rowspan > 1)
-          mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(rowspan));
+          mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(rowspan));
         else
           mainTableNode->node->tag->deleteAttribute("rowspan");
         updatedMainNodes.append(mainTableNode);
@@ -970,12 +970,12 @@ void TableEditor::slotRemoveCol()
     if ((*it2).merged)
     {
       TableNode *mainTableNode = &((*m_tableTags)[(*it2).mergedRow][(*it2).mergedCol]);
-      if (mainTableNode->node && !updatedMainNodes.contains(mainTableNode))
+      if (mainTableNode->node && !updatedMainNodes.tqcontains(mainTableNode))
       {
         int colspan = mainTableNode->node->tag->attributeValue("colspan", true).toInt();
         colspan--;
         if (colspan > 1)
-          mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(colspan));
+          mainTableNode->node->tag->editAttribute("colspan", TQString("%1").tqarg(colspan));
         else
           mainTableNode->node->tag->deleteAttribute("colspan");
         updatedMainNodes.append(mainTableNode);
@@ -1054,13 +1054,13 @@ void TableEditor::slotMergeCells()
   rCol = selection.rightCol();
   TableNode *mainTableNode = &((*m_tableTags)[tRow][lCol]);
   if (rCol - lCol > 0)
-    mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(rCol - lCol + 1));
+    mainTableNode->node->tag->editAttribute("colspan", TQString("%1").tqarg(rCol - lCol + 1));
   if (bRow - tRow > 0)
-    mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(bRow - tRow + 1));
+    mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(bRow - tRow + 1));
   for (int i = 0; i < bRow - tRow + 1; i++)
     for (int j = 0; j < rCol - lCol + 1; j++) {
       if (i != 0 || j != 0) {
-        setCellText(m_dataTable, tRow + i, lCol + j, i18n("Merged with (%1, %2).").arg(tRow + 1).arg(lCol + 1));
+        setCellText(m_dataTable, tRow + i, lCol + j, i18n("Merged with (%1, %2).").tqarg(tRow + 1).tqarg(lCol + 1));
         m_dataTable->item(tRow + i, lCol + j)->setEnabled(false);
         TableNode *tableNode = &((*m_tableTags)[tRow + i][lCol + j]);
         Node::deleteNode(tableNode->node);
@@ -1163,7 +1163,7 @@ void TableEditor::slotEditChildTable()
     table = *it;
     if (table.row == m_row  && table.col == m_col) {
       TQString cellData = m_dataTable->text(table.row, table.col);
-      int pos = cellData.find(table.nestedData);
+      int pos = cellData.tqfind(table.nestedData);
       if (pos == -1) {
         KMessageBox::error(this, i18n("Cannot edit the child table; you probably modified the cell containing the table manually."), i18n("Cannot Read Table"));
         error = true;
@@ -1182,9 +1182,9 @@ void TableEditor::slotEditChildTable()
       baseNode = localParser->parse(w);
       tempDocCreated = true;
       //try to find the child table position
-      int pos2 = tableData.find(cellData);
+      int pos2 = tableData.tqfind(cellData);
       if (pos2 != -1)
-        pos2 = tableData.find(table.nestedData, pos2);
+        pos2 = tableData.tqfind(table.nestedData, pos2);
       else {
         KMessageBox::error(this, i18n("Cannot edit the child table; you probably modified the cell containing the table manually."), i18n("Cannot Read Table"));
         error = true;
@@ -1192,8 +1192,8 @@ void TableEditor::slotEditChildTable()
         break;
       }
       tableData = tableData.left(pos2);
-      table.bLine = tableData.contains('\n');
-      pos2 = tableData.findRev('\n');
+      table.bLine = tableData.tqcontains('\n');
+      pos2 = tableData.tqfindRev('\n');
       if (pos2 != -1) {
         table.bCol = tableData.length() - pos2;
       } else {
@@ -1214,7 +1214,7 @@ void TableEditor::slotEditChildTable()
       if (editor.exec()) {
        int length = table.nestedData.length();
        (*it).nestedData =  editor.readModifiedTable();
-       cellData.replace(pos, length, (*it).nestedData);
+       cellData.tqreplace(pos, length, (*it).nestedData);
        setCellText(m_dataTable, table.row, table.col, cellData);
       }
       //cleanup on success
@@ -1271,27 +1271,27 @@ void TableEditor::configureCell(int row, int col, Node * node)
      return;
    // Header (TH) or standard cell?
    item->setHeader(node->tag->name.lower() == "th");
-   // Horizontal alignment
-   Qt::AlignmentFlags flags;
+   //Qt::Horizontal tqalignment
+   TQt::AlignmentFlags flags;
    TQString align = node->tag->attributeValue("align", true);
    if (align == "right")
-     flags = Qt::AlignRight;
+     flags = TQt::AlignRight;
    else if (align == "center")
-     flags = Qt::AlignHCenter;
+     flags = TQt::AlignHCenter;
    else if (align == "justify")
-     flags = Qt::AlignJustify;
+     flags = TQt::AlignJustify;
    else if (align.isEmpty() && item->header())
-     flags = Qt::AlignHCenter;   // TH is centered by default
+     flags = TQt::AlignHCenter;   // TH is centered by default
    else
-     flags = Qt::AlignLeft;
-   item->setAlignment(flags);
-   // Vertical alignment
+     flags = TQt::AlignLeft;
+   item->tqsetAlignment(flags);
+   //Qt::Vertical tqalignment
    TQString valign = node->tag->attributeValue("valign", true);
    if (valign == "top")
-     flags = Qt::AlignTop;
+     flags = TQt::AlignTop;
    else if (valign == "bottom")
-     flags = Qt::AlignBottom;
-   else flags = Qt::AlignVCenter;
+     flags = TQt::AlignBottom;
+   else flags = TQt::AlignVCenter;
    item->setVAlignment(flags);
 }
 
diff --git a/quanta/components/tableeditor/tableeditor.h b/quanta/components/tableeditor/tableeditor.h
index 3b913811..f8e7cf40 100644
--- a/quanta/components/tableeditor/tableeditor.h
+++ b/quanta/components/tableeditor/tableeditor.h
@@ -47,9 +47,10 @@ class Parser;
 class TableEditor : public TableEditorS
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  TableEditor( TQWidget* parent = 0, const char* name = 0 );
+  TableEditor( TQWidget* tqparent = 0, const char* name = 0 );
   ~TableEditor();
 
   virtual bool setTableArea( int bLine, int bCol, int eLine, int eCol, Parser * docParser );
@@ -65,7 +66,7 @@ public:
 public slots:
   virtual void slotContextMenuRequested( int row, int col, const TQPoint & pos );
   virtual void slotEditCell();
-  // Wrapper for setText to use TableItem instead of QTableItem
+  // Wrapper for setText to use TableItem instead of TQTableItem
   virtual void slotEditCellText( int r, int );
   virtual void slotEditRow();
   virtual void slotEditCol();
diff --git a/quanta/components/tableeditor/tableeditors.ui b/quanta/components/tableeditor/tableeditors.ui
index 88def66d..04af473c 100644
--- a/quanta/components/tableeditor/tableeditors.ui
+++ b/quanta/components/tableeditor/tableeditors.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>TableEditorS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>TableEditorS</cstring>
     </property>
@@ -40,7 +40,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -78,11 +78,11 @@
                 <bool>true</bool>
             </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>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -93,7 +93,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <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>textLabel5</cstring>
                         </property>
@@ -104,7 +104,7 @@
                             <cstring>tableData</cstring>
                         </property>
                     </widget>
-                    <widget class="QTable" row="4" column="0" rowspan="1" colspan="4">
+                    <widget class="TQTable" row="4" column="0" rowspan="1" colspan="4">
                         <property name="name">
                             <cstring>tableData</cstring>
                         </property>
@@ -142,7 +142,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>276</width>
                                 <height>20</height>
@@ -159,14 +159,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>276</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QSpinBox" row="0" column="1">
+                    <widget class="TQSpinBox" row="0" column="1">
                         <property name="name">
                             <cstring>rowSpinBox</cstring>
                         </property>
@@ -177,7 +177,7 @@
                             <number>0</number>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>textLabel2</cstring>
                         </property>
@@ -188,7 +188,7 @@
                             <cstring>colSpinBox</cstring>
                         </property>
                     </widget>
-                    <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="3">
+                    <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>captionText</cstring>
                         </property>
@@ -209,7 +209,7 @@
                             <string>&amp;Table Properties</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>textLabel3</cstring>
                         </property>
@@ -228,7 +228,7 @@
                             <cstring>captionText</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>textLabel1</cstring>
                         </property>
@@ -239,7 +239,7 @@
                             <cstring>rowSpinBox</cstring>
                         </property>
                     </widget>
-                    <widget class="QSpinBox" row="1" column="1">
+                    <widget class="TQSpinBox" row="1" column="1">
                         <property name="name">
                             <cstring>colSpinBox</cstring>
                         </property>
@@ -252,7 +252,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -263,7 +263,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QFrame" row="1" column="0" rowspan="1" colspan="3">
+                    <widget class="TQFrame" row="1" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>frame3</cstring>
                         </property>
@@ -280,7 +280,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QTable" row="3" column="0" rowspan="1" colspan="3">
+                            <widget class="TQTable" row="3" column="0" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>headerTableData</cstring>
                                 </property>
@@ -313,14 +313,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>340</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QSpinBox" row="0" column="1">
+                            <widget class="TQSpinBox" row="0" column="1">
                                 <property name="name">
                                     <cstring>headerRowSpinBox</cstring>
                                 </property>
@@ -331,7 +331,7 @@
                                     <number>0</number>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>textLabel4_2</cstring>
                                 </property>
@@ -342,7 +342,7 @@
                                     <cstring>headerRowSpinBox</cstring>
                                 </property>
                             </widget>
-                            <widget class="QSpinBox" row="1" column="1">
+                            <widget class="TQSpinBox" row="1" column="1">
                                 <property name="name">
                                     <cstring>headerColSpinBox</cstring>
                                 </property>
@@ -350,7 +350,7 @@
                                     <number>999</number>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>textLabel4</cstring>
                                 </property>
@@ -361,7 +361,7 @@
                                     <cstring>headerColSpinBox</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>textLabel6</cstring>
                                 </property>
@@ -374,7 +374,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QCheckBox" row="0" column="0">
+                    <widget class="TQCheckBox" row="0" column="0">
                         <property name="name">
                             <cstring>headerCheckBox</cstring>
                         </property>
@@ -392,7 +392,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>40</width>
                                 <height>20</height>
@@ -412,7 +412,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -423,7 +423,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QFrame" row="1" column="0" rowspan="1" colspan="3">
+                    <widget class="TQFrame" row="1" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>frame3_2</cstring>
                         </property>
@@ -440,7 +440,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QTable" row="3" column="0" rowspan="1" colspan="3">
+                            <widget class="TQTable" row="3" column="0" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>footerTableData</cstring>
                                 </property>
@@ -466,7 +466,7 @@
                                     <enum>FollowStyle</enum>
                                 </property>
                             </widget>
-                            <widget class="QSpinBox" row="0" column="1">
+                            <widget class="TQSpinBox" row="0" column="1">
                                 <property name="name">
                                     <cstring>footerRowSpinBox</cstring>
                                 </property>
@@ -477,7 +477,7 @@
                                     <number>0</number>
                                 </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>
@@ -488,7 +488,7 @@
                                     <cstring>footerRowSpinBox</cstring>
                                 </property>
                             </widget>
-                            <widget class="QSpinBox" row="1" column="1">
+                            <widget class="TQSpinBox" row="1" column="1">
                                 <property name="name">
                                     <cstring>footerColSpinBox</cstring>
                                 </property>
@@ -496,7 +496,7 @@
                                     <number>999</number>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>textLabel4_3</cstring>
                                 </property>
@@ -507,7 +507,7 @@
                                     <cstring>footerColSpinBox</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>textLabel6_2</cstring>
                                 </property>
@@ -528,7 +528,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>340</width>
                                         <height>20</height>
@@ -537,7 +537,7 @@
                             </spacer>
                         </grid>
                     </widget>
-                    <widget class="QCheckBox" row="0" column="0">
+                    <widget class="TQCheckBox" row="0" column="0">
                         <property name="name">
                             <cstring>footerCheckBox</cstring>
                         </property>
@@ -555,7 +555,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>40</width>
                                 <height>20</height>
@@ -638,5 +638,5 @@
     <tabstop>footerColSpinBox</tabstop>
     <tabstop>footerTableData</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/components/tableeditor/tableitem.cpp b/quanta/components/tableeditor/tableitem.cpp
index 60625d95..b877df76 100644
--- a/quanta/components/tableeditor/tableitem.cpp
+++ b/quanta/components/tableeditor/tableitem.cpp
@@ -21,23 +21,23 @@
 TableItem::TableItem(TQTable* table, EditType et) : TQTableItem(table, et)
 {
   setReplaceable(false);
-  m_halign = Qt::AlignLeft;
-  m_valign = Qt::AlignVCenter;
+  m_halign = TQt::AlignLeft;
+  m_valign = TQt::AlignVCenter;
 }
 
 TableItem::TableItem(TQTable* table, EditType et, const TQString& text) : TQTableItem(table, et, text)
 {
   setReplaceable(false);
-  m_halign = Qt::AlignLeft;
-  m_valign = Qt::AlignVCenter;
+  m_halign = TQt::AlignLeft;
+  m_valign = TQt::AlignVCenter;
 }
 
 TableItem::TableItem (TQTable* table, EditType et, const TQString& text, const TQPixmap& p) :
   TQTableItem(table, et, text, p)
 {
   setReplaceable(false);
-  m_halign = Qt::AlignLeft;
-  m_valign = Qt::AlignVCenter;
+  m_halign = TQt::AlignLeft;
+  m_valign = TQt::AlignVCenter;
 }
 
 TQWidget* TableItem::createEditor() const
@@ -84,9 +84,9 @@ void TableItem::paint(TQPainter* p, const TQColorGroup& cg, const TQRect& cr, bo
      p->drawText(4, 4, cr0.width()-8, cr0.height()-8, m_halign | m_valign | WordBreak, text());
 }
 
-TQSize TableItem::sizeHint() const
+TQSize TableItem::tqsizeHint() const
 {
-   TQSize size = TQTableItem::sizeHint();
+   TQSize size = TQTableItem::tqsizeHint();
    size.setWidth(size.width()+8);
    size.setHeight(size.height()+8);
    return size;
diff --git a/quanta/components/tableeditor/tableitem.h b/quanta/components/tableeditor/tableitem.h
index 88c94e20..66d3b85b 100644
--- a/quanta/components/tableeditor/tableitem.h
+++ b/quanta/components/tableeditor/tableitem.h
@@ -20,31 +20,31 @@
 #include <tqtable.h>
 #include <kdeversion.h>
 
-class TableItem : public QTableItem
+class TableItem : public TQTableItem
 {
 private:
-  Qt::AlignmentFlags m_halign;
-  Qt::AlignmentFlags m_valign;
+  TQt::AlignmentFlags m_halign;
+  TQt::AlignmentFlags m_valign;
   bool m_header;
 public:
-  // Standard constructors copied from QTableItem
+  // Standard constructors copied from TQTableItem
   TableItem(TQTable* table, EditType et);
   TableItem(TQTable* table, EditType et, const TQString& text);
   TableItem (TQTable* table, EditType et, const TQString& text, const TQPixmap& p);
-  // Use TQTextEdit instead of standard QLineEdit
+  // Use TQTextEdit instead of standard TQLineEdit
   virtual TQWidget* createEditor() const;
-  // Get text from QTextEdit
+  // Get text from TQTextEdit
   virtual void setContentFromEditor(TQWidget *w);
-  // Paint cell - handle alignment (horizontal and vertical) and bold for header
+  // Paint cell - handle tqalignment (horizontal and vertical) and bold for header
   virtual void paint(TQPainter* p, const TQColorGroup& cg, const TQRect& cr, bool selected);
-  // Return A bit larger sizeHint because TQTextEdit has some margin around
-  virtual TQSize sizeHint() const;
+  // Return A bit larger tqsizeHint because TQTextEdit has some margin around
+  virtual TQSize tqsizeHint() const;
   // Get and set vertical aligment
-  Qt::AlignmentFlags vAlignment()	{return m_valign;}
-  void setVAlignment(Qt::AlignmentFlags flags)	{m_valign = flags;}
+  TQt::AlignmentFlags vAlignment()	{return m_valign;}
+  void setVAlignment(TQt::AlignmentFlags flags)	{m_valign = flags;}
   // Get and set horizontal aligment
-  Qt::AlignmentFlags alignment()	{return m_halign;}
-  void setAlignment(Qt::AlignmentFlags flags)	{m_halign = flags;}
+  TQt::AlignmentFlags tqalignment()	{return m_halign;}
+  void tqsetAlignment(TQt::AlignmentFlags flags)	{m_halign = flags;}
   // Get and set header status (use true for TH, false for TD)
   bool header()	{return m_header;}
   void setHeader(bool h)  {m_header = h;}
diff --git a/quanta/data/chars b/quanta/data/chars
index e5d2a4f4..eef828a5 100644
--- a/quanta/data/chars
+++ b/quanta/data/chars
@@ -5,8 +5,8 @@ $ (&#036;) Dollar sign
 % (&#037;) Percent sign
 & (&amp;) Ampersand
 ' (&apos;) Apostrophe
-( (&#040;) Left parenthesis
-) (&#041;) Right parenthesis
+( (&#040;) Left tqparenthesis
+) (&#041;) Right tqparenthesis
 * (&#042;) Asterisk
 + (&#043;) Plus sign
 , (&#044;) Comma
@@ -27,7 +27,7 @@ $ (&#036;) Dollar sign
 _ (&#095;) Underscore
 ` (&#096;) Grave accent
 { (&#123;) Left curly brace
-| (&#124;) Vertical bar
+| (&#124;)Qt::Vertical bar
 } (&#125;) Right curly brace
 ~ (&#126;) Tilde
   (&nbsp;) Nonbreaking space
@@ -157,7 +157,7 @@ _ (&#095;) Underscore
 † (&dagger;) Dagger
 ‡ (&Dagger;) Double Dagger
 • (&bull;) Bullet
-… (&hellip;) Horizontal Ellipsis
+… (&hellip;)Qt::Horizontal Ellipsis
 ‰ (&permil;) Per Mille sign
 ‹ (&lsaquo;) Single Left-Pointing Angle Quotation mark
 › (&rsaquo;) Single Right-Pointing Angle Quotation mark
diff --git a/quanta/data/doc/faq.html b/quanta/data/doc/faq.html
index e48a438d..2f5fb651 100644
--- a/quanta/data/doc/faq.html
+++ b/quanta/data/doc/faq.html
@@ -126,11 +126,11 @@
             <div class="fltop"><a href="#top">Top</a></div>
             <div class="minihdr">2.3 Compiling Quanta Plus</div>
             <div class="indent">
-             <p>An assumption is made that you have the knowledge and ability to find and install any missing libraries that you may encounter.  Basically, you need the headers from KDE, Qt, and GCC.  If you don't know what was just said, then try the steps below and, if it doesn't work for you, then find yourself a Linux geek that can help.</p>
+             <p>An assumption is made that you have the knowledge and ability to find and install any missing libraries that you may encounter.  Basically, you need the headers from KDE, TQt, and GCC.  If you don't know what was just said, then try the steps below and, if it doesn't work for you, then find yourself a Linux geek that can help.</p>
              <p>Type the following in a shell and see what you get:</p>
              <ul>
               <li>test `echo $KDEDIR` &amp;&amp; echo "yes" || echo "noKDE"</li>
-              <li>test `echo $QTDIR` &amp;&amp; echo "yes" || echo "noQT"</li>
+              <li>test `echo $TQTDIR` &amp;&amp; echo "yes" || echo "noQT"</li>
              </ul>
              <p>If you don't get two yes answers, then you need to find the location of the one that failed and export it to your current shell environment.</p>
              <p>Then it is as simple as:</p>
@@ -145,7 +145,7 @@
             <div class="fltop"><a href="#top">Top</a></div>
             <div class="minihdr">2.4 I get error <i>X</i> when running ./configure</div>
             <div class="indent">
-              <p>Please read 2.3 carefully again and make certain that you have exported the $KDEDIR and $QTDIR environment variables.  This is the most likely cause.  Aside from that, if you are missing something very important, then configure will tell you what it needs.</p>
+              <p>Please read 2.3 carefully again and make certain that you have exported the $KDEDIR and $TQTDIR environment variables.  This is the most likely cause.  Aside from that, if you are missing something very important, then configure will tell you what it needs.</p>
             </div>
             <a name="2.5" />
             <div class="fltop"><a href="#top">Top</a></div>
diff --git a/quanta/data/doc/templates.html b/quanta/data/doc/templates.html
index 3043187e..0e6f3e82 100644
--- a/quanta/data/doc/templates.html
+++ b/quanta/data/doc/templates.html
@@ -145,7 +145,7 @@ cool things we took into consideration when using templates in projects.
 <p>Our goal with templates is to extend them to include multi file "concept" templates useful
 for things like placing an order or creating an about section, Ideally this will be a tool for 
 making your work more productive and dynamic. An eventual goal is to have a structural template
-design mode to deal with site layout and structure which you could use to design and interactively
+design mode to deal with site tqlayout and structure which you could use to design and interactively
 update your sites. If you would like to be involved contact us.
 </p>
 <br>
diff --git a/quanta/data/doc/tips.html b/quanta/data/doc/tips.html
index 9efe6822..81b26204 100644
--- a/quanta/data/doc/tips.html
+++ b/quanta/data/doc/tips.html
@@ -105,7 +105,7 @@
           <li>You always have control where you place your templates so you can choose to move them. However, Quanta Plus does not track this, so you will need to change links. This is a good task for KFileReplace, which is now a plug-in as a KPart!</li>
          </ul>
          <p class="minihdr">Templates conclusion</p>
-         <p>Our goal with templates is to extend them to include multi-file "concept" templates, useful for certain things, like placing an order or creating an about section. Ideally this will be a tool for making your work more productive and dynamic. An eventual goal is to have a structural template design mode to deal with site layout and structure which you could use to design and interactively update your sites. If you would like to be involved, then contact us. </p>
+         <p>Our goal with templates is to extend them to include multi-file "concept" templates, useful for certain things, like placing an order or creating an about section. Ideally this will be a tool for making your work more productive and dynamic. An eventual goal is to have a structural template design mode to deal with site tqlayout and structure which you could use to design and interactively update your sites. If you would like to be involved, then contact us. </p>
          <a name="toolbars" />
          <h2>Quanta Plus Toolbars</h2>
          <p class="minihdr">Toolbar Description</p>
diff --git a/quanta/data/dtep/cffunct/bitmaskset.tag b/quanta/data/dtep/cffunct/bitmaskset.tag
index 42289ce6..0e57dec9 100644
--- a/quanta/data/dtep/cffunct/bitmaskset.tag
+++ b/quanta/data/dtep/cffunct/bitmaskset.tag
@@ -2,7 +2,7 @@
 <TAGS>
 	<tag name="BitMaskSet" type="function" returnType="number">
 		<attr name="number" type="int" status="required" />
-		<attr name="mask" type="int" status="required" />
+		<attr name="tqmask" type="int" status="required" />
 		<attr name="start" type="int" status="required" />
 		<attr name="length" type="int" status="required" />
 	</tag>
diff --git a/quanta/data/dtep/cffunct/datetime.tag b/quanta/data/dtep/cffunct/datetime.tag
index a2f29126..bd5b4e04 100644
--- a/quanta/data/dtep/cffunct/datetime.tag
+++ b/quanta/data/dtep/cffunct/datetime.tag
@@ -54,7 +54,7 @@
 	</tag>
 	<tag name="DateFormat" type="function" returnType="date">
 		<attr name="date" type="object" status="required" />
-		<attr name="mask" type="object" status="optional" />
+		<attr name="tqmask" type="object" status="optional" />
 	</tag>
 	<tag name="DatePart" type="function" returnType="int">
 		<attr name="datepart" type="string" status="required" />
diff --git a/quanta/data/dtep/cfml/cfldap.tag b/quanta/data/dtep/cfml/cfldap.tag
index 9d77cd77..497d51aa 100644
--- a/quanta/data/dtep/cfml/cfldap.tag
+++ b/quanta/data/dtep/cfml/cfldap.tag
@@ -43,7 +43,7 @@
 		<items>
 			<item>add</item>
 			<item>delete</item>
-			<item>replace</item>
+			<item>tqreplace</item>
 		</items>
 	</attr>
 	<attr name="rebind" type="list">
diff --git a/quanta/data/dtep/cfml/cftreeitem.tag b/quanta/data/dtep/cfml/cftreeitem.tag
index 2e54a59a..710ddd6f 100644
--- a/quanta/data/dtep/cfml/cftreeitem.tag
+++ b/quanta/data/dtep/cfml/cftreeitem.tag
@@ -3,7 +3,7 @@
 <tag name="cftreeitem" single="1">
 	<attr name="value" />
 	<attr name="display" />
-	<attr name="parent" />
+	<attr name="tqparent" />
 	<attr name="img" type="list">
 		<items>
 			<item>cd</item>
diff --git a/quanta/data/dtep/css/table-layout.tag b/quanta/data/dtep/css/table-layout.tag
index 36306882..4e47f267 100644
--- a/quanta/data/dtep/css/table-layout.tag
+++ b/quanta/data/dtep/css/table-layout.tag
@@ -1,6 +1,6 @@
 <!DOCTYPE tags>
 <tags>
-  <tag name="table-layout" type="property">
+  <tag name="table-tqlayout" type="property">
      <attr name="value" type="list">
        <items>
 		 <item>auto</item>
diff --git a/quanta/data/dtep/css/unicode-bidi.tag b/quanta/data/dtep/css/unicode-bidi.tag
index cb3b4cf8..b0d9024d 100644
--- a/quanta/data/dtep/css/unicode-bidi.tag
+++ b/quanta/data/dtep/css/unicode-bidi.tag
@@ -1,6 +1,6 @@
 <!DOCTYPE tags>
 <tags>
-  <tag name="unicode-bidi" type="property">
+  <tag name="tqunicode-bidi" type="property">
      <attr name="value" type="list">
        <items>
          <item>normal</item>
diff --git a/quanta/data/dtep/docbook-4.2/a.tag b/quanta/data/dtep/docbook-4.2/a.tag
index 2e5e1355..367eaca6 100644
--- a/quanta/data/dtep/docbook-4.2/a.tag
+++ b/quanta/data/dtep/docbook-4.2/a.tag
@@ -253,8 +253,8 @@
   </attr>
  </tag>
  <tag name="article" hasCore="1">
-  <attr name="parentbook" type="input">
-   <text>parentbook</text>
+  <attr name="tqparentbook" type="input">
+   <text>tqparentbook</text>
    <textlocation row="0" col="0" />
    <location row="0" col="1" />
   </attr>
diff --git a/quanta/data/dtep/docbook-4.2/l.tag b/quanta/data/dtep/docbook-4.2/l.tag
index 08737456..b94155dc 100644
--- a/quanta/data/dtep/docbook-4.2/l.tag
+++ b/quanta/data/dtep/docbook-4.2/l.tag
@@ -41,7 +41,7 @@
    </items>
   </attr>
  </tag>
- <tag name="literallayout" hasCore="1">
+ <tag name="literaltqlayout" hasCore="1">
   <attr name="width" type="input">
    <text>width</text>
    <textlocation row="0" col="0" />
diff --git a/quanta/data/dtep/docbook-4.2/s.tag b/quanta/data/dtep/docbook-4.2/s.tag
index 1a616cc1..45e0e481 100644
--- a/quanta/data/dtep/docbook-4.2/s.tag
+++ b/quanta/data/dtep/docbook-4.2/s.tag
@@ -470,7 +470,7 @@
     <item>ipaddress</item>
     <item>library</item>
     <item>macro</item>
-    <item>netmask</item>
+    <item>nettqmask</item>
     <item>newsgroup</item>
     <item>osname</item>
     <item>resource</item>
diff --git a/quanta/data/dtep/dtd-description.txt b/quanta/data/dtep/dtd-description.txt
index 3c55890d..b66ad8c6 100644
--- a/quanta/data/dtep/dtd-description.txt
+++ b/quanta/data/dtep/dtd-description.txt
@@ -172,7 +172,7 @@ TypeRx = regular expression to find the type of the element. The pattern is
         DefinitionRx =\$+([a-zA-Z]+)=new\\s[a-zA-Z]+;
         TypeRx = new\\s([a-zA-Z]+);
         This will match strings like "$fooObj=new foo;". Now this string is
-        searched and it will find "new foo;", where "foo" is the first
+        searched and it will tqfind "new foo;", where "foo" is the first
         captured text (the regular expression matching foo is between brackets).
         So the type of "$fooObj" is "foo".
 
@@ -185,7 +185,7 @@ ClearRx = OBSOLETED by DefinitionRx. Don't use it.
 [Parsing rules]
 AreaBorders = comma separated list of the area borders encapsulating this pseudo
     DTD. In case of PHP it is: <? ?>, <* *>, <% %>
-Tags = tagname(attribute[defaultvalue]). If the parent(real) DTD has a tag with tagname and
+Tags = tagname(attribute[defaultvalue]). If the tqparent(real) DTD has a tag with tagname and
     the attribute value of this tag is equal with the DTD name, the tag area
     is parsed according to the rules of this DTD. If [defaultvalue] is present, it means that if the attribute
     is not present in the tag it's taken as present with value = defaultvalue. Example:
diff --git a/quanta/data/dtep/html-frameset/font.tag b/quanta/data/dtep/html-frameset/font.tag
index 2e38aa2c..1c8aa521 100644
--- a/quanta/data/dtep/html-frameset/font.tag
+++ b/quanta/data/dtep/html-frameset/font.tag
@@ -31,7 +31,7 @@
                 <item>-4</item>
         </items>
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -71,7 +71,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
 
diff --git a/quanta/data/dtep/html-frameset/frame.tag b/quanta/data/dtep/html-frameset/frame.tag
index 0cf37a05..44b8fd0c 100644
--- a/quanta/data/dtep/html-frameset/frame.tag
+++ b/quanta/data/dtep/html-frameset/frame.tag
@@ -9,10 +9,10 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="frameset" />
 <child name="head" />
-</children>
+</tqchildren>
 
 </tag>
 
diff --git a/quanta/data/dtep/html-frameset/frameset.tag b/quanta/data/dtep/html-frameset/frameset.tag
index 0c830af5..c32bd8ae 100644
--- a/quanta/data/dtep/html-frameset/frameset.tag
+++ b/quanta/data/dtep/html-frameset/frameset.tag
@@ -26,10 +26,10 @@
         <textlocation col="0" row="4" />
         <location col="1" row="4"  colspan="2"/>
     </attr>
-<children>
+<tqchildren>
 <child name="frame" />
 <child name="frameset" />
 <child name="noframes" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/a.tag b/quanta/data/dtep/html-strict/a.tag
index a10e1c04..471badb7 100644
--- a/quanta/data/dtep/html-strict/a.tag
+++ b/quanta/data/dtep/html-strict/a.tag
@@ -109,9 +109,9 @@
     <attr name="charset"> </attr>
     <attr name="accesskey"> </attr>
     <attr name="tabindex"> </attr>
-    <attr name="shape"> </attr>
+    <attr name="tqshape"> </attr>
     <attr name="coords"> </attr>
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -143,11 +143,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="abbr" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -180,11 +180,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="acronym" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -217,11 +217,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="address" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -254,12 +254,12 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="area" hasScript="1" hasCore="1" hasI18n="1" single="1">
 
-    <attr name="shape" type="list">
+    <attr name="tqshape" type="list">
         <text>Shape</text>
         <textlocation col="0" row="0" />
         <location col="1" row="0" colspan="2"/>
diff --git a/quanta/data/dtep/html-strict/b.tag b/quanta/data/dtep/html-strict/b.tag
index 47424fe8..d2bb30da 100644
--- a/quanta/data/dtep/html-strict/b.tag
+++ b/quanta/data/dtep/html-strict/b.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="b" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -35,7 +35,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="base" single="1">
@@ -71,7 +71,7 @@
     <textlocation col="0" row="1" />
     <location col="1" row="1" colspan="2" />
   </attr>
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -104,11 +104,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="big" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -141,7 +141,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="blockquote" hasScript="1" hasCore="1" hasI18n="1">
@@ -163,7 +163,7 @@
                 <item>RTL</item>
         </items>
     </attr>
-<children>
+<tqchildren>
 <child name="p" />
  <child name="h1" />
  <child name="h2" />
@@ -184,7 +184,7 @@
  <child name="fieldset" />
  <child name="address" />
  <child name="script" />
- </children>
+ </tqchildren>
 
 </tag>
 
@@ -246,7 +246,7 @@
     <attr name="leftmargin"> </attr>
     <attr name="marginwidth"> </attr>
     <attr name="marginheight"> </attr>
-<children>
+<tqchildren>
 <child name="p" />
  <child name="h1" />
  <child name="h2" />
@@ -269,7 +269,7 @@
  <child name="script" />
  <child name="ins" />
  <child name="del" />
- </children>
+ </tqchildren>
 
 </tag>
 <tag name="br" hasCore="1" single="1">
@@ -316,7 +316,7 @@
     <textlocation col="0" row="3" />
     <location col="1" row="3" colspan="2" />
   </attr>
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -360,6 +360,6 @@
  <child name="hr" />
  <child name="table" />
  <child name="address" />
- </children>
+ </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/c.tag b/quanta/data/dtep/html-strict/c.tag
index e22bc9d3..25afb2f1 100644
--- a/quanta/data/dtep/html-strict/c.tag
+++ b/quanta/data/dtep/html-strict/c.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="caption" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -35,11 +35,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="cite" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -72,11 +72,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="code" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -109,7 +109,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="col" hasScript="1" hasCore="1" hasI18n="1" single="1">
@@ -164,14 +164,14 @@
     <attr name="char" type="input">
         <text>Character</text>
         <textlocation col="0" row="4" />
-        <tooltip>alignment character for cells</tooltip>
+        <tooltip>tqalignment character for cells</tooltip>
         <location col="1" row="4" />
     </attr>
 
     <attr name="charoff" type="input">
         <text>Character offset</text>
         <textlocation col="0" row="5" />
-        <tooltip>alignment character offset</tooltip>
+        <tooltip>tqalignment character offset</tooltip>
         <location col="1" row="5" />
     </attr>
 
@@ -232,19 +232,19 @@
     <attr name="char" type="input">
         <text>Character</text>
         <textlocation col="0" row="4" />
-        <tooltip>alignment character for cells</tooltip>
+        <tooltip>tqalignment character for cells</tooltip>
         <location col="1" row="4" />
     </attr>
 
     <attr name="charoff" type="input">
         <text>Character offset</text>
         <textlocation col="0" row="5" />
-        <tooltip>alignment character offset</tooltip>
+        <tooltip>tqalignment character offset</tooltip>
         <location col="1" row="5" />
     </attr>
-<children>
+<tqchildren>
 <child name="col" usage="required" />
-</children>
+</tqchildren>
     <stoppingtags>
         <stoppingtag name="colgroup" />
         <stoppingtag name="tbody" />
diff --git a/quanta/data/dtep/html-strict/d.tag b/quanta/data/dtep/html-strict/d.tag
index bef94ba9..d9ef7134 100644
--- a/quanta/data/dtep/html-strict/d.tag
+++ b/quanta/data/dtep/html-strict/d.tag
@@ -6,7 +6,7 @@
     <stoppingtag name="dt" />
     <stoppingtag name="dd" />
   </stoppingtags>
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -58,7 +58,7 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="del" hasCore="1" hasI18n="1" hasScript="1">
@@ -72,7 +72,7 @@
     <textlocation col="0" row="1" />
     <location col="1" row="1" colspan="2" />
   </attr>
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -124,11 +124,11 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="dfn" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -161,7 +161,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="div" hasScript="1" hasCore="1" hasI18n="1" scope="paragraph">
@@ -178,7 +178,7 @@
                 <item>justify</item>
         </items>
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -230,7 +230,7 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="dl" hasCore="1" hasI18n="1" hasScript="1">
@@ -239,10 +239,10 @@
     <textlocation col="0" row="0" />
     <location col="1" row="0" colspan="2" />
   </attr>
-<children>
+<tqchildren>
 <child name="dt" />
 <child name="dd" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="dt" hasCore="1" hasI18n="1" hasScript="1" optional="1">
@@ -250,7 +250,7 @@
     <stoppingtag name="dt" />
     <stoppingtag name="dd" />
   </stoppingtags>
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -283,6 +283,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/e.tag b/quanta/data/dtep/html-strict/e.tag
index 275630e7..ab77988b 100644
--- a/quanta/data/dtep/html-strict/e.tag
+++ b/quanta/data/dtep/html-strict/e.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="em" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -35,6 +35,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/f.tag b/quanta/data/dtep/html-strict/f.tag
index 67ce4dc9..786f2108 100644
--- a/quanta/data/dtep/html-strict/f.tag
+++ b/quanta/data/dtep/html-strict/f.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="fieldset" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <chid name="legend" />
  <child name="tt" />
@@ -55,7 +55,7 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="form" hasScript="1" hasCore="1" hasI18n="1">
@@ -109,7 +109,7 @@
     <attr name="onsubmit"> </attr>
     <attr name="onreset"> </attr>
 
-<children>
+<tqchildren>
 <child name="p" />
  <child name="h1" />
  <child name="h2" />
@@ -130,7 +130,7 @@
  <child name="fieldset" />
  <child name="address" />
  <child name="script" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/h.tag b/quanta/data/dtep/html-strict/h.tag
index 9d48f029..fd241416 100644
--- a/quanta/data/dtep/html-strict/h.tag
+++ b/quanta/data/dtep/html-strict/h.tag
@@ -15,7 +15,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -48,7 +48,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h2" hasScript="1" hasCore="1" hasI18n="1">
@@ -65,7 +65,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -98,7 +98,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h3" hasScript="1" hasCore="1" hasI18n="1">
@@ -115,7 +115,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -148,7 +148,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h4" hasScript="1" hasCore="1" hasI18n="1">
@@ -165,7 +165,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -198,7 +198,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h5" hasScript="1" hasCore="1" hasI18n="1">
@@ -215,7 +215,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -248,7 +248,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h6" hasScript="1" hasCore="1" hasI18n="1">
@@ -265,7 +265,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -298,7 +298,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="head" hasI18n="1">
@@ -309,7 +309,7 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="title" usage="required" />
 <child name="isindex" />
 <child name="base" />
@@ -318,7 +318,7 @@
  <child name="meta" />
  <child name="link" />
  <child name="object" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="hr" hasScript="1" hasCore="1" single="1">
@@ -365,10 +365,10 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="body" />
 <child name="head" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/i.tag b/quanta/data/dtep/html-strict/i.tag
index cf4f838e..e38436b8 100644
--- a/quanta/data/dtep/html-strict/i.tag
+++ b/quanta/data/dtep/html-strict/i.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -35,7 +35,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="img" single="1">
@@ -246,7 +246,7 @@
     <location col="1" row="1" colspan="2" />
   </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -298,6 +298,6 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
- </children>
+ </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/k.tag b/quanta/data/dtep/html-strict/k.tag
index fa7f66d9..fa12141e 100644
--- a/quanta/data/dtep/html-strict/k.tag
+++ b/quanta/data/dtep/html-strict/k.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="kbd" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -35,6 +35,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/l.tag b/quanta/data/dtep/html-strict/l.tag
index 68718b4f..4117b3a0 100644
--- a/quanta/data/dtep/html-strict/l.tag
+++ b/quanta/data/dtep/html-strict/l.tag
@@ -23,7 +23,7 @@
     <location col="1" row="3" colspan="2" />
   </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -55,7 +55,7 @@
  <child name="select" />
  <child name="textarea" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="legend" hasCore="1" hasI18n="1" hasScript="1">
@@ -76,7 +76,7 @@
     <location col="1" row="1" colspan="2" />
   </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -109,7 +109,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="li" hasCore="1" hasI18n="1" hasScript="1" optional="1">
@@ -140,7 +140,7 @@
         <text>compact</text>
         <location col="0" row="2" colspan="2" />
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -192,7 +192,7 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
- </children>
+ </tqchildren>
 
 </tag>
 <tag name="link" hasScript="1" hasCore="1" hasI18n="1" single="1">
diff --git a/quanta/data/dtep/html-strict/m.tag b/quanta/data/dtep/html-strict/m.tag
index 3b20e3bd..92908dd3 100644
--- a/quanta/data/dtep/html-strict/m.tag
+++ b/quanta/data/dtep/html-strict/m.tag
@@ -27,7 +27,7 @@
     <textlocation col="0" row="4" />
     <location col="1" row="4" colspan="2" />
   </attr>
-<children>
+<tqchildren>
 <child name="p" />
  <child name="h1" />
  <child name="h2" />
@@ -48,7 +48,7 @@
  <child name="fieldset" />
  <child name="address" />
  <child name="area" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="meta" hasI18n="1" single="1">
diff --git a/quanta/data/dtep/html-strict/n.tag b/quanta/data/dtep/html-strict/n.tag
index 648cbe2b..5d749973 100644
--- a/quanta/data/dtep/html-strict/n.tag
+++ b/quanta/data/dtep/html-strict/n.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="noscript" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="p" />
  <child name="h1" />
  <child name="h2" />
@@ -22,6 +22,6 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
- </children>
+ </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/o.tag b/quanta/data/dtep/html-strict/o.tag
index 0caa1fee..5b92af52 100644
--- a/quanta/data/dtep/html-strict/o.tag
+++ b/quanta/data/dtep/html-strict/o.tag
@@ -97,7 +97,7 @@
     <textlocation col="0" row="16" />
     <location col="1" row="16" colspan="2" />
   </attr>
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -150,7 +150,7 @@
  <child name="fieldset" />
  <child name="address" />
  <child name="param" />
- </children>
+ </tqchildren>
 </tag>
 <tag name="ol" hasScript="1" hasCore="1" hasI18n="1">
 
@@ -179,9 +179,9 @@
         <location col="0" row="2" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="li" usage="required" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="option" hasScript="1" hasCore="1" hasI18n="1" optional="1">
@@ -235,8 +235,8 @@
     <textlocation col="0" row="1" />
     <location col="1" row="1" colspan="2" />
   </attr>
-<children>
+<tqchildren>
 <child name="option" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/p.tag b/quanta/data/dtep/html-strict/p.tag
index 71487b05..fc7e41e1 100644
--- a/quanta/data/dtep/html-strict/p.tag
+++ b/quanta/data/dtep/html-strict/p.tag
@@ -25,7 +25,7 @@
         <stoppingtag name="dd" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -58,7 +58,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="param" single="1">
@@ -101,7 +101,7 @@
     <textlocation col="0" row="1" />
     <location col="1" row="1" colspan="2" />
   </attr>
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -128,6 +128,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/q.tag b/quanta/data/dtep/html-strict/q.tag
index 3225bf5d..b2e2fe60 100644
--- a/quanta/data/dtep/html-strict/q.tag
+++ b/quanta/data/dtep/html-strict/q.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="q" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -35,6 +35,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/s.tag b/quanta/data/dtep/html-strict/s.tag
index 30f59c9c..ae23cb35 100644
--- a/quanta/data/dtep/html-strict/s.tag
+++ b/quanta/data/dtep/html-strict/s.tag
@@ -33,13 +33,13 @@
         <location col="0" row="4" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="samp" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -72,7 +72,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="select" hasScript="1" hasCore="1" hasI18n="1">
@@ -123,14 +123,14 @@
         <stoppingtag name="select" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="optgroup" />
 <child name="option" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="small" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -162,11 +162,11 @@
  <child name="select" />
  <child name="textarea" />
  <child name="label" />
- <child name="button" /></children>
+ <child name="button" /></tqchildren>
 </tag>
 
 <tag name="span" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -199,11 +199,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="strong" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -236,7 +236,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="style" hasI18n="1">
@@ -273,13 +273,13 @@
         <location col="1" row="2" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="sub" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -312,11 +312,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="sup" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -349,6 +349,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/t.tag b/quanta/data/dtep/html-strict/t.tag
index 426dbaaf..691fdee5 100644
--- a/quanta/data/dtep/html-strict/t.tag
+++ b/quanta/data/dtep/html-strict/t.tag
@@ -70,7 +70,7 @@
     <attr name="rules"> </attr>
     <attr name="background"> </attr>
     <attr name="height"> </attr>
-<children>
+<tqchildren>
 <child name="caption" />
 <child name="col" />
 <child name="colgroup" />
@@ -78,7 +78,7 @@
 <child name="tfoot" />
 <child name="tbody" />
 <child name="tr" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="tbody" hasScript="1" hasCore="1" hasI18n="1">
@@ -118,9 +118,9 @@
     <attr name="char"> </attr>
     <attr name="charoff"> </attr>
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="td" hasScript="1" hasCore="1" hasI18n="1" optional="1">
@@ -222,7 +222,7 @@
         <stoppingtag name="tr" />
         <stoppingtag name="th" />
     </stoppingtags>
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -274,7 +274,7 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="textarea" hasScript="1" hasCore="1" hasI18n="1">
@@ -320,9 +320,9 @@
     <attr name="onselect"> </attr>
     <attr name="onchange"> </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="tfoot" hasScript="1" hasCore="1" hasI18n="1">
@@ -360,9 +360,9 @@
 
     <attr name="char"> </attr>
     <attr name="charoff"> </attr>
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="th" hasScript="1" hasCore="1" hasI18n="1" optional="1">
@@ -464,7 +464,7 @@
 		<stoppingtag name="tr" />
 		<stoppingtag name="th" />
 	</stoppingtags>
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -516,7 +516,7 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
- </children>
+ </tqchildren>
 
 </tag>
 
@@ -555,15 +555,15 @@
 
     <attr name="char"> </attr>
     <attr name="charoff"> </attr>
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="title" hasI18n="1" >
-<children>
+<tqchildren>
 <child name="#text" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="tr" hasScript="1" hasCore="1" hasI18n="1" optional="1">
@@ -606,14 +606,14 @@
         <stoppingtag name="tr" />
         <stoppingtag name="tfoot" />
     </stoppingtags>
-<children>
+<tqchildren>
 <child name="th" />
 <child name="td" usage="required" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="tt" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -646,6 +646,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/u.tag b/quanta/data/dtep/html-strict/u.tag
index 305f837c..df243de9 100644
--- a/quanta/data/dtep/html-strict/u.tag
+++ b/quanta/data/dtep/html-strict/u.tag
@@ -20,14 +20,14 @@
         <tooltip>Depricated in HTML 4.0</tooltip>
         <location col="0" row="2" colspan="2" />
     </attr>
-<children>
+<tqchildren>
 <child name="li" usage="required" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="u" hasCore="1" hasI18n="1" hasScript="1" scope="word">
 
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -67,6 +67,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html-strict/v.tag b/quanta/data/dtep/html-strict/v.tag
index 06fa14bb..22026f9b 100644
--- a/quanta/data/dtep/html-strict/v.tag
+++ b/quanta/data/dtep/html-strict/v.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="var" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -35,6 +35,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/a.tag b/quanta/data/dtep/html/a.tag
index a4658cb1..914f1031 100644
--- a/quanta/data/dtep/html/a.tag
+++ b/quanta/data/dtep/html/a.tag
@@ -109,9 +109,9 @@
     <attr name="charset"> </attr>
     <attr name="accesskey"> </attr>
     <attr name="tabindex"> </attr>
-    <attr name="shape"> </attr>
+    <attr name="tqshape"> </attr>
     <attr name="coords"> </attr>
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -151,11 +151,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="abbr" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -195,11 +195,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="acronym" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -239,11 +239,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="address" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -284,12 +284,12 @@
  <child name="label" />
  <child name="button" />
  <child name="p" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="area" hasScript="1" hasCore="1" hasI18n="1" single="1">
 
-    <attr name="shape" type="list">
+    <attr name="tqshape" type="list">
         <text>Shape</text>
         <textlocation col="0" row="0" />
         <location col="1" row="0" colspan="2"/>
diff --git a/quanta/data/dtep/html/b.tag b/quanta/data/dtep/html/b.tag
index 35877ad6..cab51e10 100644
--- a/quanta/data/dtep/html/b.tag
+++ b/quanta/data/dtep/html/b.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="b" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -42,7 +42,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="base" single="1">
@@ -76,7 +76,7 @@
     <textlocation col="0" row="1" />
     <location col="1" row="1" colspan="2" />
   </attr>
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -116,11 +116,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="big" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -160,7 +160,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="blockquote" hasScript="1" hasCore="1" hasI18n="1">
@@ -182,7 +182,7 @@
                 <item>RTL</item>
         </items>
     </attr>
-<children>
+<tqchildren>
  <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -246,7 +246,7 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="body" hasScript="1" hasCore="1" hasI18n="1">
@@ -307,7 +307,7 @@
     <attr name="leftmargin"> </attr>
     <attr name="marginwidth"> </attr>
     <attr name="marginheight"> </attr>
-<children>
+<tqchildren>
  <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -373,7 +373,7 @@
  <child name="address" />
  <child name="ins" />
  <child name="del" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="br" hasCore="1" single="1">
@@ -418,7 +418,7 @@
     <textlocation col="0" row="3" />
     <location col="1" row="3" colspan="2" />
   </attr>
-<children>
+<tqchildren>
  <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -472,6 +472,6 @@
  <child name="hr" />
  <child name="table" />
  <child name="address" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/c.tag b/quanta/data/dtep/html/c.tag
index 2875b88e..bea8512b 100644
--- a/quanta/data/dtep/html/c.tag
+++ b/quanta/data/dtep/html/c.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="caption" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -42,12 +42,12 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="center" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
  <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -111,11 +111,11 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="cite" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -155,11 +155,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="code" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -199,7 +199,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="col" hasScript="1" hasCore="1" hasI18n="1" single="1">
@@ -254,14 +254,14 @@
     <attr name="char" type="input">
         <text>Character</text>
         <textlocation col="0" row="4" />
-        <tooltip>alignment character for cells</tooltip>
+        <tooltip>tqalignment character for cells</tooltip>
         <location col="1" row="4" />
     </attr>
 
     <attr name="charoff" type="input">
         <text>Character offset</text>
         <textlocation col="0" row="5" />
-        <tooltip>alignment character offset</tooltip>
+        <tooltip>tqalignment character offset</tooltip>
         <location col="1" row="5" />
     </attr>
 
@@ -322,14 +322,14 @@
     <attr name="char" type="input">
         <text>Character</text>
         <textlocation col="0" row="4" />
-        <tooltip>alignment character for cells</tooltip>
+        <tooltip>tqalignment character for cells</tooltip>
         <location col="1" row="4" />
     </attr>
 
     <attr name="charoff" type="input">
         <text>Character offset</text>
         <textlocation col="0" row="5" />
-        <tooltip>alignment character offset</tooltip>
+        <tooltip>tqalignment character offset</tooltip>
         <location col="1" row="5" />
     </attr>
     <stoppingtags>
@@ -341,9 +341,9 @@
     </stoppingtags>
     
     
-<children>
+<tqchildren>
 <child name="col" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/d.tag b/quanta/data/dtep/html/d.tag
index e482727f..6de4bdfa 100644
--- a/quanta/data/dtep/html/d.tag
+++ b/quanta/data/dtep/html/d.tag
@@ -6,7 +6,7 @@
     <stoppingtag name="dt" />
     <stoppingtag name="dd" />
   </stoppingtags>
-<children>
+<tqchildren>
  <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -70,7 +70,7 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="del" hasCore="1" hasI18n="1" hasScript="1">
@@ -84,7 +84,7 @@
     <textlocation col="0" row="1" />
     <location col="1" row="1" colspan="2" />
   </attr>
-<children>
+<tqchildren>
  <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -148,11 +148,11 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="dfn" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -192,7 +192,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="div" hasScript="1" hasCore="1" hasI18n="1">
@@ -209,7 +209,7 @@
                 <item>justify</item>
         </items>
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -273,7 +273,7 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="dl" hasCore="1" hasI18n="1" hasScript="1">
@@ -282,17 +282,17 @@
     <textlocation col="0" row="0" />
     <location col="1" row="0" colspan="2" />
   </attr>
-<children>
+<tqchildren>
 <child name="dt" />
 <child name="dd" />
-</children>
+</tqchildren>
 </tag>
 <tag name="dt" hasCore="1" hasI18n="1" hasScript="1" optional="1">
   <stoppingtags>
     <stoppingtag name="dt" />
     <stoppingtag name="dd" />
   </stoppingtags>
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -332,6 +332,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/e.tag b/quanta/data/dtep/html/e.tag
index a966799a..e8280e01 100644
--- a/quanta/data/dtep/html/e.tag
+++ b/quanta/data/dtep/html/e.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="em" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -42,6 +42,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/f.tag b/quanta/data/dtep/html/f.tag
index 8136efba..ce9ca712 100644
--- a/quanta/data/dtep/html/f.tag
+++ b/quanta/data/dtep/html/f.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="fieldset" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -67,7 +67,7 @@
  <child name="fieldset" />
  <child name="address" />
  <child name="legend" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="form" hasScript="1" hasCore="1" hasI18n="1">
@@ -121,7 +121,7 @@
     <attr name="onsubmit"> </attr>
     <attr name="onreset"> </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -184,7 +184,7 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -235,7 +235,7 @@
         <location col="0" row="9" colspan="3" />
     </spacer>
 
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -275,6 +275,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/h.tag b/quanta/data/dtep/html/h.tag
index febe25ca..2d63792d 100644
--- a/quanta/data/dtep/html/h.tag
+++ b/quanta/data/dtep/html/h.tag
@@ -15,7 +15,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -55,7 +55,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 
 </tag>
 
@@ -73,7 +73,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -113,7 +113,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="h3" hasScript="1" hasCore="1" hasI18n="1">
@@ -130,7 +130,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -170,7 +170,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 
 </tag>
 
@@ -188,7 +188,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -228,7 +228,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 
 </tag>
 
@@ -246,7 +246,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -286,7 +286,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 
 </tag>
 
@@ -304,7 +304,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -344,7 +344,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 
 </tag>
 
@@ -356,7 +356,7 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="title" usage="required" />
 <child name="isindex" />
 <child name="base" />
@@ -365,7 +365,7 @@
  <child name="meta" />
  <child name="link" />
  <child name="object" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -414,10 +414,10 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="body" />
 <child name="head" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/i.tag b/quanta/data/dtep/html/i.tag
index 0dca3a63..45eed713 100644
--- a/quanta/data/dtep/html/i.tag
+++ b/quanta/data/dtep/html/i.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -42,7 +42,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 
@@ -133,7 +133,7 @@
         <location col="1" row="12" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="a" />
 <child name="abbr" />
 <child name="acronym" />
@@ -198,7 +198,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -425,7 +425,7 @@
     <location col="1" row="1" colspan="2" />
   </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -489,6 +489,6 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/k.tag b/quanta/data/dtep/html/k.tag
index e0babed5..431505e9 100644
--- a/quanta/data/dtep/html/k.tag
+++ b/quanta/data/dtep/html/k.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="kbd" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -42,6 +42,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/l.tag b/quanta/data/dtep/html/l.tag
index 6e02de9f..ab677502 100644
--- a/quanta/data/dtep/html/l.tag
+++ b/quanta/data/dtep/html/l.tag
@@ -23,7 +23,7 @@
     <location col="1" row="3" colspan="2" />
   </attr>
 
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -62,7 +62,7 @@
  <child name="select" />
  <child name="textarea" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="legend" hasCore="1" hasI18n="1" hasScript="1">
@@ -83,7 +83,7 @@
     <location col="1" row="1" colspan="2" />
   </attr>
 
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -123,7 +123,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="li" hasCore="1" hasI18n="1" hasScript="1" optional="1">
@@ -159,7 +159,7 @@
     <stoppingtag name="ul" />    
     <stoppingtag name="ol" />    
 </stoppingtags>    
-<children>
+<tqchildren>
  <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -223,7 +223,7 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
- </children>
+ </tqchildren>
 </tag>
 
 <tag name="link" hasScript="1" hasCore="1" hasI18n="1" single="1">
diff --git a/quanta/data/dtep/html/m.tag b/quanta/data/dtep/html/m.tag
index 413df4f8..130b81b5 100644
--- a/quanta/data/dtep/html/m.tag
+++ b/quanta/data/dtep/html/m.tag
@@ -27,7 +27,7 @@
     <textlocation col="0" row="4" />
     <location col="1" row="4" colspan="2" />
   </attr>
-<children>
+<tqchildren>
  <child name="p" />
   <child name="h1" />
  <child name="h2" />
@@ -53,7 +53,7 @@
  <child name="fieldset" />
  <child name="address" />
  <child name="area" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="meta" hasI18n="1" single="1">
diff --git a/quanta/data/dtep/html/n.tag b/quanta/data/dtep/html/n.tag
index f745cf46..b759bf5e 100644
--- a/quanta/data/dtep/html/n.tag
+++ b/quanta/data/dtep/html/n.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="noscript" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -66,6 +66,6 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/o.tag b/quanta/data/dtep/html/o.tag
index 85767c1a..43529b5d 100644
--- a/quanta/data/dtep/html/o.tag
+++ b/quanta/data/dtep/html/o.tag
@@ -97,7 +97,7 @@
     <textlocation col="0" row="16" />
     <location col="1" row="16" colspan="2" />
   </attr>
-<children>
+<tqchildren>
 <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -162,7 +162,7 @@
  <child name="fieldset" />
  <child name="address" />
  <child name="param" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="ol" hasScript="1" hasCore="1" hasI18n="1">
@@ -192,9 +192,9 @@
         <location col="0" row="2" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="li" usage="required" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="option" hasScript="1" hasCore="1" hasI18n="1" optional="1">
@@ -246,8 +246,8 @@
     <textlocation col="0" row="1" />
     <location col="1" row="1" colspan="2" />
   </attr>
-<children>
+<tqchildren>
 <child name="option" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/p.tag b/quanta/data/dtep/html/p.tag
index 33017fa0..caf3ab10 100644
--- a/quanta/data/dtep/html/p.tag
+++ b/quanta/data/dtep/html/p.tag
@@ -25,7 +25,7 @@
         <stoppingtag name="dd" />
     </stoppingtags>
 
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -65,7 +65,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="param" single="1">
@@ -108,7 +108,7 @@
     <textlocation col="0" row="1" />
     <location col="1" row="1" colspan="2" />
   </attr>
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -139,6 +139,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/q.tag b/quanta/data/dtep/html/q.tag
index 1d5f512c..c14c1e36 100644
--- a/quanta/data/dtep/html/q.tag
+++ b/quanta/data/dtep/html/q.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="q" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -42,6 +42,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/s.tag b/quanta/data/dtep/html/s.tag
index 6a3cb987..188d1939 100644
--- a/quanta/data/dtep/html/s.tag
+++ b/quanta/data/dtep/html/s.tag
@@ -51,7 +51,7 @@
 </tag>
 
 <tag name="samp" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -91,7 +91,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="select" hasScript="1" hasCore="1" hasI18n="1">
@@ -142,14 +142,14 @@
         <stoppingtag name="select" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="optgroup" />
 <child name="option" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="small" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -189,11 +189,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="span" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -233,11 +233,11 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="strong" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -277,7 +277,7 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="style" hasI18n="1">
@@ -314,13 +314,13 @@
         <location col="1" row="2" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="sub" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -360,10 +360,10 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 <tag name="sup" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
  <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -403,6 +403,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/strong.tag b/quanta/data/dtep/html/strong.tag
index 2be3da65..0ec79185 100644
--- a/quanta/data/dtep/html/strong.tag
+++ b/quanta/data/dtep/html/strong.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="strong" hasCore="1" hasI18n="1" hasScript="1" scope="word">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/t.tag b/quanta/data/dtep/html/t.tag
index 3d1d959f..df104014 100644
--- a/quanta/data/dtep/html/t.tag
+++ b/quanta/data/dtep/html/t.tag
@@ -70,7 +70,7 @@
     <attr name="rules"> </attr>
     <attr name="background"> </attr>
     <attr name="height"> </attr>
-<children>
+<tqchildren>
 <child name="caption" />
 <child name="col" />
 <child name="colgroup" />
@@ -78,7 +78,7 @@
 <child name="tfoot" />
 <child name="tbody" />
 <child name="tr" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -119,9 +119,9 @@
     <attr name="char"> </attr>
     <attr name="charoff"> </attr>
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -224,7 +224,7 @@
         <stoppingtag name="tr" />
         <stoppingtag name="th" />
     </stoppingtags>
-<children>
+<tqchildren>
  <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -288,7 +288,7 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="textarea" hasScript="1" hasCore="1" hasI18n="1">
@@ -334,9 +334,9 @@
     <attr name="onselect"> </attr>
     <attr name="onchange"> </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="tfoot" hasScript="1" hasCore="1" hasI18n="1">
@@ -374,9 +374,9 @@
 
     <attr name="char"> </attr>
     <attr name="charoff"> </attr>
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="th" hasScript="1" hasCore="1" hasI18n="1" optional="1">
@@ -478,7 +478,7 @@
 		<stoppingtag name="tr" />
 		<stoppingtag name="th" />
 	</stoppingtags>
-<children>
+<tqchildren>
  <child name="#text" />
   <child name="tt" />
  <child name="i" />
@@ -542,7 +542,7 @@
  <child name="table" />
  <child name="fieldset" />
  <child name="address" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="thead" hasScript="1" hasCore="1" hasI18n="1">
@@ -580,16 +580,16 @@
 
     <attr name="char"> </attr>
     <attr name="charoff"> </attr>
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="title" hasI18n="1" >
 
-<children>
+<tqchildren>
 <child name="#text" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="tr" hasScript="1" hasCore="1" hasI18n="1" optional="1">
@@ -632,14 +632,14 @@
         <stoppingtag name="tr" />
         <stoppingtag name="tfoot" />
     </stoppingtags>
-<children>
+<tqchildren>
 <child name="th" />
 <child name="td" usage="required" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="tt" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -679,6 +679,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/u.tag b/quanta/data/dtep/html/u.tag
index 34778191..5553014b 100644
--- a/quanta/data/dtep/html/u.tag
+++ b/quanta/data/dtep/html/u.tag
@@ -20,14 +20,14 @@
         <tooltip>Depricated in HTML 4.0</tooltip>
         <location col="0" row="2" colspan="2" />
     </attr>
-<children>
+<tqchildren>
 <child name="li" usage="required" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="u" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -67,6 +67,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/html/v.tag b/quanta/data/dtep/html/v.tag
index 11ea92a7..90d6dad5 100644
--- a/quanta/data/dtep/html/v.tag
+++ b/quanta/data/dtep/html/v.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="var" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
  <child name="tt" />
  <child name="i" />
@@ -42,6 +42,6 @@
  <child name="textarea" />
  <child name="label" />
  <child name="button" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/kde-docbook-4.1.2/l.tag b/quanta/data/dtep/kde-docbook-4.1.2/l.tag
index b9238e09..cae36163 100644
--- a/quanta/data/dtep/kde-docbook-4.1.2/l.tag
+++ b/quanta/data/dtep/kde-docbook-4.1.2/l.tag
@@ -40,7 +40,7 @@
    </items>
   </attr>
  </tag>
- <tag name="literallayout" hasCore="1">
+ <tag name="literaltqlayout" hasCore="1">
   <attr name="width" type="input">
    <text>width</text>
    <textlocation row="0" col="0" />
diff --git a/quanta/data/dtep/php/dba.tag b/quanta/data/dtep/php/dba.tag
index 04efd953..bdf1a0ab 100644
--- a/quanta/data/dtep/php/dba.tag
+++ b/quanta/data/dtep/php/dba.tag
@@ -49,7 +49,7 @@
 		<attr name="handler" type="string" status="required"></attr>
 		<attr name="..." type="" status="optional"></attr>
 	</tag>
-	<tag name="dba_replace" type="function" returnType="bool" version="PHP 3&gt;= 3.0.8, PHP 4 , PHP 5">
+	<tag name="dba_tqreplace" type="function" returnType="bool" version="PHP 3&gt;= 3.0.8, PHP 4 , PHP 5">
 		<attr name="key" type="string" status="required"></attr>
 		<attr name="value" type="string" status="required"></attr>
 		<attr name="handle" type="resource" status="required"></attr>
diff --git a/quanta/data/dtep/php/dbm.tag b/quanta/data/dtep/php/dbm.tag
index 50c9011e..250b6f3c 100644
--- a/quanta/data/dtep/php/dbm.tag
+++ b/quanta/data/dtep/php/dbm.tag
@@ -33,7 +33,7 @@
 		<attr name="filename" type="string" status="required"></attr>
 		<attr name="flags" type="string" status="required"></attr>
 	</tag>
-	<tag name="dbmreplace" type="function" returnType="int" version="PHP 3, PHP 4 ">
+	<tag name="dbmtqreplace" type="function" returnType="int" version="PHP 3, PHP 4 ">
 		<attr name="dbm_identifier" type="resource" status="required"></attr>
 		<attr name="key" type="string" status="required"></attr>
 		<attr name="value" type="string" status="required"></attr>
diff --git a/quanta/data/dtep/php/dbplus.tag b/quanta/data/dtep/php/dbplus.tag
index 03f3009f..695fb448 100644
--- a/quanta/data/dtep/php/dbplus.tag
+++ b/quanta/data/dtep/php/dbplus.tag
@@ -24,7 +24,7 @@
 	</tag>
 	<tag name="dbplus_errno" type="function" returnType="int" version="4.1.0 - 4.2.3 only">
 	</tag>
-	<tag name="dbplus_find" type="function" returnType="int" version="4.1.0 - 4.2.3 only">
+	<tag name="dbplus_tqfind" type="function" returnType="int" version="4.1.0 - 4.2.3 only">
 		<attr name="relation" type="resource" status="required"></attr>
 		<attr name="constraints" type="array" status="required"></attr>
 		<attr name="tuple" type="mixed" status="required"></attr>
@@ -78,7 +78,7 @@
 	</tag>
 	<tag name="dbplus_rchperm" type="function" returnType="int" version="4.1.0 - 4.2.3 only">
 		<attr name="relation" type="resource" status="required"></attr>
-		<attr name="mask" type="int" status="required"></attr>
+		<attr name="tqmask" type="int" status="required"></attr>
 		<attr name="user" type="string" status="required"></attr>
 		<attr name="group" type="string" status="required"></attr>
 	</tag>
diff --git a/quanta/data/dtep/php/domxml.tag b/quanta/data/dtep/php/domxml.tag
index 03c2e310..b95dd866 100644
--- a/quanta/data/dtep/php/domxml.tag
+++ b/quanta/data/dtep/php/domxml.tag
@@ -139,7 +139,7 @@
 	</tag>
 	<tag name="DomNode->owner_document" type="function" returnType="object" version="">
 	</tag>
-	<tag name="DomNode->parent_node" type="function" returnType="object" version="">
+	<tag name="DomNode->tqparent_node" type="function" returnType="object" version="">
 	</tag>
 	<tag name="DomNode->prefix" type="function" returnType="string" version="">
 	</tag>
diff --git a/quanta/data/dtep/php/fam.tag b/quanta/data/dtep/php/fam.tag
index e976c9e5..1b6789df 100644
--- a/quanta/data/dtep/php/fam.tag
+++ b/quanta/data/dtep/php/fam.tag
@@ -11,7 +11,7 @@
 		<attr name="fam" type="resource" status="required"></attr>
 		<attr name="dirname" type="string" status="required"></attr>
 		<attr name="depth" type="int" status="required"></attr>
-		<attr name="mask" type="string" status="required"></attr>
+		<attr name="tqmask" type="string" status="required"></attr>
 	</tag>
 	<tag name="fam_monitor_directory" type="function" returnType="resource" version="PHP 5">
 		<attr name="fam" type="resource" status="required"></attr>
diff --git a/quanta/data/dtep/php/filesystem.tag b/quanta/data/dtep/php/filesystem.tag
index 8b75719f..601a4855 100644
--- a/quanta/data/dtep/php/filesystem.tag
+++ b/quanta/data/dtep/php/filesystem.tag
@@ -263,7 +263,7 @@
 		<attr name="atime" type="int" status="optional"></attr>
 	</tag>
 	<tag name="umask" type="function" returnType="int" version="PHP 3, PHP 4 , PHP 5">
-		<attr name="mask" type="int" status="optional"></attr>
+		<attr name="tqmask" type="int" status="optional"></attr>
 	</tag>
 	<tag name="unlink" type="function" returnType="bool" version="PHP 3, PHP 4 , PHP 5">
 		<attr name="filename" type="string" status="required"></attr>
diff --git a/quanta/data/dtep/php/http.tag b/quanta/data/dtep/php/http.tag
index ab12f29c..544571c0 100644
--- a/quanta/data/dtep/php/http.tag
+++ b/quanta/data/dtep/php/http.tag
@@ -2,7 +2,7 @@
 <tags>
 	<tag name="header" type="function" returnType="void" version="PHP 3, PHP 4 , PHP 5">
 		<attr name="string" type="string" status="required"></attr>
-		<attr name="replace" type="bool" status="optional"></attr>
+		<attr name="tqreplace" type="bool" status="optional"></attr>
 		<attr name="http_response_code" type="int" status="optional"></attr>
 	</tag>
 	<tag name="headers_list" type="function" returnType="array" version="PHP 5">
diff --git a/quanta/data/dtep/php/hw.tag b/quanta/data/dtep/php/hw.tag
index 806ed4f6..e2e4433b 100644
--- a/quanta/data/dtep/php/hw.tag
+++ b/quanta/data/dtep/php/hw.tag
@@ -8,11 +8,11 @@
 		<attr name="objid" type="int" status="required"></attr>
 		<attr name="attributes" type="array" status="required"></attr>
 	</tag>
-	<tag name="hw_children" type="function" returnType="array" version="PHP 3&gt;= 3.0.3, PHP 4 ">
+	<tag name="hw_tqchildren" type="function" returnType="array" version="PHP 3&gt;= 3.0.3, PHP 4 ">
 		<attr name="connection" type="int" status="required"></attr>
 		<attr name="objectID" type="int" status="required"></attr>
 	</tag>
-	<tag name="hw_childrenobj" type="function" returnType="array" version="PHP 3&gt;= 3.0.3, PHP 4 ">
+	<tag name="hw_tqchildrenobj" type="function" returnType="array" version="PHP 3&gt;= 3.0.3, PHP 4 ">
 		<attr name="connection" type="int" status="required"></attr>
 		<attr name="objectID" type="int" status="required"></attr>
 	</tag>
@@ -135,11 +135,11 @@
 		<attr name="query" type="string" status="required"></attr>
 		<attr name="max_hits" type="int" status="required"></attr>
 	</tag>
-	<tag name="hw_getparents" type="function" returnType="array" version="PHP 3&gt;= 3.0.3, PHP 4 ">
+	<tag name="hw_gettqparents" type="function" returnType="array" version="PHP 3&gt;= 3.0.3, PHP 4 ">
 		<attr name="connection" type="int" status="required"></attr>
 		<attr name="objectID" type="int" status="required"></attr>
 	</tag>
-	<tag name="hw_getparentsobj" type="function" returnType="array" version="PHP 3&gt;= 3.0.3, PHP 4 ">
+	<tag name="hw_gettqparentsobj" type="function" returnType="array" version="PHP 3&gt;= 3.0.3, PHP 4 ">
 		<attr name="connection" type="int" status="required"></attr>
 		<attr name="objectID" type="int" status="required"></attr>
 	</tag>
@@ -153,7 +153,7 @@
 		<attr name="connection" type="int" status="required"></attr>
 		<attr name="objectID" type="int" status="required"></attr>
 	</tag>
-	<tag name="hw_getremotechildren" type="function" returnType="int" version="PHP 3&gt;= 3.0.3, PHP 4 ">
+	<tag name="hw_getremotetqchildren" type="function" returnType="int" version="PHP 3&gt;= 3.0.3, PHP 4 ">
 		<attr name="connection" type="int" status="required"></attr>
 		<attr name="object_record" type="string" status="required"></attr>
 	</tag>
@@ -190,7 +190,7 @@
 	</tag>
 	<tag name="hw_insdoc" type="function" returnType="int" version="PHP 3&gt;= 3.0.3, PHP 4 ">
 		<attr name="connection" type="resource" status="required"></attr>
-		<attr name="parentID" type="int" status="required"></attr>
+		<attr name="tqparentID" type="int" status="required"></attr>
 		<attr name="object_record" type="string" status="required"></attr>
 		<attr name="text" type="string" status="optional"></attr>
 	</tag>
@@ -202,7 +202,7 @@
 	</tag>
 	<tag name="hw_insertdocument" type="function" returnType="int" version="PHP 3&gt;= 3.0.3, PHP 4 ">
 		<attr name="connection" type="int" status="required"></attr>
-		<attr name="parent_id" type="int" status="required"></attr>
+		<attr name="tqparent_id" type="int" status="required"></attr>
 		<attr name="hw_document" type="int" status="required"></attr>
 	</tag>
 	<tag name="hw_insertobject" type="function" returnType="int" version="PHP 3&gt;= 3.0.3, PHP 4 ">
diff --git a/quanta/data/dtep/php/hwapi.tag b/quanta/data/dtep/php/hwapi.tag
index 09744277..7b0580ab 100644
--- a/quanta/data/dtep/php/hwapi.tag
+++ b/quanta/data/dtep/php/hwapi.tag
@@ -19,7 +19,7 @@
 	<tag name="hw_api->checkout" type="function" returnType="object" version="">
 		<attr name="parameter" type="array" status="required"></attr>
 	</tag>
-	<tag name="hw_api->children" type="function" returnType="array" version="">
+	<tag name="hw_api->tqchildren" type="function" returnType="array" version="">
 		<attr name="parameter" type="array" status="required"></attr>
 	</tag>
 	<tag name="hw_api_content->mimetype" type="function" returnType="string" version="">
@@ -50,7 +50,7 @@
 	</tag>
 	<tag name="hw_api_error->reason" type="function" returnType="object" version="">
 	</tag>
-	<tag name="hw_api->find" type="function" returnType="array" version="">
+	<tag name="hw_api->tqfind" type="function" returnType="array" version="">
 		<attr name="parameter" type="array" status="required"></attr>
 	</tag>
 	<tag name="hw_api->ftstat" type="function" returnType="object" version="">
@@ -124,7 +124,7 @@
 	<tag name="hw_api->objectbyanchor" type="function" returnType="object" version="">
 		<attr name="parameter" type="array" status="required"></attr>
 	</tag>
-	<tag name="hw_api->parents" type="function" returnType="array" version="">
+	<tag name="hw_api->tqparents" type="function" returnType="array" version="">
 		<attr name="parameter" type="array" status="required"></attr>
 	</tag>
 	<tag name="hw_api_reason->description" type="function" returnType="string" version="">
@@ -134,7 +134,7 @@
 	<tag name="hw_api->remove" type="function" returnType="object" version="">
 		<attr name="parameter" type="array" status="required"></attr>
 	</tag>
-	<tag name="hw_api->replace" type="function" returnType="object" version="">
+	<tag name="hw_api->tqreplace" type="function" returnType="object" version="">
 		<attr name="parameter" type="array" status="required"></attr>
 	</tag>
 	<tag name="hw_api->setcommitedversion" type="function" returnType="object" version="">
diff --git a/quanta/data/dtep/php/hyperwave.tag b/quanta/data/dtep/php/hyperwave.tag
index af08d010..0e75108e 100644
--- a/quanta/data/dtep/php/hyperwave.tag
+++ b/quanta/data/dtep/php/hyperwave.tag
@@ -7,11 +7,11 @@
 		<attr name="objid" type="int" status="optional"></attr>
 		<attr name="attributes" type="array" status="optional"></attr>
 	</tag>
-	<tag name="hw_children" type="function" returnType="array">
+	<tag name="hw_tqchildren" type="function" returnType="array">
 		<attr name="connection" type="int" status="optional"></attr>
 		<attr name="objectID" type="int" status="optional"></attr>
 	</tag>
-	<tag name="hw_childrenobj" type="function" returnType="array">
+	<tag name="hw_tqchildrenobj" type="function" returnType="array">
 		<attr name="connection" type="int" status="optional"></attr>
 		<attr name="objectID" type="int" status="optional"></attr>
 	</tag>
@@ -133,11 +133,11 @@
 		<attr name="query" type="string" status="optional"></attr>
 		<attr name="max_hits" type="int" status="optional"></attr>
 	</tag>
-	<tag name="hw_getparents" type="function" returnType="array">
+	<tag name="hw_gettqparents" type="function" returnType="array">
 		<attr name="connection" type="int" status="optional"></attr>
 		<attr name="objectID" type="int" status="optional"></attr>
 	</tag>
-	<tag name="hw_getparentsobj" type="function" returnType="array">
+	<tag name="hw_gettqparentsobj" type="function" returnType="array">
 		<attr name="connection" type="int" status="optional"></attr>
 		<attr name="objectID" type="int" status="optional"></attr>
 	</tag>
@@ -151,7 +151,7 @@
 		<attr name="connection" type="int" status="optional"></attr>
 		<attr name="objectID" type="int" status="optional"></attr>
 	</tag>
-	<tag name="hw_getremotechildren" type="function" returnType="int">
+	<tag name="hw_getremotetqchildren" type="function" returnType="int">
 		<attr name="connection" type="int" status="optional"></attr>
 		<attr name="object record" type="string" status="optional"></attr>
 	</tag>
@@ -187,7 +187,7 @@
 	</tag>
 	<tag name="hw_insdoc" type="function" returnType="int">
 		<attr name="connection" type="int" status="optional"></attr>
-		<attr name="parentID" type="int" status="optional"></attr>
+		<attr name="tqparentID" type="int" status="optional"></attr>
 		<attr name="object_record" type="string" status="optional"></attr>
 		<attr name="text" type="string" status="optional"></attr>
 	</tag>
@@ -199,7 +199,7 @@
 	</tag>
 	<tag name="hw_insertdocument" type="function" returnType="int">
 		<attr name="connection" type="int" status="optional"></attr>
-		<attr name="parent_id" type="int" status="optional"></attr>
+		<attr name="tqparent_id" type="int" status="optional"></attr>
 		<attr name="hw_document" type="int" status="optional"></attr>
 	</tag>
 	<tag name="hw_insertobject" type="function" returnType="int">
diff --git a/quanta/data/dtep/php/ircg.tag b/quanta/data/dtep/php/ircg.tag
index a80b31c7..d948d409 100644
--- a/quanta/data/dtep/php/ircg.tag
+++ b/quanta/data/dtep/php/ircg.tag
@@ -129,7 +129,7 @@
 	</tag>
 	<tag name="ircg_who" type="function" returnType="bool" version="PHP 4 &gt;= 4.3.3, PHP 5">
 		<attr name="connection" type="resource" status="required"></attr>
-		<attr name="mask" type="string" status="required"></attr>
+		<attr name="tqmask" type="string" status="required"></attr>
 		<attr name="ops_only" type="bool" status="optional"></attr>
 	</tag>
 	<tag name="ircg_whois" type="function" returnType="bool" version="PHP 4 &gt;= 4.0.5, PHP 5">
diff --git a/quanta/data/dtep/php/ldap.tag b/quanta/data/dtep/php/ldap.tag
index bb652bb8..df81cf3b 100644
--- a/quanta/data/dtep/php/ldap.tag
+++ b/quanta/data/dtep/php/ldap.tag
@@ -113,7 +113,7 @@
 		<attr name="dn" type="string" status="required"></attr>
 		<attr name="entry" type="array" status="required"></attr>
 	</tag>
-	<tag name="ldap_mod_replace" type="function" returnType="bool" version="PHP 3&gt;= 3.0.8, PHP 4 , PHP 5">
+	<tag name="ldap_mod_tqreplace" type="function" returnType="bool" version="PHP 3&gt;= 3.0.8, PHP 4 , PHP 5">
 		<attr name="link_identifier" type="resource" status="required"></attr>
 		<attr name="dn" type="string" status="required"></attr>
 		<attr name="entry" type="array" status="required"></attr>
@@ -163,7 +163,7 @@
 		<attr name="link_identifier" type="resource" status="required"></attr>
 		<attr name="dn" type="string" status="required"></attr>
 		<attr name="newrdn" type="string" status="required"></attr>
-		<attr name="newparent" type="string" status="required"></attr>
+		<attr name="newtqparent" type="string" status="required"></attr>
 		<attr name="deleteoldrdn" type="bool" status="required"></attr>
 	</tag>
 	<tag name="ldap_sasl_bind" type="function" returnType="bool" version="PHP 5">
diff --git a/quanta/data/dtep/php/mbstring.tag b/quanta/data/dtep/php/mbstring.tag
index 64939fc7..12090db5 100644
--- a/quanta/data/dtep/php/mbstring.tag
+++ b/quanta/data/dtep/php/mbstring.tag
@@ -53,7 +53,7 @@
 		<attr name="string" type="string" status="required"></attr>
 		<attr name="option" type="string" status="optional"></attr>
 	</tag>
-	<tag name="mb_ereg_replace" type="function" returnType="string" version="PHP 4 &gt;= 4.2.0">
+	<tag name="mb_ereg_tqreplace" type="function" returnType="string" version="PHP 4 &gt;= 4.2.0">
 		<attr name="pattern" type="string" status="required"></attr>
 		<attr name="replacement" type="string" status="required"></attr>
 		<attr name="string" type="string" status="required"></attr>
@@ -88,9 +88,9 @@
 		<attr name="string" type="string" status="required"></attr>
 		<attr name="regs" type="array" status="optional"></attr>
 	</tag>
-	<tag name="mb_eregi_replace" type="function" returnType="string" version="PHP 4 &gt;= 4.2.0">
+	<tag name="mb_eregi_tqreplace" type="function" returnType="string" version="PHP 4 &gt;= 4.2.0">
 		<attr name="pattern" type="string" status="required"></attr>
-		<attr name="replace" type="string" status="required"></attr>
+		<attr name="tqreplace" type="string" status="required"></attr>
 		<attr name="string" type="string" status="required"></attr>
 	</tag>
 	<tag name="mb_eregi" type="function" returnType="int" version="PHP 4 &gt;= 4.2.0">
diff --git a/quanta/data/dtep/php/memcache.tag b/quanta/data/dtep/php/memcache.tag
index 7e93f96d..2a38e77c 100644
--- a/quanta/data/dtep/php/memcache.tag
+++ b/quanta/data/dtep/php/memcache.tag
@@ -42,7 +42,7 @@
 		<attr name="port" type="int" status="optional"></attr>
 		<attr name="timeout" type="int" status="optional"></attr>
 	</tag>
-	<tag name="Memcache::replace" type="function" returnType="bool" version="">
+	<tag name="Memcache::tqreplace" type="function" returnType="bool" version="">
 		<attr name="key" type="string" status="required"></attr>
 		<attr name="var" type="mixed" status="required"></attr>
 		<attr name="flag" type="int" status="optional"></attr>
diff --git a/quanta/data/dtep/php/ming.tag b/quanta/data/dtep/php/ming.tag
index c69ec01a..b4f42ec6 100644
--- a/quanta/data/dtep/php/ming.tag
+++ b/quanta/data/dtep/php/ming.tag
@@ -27,24 +27,24 @@
 		<attr name="action" type="resource" status="required"></attr>
 		<attr name="flags" type="int" status="required"></attr>
 	</tag>
-	<tag name="swfbutton->addshape" type="function" returnType="void" version="">
-		<attr name="shape" type="resource" status="required"></attr>
+	<tag name="swfbutton->addtqshape" type="function" returnType="void" version="">
+		<attr name="tqshape" type="resource" status="required"></attr>
 		<attr name="flags" type="int" status="required"></attr>
 	</tag>
 	<tag name="swfbutton->setaction" type="function" returnType="void" version="">
 		<attr name="action" type="resource" status="required"></attr>
 	</tag>
 	<tag name="swfbutton->setdown" type="function" returnType="void" version="">
-		<attr name="shape" type="resource" status="required"></attr>
+		<attr name="tqshape" type="resource" status="required"></attr>
 	</tag>
 	<tag name="swfbutton->sethit" type="function" returnType="void" version="">
-		<attr name="shape" type="resource" status="required"></attr>
+		<attr name="tqshape" type="resource" status="required"></attr>
 	</tag>
 	<tag name="swfbutton->setover" type="function" returnType="void" version="">
-		<attr name="shape" type="resource" status="required"></attr>
+		<attr name="tqshape" type="resource" status="required"></attr>
 	</tag>
 	<tag name="swfbutton->setup" type="function" returnType="void" version="">
-		<attr name="shape" type="resource" status="required"></attr>
+		<attr name="tqshape" type="resource" status="required"></attr>
 	</tag>
 	<tag name="swfbutton" type="function" returnType="object" version="PHP 4 &gt;= 4.0.5">
 	</tag>
@@ -141,9 +141,9 @@
 	</tag>
 	<tag name="swfgradient" type="function" returnType="object" version="PHP 4 &gt;= 4.0.5">
 	</tag>
-	<tag name="swfmorph->getshape1" type="function" returnType="mixed" version="">
+	<tag name="swfmorph->gettqshape1" type="function" returnType="mixed" version="">
 	</tag>
-	<tag name="swfmorph->getshape2" type="function" returnType="mixed" version="">
+	<tag name="swfmorph->gettqshape2" type="function" returnType="mixed" version="">
 	</tag>
 	<tag name="swfmorph" type="function" returnType="object" version="PHP 4 &gt;= 4.0.5">
 	</tag>
@@ -182,54 +182,54 @@
 	</tag>
 	<tag name="swfmovie" type="function" returnType="object" version="PHP 4 &gt;= 4.0.5">
 	</tag>
-	<tag name="swfshape->addfill" type="function" returnType="void" version="">
+	<tag name="swftqshape->addfill" type="function" returnType="void" version="">
 		<attr name="red" type="int" status="required"></attr>
 		<attr name="green" type="int" status="required"></attr>
 		<attr name="blue" type="int" status="required"></attr>
 		<attr name="a" type="int" status="optional"></attr>
 	</tag>
-	<tag name="swfshape->drawcurve" type="function" returnType="void" version="">
+	<tag name="swftqshape->drawcurve" type="function" returnType="void" version="">
 		<attr name="controldx" type="int" status="required"></attr>
 		<attr name="controldy" type="int" status="required"></attr>
 		<attr name="anchordx" type="int" status="required"></attr>
 		<attr name="anchordy" type="int" status="required"></attr>
 	</tag>
-	<tag name="swfshape->drawcurveto" type="function" returnType="void" version="">
+	<tag name="swftqshape->drawcurveto" type="function" returnType="void" version="">
 		<attr name="controlx" type="int" status="required"></attr>
 		<attr name="controly" type="int" status="required"></attr>
 		<attr name="anchorx" type="int" status="required"></attr>
 		<attr name="anchory" type="int" status="required"></attr>
 	</tag>
-	<tag name="swfshape->drawline" type="function" returnType="void" version="">
+	<tag name="swftqshape->drawline" type="function" returnType="void" version="">
 		<attr name="dx" type="int" status="required"></attr>
 		<attr name="dy" type="int" status="required"></attr>
 	</tag>
-	<tag name="swfshape->drawlineto" type="function" returnType="void" version="">
+	<tag name="swftqshape->drawlineto" type="function" returnType="void" version="">
 		<attr name="x" type="int" status="required"></attr>
 		<attr name="y" type="int" status="required"></attr>
 	</tag>
-	<tag name="swfshape->movepen" type="function" returnType="void" version="">
+	<tag name="swftqshape->movepen" type="function" returnType="void" version="">
 		<attr name="dx" type="int" status="required"></attr>
 		<attr name="dy" type="int" status="required"></attr>
 	</tag>
-	<tag name="swfshape->movepento" type="function" returnType="void" version="">
+	<tag name="swftqshape->movepento" type="function" returnType="void" version="">
 		<attr name="x" type="int" status="required"></attr>
 		<attr name="y" type="int" status="required"></attr>
 	</tag>
-	<tag name="swfshape->setleftfill" type="function" returnType="void" version="">
+	<tag name="swftqshape->setleftfill" type="function" returnType="void" version="">
 		<attr name="fill" type="swfgradient" status="required"></attr>
 	</tag>
-	<tag name="swfshape->setline" type="function" returnType="void" version="">
+	<tag name="swftqshape->setline" type="function" returnType="void" version="">
 		<attr name="width" type="int" status="required"></attr>
 		<attr name="red" type="int" status="optional"></attr>
 		<attr name="green" type="int" status="optional"></attr>
 		<attr name="blue" type="int" status="optional"></attr>
 		<attr name="a" type="int" status="optional"></attr>
 	</tag>
-	<tag name="swfshape->setrightfill" type="function" returnType="void" version="">
+	<tag name="swftqshape->setrightfill" type="function" returnType="void" version="">
 		<attr name="fill" type="swfgradient" status="required"></attr>
 	</tag>
-	<tag name="swfshape" type="function" returnType="object" version="PHP 4 &gt;= 4.0.5">
+	<tag name="swftqshape" type="function" returnType="object" version="PHP 4 &gt;= 4.0.5">
 	</tag>
 	<tag name="swfsprite->add" type="function" returnType="void" version="">
 		<attr name="object" type="resource" status="required"></attr>
diff --git a/quanta/data/dtep/php/mnogosearch.tag b/quanta/data/dtep/php/mnogosearch.tag
index 3485cdec..d813ee2f 100644
--- a/quanta/data/dtep/php/mnogosearch.tag
+++ b/quanta/data/dtep/php/mnogosearch.tag
@@ -48,7 +48,7 @@
 	<tag name="udm_error" type="function" returnType="string" version="PHP 4 &gt;= 4.0.5, PHP 5">
 		<attr name="agent" type="resource" status="required"></attr>
 	</tag>
-	<tag name="udm_find" type="function" returnType="resource" version="PHP 4 &gt;= 4.0.5, PHP 5">
+	<tag name="udm_tqfind" type="function" returnType="resource" version="PHP 4 &gt;= 4.0.5, PHP 5">
 		<attr name="agent" type="resource" status="required"></attr>
 		<attr name="query" type="string" status="required"></attr>
 	</tag>
diff --git a/quanta/data/dtep/php/msession.tag b/quanta/data/dtep/php/msession.tag
index 91495875..37114711 100644
--- a/quanta/data/dtep/php/msession.tag
+++ b/quanta/data/dtep/php/msession.tag
@@ -14,7 +14,7 @@
 	</tag>
 	<tag name="msession_disconnect" type="function" returnType="void" version="PHP 4 &gt;= 4.2.0, PHP 5">
 	</tag>
-	<tag name="msession_find" type="function" returnType="array" version="PHP 4 &gt;= 4.2.0, PHP 5">
+	<tag name="msession_tqfind" type="function" returnType="array" version="PHP 4 &gt;= 4.2.0, PHP 5">
 		<attr name="name" type="string" status="required"></attr>
 		<attr name="value" type="string" status="required"></attr>
 	</tag>
diff --git a/quanta/data/dtep/php/ncurses.tag b/quanta/data/dtep/php/ncurses.tag
index 5daae115..76fc6cc7 100644
--- a/quanta/data/dtep/php/ncurses.tag
+++ b/quanta/data/dtep/php/ncurses.tag
@@ -204,9 +204,9 @@
 	<tag name="ncurses_mouseinterval" type="function" returnType="int" version="PHP 4 &gt;= 4.1.0, PHP 5">
 		<attr name="milliseconds" type="int" status="required"></attr>
 	</tag>
-	<tag name="ncurses_mousemask" type="function" returnType="int" version="PHP 4 &gt;= 4.2.0, PHP 5">
-		<attr name="newmask" type="int" status="required"></attr>
-		<attr name="&amp;oldmask" type="int" status="required"></attr>
+	<tag name="ncurses_mousetqmask" type="function" returnType="int" version="PHP 4 &gt;= 4.2.0, PHP 5">
+		<attr name="newtqmask" type="int" status="required"></attr>
+		<attr name="&amp;oldtqmask" type="int" status="required"></attr>
 	</tag>
 	<tag name="ncurses_move_panel" type="function" returnType="int" version="PHP 4 &gt;= 4.3.0, PHP 5">
 		<attr name="panel" type="resource" status="required"></attr>
diff --git a/quanta/data/dtep/php/pcre.tag b/quanta/data/dtep/php/pcre.tag
index 15dcf520..d466a8e3 100644
--- a/quanta/data/dtep/php/pcre.tag
+++ b/quanta/data/dtep/php/pcre.tag
@@ -29,7 +29,7 @@
 		<attr name="subject" type="mixed" status="required"></attr>
 		<attr name="limit" type="int" status="optional"></attr>
 	</tag>
-	<tag name="preg_replace" type="function" returnType="mixed" version="PHP 3&gt;= 3.0.9, PHP 4 , PHP 5">
+	<tag name="preg_tqreplace" type="function" returnType="mixed" version="PHP 3&gt;= 3.0.9, PHP 4 , PHP 5">
 		<attr name="pattern" type="mixed" status="required"></attr>
 		<attr name="replacement" type="mixed" status="required"></attr>
 		<attr name="subject" type="mixed" status="required"></attr>
diff --git a/quanta/data/dtep/php/pdf.tag b/quanta/data/dtep/php/pdf.tag
index a9b1b61a..d2533f1b 100644
--- a/quanta/data/dtep/php/pdf.tag
+++ b/quanta/data/dtep/php/pdf.tag
@@ -3,7 +3,7 @@
 	<tag name="pdf_add_bookmark" type="function" returnType="int" version="PHP 4 &gt;= 4.0.1, PHP 5">
 		<attr name="pdfdoc" type="resource" status="required"></attr>
 		<attr name="text" type="string" status="required"></attr>
-		<attr name="parent" type="int" status="required"></attr>
+		<attr name="tqparent" type="int" status="required"></attr>
 		<attr name="open" type="int" status="required"></attr>
 	</tag>
 	<tag name="pdf_add_launchlink" type="function" returnType="bool" version="PHP 4 &gt;= 4.0.5, PHP 5">
diff --git a/quanta/data/dtep/php/regex.tag b/quanta/data/dtep/php/regex.tag
index 5b0752bf..325996ac 100644
--- a/quanta/data/dtep/php/regex.tag
+++ b/quanta/data/dtep/php/regex.tag
@@ -1,6 +1,6 @@
 <!DOCTYPE tags>
 <tags>
-	<tag name="ereg_replace" type="function" returnType="string" version="PHP 3, PHP 4 , PHP 5">
+	<tag name="ereg_tqreplace" type="function" returnType="string" version="PHP 3, PHP 4 , PHP 5">
 		<attr name="pattern" type="string" status="required"></attr>
 		<attr name="replacement" type="string" status="required"></attr>
 		<attr name="string" type="string" status="required"></attr>
@@ -10,7 +10,7 @@
 		<attr name="string" type="string" status="required"></attr>
 		<attr name="&amp;regs" type="array" status="optional"></attr>
 	</tag>
-	<tag name="eregi_replace" type="function" returnType="string" version="PHP 3, PHP 4 , PHP 5">
+	<tag name="eregi_tqreplace" type="function" returnType="string" version="PHP 3, PHP 4 , PHP 5">
 		<attr name="pattern" type="string" status="required"></attr>
 		<attr name="replacement" type="string" status="required"></attr>
 		<attr name="string" type="string" status="required"></attr>
diff --git a/quanta/data/dtep/php/simplexml.tag b/quanta/data/dtep/php/simplexml.tag
index e2797756..aca2b4ac 100644
--- a/quanta/data/dtep/php/simplexml.tag
+++ b/quanta/data/dtep/php/simplexml.tag
@@ -5,7 +5,7 @@
 	<tag name="simplexml_element->attributes" type="function" returnType="object SimpleXMLElement" version="">
 		<attr name="data" type="string" status="required"></attr>
 	</tag>
-	<tag name="simplexml_element->children" type="function" returnType="object SimpleXMLElement" version="">
+	<tag name="simplexml_element->tqchildren" type="function" returnType="object SimpleXMLElement" version="">
 	</tag>
 	<tag name="SimpleXMLElement->xpath" type="function" returnType="array" version="">
 		<attr name="path" type="string" status="required"></attr>
diff --git a/quanta/data/dtep/php/strings.tag b/quanta/data/dtep/php/strings.tag
index 474c10a4..461034e0 100644
--- a/quanta/data/dtep/php/strings.tag
+++ b/quanta/data/dtep/php/strings.tag
@@ -183,9 +183,9 @@
 		<attr name="format" type="string" status="required"></attr>
 		<attr name="&amp;..." type="mixed" status="optional"></attr>
 	</tag>
-	<tag name="str_ireplace" type="function" returnType="mixed" version="PHP 5">
+	<tag name="str_itqreplace" type="function" returnType="mixed" version="PHP 5">
 		<attr name="search" type="mixed" status="required"></attr>
-		<attr name="replace" type="mixed" status="required"></attr>
+		<attr name="tqreplace" type="mixed" status="required"></attr>
 		<attr name="subject" type="mixed" status="required"></attr>
 		<attr name="&amp;count" type="int" status="optional"></attr>
 	</tag>
@@ -199,9 +199,9 @@
 		<attr name="input" type="string" status="required"></attr>
 		<attr name="multiplier" type="int" status="required"></attr>
 	</tag>
-	<tag name="str_replace" type="function" returnType="mixed" version="PHP 3&gt;= 3.0.6, PHP 4 , PHP 5">
+	<tag name="str_tqreplace" type="function" returnType="mixed" version="PHP 3&gt;= 3.0.6, PHP 4 , PHP 5">
 		<attr name="search" type="mixed" status="required"></attr>
-		<attr name="replace" type="mixed" status="required"></attr>
+		<attr name="tqreplace" type="mixed" status="required"></attr>
 		<attr name="subject" type="mixed" status="required"></attr>
 		<attr name="&amp;count" type="int" status="optional"></attr>
 	</tag>
@@ -339,7 +339,7 @@
 		<attr name="haystack" type="string" status="required"></attr>
 		<attr name="needle" type="string" status="required"></attr>
 	</tag>
-	<tag name="substr_replace" type="function" returnType="string" version="PHP 4 , PHP 5">
+	<tag name="substr_tqreplace" type="function" returnType="string" version="PHP 4 , PHP 5">
 		<attr name="string" type="string" status="required"></attr>
 		<attr name="replacement" type="string" status="required"></attr>
 		<attr name="start" type="int" status="required"></attr>
diff --git a/quanta/data/dtep/php/swf.tag b/quanta/data/dtep/php/swf.tag
index 444f80c0..b453bd7c 100644
--- a/quanta/data/dtep/php/swf.tag
+++ b/quanta/data/dtep/php/swf.tag
@@ -29,7 +29,7 @@
 	</tag>
 	<tag name="swf_addbuttonrecord" type="function" returnType="void" version="PHP 4 ">
 		<attr name="states" type="int" status="required"></attr>
-		<attr name="shapeid" type="int" status="required"></attr>
+		<attr name="tqshapeid" type="int" status="required"></attr>
 		<attr name="depth" type="int" status="required"></attr>
 	</tag>
 	<tag name="swf_addcolor" type="function" returnType="void" version="PHP 4 ">
@@ -80,7 +80,7 @@
 	</tag>
 	<tag name="swf_enddoaction" type="function" returnType="void" version="PHP 4 ">
 	</tag>
-	<tag name="swf_endshape" type="function" returnType="void" version="PHP 4 ">
+	<tag name="swf_endtqshape" type="function" returnType="void" version="PHP 4 ">
 	</tag>
 	<tag name="swf_endsymbol" type="function" returnType="void" version="PHP 4 ">
 	</tag>
@@ -191,20 +191,20 @@
 	<tag name="swf_setframe" type="function" returnType="void" version="PHP 4 ">
 		<attr name="framenumber" type="int" status="required"></attr>
 	</tag>
-	<tag name="swf_shapearc" type="function" returnType="void" version="PHP 4 ">
+	<tag name="swf_tqshapearc" type="function" returnType="void" version="PHP 4 ">
 		<attr name="x" type="float" status="required"></attr>
 		<attr name="y" type="float" status="required"></attr>
 		<attr name="r" type="float" status="required"></attr>
 		<attr name="ang1" type="float" status="required"></attr>
 		<attr name="ang2" type="float" status="required"></attr>
 	</tag>
-	<tag name="swf_shapecurveto" type="function" returnType="void" version="PHP 4 ">
+	<tag name="swf_tqshapecurveto" type="function" returnType="void" version="PHP 4 ">
 		<attr name="x1" type="float" status="required"></attr>
 		<attr name="y1" type="float" status="required"></attr>
 		<attr name="x2" type="float" status="required"></attr>
 		<attr name="y2" type="float" status="required"></attr>
 	</tag>
-	<tag name="swf_shapecurveto3" type="function" returnType="void" version="PHP 4 ">
+	<tag name="swf_tqshapecurveto3" type="function" returnType="void" version="PHP 4 ">
 		<attr name="x1" type="float" status="required"></attr>
 		<attr name="y1" type="float" status="required"></attr>
 		<attr name="x2" type="float" status="required"></attr>
@@ -212,32 +212,32 @@
 		<attr name="x3" type="float" status="required"></attr>
 		<attr name="y3" type="float" status="required"></attr>
 	</tag>
-	<tag name="swf_shapefillbitmapclip" type="function" returnType="void" version="PHP 4 ">
+	<tag name="swf_tqshapefillbitmapclip" type="function" returnType="void" version="PHP 4 ">
 		<attr name="bitmapid" type="int" status="required"></attr>
 	</tag>
-	<tag name="swf_shapefillbitmaptile" type="function" returnType="void" version="PHP 4 ">
+	<tag name="swf_tqshapefillbitmaptile" type="function" returnType="void" version="PHP 4 ">
 		<attr name="bitmapid" type="int" status="required"></attr>
 	</tag>
-	<tag name="swf_shapefilloff" type="function" returnType="void" version="PHP 4 ">
+	<tag name="swf_tqshapefilloff" type="function" returnType="void" version="PHP 4 ">
 	</tag>
-	<tag name="swf_shapefillsolid" type="function" returnType="void" version="PHP 4 ">
+	<tag name="swf_tqshapefillsolid" type="function" returnType="void" version="PHP 4 ">
 		<attr name="r" type="float" status="required"></attr>
 		<attr name="g" type="float" status="required"></attr>
 		<attr name="b" type="float" status="required"></attr>
 		<attr name="a" type="float" status="required"></attr>
 	</tag>
-	<tag name="swf_shapelinesolid" type="function" returnType="void" version="PHP 4 ">
+	<tag name="swf_tqshapelinesolid" type="function" returnType="void" version="PHP 4 ">
 		<attr name="r" type="float" status="required"></attr>
 		<attr name="g" type="float" status="required"></attr>
 		<attr name="b" type="float" status="required"></attr>
 		<attr name="a" type="float" status="required"></attr>
 		<attr name="width" type="float" status="required"></attr>
 	</tag>
-	<tag name="swf_shapelineto" type="function" returnType="void" version="PHP 4 ">
+	<tag name="swf_tqshapelineto" type="function" returnType="void" version="PHP 4 ">
 		<attr name="x" type="float" status="required"></attr>
 		<attr name="y" type="float" status="required"></attr>
 	</tag>
-	<tag name="swf_shapemoveto" type="function" returnType="void" version="PHP 4 ">
+	<tag name="swf_tqshapemoveto" type="function" returnType="void" version="PHP 4 ">
 		<attr name="x" type="float" status="required"></attr>
 		<attr name="y" type="float" status="required"></attr>
 	</tag>
@@ -249,7 +249,7 @@
 	</tag>
 	<tag name="swf_startdoaction" type="function" returnType="void" version="PHP 4 ">
 	</tag>
-	<tag name="swf_startshape" type="function" returnType="void" version="PHP 4 ">
+	<tag name="swf_starttqshape" type="function" returnType="void" version="PHP 4 ">
 		<attr name="objid" type="int" status="required"></attr>
 	</tag>
 	<tag name="swf_startsymbol" type="function" returnType="void" version="PHP 4 ">
diff --git a/quanta/data/dtep/php/tidy.tag b/quanta/data/dtep/php/tidy.tag
index b87ccada..43a6385b 100644
--- a/quanta/data/dtep/php/tidy.tag
+++ b/quanta/data/dtep/php/tidy.tag
@@ -70,7 +70,7 @@
 	</tag>
 	<tag name="tidy_node->attributes" type="function" returnType="array" version="">
 	</tag>
-	<tag name="tidy_node->children" type="function" returnType="array" version="">
+	<tag name="tidy_node->tqchildren" type="function" returnType="array" version="">
 	</tag>
 	<tag name="tidy_node->get_attr" type="function" returnType="tidy_attr" version="">
 		<attr name="attrib_id" type="int" status="required"></attr>
diff --git a/quanta/data/dtep/php/xslt.tag b/quanta/data/dtep/php/xslt.tag
index 15d90be5..619c26ce 100644
--- a/quanta/data/dtep/php/xslt.tag
+++ b/quanta/data/dtep/php/xslt.tag
@@ -66,6 +66,6 @@
 	</tag>
 	<tag name="xslt_setopt" type="function" returnType="int" version="PHP 4 &gt;= 4.3.0">
 		<attr name="processor" type="resource" status="required"></attr>
-		<attr name="newmask" type="int" status="required"></attr>
+		<attr name="newtqmask" type="int" status="required"></attr>
 	</tag>
 </tags>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/anyName.tag b/quanta/data/dtep/relaxng/anyName.tag
index fc6e4c31..3598ddad 100644
--- a/quanta/data/dtep/relaxng/anyName.tag
+++ b/quanta/data/dtep/relaxng/anyName.tag
@@ -4,8 +4,8 @@
  <tag name="anyName">
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child  name="except" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/relaxng/attribute.tag b/quanta/data/dtep/relaxng/attribute.tag
index da288603..33107bf8 100644
--- a/quanta/data/dtep/relaxng/attribute.tag
+++ b/quanta/data/dtep/relaxng/attribute.tag
@@ -5,7 +5,7 @@
   <attr name="datatypeLibrary" type="input" />
   <attr name="name" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="anyName" />
    <child name="choice" />
    <child name="name" />
@@ -19,7 +19,7 @@
    <child name="oneOrMore" />
    <child name="list" />
    <child name="mixed" />
-   <child name="parentRef" />
+   <child name="tqparentRef" />
    <child name="empty" />
    <child name="text" />
    <child name="value" />
@@ -27,6 +27,6 @@
    <child name="notAllowed" />
    <child name="externalRef" />
    <child name="grammar" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/relaxng/choice.tag b/quanta/data/dtep/relaxng/choice.tag
index a5b07483..9057d664 100644
--- a/quanta/data/dtep/relaxng/choice.tag
+++ b/quanta/data/dtep/relaxng/choice.tag
@@ -4,7 +4,7 @@
  <tag name="choice">
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="name" />
    <child name="anyName" />
    <child name="nsName" />
@@ -20,7 +20,7 @@
    <child name="list" />
    <child name="mixed" />
    <child name="ref" />
-   <child name="parentRef" />
+   <child name="tqparentRef" />
    <child name="empty" />
    <child name="text" />
    <child name="value" />
@@ -28,6 +28,6 @@
    <child name="notAllowed" />
    <child name="externalRef" />
    <child name="grammar" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/relaxng/data.tag b/quanta/data/dtep/relaxng/data.tag
index d7c01c05..45ed28e7 100644
--- a/quanta/data/dtep/relaxng/data.tag
+++ b/quanta/data/dtep/relaxng/data.tag
@@ -5,9 +5,9 @@
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
   <attr name="type" type="input" />
-  <children>
+  <tqchildren>
    <child  name="except" />
    <child  name="param" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/define.tag b/quanta/data/dtep/relaxng/define.tag
index 3d43ef67..5bc39dac 100644
--- a/quanta/data/dtep/relaxng/define.tag
+++ b/quanta/data/dtep/relaxng/define.tag
@@ -6,7 +6,7 @@
   <attr name="datatypeLibrary" type="input" />
   <attr name="name" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="element" />
    <child name="attribute" />
    <child name="group" />
@@ -18,7 +18,7 @@
    <child name="list" />
    <child name="mixed" />
    <child name="ref" />
-   <child name="parentRef" />
+   <child name="tqparentRef" />
    <child name="empty" />
    <child name="text" />
    <child name="value" />
@@ -26,6 +26,6 @@
    <child name="notAllowed" />
    <child name="externalRef" />
    <child name="grammar" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/div.tag b/quanta/data/dtep/relaxng/div.tag
index 1be93bb0..f633852a 100644
--- a/quanta/data/dtep/relaxng/div.tag
+++ b/quanta/data/dtep/relaxng/div.tag
@@ -4,9 +4,9 @@
  <tag name="div">
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="div" />
    <child name="include" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/element.tag b/quanta/data/dtep/relaxng/element.tag
index 7d508021..0a92fc6a 100644
--- a/quanta/data/dtep/relaxng/element.tag
+++ b/quanta/data/dtep/relaxng/element.tag
@@ -5,7 +5,7 @@
   <attr name="datatypeLibrary" type="input" />
   <attr name="name" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="anyName" />
    <child name="choice" />
    <child name="name" />
@@ -21,7 +21,7 @@
    <child name="list" />
    <child name="mixed" />
    <child name="ref" />
-   <child name="parentRef" />
+   <child name="tqparentRef" />
    <child name="empty" />
    <child name="text" />
    <child name="value" />
@@ -29,6 +29,6 @@
    <child name="notAllowed" />
    <child name="externalRef" />
    <child name="grammar" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/relaxng/except.tag b/quanta/data/dtep/relaxng/except.tag
index bd85cab5..f6235b38 100644
--- a/quanta/data/dtep/relaxng/except.tag
+++ b/quanta/data/dtep/relaxng/except.tag
@@ -4,7 +4,7 @@
  <tag name="except">
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="anyName" />
    <child name="choice" />
    <child name="name" />
@@ -20,7 +20,7 @@
    <child name="list" />
    <child name="mixed" />
    <child name="ref" />
-   <child name="parentRef" />
+   <child name="tqparentRef" />
    <child name="empty" />
    <child name="text" />
    <child name="value" />
@@ -28,6 +28,6 @@
    <child name="notAllowed" />
    <child name="externalRef" />
    <child name="grammar" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/grammar.tag b/quanta/data/dtep/relaxng/grammar.tag
index 0f3f4a99..a9017426 100644
--- a/quanta/data/dtep/relaxng/grammar.tag
+++ b/quanta/data/dtep/relaxng/grammar.tag
@@ -5,11 +5,11 @@
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
   <attr name="xmlns" type="input" />
-  <children>
+  <tqchildren>
    <child name="define" />
    <child name="div" />
    <child name="include" />
    <child name="start" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/group.tag b/quanta/data/dtep/relaxng/group.tag
index 42f9858b..3f971508 100644
--- a/quanta/data/dtep/relaxng/group.tag
+++ b/quanta/data/dtep/relaxng/group.tag
@@ -4,7 +4,7 @@
  <tag name="group">
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="element" />
    <child name="attribute" />
    <child name="group" />
@@ -16,7 +16,7 @@
    <child name="list" />
    <child name="mixed" />
    <child name="ref" />
-   <child name="parentRef" />
+   <child name="tqparentRef" />
    <child name="empty" />
    <child name="text" />
    <child name="value" />
@@ -24,6 +24,6 @@
    <child name="notAllowed" />
    <child name="externalRef" />
    <child name="grammar" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/include.tag b/quanta/data/dtep/relaxng/include.tag
index ff3310f9..0c1d0885 100644
--- a/quanta/data/dtep/relaxng/include.tag
+++ b/quanta/data/dtep/relaxng/include.tag
@@ -5,10 +5,10 @@
   <attr name="datatypeLibrary" type="input" />
   <attr name="href" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="define" />
    <child name="div" />
    <child name="start" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/interleave.tag b/quanta/data/dtep/relaxng/interleave.tag
index d30632ab..e0a1603c 100644
--- a/quanta/data/dtep/relaxng/interleave.tag
+++ b/quanta/data/dtep/relaxng/interleave.tag
@@ -4,7 +4,7 @@
  <tag name="interleave">
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="element" />
    <child name="attribute" />
    <child name="group" />
@@ -16,7 +16,7 @@
    <child name="list" />
    <child name="mixed" />
    <child name="ref" />
-   <child name="parentRef" />
+   <child name="tqparentRef" />
    <child name="empty" />
    <child name="text" />
    <child name="value" />
@@ -24,6 +24,6 @@
    <child name="notAllowed" />
    <child name="externalRef" />
    <child name="grammar" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/list.tag b/quanta/data/dtep/relaxng/list.tag
index f5660fb8..49ee5e57 100644
--- a/quanta/data/dtep/relaxng/list.tag
+++ b/quanta/data/dtep/relaxng/list.tag
@@ -4,7 +4,7 @@
  <tag name="list">
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="element" />
    <child name="group" />
    <child name="choice" />
@@ -12,13 +12,13 @@
    <child name="zeroOrMore" />
    <child name="oneOrMore" />
    <child name="mixed" />
-   <child name="parentRef" />
+   <child name="tqparentRef" />
    <child name="empty" />
    <child name="value" />
    <child name="data" />
    <child name="notAllowed" />
    <child name="externalRef" />
    <child name="grammar" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/mixed.tag b/quanta/data/dtep/relaxng/mixed.tag
index f14335cf..8625b1dd 100644
--- a/quanta/data/dtep/relaxng/mixed.tag
+++ b/quanta/data/dtep/relaxng/mixed.tag
@@ -4,7 +4,7 @@
  <tag name="mixed">
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="element" />
    <child name="attribute" />
    <child name="group" />
@@ -16,7 +16,7 @@
    <child name="list" />
    <child name="mixed" />
    <child name="ref" />
-   <child name="parentRef" />
+   <child name="tqparentRef" />
    <child name="empty" />
    <child name="text" />
    <child name="value" />
@@ -24,6 +24,6 @@
    <child name="notAllowed" />
    <child name="externalRef" />
    <child name="grammar" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/nsName.tag b/quanta/data/dtep/relaxng/nsName.tag
index 39a73cd9..f6bd95bb 100644
--- a/quanta/data/dtep/relaxng/nsName.tag
+++ b/quanta/data/dtep/relaxng/nsName.tag
@@ -4,8 +4,8 @@
  <tag name="nsName">
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="except" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/oneOrMore.tag b/quanta/data/dtep/relaxng/oneOrMore.tag
index 4658479f..763aff34 100644
--- a/quanta/data/dtep/relaxng/oneOrMore.tag
+++ b/quanta/data/dtep/relaxng/oneOrMore.tag
@@ -4,7 +4,7 @@
  <tag name="oneOrMore">
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="element" />
    <child name="attribute" />
    <child name="group" />
@@ -16,7 +16,7 @@
    <child name="list" />
    <child name="mixed" />
    <child name="ref" />
-   <child name="parentRef" />
+   <child name="tqparentRef" />
    <child name="empty" />
    <child name="text" />
    <child name="value" />
@@ -24,6 +24,6 @@
    <child name="notAllowed" />
    <child name="externalRef" />
    <child name="grammar" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/optional.tag b/quanta/data/dtep/relaxng/optional.tag
index 5d56d5f9..8b51f18b 100644
--- a/quanta/data/dtep/relaxng/optional.tag
+++ b/quanta/data/dtep/relaxng/optional.tag
@@ -4,7 +4,7 @@
  <tag name="optional">
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="element" />
    <child name="attribute" />
    <child name="group" />
@@ -16,7 +16,7 @@
    <child name="list" />
    <child name="mixed" />
    <child name="ref" />
-   <child name="parentRef" />
+   <child name="tqparentRef" />
    <child name="empty" />
    <child name="text" />
    <child name="value" />
@@ -24,6 +24,6 @@
    <child name="notAllowed" />
    <child name="externalRef" />
    <child name="grammar" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/parentRef.tag b/quanta/data/dtep/relaxng/parentRef.tag
index 39ace697..0fcb9817 100644
--- a/quanta/data/dtep/relaxng/parentRef.tag
+++ b/quanta/data/dtep/relaxng/parentRef.tag
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE TAGS>
 <TAGS>
- <tag name="parentRef" single="1">
+ <tag name="tqparentRef" single="1">
   <attr name="datatypeLibrary" type="input" />
   <attr name="name" type="input" />
   <attr name="ns" type="input" />
diff --git a/quanta/data/dtep/relaxng/start.tag b/quanta/data/dtep/relaxng/start.tag
index 2e1a4429..952beee8 100644
--- a/quanta/data/dtep/relaxng/start.tag
+++ b/quanta/data/dtep/relaxng/start.tag
@@ -5,17 +5,17 @@
   <attr name="combine" type="input" />
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="element" />
    <child name="choice" />
    <child name="optional" />
    <child name="zeroOrMore" />
    <child name="mixed" />
    <child name="ref" />
-   <child name="parentRef" />
+   <child name="tqparentRef" />
    <child name="notAllowed" />
    <child name="externalRef" />
    <child name="grammar" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/relaxng/zeroOrMore.tag b/quanta/data/dtep/relaxng/zeroOrMore.tag
index 7b8bea98..eb5f468e 100644
--- a/quanta/data/dtep/relaxng/zeroOrMore.tag
+++ b/quanta/data/dtep/relaxng/zeroOrMore.tag
@@ -4,7 +4,7 @@
  <tag name="zeroOrMore">
   <attr name="datatypeLibrary" type="input" />
   <attr name="ns" type="input" />
-  <children>
+  <tqchildren>
    <child name="element" />
    <child name="attribute" />
    <child name="group" />
@@ -16,7 +16,7 @@
    <child name="list" />
    <child name="mixed" />
    <child name="ref" />
-   <child name="parentRef" />
+   <child name="tqparentRef" />
    <child name="empty" />
    <child name="text" />
    <child name="value" />
@@ -24,6 +24,6 @@
    <child name="notAllowed" />
    <child name="externalRef" />
    <child name="grammar" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/schema/all.tag b/quanta/data/dtep/schema/all.tag
index 62e9bb6a..0c435782 100644
--- a/quanta/data/dtep/schema/all.tag
+++ b/quanta/data/dtep/schema/all.tag
@@ -38,9 +38,9 @@
    <whatsthis>Maximum number of times the element can occur. The value must be 1.</whatsthis>
    <location col="1" row="2"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="element" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/annotation.tag b/quanta/data/dtep/schema/annotation.tag
index 1846c969..610295a0 100644
--- a/quanta/data/dtep/schema/annotation.tag
+++ b/quanta/data/dtep/schema/annotation.tag
@@ -11,9 +11,9 @@
    <whatsthis>A unique ID for the element.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="appinfo" />
    <child name="documentation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/any.tag b/quanta/data/dtep/schema/any.tag
index 182ebdf7..f2fcbf1b 100644
--- a/quanta/data/dtep/schema/any.tag
+++ b/quanta/data/dtep/schema/any.tag
@@ -56,8 +56,8 @@
    <whatsthis>How should the XML processor handle validation, in regard to elements specified by this element?</whatsthis>
    <location col="1" row="4"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/anyAttribute.tag b/quanta/data/dtep/schema/anyAttribute.tag
index 62e43733..07ebf80b 100644
--- a/quanta/data/dtep/schema/anyAttribute.tag
+++ b/quanta/data/dtep/schema/anyAttribute.tag
@@ -36,8 +36,8 @@
    <whatsthis>How should the XML processor handle validation, in regard to attributes specified by this element?</whatsthis>
    <location col="1" row="2"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/attribute.tag b/quanta/data/dtep/schema/attribute.tag
index b4e5c1bc..e6ac7ee4 100644
--- a/quanta/data/dtep/schema/attribute.tag
+++ b/quanta/data/dtep/schema/attribute.tag
@@ -102,9 +102,9 @@
    <stoppingtag name="attribute" />
    <stoppingtag name="notation" />
   </stoppingtags>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="simpleType" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/attributeGroup.tag b/quanta/data/dtep/schema/attributeGroup.tag
index 5e07e926..168ccf22 100644
--- a/quanta/data/dtep/schema/attributeGroup.tag
+++ b/quanta/data/dtep/schema/attributeGroup.tag
@@ -42,11 +42,11 @@
    <stoppingtag name="element" />
    <stoppingtag name="notation" />
   </stoppingtags>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="attribute" />
    <child name="attributeGroup" />
    <child name="anyAttribute" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/choice.tag b/quanta/data/dtep/schema/choice.tag
index d45f2356..72207791 100644
--- a/quanta/data/dtep/schema/choice.tag
+++ b/quanta/data/dtep/schema/choice.tag
@@ -31,13 +31,13 @@
    <whatsthis>Maximum number of times the element can occur. Value can be >=0 or unbounded. Default is 1.</whatsthis>
    <location col="1" row="2"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="element" />
    <child name="group" />
    <child name="choice" />
    <child name="sequence" />
    <child name="any" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/complexContent.tag b/quanta/data/dtep/schema/complexContent.tag
index 4096b604..3cc7b1dd 100644
--- a/quanta/data/dtep/schema/complexContent.tag
+++ b/quanta/data/dtep/schema/complexContent.tag
@@ -25,10 +25,10 @@
    <whatsthis>true, if character data is allowed to appear between the child elements. Default is false.</whatsthis>
    <location col="1" row="1"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="restriction" />
    <child name="extension" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/complexType.tag b/quanta/data/dtep/schema/complexType.tag
index 4ea80bfa..2efe28c4 100644
--- a/quanta/data/dtep/schema/complexType.tag
+++ b/quanta/data/dtep/schema/complexType.tag
@@ -75,7 +75,7 @@
    <stoppingtag name="element" />
    <stoppingtag name="notation" />
   </stoppingtags>
-  <children>
+  <tqchildren>
    <child name="all" />
    <child name="annotation" />
    <child name="anyAttribute" />
@@ -86,6 +86,6 @@
    <child name="group" />
    <child name="sequence" />
    <child name="simpleContent" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/element.tag b/quanta/data/dtep/schema/element.tag
index 24adffa3..3048ee50 100644
--- a/quanta/data/dtep/schema/element.tag
+++ b/quanta/data/dtep/schema/element.tag
@@ -141,8 +141,8 @@
    <location col="0" row="13"/>
   </label>
   <attr name="substitutionGroup" type="input">
-   <tooltip>Name of an element that can be substituted with this one. Only usable if the parent element is schema.</tooltip>
-   <whatsthis>Name of an element that can be substituted with this one. Only usable if the parent element is schema.</whatsthis>
+   <tooltip>Name of an element that can be substituted with this one. Only usable if the tqparent element is schema.</tooltip>
+   <whatsthis>Name of an element that can be substituted with this one. Only usable if the tqparent element is schema.</whatsthis>
    <location col="1" row="13"/>
   </attr>
 
@@ -156,13 +156,13 @@
    <stoppingtag name="attribute" />
    <stoppingtag name="notation" />
   </stoppingtags>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="simpleType" />
    <child name="complexType" />
    <child name="unique" />
    <child name="key" />
    <child name="keyref" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/enumeration.tag b/quanta/data/dtep/schema/enumeration.tag
index 3995f0ea..f8d27152 100644
--- a/quanta/data/dtep/schema/enumeration.tag
+++ b/quanta/data/dtep/schema/enumeration.tag
@@ -11,8 +11,8 @@
    <whatsthis>Acceptable value.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/extension.tag b/quanta/data/dtep/schema/extension.tag
index 12f5689f..05cea05e 100644
--- a/quanta/data/dtep/schema/extension.tag
+++ b/quanta/data/dtep/schema/extension.tag
@@ -21,7 +21,7 @@
    <whatsthis>Name of a built-in data type, simpleType, or complexType.</whatsthis>
    <location col="1" row="1"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="group" />
    <child name="all" />
@@ -30,6 +30,6 @@
    <child name="attribute" />
    <child name="attributeGroup" />
    <child name="anyAttribute" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/field.tag b/quanta/data/dtep/schema/field.tag
index c5c1fa08..59a4d0d3 100644
--- a/quanta/data/dtep/schema/field.tag
+++ b/quanta/data/dtep/schema/field.tag
@@ -21,8 +21,8 @@
    <whatsthis>Single element or attribute whose content or value is used for the constraint.</whatsthis>
    <location col="1" row="1"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/fractionDigits.tag b/quanta/data/dtep/schema/fractionDigits.tag
index 360679d1..227f9834 100644
--- a/quanta/data/dtep/schema/fractionDigits.tag
+++ b/quanta/data/dtep/schema/fractionDigits.tag
@@ -11,8 +11,8 @@
    <whatsthis>Maximum number of decimal places allowed, which must be >=0.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/schema/group.tag b/quanta/data/dtep/schema/group.tag
index 8a945c0a..3012de46 100644
--- a/quanta/data/dtep/schema/group.tag
+++ b/quanta/data/dtep/schema/group.tag
@@ -64,11 +64,11 @@
    <stoppingtag name="attribute" />
    <stoppingtag name="notation" />
   </stoppingtags>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="all" />
    <child name="choice" />
    <child name="sequence" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/import.tag b/quanta/data/dtep/schema/import.tag
index a7a7015e..dcf4d5a9 100644
--- a/quanta/data/dtep/schema/import.tag
+++ b/quanta/data/dtep/schema/import.tag
@@ -44,8 +44,8 @@
    <stoppingtag name="attribute" />
    <stoppingtag name="notation" />
   </stoppingtags>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/include.tag b/quanta/data/dtep/schema/include.tag
index 0a19816d..7e4b40dc 100644
--- a/quanta/data/dtep/schema/include.tag
+++ b/quanta/data/dtep/schema/include.tag
@@ -34,8 +34,8 @@
    <stoppingtag name="attribute" />
    <stoppingtag name="notation" />
   </stoppingtags>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/key.tag b/quanta/data/dtep/schema/key.tag
index 9798beb5..2995e7d0 100644
--- a/quanta/data/dtep/schema/key.tag
+++ b/quanta/data/dtep/schema/key.tag
@@ -21,10 +21,10 @@
    <whatsthis>Name of the key element.</whatsthis>
    <location col="1" row="1"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="selector" />
    <child name="field" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/keyref.tag b/quanta/data/dtep/schema/keyref.tag
index 87d2dcb5..a24941e8 100644
--- a/quanta/data/dtep/schema/keyref.tag
+++ b/quanta/data/dtep/schema/keyref.tag
@@ -31,10 +31,10 @@
    <whatsthis>Name of a key or unique element defined in this or another schema.</whatsthis>
    <location col="1" row="2"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="selector" />
    <child name="field" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/length.tag b/quanta/data/dtep/schema/length.tag
index 5153975c..4bc20262 100644
--- a/quanta/data/dtep/schema/length.tag
+++ b/quanta/data/dtep/schema/length.tag
@@ -11,8 +11,8 @@
    <whatsthis>Exact number of characters or list items allowed, which must be >=0.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/list.tag b/quanta/data/dtep/schema/list.tag
index 454c3225..8037dafd 100644
--- a/quanta/data/dtep/schema/list.tag
+++ b/quanta/data/dtep/schema/list.tag
@@ -21,9 +21,9 @@
    <whatsthis>Name of a built-in data type or simpleType. If the content contains a simpleType element, then itemType is not allowed, else itemType is required.</whatsthis>
    <location col="1" row="1"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="simpleType" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/maxExclusive.tag b/quanta/data/dtep/schema/maxExclusive.tag
index b30d15bf..8b41abed 100644
--- a/quanta/data/dtep/schema/maxExclusive.tag
+++ b/quanta/data/dtep/schema/maxExclusive.tag
@@ -11,8 +11,8 @@
    <whatsthis>Upper bounds for numeric values. data less than value.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/maxInclusive.tag b/quanta/data/dtep/schema/maxInclusive.tag
index 85e2a28c..75224876 100644
--- a/quanta/data/dtep/schema/maxInclusive.tag
+++ b/quanta/data/dtep/schema/maxInclusive.tag
@@ -11,8 +11,8 @@
    <whatsthis>Upper bounds for numeric values. Data less than or equal to value.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/maxLength.tag b/quanta/data/dtep/schema/maxLength.tag
index f0f285fa..905c618a 100644
--- a/quanta/data/dtep/schema/maxLength.tag
+++ b/quanta/data/dtep/schema/maxLength.tag
@@ -11,8 +11,8 @@
    <whatsthis>Maximum number of characters or list items allowed, which must be >=0.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/minExclusive.tag b/quanta/data/dtep/schema/minExclusive.tag
index 0cba57e1..e44bf4e7 100644
--- a/quanta/data/dtep/schema/minExclusive.tag
+++ b/quanta/data/dtep/schema/minExclusive.tag
@@ -11,8 +11,8 @@
    <whatsthis>Lower bounds for numeric values. Data > value.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/minInclusive.tag b/quanta/data/dtep/schema/minInclusive.tag
index b3eb6dd5..56f3716d 100644
--- a/quanta/data/dtep/schema/minInclusive.tag
+++ b/quanta/data/dtep/schema/minInclusive.tag
@@ -11,8 +11,8 @@
    <whatsthis>Lower bounds for numeric values. Data >= value.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/minLength.tag b/quanta/data/dtep/schema/minLength.tag
index 761f4302..6386027d 100644
--- a/quanta/data/dtep/schema/minLength.tag
+++ b/quanta/data/dtep/schema/minLength.tag
@@ -11,8 +11,8 @@
    <whatsthis>Minimum number of characters or list items allowed, which must be >=0.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/notation.tag b/quanta/data/dtep/schema/notation.tag
index 016c30d0..291ea924 100644
--- a/quanta/data/dtep/schema/notation.tag
+++ b/quanta/data/dtep/schema/notation.tag
@@ -54,8 +54,8 @@
    <stoppingtag name="attribute" />
    <stoppingtag name="notation" />
   </stoppingtags>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/pattern.tag b/quanta/data/dtep/schema/pattern.tag
index 4a81f785..19f3b171 100644
--- a/quanta/data/dtep/schema/pattern.tag
+++ b/quanta/data/dtep/schema/pattern.tag
@@ -11,8 +11,8 @@
    <whatsthis>Exact sequence of characters that are acceptable.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/redefine.tag b/quanta/data/dtep/schema/redefine.tag
index 8dcb0456..e421b3bb 100644
--- a/quanta/data/dtep/schema/redefine.tag
+++ b/quanta/data/dtep/schema/redefine.tag
@@ -30,12 +30,12 @@
    <stoppingtag name="attribute" />
    <stoppingtag name="notation" />
   </stoppingtags>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="simpleType" />
    <child name="complexType" />
    <child name="group" />
    <child name="attributeGroup" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/restriction.tag b/quanta/data/dtep/schema/restriction.tag
index c4562b34..d39176e4 100644
--- a/quanta/data/dtep/schema/restriction.tag
+++ b/quanta/data/dtep/schema/restriction.tag
@@ -21,7 +21,7 @@
    <whatsthis>Name of a built-in data type, simpleType, or complexType.</whatsthis>
    <location col="1" row="1"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="simpleType" />
    <child name="attribute" />
@@ -43,6 +43,6 @@
    <child name="enumeration" />
    <child name="whiteSpace" />
    <child name="pattern" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/schema.tag b/quanta/data/dtep/schema/schema.tag
index 28d38b3b..7d2cc41a 100644
--- a/quanta/data/dtep/schema/schema.tag
+++ b/quanta/data/dtep/schema/schema.tag
@@ -85,7 +85,7 @@
   <attr name="finalDefault" type="input">
    <location col="1" row="7"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="include" />
    <child name="import" />
    <child name="redefine" />
@@ -97,6 +97,6 @@
    <child name="element" />
    <child name="attribute" />
    <child name="notation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/selector.tag b/quanta/data/dtep/schema/selector.tag
index 33ab2ad3..ce5ec026 100644
--- a/quanta/data/dtep/schema/selector.tag
+++ b/quanta/data/dtep/schema/selector.tag
@@ -21,8 +21,8 @@
    <whatsthis>An XPath expression, relative to the element being declared, that identifies the child elements to which the identity constraint applies.</whatsthis>
    <location col="1" row="1"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/sequence.tag b/quanta/data/dtep/schema/sequence.tag
index 08aa3e04..c3bcc82b 100644
--- a/quanta/data/dtep/schema/sequence.tag
+++ b/quanta/data/dtep/schema/sequence.tag
@@ -31,13 +31,13 @@
    <whatsthis>Maximum number of times the element can occur. Value can be >=0 or unbounded. Default is 1.</whatsthis>
    <location col="1" row="2"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="element" />
    <child name="group" />
    <child name="choice" />
    <child name="sequence" />
    <child name="any" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/simpleContent.tag b/quanta/data/dtep/schema/simpleContent.tag
index 7c55c717..9ae47f7e 100644
--- a/quanta/data/dtep/schema/simpleContent.tag
+++ b/quanta/data/dtep/schema/simpleContent.tag
@@ -11,10 +11,10 @@
    <whatsthis>A unique ID for the element.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="restriction" />
    <child name="extension" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/simpleType.tag b/quanta/data/dtep/schema/simpleType.tag
index 7b3f7534..2476e6fc 100644
--- a/quanta/data/dtep/schema/simpleType.tag
+++ b/quanta/data/dtep/schema/simpleType.tag
@@ -34,11 +34,11 @@
    <stoppingtag name="attribute" />
    <stoppingtag name="notation" />
   </stoppingtags>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="restriction" />
    <child name="list" />
    <child name="union" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/totalDigits.tag b/quanta/data/dtep/schema/totalDigits.tag
index 73001d4e..b46744ee 100644
--- a/quanta/data/dtep/schema/totalDigits.tag
+++ b/quanta/data/dtep/schema/totalDigits.tag
@@ -11,8 +11,8 @@
    <whatsthis>Exact number of digits allowed, which must be >=0.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/union.tag b/quanta/data/dtep/schema/union.tag
index bb598cec..37b647e7 100644
--- a/quanta/data/dtep/schema/union.tag
+++ b/quanta/data/dtep/schema/union.tag
@@ -21,9 +21,9 @@
    <whatsthis>List of built-in data types or simpleType elements defined in a schema.</whatsthis>
    <location col="1" row="1"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="simpleType" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/unique.tag b/quanta/data/dtep/schema/unique.tag
index e8083013..d6ebb689 100644
--- a/quanta/data/dtep/schema/unique.tag
+++ b/quanta/data/dtep/schema/unique.tag
@@ -21,10 +21,10 @@
    <whatsthis>Name for the element. Usage is required.</whatsthis>
    <location col="1" row="1"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
    <child name="selector" />
    <child name="field" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/schema/whiteSpace.tag b/quanta/data/dtep/schema/whiteSpace.tag
index 4210eb25..dfda451b 100644
--- a/quanta/data/dtep/schema/whiteSpace.tag
+++ b/quanta/data/dtep/schema/whiteSpace.tag
@@ -9,15 +9,15 @@
   <attr name="value" type="list">
    <items>
     <item>preserve</item>
-    <item>replace</item>
+    <item>tqreplace</item>
     <item>collapse</item>
    </items>
    <tooltip>How white space (line feeds, tabs, spaces, and carriage returns) is handled.</tooltip>
    <whatsthis>How white space (line feeds, tabs, spaces, and carriage returns) is handled.</whatsthis>
    <location col="1" row="0"/>
   </attr>
-  <children>
+  <tqchildren>
    <child name="annotation" />
-  </children>
+  </tqchildren>
  </tag>
 </TAGS>
diff --git a/quanta/data/dtep/tagxml/attr.tag b/quanta/data/dtep/tagxml/attr.tag
index 1d56e92d..bf08eb6c 100644
--- a/quanta/data/dtep/tagxml/attr.tag
+++ b/quanta/data/dtep/tagxml/attr.tag
@@ -30,12 +30,12 @@
         <location col="1" row="1" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="items" />
 <child name="tooltip" />
 <child name="location" />
 <child name="label" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/tagxml/nonparams.tag b/quanta/data/dtep/tagxml/nonparams.tag
index b1244f82..f3af056d 100644
--- a/quanta/data/dtep/tagxml/nonparams.tag
+++ b/quanta/data/dtep/tagxml/nonparams.tag
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE TAGS>
 <TAGS>
-<tag name="items"><children><child name="item" /></children></tag>
+<tag name="items"><tqchildren><child name="item" /></tqchildren></tag>
 <tag name="item" />
-<tag name="label"><children><child name="text" /><child name="location" /><child name="textlocation" /></children></tag>
+<tag name="label"><tqchildren><child name="text" /><child name="location" /><child name="textlocation" /></tqchildren></tag>
 <tag name="text" />
 <tag name="tooltip" />
 <tag name="whatsthis" />
-<tag name="children"><children><child name="child" /></children></tag>
-<tag name="stoppingtags"><children><child name="stoppingtag" /></children></tag>
+<tag name="tqchildren"><tqchildren><child name="child" /></tqchildren></tag>
+<tag name="stoppingtags"><tqchildren><child name="stoppingtag" /></tqchildren></tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/tagxml/spacer.tag b/quanta/data/dtep/tagxml/spacer.tag
index 71d776ae..463f991a 100644
--- a/quanta/data/dtep/tagxml/spacer.tag
+++ b/quanta/data/dtep/tagxml/spacer.tag
@@ -3,7 +3,7 @@
 <tag name="spacer">
 
     <label>
-        <text>Orientation</text>
+        <text>Qt::Orientation</text>
         <location col="0" row="0" />
     </label>
 
diff --git a/quanta/data/dtep/xhtml-basic/a.tag b/quanta/data/dtep/xhtml-basic/a.tag
index 7d02f942..82b0b0a1 100644
--- a/quanta/data/dtep/xhtml-basic/a.tag
+++ b/quanta/data/dtep/xhtml-basic/a.tag
@@ -48,7 +48,7 @@
     <attr name="accesskey" type="input" />
     <attr name="tabindex" type="input" />
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="abbr" />
 <child name="acronym" />
@@ -69,7 +69,7 @@
 <child name="strong" />
 <child name="textarea" />
 <child name="var" />
-</children>
+</tqchildren>
 
 
 </tag>
diff --git a/quanta/data/dtep/xhtml-basic/blockquote.tag b/quanta/data/dtep/xhtml-basic/blockquote.tag
index ad642e61..fc4701fd 100644
--- a/quanta/data/dtep/xhtml-basic/blockquote.tag
+++ b/quanta/data/dtep/xhtml-basic/blockquote.tag
@@ -10,7 +10,7 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="address" />
 <child name="blockquote" />
 <child name="div" />
@@ -27,7 +27,7 @@
 <child name="pre" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/body.tag b/quanta/data/dtep/xhtml-basic/body.tag
index c9bcca72..c7bf368e 100644
--- a/quanta/data/dtep/xhtml-basic/body.tag
+++ b/quanta/data/dtep/xhtml-basic/body.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="body" hasCore="1" hasI18n="1">
-<children>
+<tqchildren>
 <child name="address" />
 <child name="blockquote" />
 <child name="div" />
@@ -19,6 +19,6 @@
 <child name="pre" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/div.tag b/quanta/data/dtep/xhtml-basic/div.tag
index 9dfc2599..5073c953 100644
--- a/quanta/data/dtep/xhtml-basic/div.tag
+++ b/quanta/data/dtep/xhtml-basic/div.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="div" hasCore="1" hasI18n="1" scope="paragraph">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -41,6 +41,6 @@
 <child name="textarea" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/xhtml-basic/form.tag b/quanta/data/dtep/xhtml-basic/form.tag
index d4e0b368..36fe22f5 100644
--- a/quanta/data/dtep/xhtml-basic/form.tag
+++ b/quanta/data/dtep/xhtml-basic/form.tag
@@ -29,7 +29,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="address" />
 <child name="blockquote" />
 <child name="div" />
@@ -45,7 +45,7 @@
 <child name="pre" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/head.tag b/quanta/data/dtep/xhtml-basic/head.tag
index bdcc1ef7..16f8b252 100644
--- a/quanta/data/dtep/xhtml-basic/head.tag
+++ b/quanta/data/dtep/xhtml-basic/head.tag
@@ -9,12 +9,12 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="link" />
 <child name="meta" />
 <child name="object" />
 <child name="title" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/headings.tag b/quanta/data/dtep/xhtml-basic/headings.tag
index af41ba13..408e31e3 100644
--- a/quanta/data/dtep/xhtml-basic/headings.tag
+++ b/quanta/data/dtep/xhtml-basic/headings.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="h1" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -25,11 +25,11 @@
 <child name="strong" />
 <child name="textarea" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h2" hasScript="1" hasCore="1" hasI18n="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -51,12 +51,12 @@
 <child name="strong" />
 <child name="textarea" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h3" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -78,10 +78,10 @@
 <child name="strong" />
 <child name="textarea" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 <tag name="h4" hasScript="1" hasCore="1" hasI18n="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -103,11 +103,11 @@
 <child name="strong" />
 <child name="textarea" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h5" hasScript="1" hasCore="1" hasI18n="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -129,11 +129,11 @@
 <child name="strong" />
 <child name="textarea" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h6" hasScript="1" hasCore="1" hasI18n="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -155,7 +155,7 @@
 <child name="strong" />
 <child name="textarea" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/html.tag b/quanta/data/dtep/xhtml-basic/html.tag
index 4d9b566e..922b9086 100644
--- a/quanta/data/dtep/xhtml-basic/html.tag
+++ b/quanta/data/dtep/xhtml-basic/html.tag
@@ -15,10 +15,10 @@
         <location col="1" row="1" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="body" />
 <child name="head" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/input.tag b/quanta/data/dtep/xhtml-basic/input.tag
index 379ececb..e52a3fa5 100644
--- a/quanta/data/dtep/xhtml-basic/input.tag
+++ b/quanta/data/dtep/xhtml-basic/input.tag
@@ -67,7 +67,7 @@
       <tooltip>Shortcut</tooltip>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -99,6 +99,6 @@
 <child name="td" />
 <child name="th" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/li.tag b/quanta/data/dtep/xhtml-basic/li.tag
index 570d70c7..f1fbda6e 100644
--- a/quanta/data/dtep/xhtml-basic/li.tag
+++ b/quanta/data/dtep/xhtml-basic/li.tag
@@ -5,7 +5,7 @@
     <stoppingtags>
         <stoppingtag name="li" />
     </stoppingtags>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -43,6 +43,6 @@
 <child name="textarea" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/ol.tag b/quanta/data/dtep/xhtml-basic/ol.tag
index 4e9adab9..355b08cf 100644
--- a/quanta/data/dtep/xhtml-basic/ol.tag
+++ b/quanta/data/dtep/xhtml-basic/ol.tag
@@ -2,8 +2,8 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="ol" hasCore="1" hasI18n="1">
- <children>
+ <tqchildren>
   <child name="li" usage="required" />
- </children>
+ </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/p.tag b/quanta/data/dtep/xhtml-basic/p.tag
index eadc4781..cba2d813 100644
--- a/quanta/data/dtep/xhtml-basic/p.tag
+++ b/quanta/data/dtep/xhtml-basic/p.tag
@@ -13,7 +13,7 @@
         <stoppingtag name="dd" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -35,7 +35,7 @@
 <child name="strong" />
 <child name="textarea" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/select.tag b/quanta/data/dtep/xhtml-basic/select.tag
index 241684e6..532cedb5 100644
--- a/quanta/data/dtep/xhtml-basic/select.tag
+++ b/quanta/data/dtep/xhtml-basic/select.tag
@@ -20,8 +20,8 @@
         <stoppingtag name="select" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="option" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/table.tag b/quanta/data/dtep/xhtml-basic/table.tag
index ead404b5..9f20ac09 100644
--- a/quanta/data/dtep/xhtml-basic/table.tag
+++ b/quanta/data/dtep/xhtml-basic/table.tag
@@ -4,9 +4,9 @@
 <tag name="table" hasCore="1" hasI18n="1">
 
     <attr name="summary" type="input" />
-<children>
+<tqchildren>
 <child name="caption" />
 <child name="tr" usage="required" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/td.tag b/quanta/data/dtep/xhtml-basic/td.tag
index cde92e8f..d09b988e 100644
--- a/quanta/data/dtep/xhtml-basic/td.tag
+++ b/quanta/data/dtep/xhtml-basic/td.tag
@@ -61,7 +61,7 @@
         <stoppingtag name="th" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -98,6 +98,6 @@
 <child name="textarea" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/textarea.tag b/quanta/data/dtep/xhtml-basic/textarea.tag
index 35161dd7..cb0f0874 100644
--- a/quanta/data/dtep/xhtml-basic/textarea.tag
+++ b/quanta/data/dtep/xhtml-basic/textarea.tag
@@ -23,7 +23,7 @@
 
     <attr name="accesskey" type="input" />
 </tag>
-<children>
+<tqchildren>
 	<child name="#text" />
-</children>
+</tqchildren>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/th.tag b/quanta/data/dtep/xhtml-basic/th.tag
index d6851796..7a58b71f 100644
--- a/quanta/data/dtep/xhtml-basic/th.tag
+++ b/quanta/data/dtep/xhtml-basic/th.tag
@@ -61,7 +61,7 @@
         <stoppingtag name="th" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -98,6 +98,6 @@
 <child name="textarea" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/tr.tag b/quanta/data/dtep/xhtml-basic/tr.tag
index 5a544503..d7d689d4 100644
--- a/quanta/data/dtep/xhtml-basic/tr.tag
+++ b/quanta/data/dtep/xhtml-basic/tr.tag
@@ -33,9 +33,9 @@
         <stoppingtag name="tfoot" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="td" />
 <child name="th" usage="required" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-basic/ul.tag b/quanta/data/dtep/xhtml-basic/ul.tag
index a2ce9a38..46385c7a 100644
--- a/quanta/data/dtep/xhtml-basic/ul.tag
+++ b/quanta/data/dtep/xhtml-basic/ul.tag
@@ -3,9 +3,9 @@
 <TAGS>
 <tag name="ul" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="li" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/a.tag b/quanta/data/dtep/xhtml-frameset/a.tag
index 9140cd66..9fc9aeb4 100644
--- a/quanta/data/dtep/xhtml-frameset/a.tag
+++ b/quanta/data/dtep/xhtml-frameset/a.tag
@@ -61,7 +61,7 @@
         <location col="1" row="6" />
     </attr>
 
-    <attr name="shape" type="list">
+    <attr name="tqshape" type="list">
         <text>Shape</text>
         <textlocation col="0" row="7" />
         <location col="1" row="7" />
@@ -85,7 +85,7 @@
         <location col="1" row="9" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="abbr" />
 <child name="applet" />
@@ -126,7 +126,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/abbr.tag b/quanta/data/dtep/xhtml-frameset/abbr.tag
index 93aa69d7..59a267d1 100644
--- a/quanta/data/dtep/xhtml-frameset/abbr.tag
+++ b/quanta/data/dtep/xhtml-frameset/abbr.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="abbr" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/acronym.tag b/quanta/data/dtep/xhtml-frameset/acronym.tag
index 93d73b08..35634a11 100644
--- a/quanta/data/dtep/xhtml-frameset/acronym.tag
+++ b/quanta/data/dtep/xhtml-frameset/acronym.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="acronym" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/address.tag b/quanta/data/dtep/xhtml-frameset/address.tag
index 7626fbf5..5cedd95f 100644
--- a/quanta/data/dtep/xhtml-frameset/address.tag
+++ b/quanta/data/dtep/xhtml-frameset/address.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="address" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,6 +45,6 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/applet.tag b/quanta/data/dtep/xhtml-frameset/applet.tag
index 1da9149e..8da60ec1 100644
--- a/quanta/data/dtep/xhtml-frameset/applet.tag
+++ b/quanta/data/dtep/xhtml-frameset/applet.tag
@@ -73,7 +73,7 @@
         <location col="1" row="9" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -140,7 +140,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/area.tag b/quanta/data/dtep/xhtml-frameset/area.tag
index 7bbf41b0..24dee60f 100644
--- a/quanta/data/dtep/xhtml-frameset/area.tag
+++ b/quanta/data/dtep/xhtml-frameset/area.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="area" hasFocus="1" hasScript="1" hasCore="1" hasI18n="1" single="1">
 
-    <attr name="shape" type="list">
+    <attr name="tqshape" type="list">
         <text>Shape</text>
         <textlocation col="0" row="0" />
         <location col="1" row="0" colspan="2"/>
diff --git a/quanta/data/dtep/xhtml-frameset/b.tag b/quanta/data/dtep/xhtml-frameset/b.tag
index dac70a04..86cbb519 100644
--- a/quanta/data/dtep/xhtml-frameset/b.tag
+++ b/quanta/data/dtep/xhtml-frameset/b.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="b" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/bdo.tag b/quanta/data/dtep/xhtml-frameset/bdo.tag
index 676eb609..eea7e5ad 100644
--- a/quanta/data/dtep/xhtml-frameset/bdo.tag
+++ b/quanta/data/dtep/xhtml-frameset/bdo.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="bdo" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/big.tag b/quanta/data/dtep/xhtml-frameset/big.tag
index bbf21a7c..6ebf8aad 100644
--- a/quanta/data/dtep/xhtml-frameset/big.tag
+++ b/quanta/data/dtep/xhtml-frameset/big.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="big" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/blockquote.tag b/quanta/data/dtep/xhtml-frameset/blockquote.tag
index 82709643..07170c99 100644
--- a/quanta/data/dtep/xhtml-frameset/blockquote.tag
+++ b/quanta/data/dtep/xhtml-frameset/blockquote.tag
@@ -10,7 +10,7 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -76,7 +76,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/body.tag b/quanta/data/dtep/xhtml-frameset/body.tag
index 36982ce4..c956b5d3 100644
--- a/quanta/data/dtep/xhtml-frameset/body.tag
+++ b/quanta/data/dtep/xhtml-frameset/body.tag
@@ -56,7 +56,7 @@
         <location col="1" row="7" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -122,7 +122,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/button.tag b/quanta/data/dtep/xhtml-frameset/button.tag
index 011def6a..52a481c6 100644
--- a/quanta/data/dtep/xhtml-frameset/button.tag
+++ b/quanta/data/dtep/xhtml-frameset/button.tag
@@ -32,7 +32,7 @@
       <tooltip>Disable the element</tooltip>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="abbr" />
 <child name="acronym" />
@@ -88,6 +88,6 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/caption.tag b/quanta/data/dtep/xhtml-frameset/caption.tag
index 7917420e..0ef0acf1 100644
--- a/quanta/data/dtep/xhtml-frameset/caption.tag
+++ b/quanta/data/dtep/xhtml-frameset/caption.tag
@@ -15,7 +15,7 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -57,7 +57,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/center.tag b/quanta/data/dtep/xhtml-frameset/center.tag
index 67943607..039a85ab 100644
--- a/quanta/data/dtep/xhtml-frameset/center.tag
+++ b/quanta/data/dtep/xhtml-frameset/center.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="center" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -69,7 +69,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/cite.tag b/quanta/data/dtep/xhtml-frameset/cite.tag
index 815bac00..4f3c8c6c 100644
--- a/quanta/data/dtep/xhtml-frameset/cite.tag
+++ b/quanta/data/dtep/xhtml-frameset/cite.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="cite" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/code.tag b/quanta/data/dtep/xhtml-frameset/code.tag
index 28759903..219089d8 100644
--- a/quanta/data/dtep/xhtml-frameset/code.tag
+++ b/quanta/data/dtep/xhtml-frameset/code.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="code" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/colgroup.tag b/quanta/data/dtep/xhtml-frameset/colgroup.tag
index d4ecc9a8..20c27974 100644
--- a/quanta/data/dtep/xhtml-frameset/colgroup.tag
+++ b/quanta/data/dtep/xhtml-frameset/colgroup.tag
@@ -54,8 +54,8 @@ You can add multiple values with commas</tooltip>
         <location col="1" row="5" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="col" usage="required" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/dd.tag b/quanta/data/dtep/xhtml-frameset/dd.tag
index b6a135ef..c7ff069f 100644
--- a/quanta/data/dtep/xhtml-frameset/dd.tag
+++ b/quanta/data/dtep/xhtml-frameset/dd.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="dd" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -69,7 +69,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/del.tag b/quanta/data/dtep/xhtml-frameset/del.tag
index 4d07e4b9..34bef391 100644
--- a/quanta/data/dtep/xhtml-frameset/del.tag
+++ b/quanta/data/dtep/xhtml-frameset/del.tag
@@ -15,7 +15,7 @@
         <location col="1" row="1" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -81,7 +81,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/dfn.tag b/quanta/data/dtep/xhtml-frameset/dfn.tag
index 99e3daff..6fe0b46a 100644
--- a/quanta/data/dtep/xhtml-frameset/dfn.tag
+++ b/quanta/data/dtep/xhtml-frameset/dfn.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="dfn" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/dir.tag b/quanta/data/dtep/xhtml-frameset/dir.tag
index 13612182..a63731e9 100644
--- a/quanta/data/dtep/xhtml-frameset/dir.tag
+++ b/quanta/data/dtep/xhtml-frameset/dir.tag
@@ -8,9 +8,9 @@
         <location col="0" row="0" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="li" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/div.tag b/quanta/data/dtep/xhtml-frameset/div.tag
index ca4b037a..4b59e711 100644
--- a/quanta/data/dtep/xhtml-frameset/div.tag
+++ b/quanta/data/dtep/xhtml-frameset/div.tag
@@ -16,7 +16,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -82,7 +82,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/dl.tag b/quanta/data/dtep/xhtml-frameset/dl.tag
index 1f38c5a0..32c9f645 100644
--- a/quanta/data/dtep/xhtml-frameset/dl.tag
+++ b/quanta/data/dtep/xhtml-frameset/dl.tag
@@ -8,9 +8,9 @@
         <location col="0" row="0" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="dt" />
 <child name="dd" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/dt.tag b/quanta/data/dtep/xhtml-frameset/dt.tag
index 4d9192aa..18d1d506 100644
--- a/quanta/data/dtep/xhtml-frameset/dt.tag
+++ b/quanta/data/dtep/xhtml-frameset/dt.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="dt" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/em.tag b/quanta/data/dtep/xhtml-frameset/em.tag
index 3c5005b1..b2765e02 100644
--- a/quanta/data/dtep/xhtml-frameset/em.tag
+++ b/quanta/data/dtep/xhtml-frameset/em.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="em" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/fieldset.tag b/quanta/data/dtep/xhtml-frameset/fieldset.tag
index f2e942bd..b80d46dc 100644
--- a/quanta/data/dtep/xhtml-frameset/fieldset.tag
+++ b/quanta/data/dtep/xhtml-frameset/fieldset.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="fieldset" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -70,7 +70,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/font.tag b/quanta/data/dtep/xhtml-frameset/font.tag
index 4cc18db6..d7784288 100644
--- a/quanta/data/dtep/xhtml-frameset/font.tag
+++ b/quanta/data/dtep/xhtml-frameset/font.tag
@@ -39,7 +39,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -81,7 +81,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
\ No newline at end of file
diff --git a/quanta/data/dtep/xhtml-frameset/form.tag b/quanta/data/dtep/xhtml-frameset/form.tag
index b3d554b1..1a87abc0 100644
--- a/quanta/data/dtep/xhtml-frameset/form.tag
+++ b/quanta/data/dtep/xhtml-frameset/form.tag
@@ -80,7 +80,7 @@
         <location col="1" row="8" colspan="3"/>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -145,7 +145,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/frameset.tag b/quanta/data/dtep/xhtml-frameset/frameset.tag
index 7e0b6f09..d1addb63 100644
--- a/quanta/data/dtep/xhtml-frameset/frameset.tag
+++ b/quanta/data/dtep/xhtml-frameset/frameset.tag
@@ -27,11 +27,11 @@
         <location col="1" row="3"  colspan="2"/>
     </attr>
 
-<children>
+<tqchildren>
 <child name="frame" />
 <child name="frameset" />
 <child name="noframes" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/head.tag b/quanta/data/dtep/xhtml-frameset/head.tag
index 9305caea..74e94d81 100644
--- a/quanta/data/dtep/xhtml-frameset/head.tag
+++ b/quanta/data/dtep/xhtml-frameset/head.tag
@@ -15,7 +15,7 @@
         <location col="1" row="1" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="base" />
 <child name="link" />
 <child name="meta" usage="required" />
@@ -24,7 +24,7 @@
 <child name="script" />
 <child name="style" />
 <child name="isindex" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/headings.tag b/quanta/data/dtep/xhtml-frameset/headings.tag
index 5469ac0b..a943a2ec 100644
--- a/quanta/data/dtep/xhtml-frameset/headings.tag
+++ b/quanta/data/dtep/xhtml-frameset/headings.tag
@@ -16,7 +16,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -58,7 +58,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -77,7 +77,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -119,7 +119,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -138,7 +138,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -180,7 +180,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -199,7 +199,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -241,7 +241,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -260,7 +260,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -302,7 +302,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -321,7 +321,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -363,7 +363,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/html.tag b/quanta/data/dtep/xhtml-frameset/html.tag
index d401f801..639ac562 100644
--- a/quanta/data/dtep/xhtml-frameset/html.tag
+++ b/quanta/data/dtep/xhtml-frameset/html.tag
@@ -18,10 +18,10 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="head" />
 <child name="frameset" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/i.tag b/quanta/data/dtep/xhtml-frameset/i.tag
index eefb38d4..e605fba6 100644
--- a/quanta/data/dtep/xhtml-frameset/i.tag
+++ b/quanta/data/dtep/xhtml-frameset/i.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/iframe.tag b/quanta/data/dtep/xhtml-frameset/iframe.tag
index fb5ffb99..9d5b5d15 100644
--- a/quanta/data/dtep/xhtml-frameset/iframe.tag
+++ b/quanta/data/dtep/xhtml-frameset/iframe.tag
@@ -88,7 +88,7 @@
         <location col="1" row="12" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -154,7 +154,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/ins.tag b/quanta/data/dtep/xhtml-frameset/ins.tag
index de225ae1..eeb636a6 100644
--- a/quanta/data/dtep/xhtml-frameset/ins.tag
+++ b/quanta/data/dtep/xhtml-frameset/ins.tag
@@ -15,7 +15,7 @@
         <location col="1" row="1" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -81,7 +81,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/kbd.tag b/quanta/data/dtep/xhtml-frameset/kbd.tag
index 6cfaa511..563ebdd0 100644
--- a/quanta/data/dtep/xhtml-frameset/kbd.tag
+++ b/quanta/data/dtep/xhtml-frameset/kbd.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="kbd" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/label.tag b/quanta/data/dtep/xhtml-frameset/label.tag
index 3e53f7ba..23878a5e 100644
--- a/quanta/data/dtep/xhtml-frameset/label.tag
+++ b/quanta/data/dtep/xhtml-frameset/label.tag
@@ -27,7 +27,7 @@
         <location col="1" row="3" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -69,7 +69,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/legend.tag b/quanta/data/dtep/xhtml-frameset/legend.tag
index 685ae528..417b9c78 100644
--- a/quanta/data/dtep/xhtml-frameset/legend.tag
+++ b/quanta/data/dtep/xhtml-frameset/legend.tag
@@ -22,7 +22,7 @@
     <location col="1" row="1" />
   </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -64,7 +64,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/li.tag b/quanta/data/dtep/xhtml-frameset/li.tag
index c4acfaa2..efff88aa 100644
--- a/quanta/data/dtep/xhtml-frameset/li.tag
+++ b/quanta/data/dtep/xhtml-frameset/li.tag
@@ -29,7 +29,7 @@
         <stoppingtag name="li" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -95,7 +95,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/map.tag b/quanta/data/dtep/xhtml-frameset/map.tag
index b64d44f2..9852af99 100644
--- a/quanta/data/dtep/xhtml-frameset/map.tag
+++ b/quanta/data/dtep/xhtml-frameset/map.tag
@@ -9,7 +9,7 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="address" />
 <child name="area" />
 <child name="blockquote" />
@@ -38,7 +38,7 @@
 <child name="script" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/menu.tag b/quanta/data/dtep/xhtml-frameset/menu.tag
index 10322fc8..a98f6d53 100644
--- a/quanta/data/dtep/xhtml-frameset/menu.tag
+++ b/quanta/data/dtep/xhtml-frameset/menu.tag
@@ -8,9 +8,9 @@
         <location col="0" row="0" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="li" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/noframes.tag b/quanta/data/dtep/xhtml-frameset/noframes.tag
index 59ff061b..a3e207cd 100644
--- a/quanta/data/dtep/xhtml-frameset/noframes.tag
+++ b/quanta/data/dtep/xhtml-frameset/noframes.tag
@@ -3,9 +3,9 @@
 <TAGS>
 <tag name="noframes" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="body" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/noscript.tag b/quanta/data/dtep/xhtml-frameset/noscript.tag
index a973201b..6bb56abc 100644
--- a/quanta/data/dtep/xhtml-frameset/noscript.tag
+++ b/quanta/data/dtep/xhtml-frameset/noscript.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="noscript" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -69,7 +69,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/object.tag b/quanta/data/dtep/xhtml-frameset/object.tag
index baebd55d..10513193 100644
--- a/quanta/data/dtep/xhtml-frameset/object.tag
+++ b/quanta/data/dtep/xhtml-frameset/object.tag
@@ -136,7 +136,7 @@
     <location col="3" row="7" />
   </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -203,7 +203,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/ol.tag b/quanta/data/dtep/xhtml-frameset/ol.tag
index 4a33b85a..2d2e2fb1 100644
--- a/quanta/data/dtep/xhtml-frameset/ol.tag
+++ b/quanta/data/dtep/xhtml-frameset/ol.tag
@@ -28,9 +28,9 @@
         <location col="0" row="2" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="li" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/optgroup.tag b/quanta/data/dtep/xhtml-frameset/optgroup.tag
index 08a52ff5..56839297 100644
--- a/quanta/data/dtep/xhtml-frameset/optgroup.tag
+++ b/quanta/data/dtep/xhtml-frameset/optgroup.tag
@@ -15,9 +15,9 @@
       <location col="1" row="0" colspan="1" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="option" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/p.tag b/quanta/data/dtep/xhtml-frameset/p.tag
index 48008e82..907587d5 100644
--- a/quanta/data/dtep/xhtml-frameset/p.tag
+++ b/quanta/data/dtep/xhtml-frameset/p.tag
@@ -26,7 +26,7 @@
         <stoppingtag name="dd" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -68,7 +68,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/pre.tag b/quanta/data/dtep/xhtml-frameset/pre.tag
index ad3955f7..5a9acb0c 100644
--- a/quanta/data/dtep/xhtml-frameset/pre.tag
+++ b/quanta/data/dtep/xhtml-frameset/pre.tag
@@ -17,7 +17,7 @@
                 <item>preserve</item>
         </items>
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -48,6 +48,6 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/q.tag b/quanta/data/dtep/xhtml-frameset/q.tag
index 241bde5b..09d64568 100644
--- a/quanta/data/dtep/xhtml-frameset/q.tag
+++ b/quanta/data/dtep/xhtml-frameset/q.tag
@@ -9,7 +9,7 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -51,7 +51,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/s.tag b/quanta/data/dtep/xhtml-frameset/s.tag
index 98ad6cf7..9fd600cb 100644
--- a/quanta/data/dtep/xhtml-frameset/s.tag
+++ b/quanta/data/dtep/xhtml-frameset/s.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="s" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/samp.tag b/quanta/data/dtep/xhtml-frameset/samp.tag
index 6cecf4e0..e84d0525 100644
--- a/quanta/data/dtep/xhtml-frameset/samp.tag
+++ b/quanta/data/dtep/xhtml-frameset/samp.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="samp" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/select.tag b/quanta/data/dtep/xhtml-frameset/select.tag
index d0c87373..fb17bd73 100644
--- a/quanta/data/dtep/xhtml-frameset/select.tag
+++ b/quanta/data/dtep/xhtml-frameset/select.tag
@@ -53,10 +53,10 @@
         <stoppingtag name="select" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="optgroup" />
 <child name="option" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/small.tag b/quanta/data/dtep/xhtml-frameset/small.tag
index 538b3b7a..7392cde2 100644
--- a/quanta/data/dtep/xhtml-frameset/small.tag
+++ b/quanta/data/dtep/xhtml-frameset/small.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="small" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/span.tag b/quanta/data/dtep/xhtml-frameset/span.tag
index 2ff722d0..aaae5401 100644
--- a/quanta/data/dtep/xhtml-frameset/span.tag
+++ b/quanta/data/dtep/xhtml-frameset/span.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="span" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/strike.tag b/quanta/data/dtep/xhtml-frameset/strike.tag
index 478e692c..c49e498e 100644
--- a/quanta/data/dtep/xhtml-frameset/strike.tag
+++ b/quanta/data/dtep/xhtml-frameset/strike.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="strike" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/strong.tag b/quanta/data/dtep/xhtml-frameset/strong.tag
index 0424fa5e..6d3f007d 100644
--- a/quanta/data/dtep/xhtml-frameset/strong.tag
+++ b/quanta/data/dtep/xhtml-frameset/strong.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="strong" hasCore="1" hasI18n="1" hasScript="1" scope="word">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/style.tag b/quanta/data/dtep/xhtml-frameset/style.tag
index aa052448..afa3fe55 100644
--- a/quanta/data/dtep/xhtml-frameset/style.tag
+++ b/quanta/data/dtep/xhtml-frameset/style.tag
@@ -50,8 +50,8 @@
                 <item>preserve</item>
         </items>
     </attr>
-    <children>
+    <tqchildren>
 	    <child name="#text" />
-    </children>
+    </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/sub.tag b/quanta/data/dtep/xhtml-frameset/sub.tag
index ec46544b..315c5ab0 100644
--- a/quanta/data/dtep/xhtml-frameset/sub.tag
+++ b/quanta/data/dtep/xhtml-frameset/sub.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="sub" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/sup.tag b/quanta/data/dtep/xhtml-frameset/sup.tag
index d441423a..dec7d2c8 100644
--- a/quanta/data/dtep/xhtml-frameset/sup.tag
+++ b/quanta/data/dtep/xhtml-frameset/sup.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="sup" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/table.tag b/quanta/data/dtep/xhtml-frameset/table.tag
index b76d5095..d5296fb2 100644
--- a/quanta/data/dtep/xhtml-frameset/table.tag
+++ b/quanta/data/dtep/xhtml-frameset/table.tag
@@ -83,7 +83,7 @@
         <tooltip>Deprecated</tooltip>
     </attr>
 
-<children>
+<tqchildren>
 <child name="caption" />
 <child name="col" />
 <child name="colgroup" />
@@ -91,7 +91,7 @@
 <child name="tfoot" />
 <child name="tbody" />
 <child name="tr" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/tbody.tag b/quanta/data/dtep/xhtml-frameset/tbody.tag
index db13711d..c04eebf6 100644
--- a/quanta/data/dtep/xhtml-frameset/tbody.tag
+++ b/quanta/data/dtep/xhtml-frameset/tbody.tag
@@ -40,9 +40,9 @@
         <location col="1" row="3" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/td.tag b/quanta/data/dtep/xhtml-frameset/td.tag
index e46c9414..39e99979 100644
--- a/quanta/data/dtep/xhtml-frameset/td.tag
+++ b/quanta/data/dtep/xhtml-frameset/td.tag
@@ -115,7 +115,7 @@
         <stoppingtag name="th" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -181,7 +181,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/textarea.tag b/quanta/data/dtep/xhtml-frameset/textarea.tag
index 9c94dc0f..50f9210a 100644
--- a/quanta/data/dtep/xhtml-frameset/textarea.tag
+++ b/quanta/data/dtep/xhtml-frameset/textarea.tag
@@ -42,8 +42,8 @@
       <textlocation col="0" row="4" colspan="1" />
       <location col="1" row="4" colspan="3" />
     </attr>
-    <children>
+    <tqchildren>
 	    <child name="#text" />
-    </children>
+    </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/tfoot.tag b/quanta/data/dtep/xhtml-frameset/tfoot.tag
index e07605f4..cca684ca 100644
--- a/quanta/data/dtep/xhtml-frameset/tfoot.tag
+++ b/quanta/data/dtep/xhtml-frameset/tfoot.tag
@@ -40,9 +40,9 @@
         <location col="1" row="3" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/th.tag b/quanta/data/dtep/xhtml-frameset/th.tag
index 27ff8b6a..7e1e3d97 100644
--- a/quanta/data/dtep/xhtml-frameset/th.tag
+++ b/quanta/data/dtep/xhtml-frameset/th.tag
@@ -115,7 +115,7 @@
         <stoppingtag name="th" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -181,7 +181,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/thead.tag b/quanta/data/dtep/xhtml-frameset/thead.tag
index 059263d1..5bb973ca 100644
--- a/quanta/data/dtep/xhtml-frameset/thead.tag
+++ b/quanta/data/dtep/xhtml-frameset/thead.tag
@@ -40,9 +40,9 @@
         <location col="1" row="3" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/title.tag b/quanta/data/dtep/xhtml-frameset/title.tag
index f24df571..02ef0059 100644
--- a/quanta/data/dtep/xhtml-frameset/title.tag
+++ b/quanta/data/dtep/xhtml-frameset/title.tag
@@ -7,8 +7,8 @@
         <textlocation col="0" row="0" />
         <location col="1" row="0" colspan="2" />
 </attr>
-<children>
+<tqchildren>
 	<child name="#text" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/tr.tag b/quanta/data/dtep/xhtml-frameset/tr.tag
index 4baf805c..e1611664 100644
--- a/quanta/data/dtep/xhtml-frameset/tr.tag
+++ b/quanta/data/dtep/xhtml-frameset/tr.tag
@@ -45,9 +45,9 @@
         <stoppingtag name="tfoot" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="th" />
 <child name="td" usage="required" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/tt.tag b/quanta/data/dtep/xhtml-frameset/tt.tag
index 08f25532..768f3791 100644
--- a/quanta/data/dtep/xhtml-frameset/tt.tag
+++ b/quanta/data/dtep/xhtml-frameset/tt.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="tt" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/u.tag b/quanta/data/dtep/xhtml-frameset/u.tag
index bc931d0d..be82dd1c 100644
--- a/quanta/data/dtep/xhtml-frameset/u.tag
+++ b/quanta/data/dtep/xhtml-frameset/u.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="u" hasCore="1" hasI18n="1" hasScript="1" scope="word">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/ul.tag b/quanta/data/dtep/xhtml-frameset/ul.tag
index 21443c5d..bb30c1c6 100644
--- a/quanta/data/dtep/xhtml-frameset/ul.tag
+++ b/quanta/data/dtep/xhtml-frameset/ul.tag
@@ -20,9 +20,9 @@
         <location col="0" row="1" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="li" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-frameset/var.tag b/quanta/data/dtep/xhtml-frameset/var.tag
index ad5627b0..c2ea19b3 100644
--- a/quanta/data/dtep/xhtml-frameset/var.tag
+++ b/quanta/data/dtep/xhtml-frameset/var.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="var" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/a.tag b/quanta/data/dtep/xhtml-strict/a.tag
index 07c82584..701ee488 100644
--- a/quanta/data/dtep/xhtml-strict/a.tag
+++ b/quanta/data/dtep/xhtml-strict/a.tag
@@ -61,7 +61,7 @@
         <location col="1" row="6" />
     </attr>
 
-    <attr name="shape" type="list">
+    <attr name="tqshape" type="list">
         <text>Shape</text>
         <textlocation col="0" row="7" />
         <location col="1" row="7" />
@@ -79,7 +79,7 @@
         <location col="1" row="8" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="abbr" />
 <child name="acronym" />
@@ -113,7 +113,7 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/abbr.tag b/quanta/data/dtep/xhtml-strict/abbr.tag
index b988c322..08fc6d94 100644
--- a/quanta/data/dtep/xhtml-strict/abbr.tag
+++ b/quanta/data/dtep/xhtml-strict/abbr.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="abbr" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/acronym.tag b/quanta/data/dtep/xhtml-strict/acronym.tag
index 12bf30f1..c2a2eba5 100644
--- a/quanta/data/dtep/xhtml-strict/acronym.tag
+++ b/quanta/data/dtep/xhtml-strict/acronym.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="acronym" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/address.tag b/quanta/data/dtep/xhtml-strict/address.tag
index 3b1f699e..c74c8141 100644
--- a/quanta/data/dtep/xhtml-strict/address.tag
+++ b/quanta/data/dtep/xhtml-strict/address.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="address" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/area.tag b/quanta/data/dtep/xhtml-strict/area.tag
index 578166c8..77286795 100644
--- a/quanta/data/dtep/xhtml-strict/area.tag
+++ b/quanta/data/dtep/xhtml-strict/area.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="area" hasFocus="1" hasScript="1" hasCore="1" hasI18n="1" single="1">
 
-    <attr name="shape" type="list">
+    <attr name="tqshape" type="list">
         <text>Shape</text>
         <textlocation col="0" row="0" />
         <location col="1" row="0" colspan="2"/>
diff --git a/quanta/data/dtep/xhtml-strict/b.tag b/quanta/data/dtep/xhtml-strict/b.tag
index 54e28332..736049f5 100644
--- a/quanta/data/dtep/xhtml-strict/b.tag
+++ b/quanta/data/dtep/xhtml-strict/b.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="b" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/bdo.tag b/quanta/data/dtep/xhtml-strict/bdo.tag
index 7435ea68..1e6919b4 100644
--- a/quanta/data/dtep/xhtml-strict/bdo.tag
+++ b/quanta/data/dtep/xhtml-strict/bdo.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="bdo" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -38,6 +38,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/big.tag b/quanta/data/dtep/xhtml-strict/big.tag
index b951e28b..c9ca87ac 100644
--- a/quanta/data/dtep/xhtml-strict/big.tag
+++ b/quanta/data/dtep/xhtml-strict/big.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="big" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/blockquote.tag b/quanta/data/dtep/xhtml-strict/blockquote.tag
index c85ecfb9..f3acbe4a 100644
--- a/quanta/data/dtep/xhtml-strict/blockquote.tag
+++ b/quanta/data/dtep/xhtml-strict/blockquote.tag
@@ -10,7 +10,7 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="address" />
 <child name="blockquote" />
 <child name="del" />
@@ -33,6 +33,6 @@
 <child name="script" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/body.tag b/quanta/data/dtep/xhtml-strict/body.tag
index c2e67cdf..e991819e 100644
--- a/quanta/data/dtep/xhtml-strict/body.tag
+++ b/quanta/data/dtep/xhtml-strict/body.tag
@@ -14,7 +14,7 @@
         <location col="1" row="1" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="address" />
 <child name="blockquote" />
 <child name="del" />
@@ -37,7 +37,7 @@
 <child name="script" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/button.tag b/quanta/data/dtep/xhtml-strict/button.tag
index bf88752c..4cea665b 100644
--- a/quanta/data/dtep/xhtml-strict/button.tag
+++ b/quanta/data/dtep/xhtml-strict/button.tag
@@ -32,7 +32,7 @@
       <tooltip>Disable the element</tooltip>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="abbr" />
 <child name="acronym" />
@@ -78,6 +78,6 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/caption.tag b/quanta/data/dtep/xhtml-strict/caption.tag
index 0d433812..956ed2bd 100644
--- a/quanta/data/dtep/xhtml-strict/caption.tag
+++ b/quanta/data/dtep/xhtml-strict/caption.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="caption" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/cite.tag b/quanta/data/dtep/xhtml-strict/cite.tag
index 58cb492f..b3e2e76b 100644
--- a/quanta/data/dtep/xhtml-strict/cite.tag
+++ b/quanta/data/dtep/xhtml-strict/cite.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="cite" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/code.tag b/quanta/data/dtep/xhtml-strict/code.tag
index b29a87d4..625050da 100644
--- a/quanta/data/dtep/xhtml-strict/code.tag
+++ b/quanta/data/dtep/xhtml-strict/code.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="code" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/colgroup.tag b/quanta/data/dtep/xhtml-strict/colgroup.tag
index d4ecc9a8..20c27974 100644
--- a/quanta/data/dtep/xhtml-strict/colgroup.tag
+++ b/quanta/data/dtep/xhtml-strict/colgroup.tag
@@ -54,8 +54,8 @@ You can add multiple values with commas</tooltip>
         <location col="1" row="5" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="col" usage="required" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/dd.tag b/quanta/data/dtep/xhtml-strict/dd.tag
index 97992bf9..53fda2d1 100644
--- a/quanta/data/dtep/xhtml-strict/dd.tag
+++ b/quanta/data/dtep/xhtml-strict/dd.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="dd" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -56,6 +56,6 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/del.tag b/quanta/data/dtep/xhtml-strict/del.tag
index eab2ed61..27d93048 100644
--- a/quanta/data/dtep/xhtml-strict/del.tag
+++ b/quanta/data/dtep/xhtml-strict/del.tag
@@ -14,7 +14,7 @@
         <textlocation col="0" row="1" />
         <location col="1" row="1" colspan="2" />
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -68,6 +68,6 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/dfn.tag b/quanta/data/dtep/xhtml-strict/dfn.tag
index fbeb6d72..42d4d6fc 100644
--- a/quanta/data/dtep/xhtml-strict/dfn.tag
+++ b/quanta/data/dtep/xhtml-strict/dfn.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="dfn" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/div.tag b/quanta/data/dtep/xhtml-strict/div.tag
index aba511ae..1f83d680 100644
--- a/quanta/data/dtep/xhtml-strict/div.tag
+++ b/quanta/data/dtep/xhtml-strict/div.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="div" hasScript="1" hasCore="1" hasI18n="1" scope="paragraph">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -57,6 +57,6 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/dl.tag b/quanta/data/dtep/xhtml-strict/dl.tag
index 430067b8..d1edcf28 100644
--- a/quanta/data/dtep/xhtml-strict/dl.tag
+++ b/quanta/data/dtep/xhtml-strict/dl.tag
@@ -2,9 +2,9 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="dl" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="dt" />
 <child name="dd" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/dt.tag b/quanta/data/dtep/xhtml-strict/dt.tag
index ef239795..efc31477 100644
--- a/quanta/data/dtep/xhtml-strict/dt.tag
+++ b/quanta/data/dtep/xhtml-strict/dt.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="dt" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/em.tag b/quanta/data/dtep/xhtml-strict/em.tag
index 807065df..f858197f 100644
--- a/quanta/data/dtep/xhtml-strict/em.tag
+++ b/quanta/data/dtep/xhtml-strict/em.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="em" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/fieldset.tag b/quanta/data/dtep/xhtml-strict/fieldset.tag
index 588944d5..9384f3d1 100644
--- a/quanta/data/dtep/xhtml-strict/fieldset.tag
+++ b/quanta/data/dtep/xhtml-strict/fieldset.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="fieldset" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -58,7 +58,7 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/form.tag b/quanta/data/dtep/xhtml-strict/form.tag
index d8b0e6dc..d4d7d9c3 100644
--- a/quanta/data/dtep/xhtml-strict/form.tag
+++ b/quanta/data/dtep/xhtml-strict/form.tag
@@ -68,7 +68,7 @@
         <location col="1" row="6" colspan="3"/>
     </attr>
 
-<children>
+<tqchildren>
 <child name="address" />
 <child name="blockquote" />
 <child name="del" />
@@ -90,6 +90,6 @@
 <child name="script" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/head.tag b/quanta/data/dtep/xhtml-strict/head.tag
index 917a21b3..6aeac10b 100644
--- a/quanta/data/dtep/xhtml-strict/head.tag
+++ b/quanta/data/dtep/xhtml-strict/head.tag
@@ -15,7 +15,7 @@
         <location col="1" row="1" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="base" />
 <child name="link" />
 <child name="meta" usage="required" />
@@ -23,7 +23,7 @@
 <child name="title" usage="required" />
 <child name="script" />
 <child name="style" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/headings.tag b/quanta/data/dtep/xhtml-strict/headings.tag
index b7190ebc..259cf843 100644
--- a/quanta/data/dtep/xhtml-strict/headings.tag
+++ b/quanta/data/dtep/xhtml-strict/headings.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="h1" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -38,12 +38,12 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h2" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -78,12 +78,12 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h3" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -118,12 +118,12 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h4" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -158,12 +158,12 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h5" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -198,12 +198,12 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 <tag name="h6" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -238,7 +238,7 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/html.tag b/quanta/data/dtep/xhtml-strict/html.tag
index afc592c3..45a26694 100644
--- a/quanta/data/dtep/xhtml-strict/html.tag
+++ b/quanta/data/dtep/xhtml-strict/html.tag
@@ -18,10 +18,10 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="head" />
 <child name="body" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/i.tag b/quanta/data/dtep/xhtml-strict/i.tag
index 36dbd43a..f7bcd0ef 100644
--- a/quanta/data/dtep/xhtml-strict/i.tag
+++ b/quanta/data/dtep/xhtml-strict/i.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/ins.tag b/quanta/data/dtep/xhtml-strict/ins.tag
index eed48a2c..5bd2e4a4 100644
--- a/quanta/data/dtep/xhtml-strict/ins.tag
+++ b/quanta/data/dtep/xhtml-strict/ins.tag
@@ -14,7 +14,7 @@
         <textlocation col="0" row="1" />
         <location col="1" row="1" colspan="2" />
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -68,6 +68,6 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/kbd.tag b/quanta/data/dtep/xhtml-strict/kbd.tag
index 2b222085..246f6230 100644
--- a/quanta/data/dtep/xhtml-strict/kbd.tag
+++ b/quanta/data/dtep/xhtml-strict/kbd.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="kbd" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/label.tag b/quanta/data/dtep/xhtml-strict/label.tag
index 9b898aee..f675a366 100644
--- a/quanta/data/dtep/xhtml-strict/label.tag
+++ b/quanta/data/dtep/xhtml-strict/label.tag
@@ -26,7 +26,7 @@
         <textlocation col="0" row="3" />
         <location col="1" row="3" />
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -61,6 +61,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/legend.tag b/quanta/data/dtep/xhtml-strict/legend.tag
index 1a5f486c..034fbaa2 100644
--- a/quanta/data/dtep/xhtml-strict/legend.tag
+++ b/quanta/data/dtep/xhtml-strict/legend.tag
@@ -9,7 +9,7 @@
       <location col="3" row="0" colspan="1" />
       <tooltip>Shortcut</tooltip>
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -44,6 +44,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/li.tag b/quanta/data/dtep/xhtml-strict/li.tag
index 5ceb4358..66fd4600 100644
--- a/quanta/data/dtep/xhtml-strict/li.tag
+++ b/quanta/data/dtep/xhtml-strict/li.tag
@@ -6,7 +6,7 @@
     <stoppingtags>
         <stoppingtag name="li" />
     </stoppingtags>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -60,6 +60,6 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/map.tag b/quanta/data/dtep/xhtml-strict/map.tag
index 8f6a1e9d..5104be41 100644
--- a/quanta/data/dtep/xhtml-strict/map.tag
+++ b/quanta/data/dtep/xhtml-strict/map.tag
@@ -9,7 +9,7 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="address" />
 <child name="area" />
 <child name="blockquote" />
@@ -33,7 +33,7 @@
 <child name="script" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/noscript.tag b/quanta/data/dtep/xhtml-strict/noscript.tag
index 451adfd4..7dad1ffe 100644
--- a/quanta/data/dtep/xhtml-strict/noscript.tag
+++ b/quanta/data/dtep/xhtml-strict/noscript.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="noscript" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="address" />
 <child name="blockquote" />
 <child name="del" />
@@ -26,6 +26,6 @@
 <child name="script" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/object.tag b/quanta/data/dtep/xhtml-strict/object.tag
index add63d74..fc8a1d5a 100644
--- a/quanta/data/dtep/xhtml-strict/object.tag
+++ b/quanta/data/dtep/xhtml-strict/object.tag
@@ -102,7 +102,7 @@
         <location col="1" row="12" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -157,7 +157,7 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/ol.tag b/quanta/data/dtep/xhtml-strict/ol.tag
index 25c76d7a..98e58f38 100644
--- a/quanta/data/dtep/xhtml-strict/ol.tag
+++ b/quanta/data/dtep/xhtml-strict/ol.tag
@@ -3,9 +3,9 @@
 <TAGS>
 <tag name="ol" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="li" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/optgroup.tag b/quanta/data/dtep/xhtml-strict/optgroup.tag
index 08a52ff5..56839297 100644
--- a/quanta/data/dtep/xhtml-strict/optgroup.tag
+++ b/quanta/data/dtep/xhtml-strict/optgroup.tag
@@ -15,9 +15,9 @@
       <location col="1" row="0" colspan="1" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="option" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/p.tag b/quanta/data/dtep/xhtml-strict/p.tag
index 4c5e225f..9146892d 100644
--- a/quanta/data/dtep/xhtml-strict/p.tag
+++ b/quanta/data/dtep/xhtml-strict/p.tag
@@ -13,7 +13,7 @@
         <stoppingtag name="dd" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -48,7 +48,7 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/pre.tag b/quanta/data/dtep/xhtml-strict/pre.tag
index 9abff9a7..7c5f6909 100644
--- a/quanta/data/dtep/xhtml-strict/pre.tag
+++ b/quanta/data/dtep/xhtml-strict/pre.tag
@@ -11,7 +11,7 @@
                 <item>preserve</item>
         </items>
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -40,6 +40,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/q.tag b/quanta/data/dtep/xhtml-strict/q.tag
index ebb1b878..76d13722 100644
--- a/quanta/data/dtep/xhtml-strict/q.tag
+++ b/quanta/data/dtep/xhtml-strict/q.tag
@@ -8,7 +8,7 @@
         <textlocation col="0" row="0" />
         <location col="1" row="0" colspan="2" />
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -43,6 +43,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/samp.tag b/quanta/data/dtep/xhtml-strict/samp.tag
index 2ec41eb4..e0f7bdf7 100644
--- a/quanta/data/dtep/xhtml-strict/samp.tag
+++ b/quanta/data/dtep/xhtml-strict/samp.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="samp" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/select.tag b/quanta/data/dtep/xhtml-strict/select.tag
index d0c87373..fb17bd73 100644
--- a/quanta/data/dtep/xhtml-strict/select.tag
+++ b/quanta/data/dtep/xhtml-strict/select.tag
@@ -53,10 +53,10 @@
         <stoppingtag name="select" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="optgroup" />
 <child name="option" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/small.tag b/quanta/data/dtep/xhtml-strict/small.tag
index 0fdbe561..0d2c4263 100644
--- a/quanta/data/dtep/xhtml-strict/small.tag
+++ b/quanta/data/dtep/xhtml-strict/small.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="small" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/span.tag b/quanta/data/dtep/xhtml-strict/span.tag
index ca85ab65..6218d5d7 100644
--- a/quanta/data/dtep/xhtml-strict/span.tag
+++ b/quanta/data/dtep/xhtml-strict/span.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="span" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/strong.tag b/quanta/data/dtep/xhtml-strict/strong.tag
index 98d57d89..3bc13488 100644
--- a/quanta/data/dtep/xhtml-strict/strong.tag
+++ b/quanta/data/dtep/xhtml-strict/strong.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="strong" hasCore="1" hasI18n="1" hasScript="1" scope="word">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/style.tag b/quanta/data/dtep/xhtml-strict/style.tag
index aa052448..afa3fe55 100644
--- a/quanta/data/dtep/xhtml-strict/style.tag
+++ b/quanta/data/dtep/xhtml-strict/style.tag
@@ -50,8 +50,8 @@
                 <item>preserve</item>
         </items>
     </attr>
-    <children>
+    <tqchildren>
 	    <child name="#text" />
-    </children>
+    </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/sub.tag b/quanta/data/dtep/xhtml-strict/sub.tag
index 5691c5f0..0a195674 100644
--- a/quanta/data/dtep/xhtml-strict/sub.tag
+++ b/quanta/data/dtep/xhtml-strict/sub.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="sub" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/sup.tag b/quanta/data/dtep/xhtml-strict/sup.tag
index 33e052d3..815c4e35 100644
--- a/quanta/data/dtep/xhtml-strict/sup.tag
+++ b/quanta/data/dtep/xhtml-strict/sup.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="sup" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/table.tag b/quanta/data/dtep/xhtml-strict/table.tag
index aa22e02c..39d145c9 100644
--- a/quanta/data/dtep/xhtml-strict/table.tag
+++ b/quanta/data/dtep/xhtml-strict/table.tag
@@ -65,7 +65,7 @@
         <location col="1" row="4" colspan="3"/>
     </attr>
 
-<children>
+<tqchildren>
 <child name="caption" />
 <child name="col" />
 <child name="colgroup" />
@@ -73,7 +73,7 @@
 <child name="tfoot" />
 <child name="tbody" />
 <child name="tr" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/tbody.tag b/quanta/data/dtep/xhtml-strict/tbody.tag
index db13711d..c04eebf6 100644
--- a/quanta/data/dtep/xhtml-strict/tbody.tag
+++ b/quanta/data/dtep/xhtml-strict/tbody.tag
@@ -40,9 +40,9 @@
         <location col="1" row="3" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/td.tag b/quanta/data/dtep/xhtml-strict/td.tag
index 48775d37..26c47877 100644
--- a/quanta/data/dtep/xhtml-strict/td.tag
+++ b/quanta/data/dtep/xhtml-strict/td.tag
@@ -88,7 +88,7 @@
         <stoppingtag name="th" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -142,6 +142,6 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/textarea.tag b/quanta/data/dtep/xhtml-strict/textarea.tag
index 9c94dc0f..50f9210a 100644
--- a/quanta/data/dtep/xhtml-strict/textarea.tag
+++ b/quanta/data/dtep/xhtml-strict/textarea.tag
@@ -42,8 +42,8 @@
       <textlocation col="0" row="4" colspan="1" />
       <location col="1" row="4" colspan="3" />
     </attr>
-    <children>
+    <tqchildren>
 	    <child name="#text" />
-    </children>
+    </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/tfoot.tag b/quanta/data/dtep/xhtml-strict/tfoot.tag
index e07605f4..cca684ca 100644
--- a/quanta/data/dtep/xhtml-strict/tfoot.tag
+++ b/quanta/data/dtep/xhtml-strict/tfoot.tag
@@ -40,9 +40,9 @@
         <location col="1" row="3" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/th.tag b/quanta/data/dtep/xhtml-strict/th.tag
index d5c619f2..84230d57 100644
--- a/quanta/data/dtep/xhtml-strict/th.tag
+++ b/quanta/data/dtep/xhtml-strict/th.tag
@@ -88,7 +88,7 @@
         <stoppingtag name="th" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -142,7 +142,7 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/thead.tag b/quanta/data/dtep/xhtml-strict/thead.tag
index 059263d1..5bb973ca 100644
--- a/quanta/data/dtep/xhtml-strict/thead.tag
+++ b/quanta/data/dtep/xhtml-strict/thead.tag
@@ -40,9 +40,9 @@
         <location col="1" row="3" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/title.tag b/quanta/data/dtep/xhtml-strict/title.tag
index f24df571..02ef0059 100644
--- a/quanta/data/dtep/xhtml-strict/title.tag
+++ b/quanta/data/dtep/xhtml-strict/title.tag
@@ -7,8 +7,8 @@
         <textlocation col="0" row="0" />
         <location col="1" row="0" colspan="2" />
 </attr>
-<children>
+<tqchildren>
 	<child name="#text" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/tr.tag b/quanta/data/dtep/xhtml-strict/tr.tag
index 4baf805c..e1611664 100644
--- a/quanta/data/dtep/xhtml-strict/tr.tag
+++ b/quanta/data/dtep/xhtml-strict/tr.tag
@@ -45,9 +45,9 @@
         <stoppingtag name="tfoot" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="th" />
 <child name="td" usage="required" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/tt.tag b/quanta/data/dtep/xhtml-strict/tt.tag
index a7506a8b..91138326 100644
--- a/quanta/data/dtep/xhtml-strict/tt.tag
+++ b/quanta/data/dtep/xhtml-strict/tt.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="tt" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/ul.tag b/quanta/data/dtep/xhtml-strict/ul.tag
index bd4404c4..9f1450f6 100644
--- a/quanta/data/dtep/xhtml-strict/ul.tag
+++ b/quanta/data/dtep/xhtml-strict/ul.tag
@@ -3,9 +3,9 @@
 <TAGS>
 <tag name="ul" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="li" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml-strict/var.tag b/quanta/data/dtep/xhtml-strict/var.tag
index 1c20c088..4c4e8dc3 100644
--- a/quanta/data/dtep/xhtml-strict/var.tag
+++ b/quanta/data/dtep/xhtml-strict/var.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="var" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/a.tag b/quanta/data/dtep/xhtml/a.tag
index 9140cd66..9fc9aeb4 100644
--- a/quanta/data/dtep/xhtml/a.tag
+++ b/quanta/data/dtep/xhtml/a.tag
@@ -61,7 +61,7 @@
         <location col="1" row="6" />
     </attr>
 
-    <attr name="shape" type="list">
+    <attr name="tqshape" type="list">
         <text>Shape</text>
         <textlocation col="0" row="7" />
         <location col="1" row="7" />
@@ -85,7 +85,7 @@
         <location col="1" row="9" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="abbr" />
 <child name="applet" />
@@ -126,7 +126,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/abbr.tag b/quanta/data/dtep/xhtml/abbr.tag
index 9748630f..76cab4bd 100644
--- a/quanta/data/dtep/xhtml/abbr.tag
+++ b/quanta/data/dtep/xhtml/abbr.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="abbr" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />		
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/acronym.tag b/quanta/data/dtep/xhtml/acronym.tag
index 93d73b08..35634a11 100644
--- a/quanta/data/dtep/xhtml/acronym.tag
+++ b/quanta/data/dtep/xhtml/acronym.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="acronym" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/address.tag b/quanta/data/dtep/xhtml/address.tag
index 6a309b43..45b2c9fc 100644
--- a/quanta/data/dtep/xhtml/address.tag
+++ b/quanta/data/dtep/xhtml/address.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="address" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child 	name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,6 +45,6 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/applet.tag b/quanta/data/dtep/xhtml/applet.tag
index 98aed01a..4372bef9 100644
--- a/quanta/data/dtep/xhtml/applet.tag
+++ b/quanta/data/dtep/xhtml/applet.tag
@@ -73,7 +73,7 @@
         <location col="1" row="9" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="a" />
 <child name="abbr" />
 <child name="acronym" />
@@ -139,7 +139,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/area.tag b/quanta/data/dtep/xhtml/area.tag
index 7bbf41b0..24dee60f 100644
--- a/quanta/data/dtep/xhtml/area.tag
+++ b/quanta/data/dtep/xhtml/area.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="area" hasFocus="1" hasScript="1" hasCore="1" hasI18n="1" single="1">
 
-    <attr name="shape" type="list">
+    <attr name="tqshape" type="list">
         <text>Shape</text>
         <textlocation col="0" row="0" />
         <location col="1" row="0" colspan="2"/>
diff --git a/quanta/data/dtep/xhtml/b.tag b/quanta/data/dtep/xhtml/b.tag
index dac70a04..86cbb519 100644
--- a/quanta/data/dtep/xhtml/b.tag
+++ b/quanta/data/dtep/xhtml/b.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="b" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/bdo.tag b/quanta/data/dtep/xhtml/bdo.tag
index 2a592a37..ed648538 100644
--- a/quanta/data/dtep/xhtml/bdo.tag
+++ b/quanta/data/dtep/xhtml/bdo.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="bdo" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/big.tag b/quanta/data/dtep/xhtml/big.tag
index bbf21a7c..6ebf8aad 100644
--- a/quanta/data/dtep/xhtml/big.tag
+++ b/quanta/data/dtep/xhtml/big.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="big" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/blockquote.tag b/quanta/data/dtep/xhtml/blockquote.tag
index 82709643..07170c99 100644
--- a/quanta/data/dtep/xhtml/blockquote.tag
+++ b/quanta/data/dtep/xhtml/blockquote.tag
@@ -10,7 +10,7 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -76,7 +76,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/body.tag b/quanta/data/dtep/xhtml/body.tag
index c7fe5941..d2d20457 100644
--- a/quanta/data/dtep/xhtml/body.tag
+++ b/quanta/data/dtep/xhtml/body.tag
@@ -56,7 +56,7 @@
         <location col="1" row="7" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -122,7 +122,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/button.tag b/quanta/data/dtep/xhtml/button.tag
index 011def6a..52a481c6 100644
--- a/quanta/data/dtep/xhtml/button.tag
+++ b/quanta/data/dtep/xhtml/button.tag
@@ -32,7 +32,7 @@
       <tooltip>Disable the element</tooltip>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="abbr" />
 <child name="acronym" />
@@ -88,6 +88,6 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/caption.tag b/quanta/data/dtep/xhtml/caption.tag
index 8936eb10..92a47799 100644
--- a/quanta/data/dtep/xhtml/caption.tag
+++ b/quanta/data/dtep/xhtml/caption.tag
@@ -15,7 +15,7 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -57,7 +57,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/center.tag b/quanta/data/dtep/xhtml/center.tag
index 860eff90..2351c61a 100644
--- a/quanta/data/dtep/xhtml/center.tag
+++ b/quanta/data/dtep/xhtml/center.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="center" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -69,7 +69,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/cite.tag b/quanta/data/dtep/xhtml/cite.tag
index 57f00da6..1a92b725 100644
--- a/quanta/data/dtep/xhtml/cite.tag
+++ b/quanta/data/dtep/xhtml/cite.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="cite" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/code.tag b/quanta/data/dtep/xhtml/code.tag
index e96dfd0b..29f1147c 100644
--- a/quanta/data/dtep/xhtml/code.tag
+++ b/quanta/data/dtep/xhtml/code.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="code" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/colgroup.tag b/quanta/data/dtep/xhtml/colgroup.tag
index d4ecc9a8..20c27974 100644
--- a/quanta/data/dtep/xhtml/colgroup.tag
+++ b/quanta/data/dtep/xhtml/colgroup.tag
@@ -54,8 +54,8 @@ You can add multiple values with commas</tooltip>
         <location col="1" row="5" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="col" usage="required" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/dd.tag b/quanta/data/dtep/xhtml/dd.tag
index 7b6779b9..a56729a4 100644
--- a/quanta/data/dtep/xhtml/dd.tag
+++ b/quanta/data/dtep/xhtml/dd.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="dd" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -69,7 +69,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/del.tag b/quanta/data/dtep/xhtml/del.tag
index f4026744..1ae3dae3 100644
--- a/quanta/data/dtep/xhtml/del.tag
+++ b/quanta/data/dtep/xhtml/del.tag
@@ -15,7 +15,7 @@
         <location col="1" row="1" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -81,7 +81,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/dfn.tag b/quanta/data/dtep/xhtml/dfn.tag
index dcd1fbb9..432f3931 100644
--- a/quanta/data/dtep/xhtml/dfn.tag
+++ b/quanta/data/dtep/xhtml/dfn.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="dfn" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/dir.tag b/quanta/data/dtep/xhtml/dir.tag
index 13612182..a63731e9 100644
--- a/quanta/data/dtep/xhtml/dir.tag
+++ b/quanta/data/dtep/xhtml/dir.tag
@@ -8,9 +8,9 @@
         <location col="0" row="0" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="li" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/div.tag b/quanta/data/dtep/xhtml/div.tag
index 21a5b47c..6b033710 100644
--- a/quanta/data/dtep/xhtml/div.tag
+++ b/quanta/data/dtep/xhtml/div.tag
@@ -16,7 +16,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -82,7 +82,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/dl.tag b/quanta/data/dtep/xhtml/dl.tag
index 1f38c5a0..32c9f645 100644
--- a/quanta/data/dtep/xhtml/dl.tag
+++ b/quanta/data/dtep/xhtml/dl.tag
@@ -8,9 +8,9 @@
         <location col="0" row="0" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="dt" />
 <child name="dd" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/dt.tag b/quanta/data/dtep/xhtml/dt.tag
index 4d9192aa..18d1d506 100644
--- a/quanta/data/dtep/xhtml/dt.tag
+++ b/quanta/data/dtep/xhtml/dt.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="dt" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/em.tag b/quanta/data/dtep/xhtml/em.tag
index 3c5005b1..b2765e02 100644
--- a/quanta/data/dtep/xhtml/em.tag
+++ b/quanta/data/dtep/xhtml/em.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="em" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/fieldset.tag b/quanta/data/dtep/xhtml/fieldset.tag
index 550b5e7f..8db70f7d 100644
--- a/quanta/data/dtep/xhtml/fieldset.tag
+++ b/quanta/data/dtep/xhtml/fieldset.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="fieldset" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -70,7 +70,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/font.tag b/quanta/data/dtep/xhtml/font.tag
index 61c00a64..bb1df39f 100644
--- a/quanta/data/dtep/xhtml/font.tag
+++ b/quanta/data/dtep/xhtml/font.tag
@@ -39,7 +39,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -81,7 +81,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/form.tag b/quanta/data/dtep/xhtml/form.tag
index e913755e..cb7798e4 100644
--- a/quanta/data/dtep/xhtml/form.tag
+++ b/quanta/data/dtep/xhtml/form.tag
@@ -80,7 +80,7 @@
         <location col="1" row="8" colspan="3"/>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -145,7 +145,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/head.tag b/quanta/data/dtep/xhtml/head.tag
index 9305caea..74e94d81 100644
--- a/quanta/data/dtep/xhtml/head.tag
+++ b/quanta/data/dtep/xhtml/head.tag
@@ -15,7 +15,7 @@
         <location col="1" row="1" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="base" />
 <child name="link" />
 <child name="meta" usage="required" />
@@ -24,7 +24,7 @@
 <child name="script" />
 <child name="style" />
 <child name="isindex" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/headings.tag b/quanta/data/dtep/xhtml/headings.tag
index 37e6eca2..6f2ab4f5 100644
--- a/quanta/data/dtep/xhtml/headings.tag
+++ b/quanta/data/dtep/xhtml/headings.tag
@@ -16,7 +16,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -58,7 +58,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -77,7 +77,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -119,7 +119,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -138,7 +138,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -180,7 +180,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -199,7 +199,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -241,7 +241,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -260,7 +260,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -302,7 +302,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 
@@ -321,7 +321,7 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -363,7 +363,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/html.tag b/quanta/data/dtep/xhtml/html.tag
index afc592c3..45a26694 100644
--- a/quanta/data/dtep/xhtml/html.tag
+++ b/quanta/data/dtep/xhtml/html.tag
@@ -18,10 +18,10 @@
         </items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="head" />
 <child name="body" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/i.tag b/quanta/data/dtep/xhtml/i.tag
index 45855df4..0b4e0b1e 100644
--- a/quanta/data/dtep/xhtml/i.tag
+++ b/quanta/data/dtep/xhtml/i.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/iframe.tag b/quanta/data/dtep/xhtml/iframe.tag
index 7c09ad13..3f4420e6 100644
--- a/quanta/data/dtep/xhtml/iframe.tag
+++ b/quanta/data/dtep/xhtml/iframe.tag
@@ -88,7 +88,7 @@
         <location col="1" row="12" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="a" />
 <child name="abbr" />
 <child name="acronym" />
@@ -153,7 +153,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/ins.tag b/quanta/data/dtep/xhtml/ins.tag
index e3b082e8..16dadd0c 100644
--- a/quanta/data/dtep/xhtml/ins.tag
+++ b/quanta/data/dtep/xhtml/ins.tag
@@ -15,7 +15,7 @@
         <location col="1" row="1" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -81,7 +81,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/kbd.tag b/quanta/data/dtep/xhtml/kbd.tag
index 433d0310..f71fcb58 100644
--- a/quanta/data/dtep/xhtml/kbd.tag
+++ b/quanta/data/dtep/xhtml/kbd.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="kbd" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/label.tag b/quanta/data/dtep/xhtml/label.tag
index 249d512a..bf1fce54 100644
--- a/quanta/data/dtep/xhtml/label.tag
+++ b/quanta/data/dtep/xhtml/label.tag
@@ -27,7 +27,7 @@
         <location col="1" row="3" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -69,7 +69,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/legend.tag b/quanta/data/dtep/xhtml/legend.tag
index 18de65d3..0b7d7cb3 100644
--- a/quanta/data/dtep/xhtml/legend.tag
+++ b/quanta/data/dtep/xhtml/legend.tag
@@ -22,7 +22,7 @@
     <location col="1" row="1" />
   </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -64,7 +64,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/li.tag b/quanta/data/dtep/xhtml/li.tag
index f6644cee..5bc5ca06 100644
--- a/quanta/data/dtep/xhtml/li.tag
+++ b/quanta/data/dtep/xhtml/li.tag
@@ -29,7 +29,7 @@
         <stoppingtag name="li" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -95,7 +95,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/map.tag b/quanta/data/dtep/xhtml/map.tag
index b64d44f2..9852af99 100644
--- a/quanta/data/dtep/xhtml/map.tag
+++ b/quanta/data/dtep/xhtml/map.tag
@@ -9,7 +9,7 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="address" />
 <child name="area" />
 <child name="blockquote" />
@@ -38,7 +38,7 @@
 <child name="script" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/menu.tag b/quanta/data/dtep/xhtml/menu.tag
index 10322fc8..a98f6d53 100644
--- a/quanta/data/dtep/xhtml/menu.tag
+++ b/quanta/data/dtep/xhtml/menu.tag
@@ -8,9 +8,9 @@
         <location col="0" row="0" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="li" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/noframes.tag b/quanta/data/dtep/xhtml/noframes.tag
index 758e6cb2..b932929e 100644
--- a/quanta/data/dtep/xhtml/noframes.tag
+++ b/quanta/data/dtep/xhtml/noframes.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="noframes" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="a" />
 <child name="abbr" />
 <child name="acronym" />
@@ -68,7 +68,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/noscript.tag b/quanta/data/dtep/xhtml/noscript.tag
index 0c604a67..ec2f3ac3 100644
--- a/quanta/data/dtep/xhtml/noscript.tag
+++ b/quanta/data/dtep/xhtml/noscript.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="noscript" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -69,7 +69,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/object.tag b/quanta/data/dtep/xhtml/object.tag
index baebd55d..10513193 100644
--- a/quanta/data/dtep/xhtml/object.tag
+++ b/quanta/data/dtep/xhtml/object.tag
@@ -136,7 +136,7 @@
     <location col="3" row="7" />
   </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -203,7 +203,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/ol.tag b/quanta/data/dtep/xhtml/ol.tag
index 4a33b85a..2d2e2fb1 100644
--- a/quanta/data/dtep/xhtml/ol.tag
+++ b/quanta/data/dtep/xhtml/ol.tag
@@ -28,9 +28,9 @@
         <location col="0" row="2" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="li" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/optgroup.tag b/quanta/data/dtep/xhtml/optgroup.tag
index 08a52ff5..56839297 100644
--- a/quanta/data/dtep/xhtml/optgroup.tag
+++ b/quanta/data/dtep/xhtml/optgroup.tag
@@ -15,9 +15,9 @@
       <location col="1" row="0" colspan="1" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="option" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/p.tag b/quanta/data/dtep/xhtml/p.tag
index aabd50f8..b9bea07e 100644
--- a/quanta/data/dtep/xhtml/p.tag
+++ b/quanta/data/dtep/xhtml/p.tag
@@ -26,7 +26,7 @@
         <stoppingtag name="dd" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -68,7 +68,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/pre.tag b/quanta/data/dtep/xhtml/pre.tag
index 0b861099..b4d70015 100644
--- a/quanta/data/dtep/xhtml/pre.tag
+++ b/quanta/data/dtep/xhtml/pre.tag
@@ -17,7 +17,7 @@
                 <item>preserve</item>
         </items>
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -48,6 +48,6 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/q.tag b/quanta/data/dtep/xhtml/q.tag
index abc31b1b..b1577c29 100644
--- a/quanta/data/dtep/xhtml/q.tag
+++ b/quanta/data/dtep/xhtml/q.tag
@@ -9,7 +9,7 @@
         <location col="1" row="0" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -51,7 +51,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/s.tag b/quanta/data/dtep/xhtml/s.tag
index 419cb720..5f072e92 100644
--- a/quanta/data/dtep/xhtml/s.tag
+++ b/quanta/data/dtep/xhtml/s.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="s" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="a" />
 <child name="abbr" />
 <child name="applet" />
@@ -44,7 +44,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/samp.tag b/quanta/data/dtep/xhtml/samp.tag
index 6cecf4e0..e84d0525 100644
--- a/quanta/data/dtep/xhtml/samp.tag
+++ b/quanta/data/dtep/xhtml/samp.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="samp" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/select.tag b/quanta/data/dtep/xhtml/select.tag
index d0c87373..fb17bd73 100644
--- a/quanta/data/dtep/xhtml/select.tag
+++ b/quanta/data/dtep/xhtml/select.tag
@@ -53,10 +53,10 @@
         <stoppingtag name="select" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="optgroup" />
 <child name="option" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/small.tag b/quanta/data/dtep/xhtml/small.tag
index 4d045201..9799ee96 100644
--- a/quanta/data/dtep/xhtml/small.tag
+++ b/quanta/data/dtep/xhtml/small.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="small" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/span.tag b/quanta/data/dtep/xhtml/span.tag
index d674850e..82241f9c 100644
--- a/quanta/data/dtep/xhtml/span.tag
+++ b/quanta/data/dtep/xhtml/span.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="span" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/strike.tag b/quanta/data/dtep/xhtml/strike.tag
index 4907d5be..03d9e85c 100644
--- a/quanta/data/dtep/xhtml/strike.tag
+++ b/quanta/data/dtep/xhtml/strike.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="strike" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="a" />
 <child name="abbr" />
 <child name="applet" />
@@ -44,7 +44,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/strong.tag b/quanta/data/dtep/xhtml/strong.tag
index 2be3da65..0ec79185 100644
--- a/quanta/data/dtep/xhtml/strong.tag
+++ b/quanta/data/dtep/xhtml/strong.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="strong" hasCore="1" hasI18n="1" hasScript="1" scope="word">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/style.tag b/quanta/data/dtep/xhtml/style.tag
index 781181b4..5cad56d6 100644
--- a/quanta/data/dtep/xhtml/style.tag
+++ b/quanta/data/dtep/xhtml/style.tag
@@ -50,8 +50,8 @@
                 <item>preserve</item>
         </items>
     </attr>
-    <children>
+    <tqchildren>
 	<child name="#text" />
-   </children>
+   </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/sub.tag b/quanta/data/dtep/xhtml/sub.tag
index ec46544b..315c5ab0 100644
--- a/quanta/data/dtep/xhtml/sub.tag
+++ b/quanta/data/dtep/xhtml/sub.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="sub" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/sup.tag b/quanta/data/dtep/xhtml/sup.tag
index 176cf71a..07eac389 100644
--- a/quanta/data/dtep/xhtml/sup.tag
+++ b/quanta/data/dtep/xhtml/sup.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="sup" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/table.tag b/quanta/data/dtep/xhtml/table.tag
index b76d5095..d5296fb2 100644
--- a/quanta/data/dtep/xhtml/table.tag
+++ b/quanta/data/dtep/xhtml/table.tag
@@ -83,7 +83,7 @@
         <tooltip>Deprecated</tooltip>
     </attr>
 
-<children>
+<tqchildren>
 <child name="caption" />
 <child name="col" />
 <child name="colgroup" />
@@ -91,7 +91,7 @@
 <child name="tfoot" />
 <child name="tbody" />
 <child name="tr" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/tbody.tag b/quanta/data/dtep/xhtml/tbody.tag
index db13711d..c04eebf6 100644
--- a/quanta/data/dtep/xhtml/tbody.tag
+++ b/quanta/data/dtep/xhtml/tbody.tag
@@ -40,9 +40,9 @@
         <location col="1" row="3" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/td.tag b/quanta/data/dtep/xhtml/td.tag
index e46c9414..39e99979 100644
--- a/quanta/data/dtep/xhtml/td.tag
+++ b/quanta/data/dtep/xhtml/td.tag
@@ -115,7 +115,7 @@
         <stoppingtag name="th" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -181,7 +181,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/textarea.tag b/quanta/data/dtep/xhtml/textarea.tag
index ea019898..6612247b 100644
--- a/quanta/data/dtep/xhtml/textarea.tag
+++ b/quanta/data/dtep/xhtml/textarea.tag
@@ -42,8 +42,8 @@
       <textlocation col="0" row="4" colspan="1" />
       <location col="1" row="4" colspan="3" />
     </attr>
-    <children>
+    <tqchildren>
       <child name="#text" />
-    </children>
+    </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/tfoot.tag b/quanta/data/dtep/xhtml/tfoot.tag
index e07605f4..cca684ca 100644
--- a/quanta/data/dtep/xhtml/tfoot.tag
+++ b/quanta/data/dtep/xhtml/tfoot.tag
@@ -40,9 +40,9 @@
         <location col="1" row="3" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/th.tag b/quanta/data/dtep/xhtml/th.tag
index 78b82c25..6720e4e0 100644
--- a/quanta/data/dtep/xhtml/th.tag
+++ b/quanta/data/dtep/xhtml/th.tag
@@ -115,7 +115,7 @@
         <stoppingtag name="th" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -181,7 +181,7 @@
 <child name="u" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/thead.tag b/quanta/data/dtep/xhtml/thead.tag
index 059263d1..5bb973ca 100644
--- a/quanta/data/dtep/xhtml/thead.tag
+++ b/quanta/data/dtep/xhtml/thead.tag
@@ -40,9 +40,9 @@
         <location col="1" row="3" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/title.tag b/quanta/data/dtep/xhtml/title.tag
index f24df571..02ef0059 100644
--- a/quanta/data/dtep/xhtml/title.tag
+++ b/quanta/data/dtep/xhtml/title.tag
@@ -7,8 +7,8 @@
         <textlocation col="0" row="0" />
         <location col="1" row="0" colspan="2" />
 </attr>
-<children>
+<tqchildren>
 	<child name="#text" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/tr.tag b/quanta/data/dtep/xhtml/tr.tag
index 4baf805c..e1611664 100644
--- a/quanta/data/dtep/xhtml/tr.tag
+++ b/quanta/data/dtep/xhtml/tr.tag
@@ -45,9 +45,9 @@
         <stoppingtag name="tfoot" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="th" />
 <child name="td" usage="required" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/tt.tag b/quanta/data/dtep/xhtml/tt.tag
index 08f25532..768f3791 100644
--- a/quanta/data/dtep/xhtml/tt.tag
+++ b/quanta/data/dtep/xhtml/tt.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="tt" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/u.tag b/quanta/data/dtep/xhtml/u.tag
index 38e47050..56a4e61e 100644
--- a/quanta/data/dtep/xhtml/u.tag
+++ b/quanta/data/dtep/xhtml/u.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="u" hasCore="1" hasI18n="1" hasScript="1" scope="word">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/ul.tag b/quanta/data/dtep/xhtml/ul.tag
index 21443c5d..bb30c1c6 100644
--- a/quanta/data/dtep/xhtml/ul.tag
+++ b/quanta/data/dtep/xhtml/ul.tag
@@ -20,9 +20,9 @@
         <location col="0" row="1" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="li" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml/var.tag b/quanta/data/dtep/xhtml/var.tag
index 74e336d4..2b0bddb5 100644
--- a/quanta/data/dtep/xhtml/var.tag
+++ b/quanta/data/dtep/xhtml/var.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="var" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="#text" />	
 <child name="a" />
 <child name="abbr" />
@@ -45,7 +45,7 @@
 <child name="tt" />
 <child name="u" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/a.tag b/quanta/data/dtep/xhtml11/a.tag
index eda33421..34ccd660 100644
--- a/quanta/data/dtep/xhtml11/a.tag
+++ b/quanta/data/dtep/xhtml11/a.tag
@@ -59,7 +59,7 @@
     <attr name="charset" type="input" />
     <attr name="accesskey" type="input" />
     <attr name="tabindex" type="input" />
-    <attr name="shape" type="list">
+    <attr name="tqshape" type="list">
      <items>
       <item>rect</item>
       <item>circle</item>
@@ -69,7 +69,7 @@
     </attr>
     <attr name="coords" type="input" />
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="abbr" />
 <child name="acronym" />
@@ -103,6 +103,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/abbr.tag b/quanta/data/dtep/xhtml11/abbr.tag
index b988c322..08fc6d94 100644
--- a/quanta/data/dtep/xhtml11/abbr.tag
+++ b/quanta/data/dtep/xhtml11/abbr.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="abbr" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/acronym.tag b/quanta/data/dtep/xhtml11/acronym.tag
index 12bf30f1..c2a2eba5 100644
--- a/quanta/data/dtep/xhtml11/acronym.tag
+++ b/quanta/data/dtep/xhtml11/acronym.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="acronym" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/address.tag b/quanta/data/dtep/xhtml11/address.tag
index 3b1f699e..c74c8141 100644
--- a/quanta/data/dtep/xhtml11/address.tag
+++ b/quanta/data/dtep/xhtml11/address.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="address" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/applet.tag b/quanta/data/dtep/xhtml11/applet.tag
index 1a9d5acd..e4bec12d 100644
--- a/quanta/data/dtep/xhtml11/applet.tag
+++ b/quanta/data/dtep/xhtml11/applet.tag
@@ -63,7 +63,7 @@
         <location col="3" row="9" colspan="1" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -117,7 +117,7 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/area.tag b/quanta/data/dtep/xhtml11/area.tag
index 1c992e3b..67c45a1d 100644
--- a/quanta/data/dtep/xhtml11/area.tag
+++ b/quanta/data/dtep/xhtml11/area.tag
@@ -3,8 +3,8 @@
 <TAGS>
 <tag name="area" hasFocus="1" hasScript="1" hasCore="1" hasI18n="1" single="1">
 
-    <attr name="shape" type="list">
-        <text>shape</text>
+    <attr name="tqshape" type="list">
+        <text>tqshape</text>
         <textlocation col="0" row="0" />
         <location col="1" row="0" colspan="2"/>
         <items>
diff --git a/quanta/data/dtep/xhtml11/b.tag b/quanta/data/dtep/xhtml11/b.tag
index 54e28332..736049f5 100644
--- a/quanta/data/dtep/xhtml11/b.tag
+++ b/quanta/data/dtep/xhtml11/b.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="b" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/bdo.tag b/quanta/data/dtep/xhtml11/bdo.tag
index 47fc984f..6981975c 100644
--- a/quanta/data/dtep/xhtml11/bdo.tag
+++ b/quanta/data/dtep/xhtml11/bdo.tag
@@ -13,7 +13,7 @@
                 <item>rtl</item>
         </items>
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -48,6 +48,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/big.tag b/quanta/data/dtep/xhtml11/big.tag
index b951e28b..c9ca87ac 100644
--- a/quanta/data/dtep/xhtml11/big.tag
+++ b/quanta/data/dtep/xhtml11/big.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="big" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/blockquote.tag b/quanta/data/dtep/xhtml11/blockquote.tag
index b74910eb..1ac79dbf 100644
--- a/quanta/data/dtep/xhtml11/blockquote.tag
+++ b/quanta/data/dtep/xhtml11/blockquote.tag
@@ -8,7 +8,7 @@
         <textlocation col="0" row="0" />
         <location col="1" row="0" colspan="2" />
     </attr>
-<children>
+<tqchildren>
 <child name="address" />
 <child name="blockquote" />
 <child name="del" />
@@ -31,6 +31,6 @@
 <child name="script" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/body.tag b/quanta/data/dtep/xhtml11/body.tag
index 6b46aba5..50117437 100644
--- a/quanta/data/dtep/xhtml11/body.tag
+++ b/quanta/data/dtep/xhtml11/body.tag
@@ -14,7 +14,7 @@
         <location col="1" row="1" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="address" />
 <child name="blockquote" />
 <child name="del" />
@@ -37,6 +37,6 @@
 <child name="script" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/button.tag b/quanta/data/dtep/xhtml11/button.tag
index c659c0e3..0c204c06 100644
--- a/quanta/data/dtep/xhtml11/button.tag
+++ b/quanta/data/dtep/xhtml11/button.tag
@@ -15,7 +15,7 @@
 
 <attr name="disabled" type="check" />
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="abbr" />
 <child name="acronym" />
@@ -61,6 +61,6 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/caption.tag b/quanta/data/dtep/xhtml11/caption.tag
index 0d433812..956ed2bd 100644
--- a/quanta/data/dtep/xhtml11/caption.tag
+++ b/quanta/data/dtep/xhtml11/caption.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="caption" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/cite.tag b/quanta/data/dtep/xhtml11/cite.tag
index 58cb492f..b3e2e76b 100644
--- a/quanta/data/dtep/xhtml11/cite.tag
+++ b/quanta/data/dtep/xhtml11/cite.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="cite" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/code.tag b/quanta/data/dtep/xhtml11/code.tag
index b29a87d4..625050da 100644
--- a/quanta/data/dtep/xhtml11/code.tag
+++ b/quanta/data/dtep/xhtml11/code.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="code" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/col.tag b/quanta/data/dtep/xhtml11/col.tag
index 9bad383d..e900365a 100644
--- a/quanta/data/dtep/xhtml11/col.tag
+++ b/quanta/data/dtep/xhtml11/col.tag
@@ -45,14 +45,14 @@ You can add multiple values with commas</tooltip>
     <attr name="char" type="input">
         <text>char</text>
         <textlocation col="0" row="4" />
-        <tooltip>alignment character for cells</tooltip>
+        <tooltip>tqalignment character for cells</tooltip>
         <location col="1" row="4" />
     </attr>
 
     <attr name="charoff" type="input">
         <text>charoff</text>
         <textlocation col="0" row="5" />
-        <tooltip>alignment character offset</tooltip>
+        <tooltip>tqalignment character offset</tooltip>
         <location col="1" row="5" />
     </attr>
 
diff --git a/quanta/data/dtep/xhtml11/colgroup.tag b/quanta/data/dtep/xhtml11/colgroup.tag
index a0dfb5d2..548a7cb8 100644
--- a/quanta/data/dtep/xhtml11/colgroup.tag
+++ b/quanta/data/dtep/xhtml11/colgroup.tag
@@ -45,19 +45,19 @@ You can add multiple values with commas</tooltip>
     <attr name="char" type="input">
         <text>char</text>
         <textlocation col="0" row="4" />
-        <tooltip>alignment character for cells</tooltip>
+        <tooltip>tqalignment character for cells</tooltip>
         <location col="1" row="4" />
     </attr>
 
     <attr name="charoff" type="input">
         <text>charoff</text>
         <textlocation col="0" row="5" />
-        <tooltip>alignment character offset</tooltip>
+        <tooltip>tqalignment character offset</tooltip>
         <location col="1" row="5" />
     </attr>
-<children>
+<tqchildren>
 <child name="col" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/dd.tag b/quanta/data/dtep/xhtml11/dd.tag
index 97992bf9..53fda2d1 100644
--- a/quanta/data/dtep/xhtml11/dd.tag
+++ b/quanta/data/dtep/xhtml11/dd.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="dd" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -56,6 +56,6 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/del.tag b/quanta/data/dtep/xhtml11/del.tag
index 1a7c17db..dc48ab2b 100644
--- a/quanta/data/dtep/xhtml11/del.tag
+++ b/quanta/data/dtep/xhtml11/del.tag
@@ -14,7 +14,7 @@
         <textlocation col="0" row="1" />
         <location col="1" row="1" colspan="2" />
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -68,6 +68,6 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/dfn.tag b/quanta/data/dtep/xhtml11/dfn.tag
index fbeb6d72..42d4d6fc 100644
--- a/quanta/data/dtep/xhtml11/dfn.tag
+++ b/quanta/data/dtep/xhtml11/dfn.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="dfn" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/div.tag b/quanta/data/dtep/xhtml11/div.tag
index 1f8500f0..dde0e712 100644
--- a/quanta/data/dtep/xhtml11/div.tag
+++ b/quanta/data/dtep/xhtml11/div.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="div" hasScript="1" hasCore="1" hasI18n="1" scope="paragraph">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -56,6 +56,6 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/dl.tag b/quanta/data/dtep/xhtml11/dl.tag
index 430067b8..d1edcf28 100644
--- a/quanta/data/dtep/xhtml11/dl.tag
+++ b/quanta/data/dtep/xhtml11/dl.tag
@@ -2,9 +2,9 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="dl" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="dt" />
 <child name="dd" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/dt.tag b/quanta/data/dtep/xhtml11/dt.tag
index ef239795..efc31477 100644
--- a/quanta/data/dtep/xhtml11/dt.tag
+++ b/quanta/data/dtep/xhtml11/dt.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="dt" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/em.tag b/quanta/data/dtep/xhtml11/em.tag
index 807065df..f858197f 100644
--- a/quanta/data/dtep/xhtml11/em.tag
+++ b/quanta/data/dtep/xhtml11/em.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="em" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/fieldset.tag b/quanta/data/dtep/xhtml11/fieldset.tag
index c2bc156f..7ab940b3 100644
--- a/quanta/data/dtep/xhtml11/fieldset.tag
+++ b/quanta/data/dtep/xhtml11/fieldset.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="fieldset" hasScript="1" hasCore="1">
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -59,7 +59,7 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/form.tag b/quanta/data/dtep/xhtml11/form.tag
index c332c515..5f851d9d 100644
--- a/quanta/data/dtep/xhtml11/form.tag
+++ b/quanta/data/dtep/xhtml11/form.tag
@@ -57,7 +57,7 @@
         <location col="3" row="6"/>
     </attr>
 
-<children>
+<tqchildren>
 <child name="address" />
 <child name="blockquote" />
 <child name="del" />
@@ -79,6 +79,6 @@
 <child name="script" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/head.tag b/quanta/data/dtep/xhtml11/head.tag
index b53932b3..30b8fad8 100644
--- a/quanta/data/dtep/xhtml11/head.tag
+++ b/quanta/data/dtep/xhtml11/head.tag
@@ -15,7 +15,7 @@
         <location col="1" row="1" colspan="2" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="base" />
 <child name="link" />
 <child name="meta" usage="required" />
@@ -23,7 +23,7 @@
 <child name="title" usage="required" />
 <child name="script" />
 <child name="style" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/headings.tag b/quanta/data/dtep/xhtml11/headings.tag
index eb0b4fa0..dc23edec 100644
--- a/quanta/data/dtep/xhtml11/headings.tag
+++ b/quanta/data/dtep/xhtml11/headings.tag
@@ -3,7 +3,7 @@
 <TAGS>
 
 <tag name="h1" hasScript="1" hasCore="1" hasI18n="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -38,11 +38,11 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="h2" hasScript="1" hasCore="1" hasI18n="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -77,11 +77,11 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="h3" hasScript="1" hasCore="1" hasI18n="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -116,11 +116,11 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="h4" hasScript="1" hasCore="1" hasI18n="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -155,11 +155,11 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="h5" hasScript="1" hasCore="1" hasI18n="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -194,11 +194,11 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 
 <tag name="h6" hasScript="1" hasCore="1" hasI18n="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -233,7 +233,7 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/html.tag b/quanta/data/dtep/xhtml11/html.tag
index 22894f8d..7794c33a 100644
--- a/quanta/data/dtep/xhtml11/html.tag
+++ b/quanta/data/dtep/xhtml11/html.tag
@@ -16,10 +16,10 @@
         <items><item>http://www.w3.org/1999/xhtml</item></items>
     </attr>
 
-<children>
+<tqchildren>
 <child name="body" />
 <child name="head" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/i.tag b/quanta/data/dtep/xhtml11/i.tag
index 36dbd43a..f7bcd0ef 100644
--- a/quanta/data/dtep/xhtml11/i.tag
+++ b/quanta/data/dtep/xhtml11/i.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/ins.tag b/quanta/data/dtep/xhtml11/ins.tag
index c088199f..37c7be63 100644
--- a/quanta/data/dtep/xhtml11/ins.tag
+++ b/quanta/data/dtep/xhtml11/ins.tag
@@ -14,7 +14,7 @@
         <textlocation col="0" row="1" />
         <location col="1" row="1" colspan="2" />
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -68,6 +68,6 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/kbd.tag b/quanta/data/dtep/xhtml11/kbd.tag
index 2b222085..246f6230 100644
--- a/quanta/data/dtep/xhtml11/kbd.tag
+++ b/quanta/data/dtep/xhtml11/kbd.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="kbd" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/label.tag b/quanta/data/dtep/xhtml11/label.tag
index 75fb81c6..efb6174a 100644
--- a/quanta/data/dtep/xhtml11/label.tag
+++ b/quanta/data/dtep/xhtml11/label.tag
@@ -26,7 +26,7 @@
         <textlocation col="0" row="3" />
         <location col="1" row="3" />
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -61,6 +61,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/legend.tag b/quanta/data/dtep/xhtml11/legend.tag
index 048dff82..a55a5880 100644
--- a/quanta/data/dtep/xhtml11/legend.tag
+++ b/quanta/data/dtep/xhtml11/legend.tag
@@ -9,7 +9,7 @@
       <location col="3" row="0" colspan="1" />
       <tooltip>Shortcut</tooltip>
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -44,6 +44,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/li.tag b/quanta/data/dtep/xhtml11/li.tag
index 5ceb4358..66fd4600 100644
--- a/quanta/data/dtep/xhtml11/li.tag
+++ b/quanta/data/dtep/xhtml11/li.tag
@@ -6,7 +6,7 @@
     <stoppingtags>
         <stoppingtag name="li" />
     </stoppingtags>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -60,6 +60,6 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/map.tag b/quanta/data/dtep/xhtml11/map.tag
index 156f895f..4edddf1e 100644
--- a/quanta/data/dtep/xhtml11/map.tag
+++ b/quanta/data/dtep/xhtml11/map.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="map" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="address" />
 <child name="area" />
 <child name="blockquote" />
@@ -27,7 +27,7 @@
 <child name="script" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/noscript.tag b/quanta/data/dtep/xhtml11/noscript.tag
index 86b73ab5..8a9cb611 100644
--- a/quanta/data/dtep/xhtml11/noscript.tag
+++ b/quanta/data/dtep/xhtml11/noscript.tag
@@ -3,7 +3,7 @@
 <TAGS>
 <tag name="noscript" hasCore="1" hasI18n="1" hasScript="1">
 
-<children>
+<tqchildren>
 <child name="address" />
 <child name="blockquote" />
 <child name="del" />
@@ -26,6 +26,6 @@
 <child name="script" />
 <child name="table" />
 <child name="ul" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/object.tag b/quanta/data/dtep/xhtml11/object.tag
index 3953c45b..a76d9589 100644
--- a/quanta/data/dtep/xhtml11/object.tag
+++ b/quanta/data/dtep/xhtml11/object.tag
@@ -121,7 +121,7 @@
         <location col="3" row="15" colspan="1" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -175,7 +175,7 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/ol.tag b/quanta/data/dtep/xhtml11/ol.tag
index 25c76d7a..98e58f38 100644
--- a/quanta/data/dtep/xhtml11/ol.tag
+++ b/quanta/data/dtep/xhtml11/ol.tag
@@ -3,9 +3,9 @@
 <TAGS>
 <tag name="ol" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="li" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/optgroup.tag b/quanta/data/dtep/xhtml11/optgroup.tag
index 82452057..57c7c978 100644
--- a/quanta/data/dtep/xhtml11/optgroup.tag
+++ b/quanta/data/dtep/xhtml11/optgroup.tag
@@ -15,9 +15,9 @@
       <location col="1" row="1" colspan="1" />
     </attr>
 
-<children>
+<tqchildren>
 <child name="option" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/p.tag b/quanta/data/dtep/xhtml11/p.tag
index bffe7b97..52233810 100644
--- a/quanta/data/dtep/xhtml11/p.tag
+++ b/quanta/data/dtep/xhtml11/p.tag
@@ -13,7 +13,7 @@
         <stoppingtag name="dd" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -48,7 +48,7 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/pre.tag b/quanta/data/dtep/xhtml11/pre.tag
index 623064c4..03f41221 100644
--- a/quanta/data/dtep/xhtml11/pre.tag
+++ b/quanta/data/dtep/xhtml11/pre.tag
@@ -11,7 +11,7 @@
                 <item>preserve</item>
         </items>
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -40,6 +40,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/q.tag b/quanta/data/dtep/xhtml11/q.tag
index 1eaefcd1..ad91bfe2 100644
--- a/quanta/data/dtep/xhtml11/q.tag
+++ b/quanta/data/dtep/xhtml11/q.tag
@@ -8,7 +8,7 @@
         <textlocation col="0" row="0" />
         <location col="1" row="0" colspan="2" />
     </attr>
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -43,6 +43,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/rbc.tag b/quanta/data/dtep/xhtml11/rbc.tag
index fbd5b7ec..5f73674a 100644
--- a/quanta/data/dtep/xhtml11/rbc.tag
+++ b/quanta/data/dtep/xhtml11/rbc.tag
@@ -2,8 +2,8 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="rbc" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="rb" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/rtc.tag b/quanta/data/dtep/xhtml11/rtc.tag
index 97c21176..67abdda7 100644
--- a/quanta/data/dtep/xhtml11/rtc.tag
+++ b/quanta/data/dtep/xhtml11/rtc.tag
@@ -2,8 +2,8 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="rtc" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="rt" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/ruby.tag b/quanta/data/dtep/xhtml11/ruby.tag
index d133114f..5a55cdff 100644
--- a/quanta/data/dtep/xhtml11/ruby.tag
+++ b/quanta/data/dtep/xhtml11/ruby.tag
@@ -2,12 +2,12 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="ruby" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="rb" />
 <child name="rt" />
 <child name="rp" />
 <child name="rtc" />
 <child name="rbc" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/samp.tag b/quanta/data/dtep/xhtml11/samp.tag
index 2ec41eb4..e0f7bdf7 100644
--- a/quanta/data/dtep/xhtml11/samp.tag
+++ b/quanta/data/dtep/xhtml11/samp.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="samp" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/select.tag b/quanta/data/dtep/xhtml11/select.tag
index 74eb9e58..31ada1cc 100644
--- a/quanta/data/dtep/xhtml11/select.tag
+++ b/quanta/data/dtep/xhtml11/select.tag
@@ -47,9 +47,9 @@
         <stoppingtag name="select" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="optgroup" />
 <child name="option" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/small.tag b/quanta/data/dtep/xhtml11/small.tag
index 0fdbe561..0d2c4263 100644
--- a/quanta/data/dtep/xhtml11/small.tag
+++ b/quanta/data/dtep/xhtml11/small.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="small" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/span.tag b/quanta/data/dtep/xhtml11/span.tag
index ca85ab65..6218d5d7 100644
--- a/quanta/data/dtep/xhtml11/span.tag
+++ b/quanta/data/dtep/xhtml11/span.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="span" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/strong.tag b/quanta/data/dtep/xhtml11/strong.tag
index 98d57d89..3bc13488 100644
--- a/quanta/data/dtep/xhtml11/strong.tag
+++ b/quanta/data/dtep/xhtml11/strong.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="strong" hasCore="1" hasI18n="1" hasScript="1" scope="word">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/style.tag b/quanta/data/dtep/xhtml11/style.tag
index d3c16a0e..648217c5 100644
--- a/quanta/data/dtep/xhtml11/style.tag
+++ b/quanta/data/dtep/xhtml11/style.tag
@@ -53,8 +53,8 @@
         <textlocation col="0" row="5" />
         <location col="1" row="5" colspan="2" />
     </attr>
-    <children>
+    <tqchildren>
 	    <child name="#text" />
-    </children>
+    </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/sub.tag b/quanta/data/dtep/xhtml11/sub.tag
index 5691c5f0..0a195674 100644
--- a/quanta/data/dtep/xhtml11/sub.tag
+++ b/quanta/data/dtep/xhtml11/sub.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="sub" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/sup.tag b/quanta/data/dtep/xhtml11/sup.tag
index 33e052d3..815c4e35 100644
--- a/quanta/data/dtep/xhtml11/sup.tag
+++ b/quanta/data/dtep/xhtml11/sup.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="sup" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/table.tag b/quanta/data/dtep/xhtml11/table.tag
index 2680b2d3..334a0d91 100644
--- a/quanta/data/dtep/xhtml11/table.tag
+++ b/quanta/data/dtep/xhtml11/table.tag
@@ -65,7 +65,7 @@
         <location col="1" row="5" colspan="2"/>
     </attr>
 
-<children>
+<tqchildren>
 <child name="caption" />
 <child name="col" />
 <child name="colgroup" />
@@ -73,7 +73,7 @@
 <child name="tfoot" />
 <child name="tbody" />
 <child name="tr" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/tbody.tag b/quanta/data/dtep/xhtml11/tbody.tag
index 62814633..62e80ac3 100644
--- a/quanta/data/dtep/xhtml11/tbody.tag
+++ b/quanta/data/dtep/xhtml11/tbody.tag
@@ -31,9 +31,9 @@
     <attr name="char" type="input" />
     <attr name="charoff" type="input" />
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/td.tag b/quanta/data/dtep/xhtml11/td.tag
index 4ace9ce3..30ec67d6 100644
--- a/quanta/data/dtep/xhtml11/td.tag
+++ b/quanta/data/dtep/xhtml11/td.tag
@@ -72,7 +72,7 @@
         <stoppingtag name="th" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -126,7 +126,7 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/textarea.tag b/quanta/data/dtep/xhtml11/textarea.tag
index e19a6061..a0233b03 100644
--- a/quanta/data/dtep/xhtml11/textarea.tag
+++ b/quanta/data/dtep/xhtml11/textarea.tag
@@ -36,8 +36,8 @@
       <textlocation col="2" row="5" colspan="1" />
       <location col="3" row="5" colspan="1" />
     </attr>
-    <children>
+    <tqchildren>
 	    <child name="#text" />
-    </children>
+    </tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/tfoot.tag b/quanta/data/dtep/xhtml11/tfoot.tag
index ec0b79a2..dadde62b 100644
--- a/quanta/data/dtep/xhtml11/tfoot.tag
+++ b/quanta/data/dtep/xhtml11/tfoot.tag
@@ -31,8 +31,8 @@
     <attr name="char" type="input" />
     <attr name="charoff" type="input" />
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/th.tag b/quanta/data/dtep/xhtml11/th.tag
index bd944333..3d8e539c 100644
--- a/quanta/data/dtep/xhtml11/th.tag
+++ b/quanta/data/dtep/xhtml11/th.tag
@@ -72,7 +72,7 @@
         <stoppingtag name="th" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -126,7 +126,7 @@
 <child name="tt" />
 <child name="ul" />
 <child name="var" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/thead.tag b/quanta/data/dtep/xhtml11/thead.tag
index 326a1b87..f5df6cc5 100644
--- a/quanta/data/dtep/xhtml11/thead.tag
+++ b/quanta/data/dtep/xhtml11/thead.tag
@@ -31,8 +31,8 @@
     <attr name="char" type="input" />
     <attr name="charoff" type="input" />
 
-<children>
+<tqchildren>
 <child name="tr" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/title.tag b/quanta/data/dtep/xhtml11/title.tag
index 4c9f61b7..76f9045c 100644
--- a/quanta/data/dtep/xhtml11/title.tag
+++ b/quanta/data/dtep/xhtml11/title.tag
@@ -7,8 +7,8 @@
         <textlocation col="0" row="0" />
         <location col="1" row="0" colspan="2" />
 </attr>
-<children>
+<tqchildren>
 	<child name="#text" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/tr.tag b/quanta/data/dtep/xhtml11/tr.tag
index 27c68366..1ca8aa0e 100644
--- a/quanta/data/dtep/xhtml11/tr.tag
+++ b/quanta/data/dtep/xhtml11/tr.tag
@@ -36,9 +36,9 @@
         <stoppingtag name="tfoot" />
     </stoppingtags>
 
-<children>
+<tqchildren>
 <child name="th" />
 <child name="td" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/tt.tag b/quanta/data/dtep/xhtml11/tt.tag
index a7506a8b..91138326 100644
--- a/quanta/data/dtep/xhtml11/tt.tag
+++ b/quanta/data/dtep/xhtml11/tt.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="tt" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/ul.tag b/quanta/data/dtep/xhtml11/ul.tag
index bd4404c4..9f1450f6 100644
--- a/quanta/data/dtep/xhtml11/ul.tag
+++ b/quanta/data/dtep/xhtml11/ul.tag
@@ -3,9 +3,9 @@
 <TAGS>
 <tag name="ul" hasScript="1" hasCore="1" hasI18n="1">
 
-<children>
+<tqchildren>
 <child name="li" usage="required" />
-</children>
+</tqchildren>
 
 </tag>
 </TAGS>
diff --git a/quanta/data/dtep/xhtml11/var.tag b/quanta/data/dtep/xhtml11/var.tag
index 1c20c088..4c4e8dc3 100644
--- a/quanta/data/dtep/xhtml11/var.tag
+++ b/quanta/data/dtep/xhtml11/var.tag
@@ -2,7 +2,7 @@
 <!DOCTYPE TAGS>
 <TAGS>
 <tag name="var" hasCore="1" hasI18n="1" hasScript="1">
-<children>
+<tqchildren>
 <child name="#text" />
 <child name="a" />
 <child name="abbr" />
@@ -37,6 +37,6 @@
 <child name="textarea" />
 <child name="tt" />
 <child name="var" />
-</children>
+</tqchildren>
 </tag>
 </TAGS>
diff --git a/quanta/data/templates/pages/docbook/kde-doc-template.docbook b/quanta/data/templates/pages/docbook/kde-doc-template.docbook
index 65a5773c..e9b610fb 100644
--- a/quanta/data/templates/pages/docbook/kde-doc-template.docbook
+++ b/quanta/data/templates/pages/docbook/kde-doc-template.docbook
@@ -271,7 +271,7 @@ Programming &kmyapplication; plugins is a joy to behold. Just read through the n
 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>
@@ -279,10 +279,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>
@@ -291,16 +291,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
@@ -309,40 +309,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
@@ -354,12 +354,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:
@@ -388,11 +388,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/quanta/data/templates/scripts/javascript/overlib.js b/quanta/data/templates/scripts/javascript/overlib.js
index 4ec178bd..ed75a9ea 100644
--- a/quanta/data/templates/scripts/javascript/overlib.js
+++ b/quanta/data/templates/scripts/javascript/overlib.js
@@ -182,7 +182,7 @@ if (typeof ol_background == 'undefined') { var ol_background = ""; }
 // Normal is "Close".

 if (typeof ol_close == 'undefined') { var ol_close = "Close"; }

 

-// Default vertical alignment for popups.

+// Default vertical tqalignment for popups.

 // It's best to leave RIGHT here. Other options are LEFT and CENTER.

 if (typeof ol_hpos == 'undefined') { var ol_hpos = RIGHT; }

 

@@ -196,11 +196,11 @@ if (typeof ol_autostatus == 'undefined') { var ol_autostatus = 0; }
 // Default height for popup. Often best left alone.

 if (typeof ol_height == 'undefined') { var ol_height = -1; }

 

-// Horizontal grid spacing that popups will snap to.

+//Qt::Horizontal grid spacing that popups will snap to.

 // 0 makes no grid, anything else will cause a snap to that grid spacing.

 if (typeof ol_snapx == 'undefined') { var ol_snapx = 0; }

 

-// Vertical grid spacing that popups will snap to.

+//Qt::Vertical grid spacing that popups will snap to.

 // 0 makes no grid, andthing else will cause a snap to that grid spacing.

 if (typeof ol_snapy == 'undefined') { var ol_snapy = 0; }

 

diff --git a/quanta/data/tips b/quanta/data/tips
index 609ed245..1a23291c 100644
--- a/quanta/data/tips
+++ b/quanta/data/tips
@@ -201,7 +201,7 @@ Just go to <b>Settings > Configure Shortcuts</b>.
 
 <tip category="Project">
 <html>
-<p>...that you can set the <b>Upload Status</b> of files and folders in the project tree? Right click on a project file or folder and select <i>Upload Status</i> and set the appropriate actions. This enables you to set a project root below the document root and prevent support files from uploading while requiring confirmation on sensitive data files.
+<p>...that you can set the <b>Upload tqStatus</b> of files and folders in the project tree? Right click on a project file or folder and select <i>Upload tqStatus</i> and set the appropriate actions. This enables you to set a project root below the document root and prevent support files from uploading while requiring confirmation on sensitive data files.
 </p>
 </html>
 </tip>
@@ -278,7 +278,7 @@ Just go to <b>Settings > Configure Shortcuts</b>.
 
 <tip category="Application">
 <html>
-<p>...that you can visually check the status of your links from within Quanta? <b>Select KLinkStatus from the Plugins menu</b> and Quanta will load a visual link checker.
+<p>...that you can visually check the status of your links from within Quanta? <b>Select KLinktqStatus from the Plugins menu</b> and Quanta will load a visual link checker.
 </p>
 </html>
 </tip>
diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index de63fc3e..d823fc1f 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -50,10 +50,10 @@
 #include "tagaction.h"
 #include "toolbartabwidget.h"
 
-ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, KMainWindow* parent, const char* name, bool modal, WFlags fl, const TQString& defaultAction )
-    :ActionConfigDialogS( parent, name, modal, fl )
+ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, KMainWindow* tqparent, const char* name, bool modal, WFlags fl, const TQString& defaultAction )
+    :ActionConfigDialogS( tqparent, name, modal, fl )
 {
-  m_mainWindow = parent;
+  m_mainWindow = tqparent;
   m_toolbarList = toolbarList;
   buttonOk->setIconSet(SmallIconSet("button_ok"));
   buttonCancel->setIconSet(SmallIconSet("button_cancel"));
@@ -89,7 +89,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
   for (int i = 0; i < tb->count(); i++)
   {
     toolbarName = tb->label(i);
-    toolbarName.replace(r, "");
+    toolbarName.tqreplace(r, "");
     item = new KListViewItem(actionTreeView, oldItem, i18n(toolbarName.utf8()));
     actionTreeView->insertItem(item);
 
@@ -106,13 +106,13 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
           action = ac->action(node.toElement().attribute("name").ascii());
           if (action)
           {
-            oldActionItem = new KListViewItem(item, oldActionItem, action->text().replace(r,""), action->shortcut().toString(), action->name());
+            oldActionItem = new KListViewItem(item, oldActionItem, action->text().tqreplace(r,""), action->shortcut().toString(), action->name());
             oldActionItem->setPixmap(0, SmallIcon(action->icon()) );
           }
         }
         node = node.nextSibling();
       }
-      if (tb->label(tb->currentPageIndex()).replace(r, "") == toolbarName)
+      if (tb->label(tb->currentPageIndex()).tqreplace(r, "") == toolbarName)
       {
          item->setOpen(true);
          if (item->firstChild())
@@ -142,7 +142,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
   for (uint i = 0; i < acCount; i++)
   {
     action = ac->action(i);
-    item = new KListViewItem(allActionsItem, action->text().replace(r, ""),  action->shortcut().toString(), action->name());
+    item = new KListViewItem(allActionsItem, action->text().tqreplace(r, ""),  action->shortcut().toString(), action->name());
     item->setPixmap(0, SmallIcon(action->icon()) );
   }
   allActionsItem->sortChildItems(0, true);
@@ -168,11 +168,11 @@ void ActionConfigDialog::slotAddToolbar()
   for (int i = 0; i < tb->count(); i++)
   {
     toolbarName = tb->label(i);
-    if (!actionTreeView->findItem(toolbarName, 0))
+    if (!actionTreeView->tqfindItem(toolbarName, 0))
     {
       item = actionTreeView->lastItem();
-      if (item->parent())
-        item = item->parent();
+      if (item->tqparent())
+        item = item->tqparent();
       new KListViewItem(actionTreeView, item, i18n(toolbarName.utf8()));
       break;
     }
@@ -183,14 +183,14 @@ void ActionConfigDialog::slotRemoveToolbar()
 {
   TQListViewItem *item = actionTreeView->currentItem();
   TQString s = item->text(0);
-  if (item->parent())
+  if (item->tqparent())
   {
-    item = item->parent();
+    item = item->tqparent();
     s = item->text(0);
   }
   if (s != i18n("All"))
   {
-      if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").arg(s),TQString::null,KStdGuiItem::del()) == KMessageBox::Continue )
+      if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").tqarg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue )
     {
       m_toolbarItem = item;
       connect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), TQT_SLOT(slotToolbarRemoved(const TQString&)));
@@ -213,8 +213,8 @@ void ActionConfigDialog::slotEditToolbar()
   TQString toolbarId;
   TQListViewItem *oldItem;
   TQListViewItem *item = actionTreeView->currentItem();
-  if (item->parent())
-     item = item->parent();
+  if (item->tqparent())
+     item = item->tqparent();
   toolbarName = item->text(0);
   if ( toolbarName != i18n("All"))
   {
@@ -231,7 +231,7 @@ void ActionConfigDialog::slotEditToolbar()
       ToolbarEntry *p_toolbar = m_toolbarList[toolbarId];
       if (p_toolbar)
       {
-        oldItem = actionTreeView->findItem(toolbarName, 0);
+        oldItem = actionTreeView->tqfindItem(toolbarName, 0);
         item = new KListViewItem(actionTreeView, oldItem, toolbarName);
         item->setOpen(oldItem->isOpen());
         delete oldItem;
@@ -243,7 +243,7 @@ void ActionConfigDialog::slotEditToolbar()
             action = ac->action(node.toElement().attribute("name").ascii());
             if (action)
             {
-              oldItem = new KListViewItem(item, oldItem, action->text().replace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name());
+              oldItem = new KListViewItem(item, oldItem, action->text().tqreplace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name());
               oldItem->setPixmap(0, SmallIcon(action->icon()));
             }
           }
@@ -266,7 +266,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item)
   if (currentAction && currentAction->inherits("TagAction"))
   {
     if ( buttonApply->isEnabled() &&
-         KMessageBox::questionYesNo(this, i18n("Do you want to save the changes made to this action?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard()) == KMessageBox::Yes )
+         KMessageBox::questionYesNo(this, i18n("Do you want to save the changes made to this action?"), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()) == KMessageBox::Yes )
     {
       saveCurrentAction();
     }
@@ -309,7 +309,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item)
         actionIcon->setIcon(s);
       }
       TQString actionText = el.attribute("text");
-      actionText.replace(TQRegExp("\\&(?!\\&)"),"");
+      actionText.tqreplace(TQRegExp("\\&(?!\\&)"),"");
       lineText->setText(actionText);
       lineToolTip->setText( el.attribute("tooltip") );
       selectedShortcut = action->shortcut();
@@ -344,7 +344,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item)
                 node.toElement().attribute("name") == el.attribute("name"))
             {
               toolbarListBox->insertItem(toolbarName);
-              if (item->parent()->text(0) == toolbarName)
+              if (item->tqparent()->text(0) == toolbarName)
                 current = count;
               count++;
             }
@@ -406,7 +406,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item)
         {
           outputBox->setCurrentItem(2);
         } else
-        if (s == "replace")
+        if (s == "tqreplace")
         {
           outputBox->setCurrentItem(3);
         } else
@@ -431,7 +431,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item)
         {
           errorBox->setCurrentItem(2);
         } else
-        if (s == "replace")
+        if (s == "tqreplace")
         {
           errorBox->setCurrentItem(3);
         } else
@@ -472,7 +472,7 @@ void ActionConfigDialog::saveCurrentAction()
   currentAction->setIcon(s);
   TQString oldText = el.attribute("text");
   s = lineText->text();
-  s.replace('&', "&&");
+  s.tqreplace('&', "&&");
   el.setAttribute("text", s);
   currentAction->setText(s);
   s = lineToolTip->text();
@@ -549,7 +549,7 @@ void ActionConfigDialog::saveCurrentAction()
           case 2:{ item.setAttribute("output", "selection");
                    break;
                  }
-          case 3:{ item.setAttribute("output", "replace");
+          case 3:{ item.setAttribute("output", "tqreplace");
                    break;
                  }
           case 4:{ item.setAttribute("output", "new");
@@ -570,7 +570,7 @@ void ActionConfigDialog::saveCurrentAction()
           case 2:{ item.setAttribute("error", "selection");
                    break;
                  }
-          case 3:{ item.setAttribute("error", "replace");
+          case 3:{ item.setAttribute("error", "tqreplace");
                    break;
                  }
           case 4:{ item.setAttribute("error", "new");
@@ -618,7 +618,7 @@ void ActionConfigDialog::saveCurrentAction()
     if (p_toolbar)
     {
       TQDomNode node = p_toolbar->guiClient->domDocument().firstChild().firstChild().firstChild();
-      bool placeOnToolbar = toolbarListBox->findItem(toolbarName, Qt::ExactMatch);
+      bool placeOnToolbar = toolbarListBox->tqfindItem(toolbarName, TQt::ExactMatch);
       while (!node.isNull())
       {
         if (node.nodeName() == "Action" &&
@@ -630,12 +630,12 @@ void ActionConfigDialog::saveCurrentAction()
           {
             currentAction->unplug(tb->page(i));
             currentAction->unplug(p_toolbar->menu);
-            node.parentNode().removeChild(node);
+            node.tqparentNode().removeChild(node);
             TQListViewItemIterator iter(actionTreeView);
             while (iter.current())
             {
               listItem = iter.current();
-              if (listItem->depth() > 0 && listItem->parent()->text(0) == toolbarName
+              if (listItem->depth() > 0 && listItem->tqparent()->text(0) == toolbarName
                   && listItem->text(2) == el.attribute("name"))
               {
                 delete listItem;
@@ -658,7 +658,7 @@ void ActionConfigDialog::saveCurrentAction()
         item.setAttribute("name",el.attribute("name"));
         p_toolbar->guiClient->domDocument().firstChild().firstChild().appendChild(item);
       //put it also in the treeview
-        listItem = actionTreeView->findItem(toolbarName, 0);
+        listItem = actionTreeView->tqfindItem(toolbarName, 0);
         if (listItem)
         {
           TQListViewItem *after = listItem->firstChild();
@@ -682,7 +682,7 @@ void ActionConfigDialog::saveCurrentAction()
         p_toolbar->guiClient->xmlFile(), p_toolbar->guiClient->instance());
     }
     TQWidget *toolBar = tb->page(i);
-    if (toolBar->minimumSizeHint().height() > 20)
+    if (toolBar->tqminimumSizeHint().height() > 20)
     {
       toolBar->adjustSize();
       toolBar->setGeometry(0,0, tb->width(), toolBar->height());
@@ -698,29 +698,29 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut)
 {
   TQString shortcutText = shortcut.toString();
   TQString shortcutText2;
-  int pos = shortcutText.find(';');
+  int pos = shortcutText.tqfind(';');
   if (pos != -1)
   {
     shortcutText2 = shortcutText.mid(pos + 1);
     shortcutText = shortcutText.left(pos);
   }
   TQString s = shortcutText;
-  s.replace('+', "\\+");
+  s.tqreplace('+', "\\+");
   TQRegExp shortcutRx("\\(" + s + "\\)|" + s + "$|" + s + ";");
   s = shortcutText2;
-  s.replace('+', "\\+");
+  s.tqreplace('+', "\\+");
   TQRegExp shortcutRx2("\\(" + s + "\\)|" + s + "$|" + s + ";");
   TQString global;
 //check for conflicting global shortcuts
   TQMap<TQString, TQString>::Iterator it;
   for ( it = globalShortcuts.begin(); it != globalShortcuts.end(); ++it )
   {
-    if (it.data().contains(shortcutRx))
+    if (it.data().tqcontains(shortcutRx))
     {
       global = it.key();
       break;
     }
-    if (!shortcutText2.isEmpty() && it.data().contains(shortcutRx2))
+    if (!shortcutText2.isEmpty() && it.data().tqcontains(shortcutRx2))
     {
       shortcutText = shortcutText2;
       global = it.key();
@@ -737,12 +737,12 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut)
         for (uint i = 0; i < ac->count(); i++)
         {
           KAction *action = ac->action(i);
-          if (action != currentAction && action->shortcut().toString().contains(shortcutRx))
+          if (action != currentAction && action->shortcut().toString().tqcontains(shortcutRx))
           {
             global = action->text();
             break;
           }
-          if (!shortcutText2.isEmpty() && action != currentAction &&  action->shortcut().toString().contains(shortcutRx))
+          if (!shortcutText2.isEmpty() && action != currentAction &&  action->shortcut().toString().tqcontains(shortcutRx))
           {
             shortcutText = shortcutText2;
             global = action->text();
@@ -761,11 +761,11 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut)
     selectedShortcut = shortcut;
   } else
   {
-    global.replace('&',"");
+    global.tqreplace('&',"");
     TQString s =  i18n("The '%1' key combination has already been allocated "
                 "to the \"%2\" action.\n"
                 "Please choose a unique key combination.").
-                arg(shortcutText).arg(global);
+                tqarg(shortcutText).tqarg(global);
     KMessageBox::sorry( this, s, i18n("Conflicting Shortcuts"));
   }
 }
@@ -779,7 +779,7 @@ void ActionConfigDialog::accept()
 
 void ActionConfigDialog::reject()
 {
-  if (buttonApply->isEnabled() && KMessageBox::questionYesNo(this, i18n("Do you want to save the changes made to this action?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard()) == KMessageBox::Yes  )
+  if (buttonApply->isEnabled() && KMessageBox::questionYesNo(this, i18n("Do you want to save the changes made to this action?"), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()) == KMessageBox::Yes  )
       saveCurrentAction();
   ActionConfigDialogS::reject();
 }
@@ -805,29 +805,29 @@ void ActionConfigDialog::slotNewAction()
   static_cast<TagAction*>(currentAction)->setModified(true);
   TQListViewItem *currentItem = actionTreeView->currentItem();
   TQListViewItem *item = new KListViewItem(allActionsItem);
-  TQString actionText = TQString("Action_%1").arg(m_mainWindow->actionCollection()->count());
+  TQString actionText = TQString("Action_%1").tqarg(m_mainWindow->actionCollection()->count());
   currentAction->setText(actionText);
   item->setText(2, currentAction->name());
   item->setText(0, actionText);
   item->setPixmap(0, SmallIcon("ball"));
   allActionsItem->sortChildItems(0, true);
-  if (currentItem->parent() && currentItem->parent() == allActionsItem)
+  if (currentItem->tqparent() && currentItem->tqparent() == allActionsItem)
   {
      actionTreeView->setCurrentItem(item);
   } else
   {
-    TQListViewItem *parentItem = currentItem->parent();
-    if (!parentItem)
-      parentItem = currentItem;
+    TQListViewItem *tqparentItem = currentItem->tqparent();
+    if (!tqparentItem)
+      tqparentItem = currentItem;
 
-    item = new KListViewItem(parentItem, currentItem);
+    item = new KListViewItem(tqparentItem, currentItem);
     item->setText(0, actionText);
     item->setText(2, currentAction->name());
     item->setPixmap(0, SmallIcon("ball"));
     actionTreeView->setCurrentItem(item);
-    if (parentItem != allActionsItem)
+    if (tqparentItem != allActionsItem)
     {
-      toolbarListBox->insertItem(parentItem->text(0));
+      toolbarListBox->insertItem(tqparentItem->text(0));
       toolbarListBox->setCurrentItem(0);
       toolbarListBox->setSelected(0, true);
     }
@@ -838,7 +838,7 @@ void ActionConfigDialog::slotNewAction()
 
 void ActionConfigDialog::slotDeleteAction()
 {
-    if ( KMessageBox::warningContinueCancel(this, i18n("<qt>Removing the action removes all the references to it.\nAre you sure you want to remove the <b>%1</b> action?</qt>").arg(currentAction->text()),TQString::null,KStdGuiItem::del()) == KMessageBox::Continue )
+    if ( KMessageBox::warningContinueCancel(this, i18n("<qt>Removing the action removes all the references to it.\nAre you sure you want to remove the <b>%1</b> action?</qt>").tqarg(currentAction->text()),TQString(),KStdGuiItem::del()) == KMessageBox::Continue )
   {
     TQString actionName = currentAction->name();
     emit deleteUserAction(currentAction);
@@ -876,7 +876,7 @@ void ActionConfigDialog::slotAddContainerToolbar()
   TQStringList lst;
   for (i = 0; i < tb->count(); i++)
   {
-    if (!toolbarListBox->findItem(tb->label(i), Qt::ExactMatch))
+    if (!toolbarListBox->tqfindItem(tb->label(i), TQt::ExactMatch))
         lst << tb->label(i);
   }
 
diff --git a/quanta/dialogs/actionconfigdialog.h b/quanta/dialogs/actionconfigdialog.h
index d0bee34e..cbe44d1d 100644
--- a/quanta/dialogs/actionconfigdialog.h
+++ b/quanta/dialogs/actionconfigdialog.h
@@ -42,10 +42,11 @@ struct ToolbarEntry {
 class ActionConfigDialog: public ActionConfigDialogS
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, KMainWindow* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 , const TQString& defaultAction = TQString::null);
+  ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, KMainWindow* tqparent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 , const TQString& defaultAction = TQString());
   ~ActionConfigDialog();
   void createScriptAction(const TQString& a_name, const TQString& a_script);
 
diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui
index baeb41bd..c5002777 100644
--- a/quanta/dialogs/actionconfigdialogs.ui
+++ b/quanta/dialogs/actionconfigdialogs.ui
@@ -11,7 +11,7 @@
  ***************************************************************************/
 </comment>
 <author>Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ActionConfigDialogS</cstring>
     </property>
@@ -30,16 +30,16 @@
         <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>Horizontal</enum>
             </property>
-            <widget class="QLayoutWidget">
+            <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout17</cstring>
+                    <cstring>tqlayout17</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -56,7 +56,7 @@
                             <string>&amp;Delete Action</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="2" column="1">
+                    <widget class="TQPushButton" row="2" column="1">
                         <property name="name">
                             <cstring>addAction</cstring>
                         </property>
@@ -77,7 +77,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>16</width>
                                 <height>20</height>
@@ -94,14 +94,14 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>16</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <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</cstring>
                         </property>
@@ -158,9 +158,9 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QLayoutWidget">
+            <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout9</cstring>
+                    <cstring>tqlayout9</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -177,7 +177,7 @@
                             <string>&amp;Apply</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="1" column="4">
+                    <widget class="TQPushButton" row="1" column="4">
                         <property name="name">
                             <cstring>buttonCancel</cstring>
                         </property>
@@ -198,7 +198,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>16</width>
                                 <height>20</height>
@@ -209,7 +209,7 @@
                         <property name="name">
                             <cstring>buttonOk</cstring>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>90</width>
                                 <height>0</height>
@@ -225,7 +225,7 @@
                             <bool>true</bool>
                         </property>
                     </widget>
-                    <widget class="QButtonGroup" row="0" column="1" rowspan="1" colspan="4">
+                    <widget class="TQButtonGroup" row="0" column="1" rowspan="1" colspan="4">
                         <property name="name">
                             <cstring>actionProperties</cstring>
                         </property>
@@ -239,7 +239,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QPushButton" row="6" column="3" rowspan="1" colspan="2">
+                            <widget class="TQPushButton" row="6" column="3" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>addToolbar</cstring>
                                 </property>
@@ -247,7 +247,7 @@
                                     <string>&amp;Add...</string>
                                 </property>
                             </widget>
-                            <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>removeToolbar</cstring>
                                 </property>
@@ -265,14 +265,14 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <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>TextLabel2</cstring>
                                 </property>
@@ -283,12 +283,12 @@
                                     <cstring>lineToolTip</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="2" column="2" rowspan="1" colspan="3">
+                            <widget class="TQLineEdit" row="2" column="2" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>lineToolTip</cstring>
                                 </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>TextLabel1_2</cstring>
                                 </property>
@@ -311,13 +311,13 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>32</width>
                                         <height>32</height>
                                     </size>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>32</width>
                                         <height>32</height>
@@ -330,12 +330,12 @@
                                     <number>22</number>
                                 </property>
                             </widget>
-                            <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>lineText</cstring>
                                 </property>
                             </widget>
-                            <widget class="QButtonGroup" row="4" column="0" rowspan="1" colspan="5">
+                            <widget class="TQButtonGroup" row="4" column="0" rowspan="1" colspan="5">
                                 <property name="name">
                                     <cstring>buttonGroup4_2</cstring>
                                 </property>
@@ -346,7 +346,7 @@
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QRadioButton" row="0" column="1">
+                                    <widget class="TQRadioButton" row="0" column="1">
                                         <property name="name">
                                             <cstring>customShortcut</cstring>
                                         </property>
@@ -365,7 +365,7 @@
                                             <string>None</string>
                                         </property>
                                     </widget>
-                                    <widget class="QRadioButton" row="0" column="0">
+                                    <widget class="TQRadioButton" row="0" column="0">
                                         <property name="name">
                                             <cstring>noShortcut</cstring>
                                         </property>
@@ -383,7 +383,7 @@
                                     <cstring>toolbarListBox</cstring>
                                 </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>textLabel2</cstring>
                                 </property>
@@ -391,7 +391,7 @@
                                     <string>Container toolbars:</string>
                                 </property>
                             </widget>
-                            <widget class="QComboBox" row="0" column="2" rowspan="1" colspan="3">
+                            <widget class="TQComboBox" row="0" column="2" rowspan="1" colspan="3">
                                 <item>
                                     <property name="text">
                                         <string>Tag</string>
@@ -419,7 +419,7 @@
                                     </sizepolicy>
                                 </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>
@@ -430,7 +430,7 @@
                                     <cstring>typeCombo</cstring>
                                 </property>
                             </widget>
-                            <widget class="QButtonGroup" row="8" column="0" rowspan="1" colspan="5">
+                            <widget class="TQButtonGroup" row="8" column="0" rowspan="1" colspan="5">
                                 <property name="name">
                                     <cstring>buttonGroup13</cstring>
                                 </property>
@@ -441,11 +441,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>page</cstring>
                                             </property>
@@ -456,7 +456,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>TextLabel5_2_2_2</cstring>
                                                     </property>
@@ -464,17 +464,17 @@
                                                         <string>&lt;tag&gt; :</string>
                                                     </property>
                                                 </widget>
-                                                <widget class="QLineEdit" row="0" column="1">
+                                                <widget class="TQLineEdit" row="0" column="1">
                                                     <property name="name">
                                                         <cstring>lineTag</cstring>
                                                     </property>
                                                 </widget>
-                                                <widget class="QLineEdit" row="1" column="1">
+                                                <widget class="TQLineEdit" row="1" column="1">
                                                     <property name="name">
                                                         <cstring>lineClosingTag</cstring>
                                                     </property>
                                                 </widget>
-                                                <widget class="QCheckBox" row="1" column="0">
+                                                <widget class="TQCheckBox" row="1" column="0">
                                                     <property name="name">
                                                         <cstring>useClosingTag</cstring>
                                                     </property>
@@ -485,7 +485,7 @@
                                                         <bool>true</bool>
                                                     </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>useActionDialog</cstring>
                                                     </property>
@@ -498,7 +498,7 @@
                                                 </widget>
                                             </grid>
                                         </widget>
-                                        <widget class="QWidget">
+                                        <widget class="TQWidget">
                                             <property name="name">
                                                 <cstring>page</cstring>
                                             </property>
@@ -521,14 +521,14 @@
                                                             <verstretch>0</verstretch>
                                                         </sizepolicy>
                                                     </property>
-                                                    <property name="minimumSize">
+                                                    <property name="tqminimumSize">
                                                         <size>
                                                             <width>64</width>
                                                             <height>20</height>
                                                         </size>
                                                     </property>
                                                 </widget>
-                                                <widget class="QLabel" row="1" column="0">
+                                                <widget class="TQLabel" row="1" column="0">
                                                     <property name="name">
                                                         <cstring>textLabel1_2</cstring>
                                                     </property>
@@ -547,7 +547,7 @@
                                                         <cstring>inputBox</cstring>
                                                     </property>
                                                 </widget>
-                                                <widget class="QComboBox" row="1" column="1">
+                                                <widget class="TQComboBox" row="1" column="1">
                                                     <item>
                                                         <property name="text">
                                                             <string>None</string>
@@ -575,7 +575,7 @@
                                                         </sizepolicy>
                                                     </property>
                                                 </widget>
-                                                <widget class="QLabel" row="2" column="0">
+                                                <widget class="TQLabel" row="2" column="0">
                                                     <property name="name">
                                                         <cstring>textLabel2_2</cstring>
                                                     </property>
@@ -594,7 +594,7 @@
                                                         <cstring>outputBox</cstring>
                                                     </property>
                                                 </widget>
-                                                <widget class="QComboBox" row="2" column="1">
+                                                <widget class="TQComboBox" row="2" column="1">
                                                     <item>
                                                         <property name="text">
                                                             <string>None</string>
@@ -640,7 +640,7 @@
                                                         <number>5</number>
                                                     </property>
                                                 </widget>
-                                                <widget class="QComboBox" row="3" column="1">
+                                                <widget class="TQComboBox" row="3" column="1">
                                                     <item>
                                                         <property name="text">
                                                             <string>None</string>
@@ -686,7 +686,7 @@
                                                         <number>5</number>
                                                     </property>
                                                 </widget>
-                                                <widget class="QLabel" row="3" column="0">
+                                                <widget class="TQLabel" row="3" column="0">
                                                     <property name="name">
                                                         <cstring>textLabel3_2</cstring>
                                                     </property>
@@ -707,7 +707,7 @@
                                                 </widget>
                                             </grid>
                                         </widget>
-                                        <widget class="QWidget">
+                                        <widget class="TQWidget">
                                             <property name="name">
                                                 <cstring>page</cstring>
                                             </property>
@@ -718,7 +718,7 @@
                                                 <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>textEdit</cstring>
                                                     </property>
@@ -740,7 +740,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>55</width>
                                 <height>20</height>
@@ -976,7 +976,7 @@
     <include location="global" impldecl="in implementation">kkeybutton.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>buttonOk_clicked()</slot>
     <slot>slotNewAction()</slot>
     <slot>slotDeleteAction()</slot>
@@ -989,8 +989,8 @@
     <slot>shortcutKeyButton_toggled(bool)</slot>
     <slot>slotToggled(bool)</slot>
     <slot>slotTextChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kicondialog.h</includehint>
diff --git a/quanta/dialogs/casewidget.ui b/quanta/dialogs/casewidget.ui
index f7f064f9..916332dd 100644
--- a/quanta/dialogs/casewidget.ui
+++ b/quanta/dialogs/casewidget.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>CaseWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CaseWidget</cstring>
     </property>
@@ -12,7 +12,7 @@
             <height>158</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>500</width>
             <height>100</height>
@@ -22,7 +22,7 @@
         <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>buttonGroup2</cstring>
             </property>
@@ -33,7 +33,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>upperTag</cstring>
                     </property>
@@ -41,7 +41,7 @@
                         <string>Upper case</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>lowerTag</cstring>
                     </property>
@@ -49,7 +49,7 @@
                         <string>Lower case</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="2" column="0">
+                <widget class="TQRadioButton" row="2" column="0">
                     <property name="name">
                         <cstring>unchangedTag</cstring>
                     </property>
@@ -62,7 +62,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="0" column="1">
+        <widget class="TQButtonGroup" row="0" column="1">
             <property name="name">
                 <cstring>buttonGroup3</cstring>
             </property>
@@ -73,7 +73,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>upperAttr</cstring>
                     </property>
@@ -81,7 +81,7 @@
                         <string>Upper case</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>lowerAttr</cstring>
                     </property>
@@ -89,7 +89,7 @@
                         <string>Lower case</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="2" column="0">
+                <widget class="TQRadioButton" row="2" column="0">
                     <property name="name">
                         <cstring>unchangedAttr</cstring>
                     </property>
@@ -104,5 +104,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp
index 9f66cb11..7a4c596d 100644
--- a/quanta/dialogs/copyto.cpp
+++ b/quanta/dialogs/copyto.cpp
@@ -46,9 +46,9 @@ KURL CopyTo::copy(const KURL& urlToCopy, const KURL& destination)
   targetDirURL.adjustPath(1);
 
   bool doCopy = true;
-  if (!QExtFileInfo::exists(targetDirURL, false, 0L))
+  if (!TQExtFileInfo::exists(targetDirURL, false, 0L))
   {
-    doCopy = QExtFileInfo::createDir(targetDirURL, 0L);
+    doCopy = TQExtFileInfo::createDir(targetDirURL, 0L);
   }
 
   KURL destURL;
@@ -93,9 +93,9 @@ KURL::List CopyTo::copy(const KURL::List& sourceList, const KURL& destination )
     targetDirURL = destination;
   }
   bool doCopy = true;
-  if (!QExtFileInfo::exists(targetDirURL, false, 0L))
+  if (!TQExtFileInfo::exists(targetDirURL, false, 0L))
   {
-    doCopy = QExtFileInfo::createDir(targetDirURL, 0L);
+    doCopy = TQExtFileInfo::createDir(targetDirURL, 0L);
   }
 
   KIO::UDSEntry entry;
diff --git a/quanta/dialogs/copyto.h b/quanta/dialogs/copyto.h
index 452919aa..b46947db 100644
--- a/quanta/dialogs/copyto.h
+++ b/quanta/dialogs/copyto.h
@@ -28,8 +28,9 @@
 
 class KURL;
 
-class CopyTo : public QObject{
+class CopyTo : public TQObject{
 Q_OBJECT
+  TQ_OBJECT
 public:
   CopyTo(const KURL& dirURL);
   ~CopyTo();
diff --git a/quanta/dialogs/debuggeroptionss.ui b/quanta/dialogs/debuggeroptionss.ui
index 8e1910f4..d44b604e 100644
--- a/quanta/dialogs/debuggeroptionss.ui
+++ b/quanta/dialogs/debuggeroptionss.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>DebuggerOptionsS</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DebuggerOptionsS</cstring>
     </property>
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>350</width>
             <height>220</height>
@@ -36,7 +36,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QCheckBox" row="0" column="0">
+        <widget class="TQCheckBox" row="0" column="0">
             <property name="name">
                 <cstring>checkDebugger</cstring>
             </property>
@@ -47,7 +47,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -72,7 +72,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>radioPhp3</cstring>
                     </property>
@@ -80,7 +80,7 @@
                         <string>PHP3 listener</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>radioPhp4</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>
@@ -120,7 +120,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -137,5 +137,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/dirtydialog.ui b/quanta/dialogs/dirtydialog.ui
index 3d46130e..d339ebdc 100644
--- a/quanta/dialogs/dirtydialog.ui
+++ b/quanta/dialogs/dirtydialog.ui
@@ -9,7 +9,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2002 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DirtyDialog</cstring>
     </property>
@@ -29,7 +29,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>400</width>
             <height>220</height>
@@ -42,7 +42,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>textLabel</cstring>
             </property>
@@ -58,7 +58,7 @@
                 <string>The file was changed outside of the Quanta editor.</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>ButtonGroup2</cstring>
             </property>
@@ -75,7 +75,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <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>buttonIgnore</cstring>
                     </property>
@@ -83,7 +83,7 @@
                         <string>&amp;Do not load the modified version from disk</string>
                     </property>
                 </widget>
-                <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>buttonLoad</cstring>
                     </property>
@@ -91,7 +91,7 @@
                         <string>&amp;Use the version from disk (will lose the current content)</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="1">
+                <widget class="TQLabel" row="3" column="1">
                     <property name="name">
                         <cstring>warningLabel</cstring>
                     </property>
@@ -106,7 +106,7 @@
                     <property name="text">
                         <string>(If you later save the document, you will lose what was on the disk.)</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -120,14 +120,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="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>buttonCompare</cstring>
                     </property>
@@ -150,5 +150,5 @@
     <tabstop>buttonIgnore</tabstop>
     <tabstop>buttonLoad</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp
index 70d06c86..18301045 100644
--- a/quanta/dialogs/dirtydlg.cpp
+++ b/quanta/dialogs/dirtydlg.cpp
@@ -34,14 +34,14 @@
 #include "resource.h"
 #include "qextfileinfo.h"
 
-DirtyDlg::DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup, TQWidget *parent, const char *name ) : KDialogBase(parent, name, true, i18n("File Changed"), KDialogBase::Ok)
+DirtyDlg::DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup, TQWidget *tqparent, const char *name ) : KDialogBase(tqparent, name, true, i18n("File Changed"), KDialogBase::Ok)
 {
  m_src.setPath(srcName);
  m_dest.setPath(destName);
  m_busy = false;
  m_createBackup = createBackup;
  m_mainWidget = new DirtyDialog(this);
- m_mainWidget->textLabel->setText(i18n("<qt>The file <b>%1</b> was changed outside of the Quanta editor.</qt>").arg(srcName));
+ m_mainWidget->textLabel->setText(i18n("<qt>The file <b>%1</b> was changed outside of the Quanta editor.</qt>").tqarg(srcName));
  setMainWidget(m_mainWidget);
 }
 
@@ -78,7 +78,7 @@ void DirtyDlg::slotCompareDone(KProcess* proc)
  {
    KURL backupURL = m_src;
    backupURL.setPath(backupURL.path()+".backup");
-   QExtFileInfo::copy(m_src, backupURL, -1, true, false, this);
+   TQExtFileInfo::copy(m_src, backupURL, -1, true, false, this);
  }
 
  KIO::UDSEntry entry;
diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h
index ec457d25..c850ab25 100644
--- a/quanta/dialogs/dirtydlg.h
+++ b/quanta/dialogs/dirtydlg.h
@@ -28,9 +28,10 @@ class TQCloseEvent;
 
 class DirtyDlg : public KDialogBase  {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-  DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup = false, TQWidget *parent=0, const char *name=0);
+  DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup = false, TQWidget *tqparent=0, const char *name=0);
   ~DirtyDlg();
 
 protected slots: // Protected slots
diff --git a/quanta/dialogs/donationdialog.ui b/quanta/dialogs/donationdialog.ui
index e5aab152..0921fa98 100644
--- a/quanta/dialogs/donationdialog.ui
+++ b/quanta/dialogs/donationdialog.ui
@@ -9,7 +9,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2002, 2003 Andras Mantia &lt;amantia@kde.org&gt;, (C) 2002, 2003, 2004 Eric Laffoon &lt;sequitur@kde.org&gt;</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>DonationDialog</cstring>
     </property>
@@ -86,7 +86,7 @@ is the future of software, but it is no guarantee of success. How many open sour
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>365</width>
                     <height>20</height>
@@ -108,13 +108,13 @@ is the future of software, but it is no guarantee of success. How many open sour
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>30</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>40</height>
@@ -143,10 +143,10 @@ is the future of software, but it is no guarantee of success. How many open sour
     <tabstop>KTextBrowser2</tabstop>
     <tabstop>closeButton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>ktextbrowser.h</includehint>
diff --git a/quanta/dialogs/dtdselectdialog.ui b/quanta/dialogs/dtdselectdialog.ui
index 525a0429..60c47e20 100644
--- a/quanta/dialogs/dtdselectdialog.ui
+++ b/quanta/dialogs/dtdselectdialog.ui
@@ -9,7 +9,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2002, 2003 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DTDSelectDialog</cstring>
     </property>
@@ -21,7 +21,7 @@
             <height>161</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>440</width>
             <height>160</height>
@@ -34,7 +34,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>messageLabel</cstring>
             </property>
@@ -45,16 +45,16 @@ Dialog message2:</string>
             <property name="scaledContents">
                 <bool>true</bool>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
-        <widget class="QComboBox" row="1" column="1">
+        <widget class="TQComboBox" row="1" column="1">
             <property name="name">
                 <cstring>dtdCombo</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel</cstring>
             </property>
@@ -62,7 +62,7 @@ Dialog message2:</string>
                 <string>Current DTD:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>comboLabel</cstring>
             </property>
@@ -70,7 +70,7 @@ Dialog message2:</string>
                 <string>Select DTD:</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="2" column="1">
+        <widget class="TQLineEdit" row="2" column="1">
             <property name="name">
                 <cstring>currentDTD</cstring>
             </property>
@@ -78,7 +78,7 @@ Dialog message2:</string>
                 <bool>true</bool>
             </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>convertDTD</cstring>
             </property>
@@ -86,7 +86,7 @@ Dialog message2:</string>
                 <string>Conver&amp;t the document to the selected DTD</string>
             </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>useClosestMatching</cstring>
             </property>
@@ -105,8 +105,8 @@ Dialog message2:</string>
 <includes>
     <include location="local" impldecl="in implementation">dtdselectdialog.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp
index c2595716..72759a00 100644
--- a/quanta/dialogs/dtepeditdlg.cpp
+++ b/quanta/dialogs/dtepeditdlg.cpp
@@ -40,8 +40,8 @@
 #include "resource.h"
 #include "quantacommon.h"
 
-DTEPEditDlg::DTEPEditDlg(const TQString& descriptionFile, TQWidget *parent, const char *name)
- : DTEPEditDlgS(parent, name)
+DTEPEditDlg::DTEPEditDlg(const TQString& descriptionFile, TQWidget *tqparent, const char *name)
+ : DTEPEditDlgS(tqparent, name)
 {
   nameEdit->setFocus();
   m_descriptionFile = descriptionFile;
@@ -94,7 +94,7 @@ void DTEPEditDlg::readGeneral()
   TQString inherits = m_config->readEntry("Inherits");
   TQStringList lst(DTDs::ref()->nameList());
   inheritsCombo->insertStringList(lst);
-  int idx = lst.findIndex(inherits);
+  int idx = lst.tqfindIndex(inherits);
   if (idx == -1)
     inheritsCombo->insertItem(inherits, 0);
   else
@@ -113,9 +113,9 @@ void DTEPEditDlg::readGeneral()
 void DTEPEditDlg::readPages()
 {
   int i = 1;
-  while (m_config->hasGroup(TQString("Page%1").arg(i)) && i < 6)
+  while (m_config->hasGroup(TQString("Page%1").tqarg(i)) && i < 6)
   {
-    m_config->setGroup(TQString("Page%1").arg(i));
+    m_config->setGroup(TQString("Page%1").tqarg(i));
     TQString title = m_config->readEntry("Title");
     TQString groups = m_config->readEntry("Groups");
     if (i == 1)
@@ -203,7 +203,7 @@ void DTEPEditDlg::saveResult()
   {
     if (f.exists())
     {
-      if (KMessageBox::questionYesNo(this, i18n("<qt>The file <b>%1</b> is not writable.<br>Do you want to save the configuration to a different file?</qt>").arg(f.filePath()),i18n("Save As"),i18n("Save to Different File"), i18n("Do Not Save")) == KMessageBox::Yes)
+      if (KMessageBox::questionYesNo(this, i18n("<qt>The file <b>%1</b> is not writable.<br>Do you want to save the configuration to a different file?</qt>").tqarg(f.filePath()),i18n("Save As"),i18n("Save to Different File"), i18n("Do Not Save")) == KMessageBox::Yes)
       {
         targetFile = KFileDialog::getSaveFileName(locateLocal("data", resourceDir + "dtep/description.rc"), i18n("*.rc|DTEP Description"), this, i18n("Save Description As"));
       } else
@@ -255,35 +255,35 @@ void DTEPEditDlg::writePages(KConfig *config)
     if (enablePage1->isChecked())
     {
       num++;
-      config->setGroup(TQString("Page%1").arg(num));
+      config->setGroup(TQString("Page%1").tqarg(num));
       writeEntry(config, "Title", pageTitleEdit1->text());
       writeEntry(config, "Groups", groupsEdit1->text());
     }
     if (enablePage2->isChecked())
     {
       num++;
-      config->setGroup(TQString("Page%1").arg(num));
+      config->setGroup(TQString("Page%1").tqarg(num));
       writeEntry(config, "Title", pageTitleEdit2->text());
       writeEntry(config, "Groups", groupsEdit2->text());
     }
     if (enablePage3->isChecked())
     {
       num++;
-      config->setGroup(TQString("Page%1").arg(num));
+      config->setGroup(TQString("Page%1").tqarg(num));
       writeEntry(config, "Title", pageTitleEdit3->text());
       writeEntry(config, "Groups", groupsEdit3->text());
     }
     if (enablePage4->isChecked())
     {
       num++;
-      config->setGroup(TQString("Page%1").arg(num));
+      config->setGroup(TQString("Page%1").tqarg(num));
       writeEntry(config, "Title", pageTitleEdit4->text());
       writeEntry(config, "Groups", groupsEdit4->text());
     }
     if (enablePage5->isChecked())
     {
       num++;
-      config->setGroup(TQString("Page%1").arg(num));
+      config->setGroup(TQString("Page%1").tqarg(num));
       writeEntry(config, "Title", pageTitleEdit5->text());
       writeEntry(config, "Groups", groupsEdit5->text());
     }
@@ -343,10 +343,10 @@ void DTEPEditDlg::readStructures()
   int objectGroupId = m_config->readNumEntry("ObjectGroupIndex", -1);
 
   int i = 1;
-  while (m_config->hasGroup(TQString("StructGroup_%1").arg(i)))
+  while (m_config->hasGroup(TQString("StructGroup_%1").tqarg(i)))
   {
     StructGroup group;
-    m_config->setGroup(TQString("StructGroup_%1").arg(i));
+    m_config->setGroup(TQString("StructGroup_%1").tqarg(i));
     group.name = m_config->readEntry("Name");
     group.noName = m_config->readEntry("No_Name");
     group.icon = m_config->readEntry("Icon");
@@ -354,7 +354,7 @@ void DTEPEditDlg::readStructures()
     group.hasFileName = m_config->readBoolEntry("HasFileName", false);
     group.fileNameRx = m_config->readEntry("FileNameRx");
     group.appendToTags = m_config->readBoolEntry("AppendToTags", false);
-    group.parentGroup = m_config->readEntry("ParentGroup");
+    group.tqparentGroup = m_config->readEntry("ParentGroup");
     group.definitionRx = m_config->readEntry("DefinitionRx");
     group.definitionRxMinimal = m_config->readBoolEntry("DefinitionRx_Minimal", false);
     group.usageRx = m_config->readEntry("UsageRx");
@@ -387,7 +387,7 @@ void DTEPEditDlg::writeStructures(KConfig *config)
   for (TQValueList<StructGroup>::ConstIterator it = m_structGroups.constBegin(); it != m_structGroups.constEnd(); ++it)
   {
     StructGroup group = *it;
-    config->setGroup(TQString("StructGroup_%1").arg(i));
+    config->setGroup(TQString("StructGroup_%1").tqarg(i));
     writeEntry(config, "Name", group.name);
     writeEntry(config, "No_Name", group.noName);
     writeEntry(config, "Icon", group.icon);
@@ -397,7 +397,7 @@ void DTEPEditDlg::writeStructures(KConfig *config)
     config->writeEntry("AppendToTags", group.appendToTags);
     if (m_family == 1)
     {
-      writeEntry(config, "ParentGroup", group.parentGroup);
+      writeEntry(config, "ParentGroup", group.tqparentGroup);
       writeEntry(config, "DefinitionRx", group.definitionRx);
       config->writeEntry("DefinitionRx_Minimal", group.definitionRxMinimal);
       writeEntry(config, "UsageRx", group.usageRx);
@@ -453,7 +453,7 @@ void DTEPEditDlg::slotEditStructGroup()
     structDlg.hasFilename->setChecked(group.hasFileName);
     structDlg.fileNameRxEdit->setText(group.fileNameRx);
     structDlg.appendToTags->setChecked(group.appendToTags);
-    structDlg.parentGroupEdit->setText(group.parentGroup);
+    structDlg.tqparentGroupEdit->setText(group.tqparentGroup);
     for (int i = 0; i < structDlg.tagTypeCombo->count(); i++)
     {
       if (structDlg.tagTypeCombo->text(i) == group.tagType)
@@ -513,7 +513,7 @@ StructGroup DTEPEditDlg::readFromStructDlg(DTEPStructureEditDlgS *structDlg)
   group.hasFileName = structDlg->hasFilename->isChecked();
   group.fileNameRx = structDlg->fileNameRxEdit->text();
   group.appendToTags = structDlg->appendToTags->isChecked();
-  group.parentGroup = structDlg->parentGroupEdit->text();
+  group.tqparentGroup = structDlg->tqparentGroupEdit->text();
   group.tagType = structDlg->tagTypeCombo->currentText();
   group.definitionRx = structDlg->definitionRxEdit->text();
   group.definitionRxMinimal = structDlg->definitionRxMinimal->isChecked();
@@ -536,7 +536,7 @@ void DTEPEditDlg::slotDeleteStructGroup()
   int currentItem = structuresList->currentItem();
   if (currentItem != -1)
   {
-      if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to delete the <b>%1</b> group?</qt>").arg(structuresList->currentText()), i18n("Delete Group"),KStdGuiItem::del()) == KMessageBox::Continue)
+      if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to delete the <b>%1</b> group?</qt>").tqarg(structuresList->currentText()), i18n("Delete Group"),KStdGuiItem::del()) == KMessageBox::Continue)
     {
       m_structGroups.remove(m_structGroups.at(currentItem));
       structuresList->removeItem(currentItem);
diff --git a/quanta/dialogs/dtepeditdlg.h b/quanta/dialogs/dtepeditdlg.h
index ed921a5a..6906e40d 100644
--- a/quanta/dialogs/dtepeditdlg.h
+++ b/quanta/dialogs/dtepeditdlg.h
@@ -37,7 +37,7 @@ struct StructGroup {
   bool hasFileName;
   TQString fileNameRx;
   bool appendToTags;
-  TQString parentGroup;
+  TQString tqparentGroup;
   TQString definitionRx;
   bool definitionRxMinimal;
   TQString usageRx;
@@ -56,8 +56,9 @@ struct StructGroup {
 class DTEPEditDlg : public DTEPEditDlgS
 {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    DTEPEditDlg(const TQString& descriptionFile, TQWidget *parent = 0, const char *name = 0);
+    DTEPEditDlg(const TQString& descriptionFile, TQWidget *tqparent = 0, const char *name = 0);
     ~DTEPEditDlg();
     void saveResult();
     void slotFamilyChanged(int family);
diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui
index 739ffcc5..3b36feeb 100644
--- a/quanta/dialogs/dtepeditdlgs.ui
+++ b/quanta/dialogs/dtepeditdlgs.ui
@@ -9,7 +9,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2005 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DTEPEditDlgS</cstring>
     </property>
@@ -28,11 +28,11 @@
         <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>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -43,7 +43,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>
@@ -68,7 +68,7 @@
                             <string>The real name of the DTEP. In case of XML DTEPs this should be the DTD definition string, like -&lt;i&gt;//W3C//DTD&amp;nbsp;HTML&amp;nbsp;4.01&amp;nbsp;Transitional//EN&lt;/i&gt;.</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>textLabel2</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>
@@ -158,14 +158,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>50</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QGroupBox" row="8" column="0" rowspan="1" colspan="6">
+                    <widget class="TQGroupBox" row="8" column="0" rowspan="1" colspan="6">
                         <property name="name">
                             <cstring>groupBox1</cstring>
                         </property>
@@ -176,11 +176,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>generalWidgetStack</cstring>
                                 </property>
-                                <widget class="QWidget">
+                                <widget class="TQWidget">
                                     <property name="name">
                                         <cstring>WStackPage</cstring>
                                     </property>
@@ -191,7 +191,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>textLabel3</cstring>
                                             </property>
@@ -208,7 +208,7 @@
                                                 <string>URL pointing to the DTD definiton file, like &lt;i&gt;http://www.w3.org/TR/html4/loose.dtd&lt;/i&gt;.</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="1" column="0" rowspan="2" colspan="1">
+                                        <widget class="TQLabel" row="1" column="0" rowspan="2" colspan="1">
                                             <property name="name">
                                                 <cstring>textLabel4</cstring>
                                             </property>
@@ -251,14 +251,14 @@
                                         </widget>
                                     </grid>
                                 </widget>
-                                <widget class="QWidget">
+                                <widget class="TQWidget">
                                     <property name="name">
                                         <cstring>WStackPage</cstring>
                                     </property>
                                     <attribute name="id">
                                         <number>1</number>
                                     </attribute>
-                                    <widget class="QCheckBox">
+                                    <widget class="TQCheckBox">
                                         <property name="name">
                                             <cstring>topLevel</cstring>
                                         </property>
@@ -284,7 +284,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QLabel" row="5" column="0">
+                    <widget class="TQLabel" row="5" column="0">
                         <property name="name">
                             <cstring>textLabel9</cstring>
                         </property>
@@ -312,7 +312,7 @@
                             <string>The name of the folder where the toolbars are stored. This is a relative name to &lt;br&gt;&lt;i&gt;$KDEDIR(&amp;nbsp;or&amp;nbsp;$KDEHOME)/share/apps/quanta/toolbars&lt;/i&gt; .</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="6" column="0">
+                    <widget class="TQLabel" row="6" column="0">
                         <property name="name">
                             <cstring>textLabel10</cstring>
                         </property>
@@ -340,7 +340,7 @@
                             <string>Comma separated list of toolbars from the toolbar folder that will be loaded when a document with this DTEP is loaded.</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="2">
+                    <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>caseSensitive</cstring>
                         </property>
@@ -365,7 +365,7 @@
                             <string>Indicates whether the DTEP has case sensitive tags. In case of XML this should be checked, but for example HTML variants are not case sensitive.</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="0">
+                    <widget class="TQLabel" row="3" column="0">
                         <property name="name">
                             <cstring>textLabel7</cstring>
                         </property>
@@ -388,7 +388,7 @@
 &lt;p&gt;&lt;b&gt;Pseudo type&lt;/b&gt;:DTEP describing some other language, where the notion of a tag is not the same as in XML. Examples are &lt;i&gt;PHP, JavaScript, CSS&lt;/i&gt;.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>textLabel8</cstring>
                         </property>
@@ -432,7 +432,7 @@
 &lt;p&gt;&lt;b&gt;Pseudo type&lt;/b&gt;:DTEP describing some other language, where the notion of a tag is not the same as in XML. Examples are &lt;i&gt;PHP, JavaScript, CSS&lt;/i&gt;.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="4" column="0">
+                    <widget class="TQLabel" row="4" column="0">
                         <property name="name">
                             <cstring>textLabel1_2</cstring>
                         </property>
@@ -484,7 +484,7 @@
                             <string>The default extension of files belonging to this DTEP</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="4" column="4">
+                    <widget class="TQLabel" row="4" column="4">
                         <property name="name">
                             <cstring>textLabel2_2</cstring>
                         </property>
@@ -505,7 +505,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>40</width>
                                 <height>20</height>
@@ -514,7 +514,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -535,14 +535,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>50</height>
                             </size>
                         </property>
                     </spacer>
-                    <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>enablePage1</cstring>
                         </property>
@@ -556,7 +556,7 @@
                             <string>Every tab edit dialog will have one more extra page aside of the main page. You can configure what will be on this page in the below fields.</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>textLabel11</cstring>
                         </property>
@@ -573,7 +573,7 @@
                             <string>The title of the page, like &lt;b&gt;Core &amp;&amp; i18n&lt;/b&gt;. As you see, the ampersand must be doubled.</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>textLabel12</cstring>
                         </property>
@@ -595,7 +595,7 @@
 &lt;/b&gt;&lt;/p&gt;</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>enablePage2</cstring>
                         </property>
@@ -609,7 +609,7 @@
                             <string>See the tooltip and "What's This?" information for the first checkbox</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>enablePage3</cstring>
                         </property>
@@ -623,7 +623,7 @@
                             <string>See the tooltip and "What's This?" information for the first checkbox</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="9" column="0" rowspan="1" colspan="3">
+                    <widget class="TQCheckBox" row="9" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>enablePage4</cstring>
                         </property>
@@ -637,7 +637,7 @@
                             <string>See the tooltip and "What's This?" information for the first checkbox</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="12" column="0" rowspan="1" colspan="3">
+                    <widget class="TQCheckBox" row="12" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>enablePage5</cstring>
                         </property>
@@ -695,7 +695,7 @@
                             <string>See the tooltip and "What's This?" information for the first page fields</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="8" column="0">
+                    <widget class="TQLabel" row="8" column="0">
                         <property name="name">
                             <cstring>textLabel12_3</cstring>
                         </property>
@@ -720,7 +720,7 @@
                             <string>See the tooltip and "What's This?" information for the first page fields</string>
                         </property>
                     </widget>
-                    <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>textLabel11_3_2</cstring>
                         </property>
@@ -734,7 +734,7 @@
                             <string>See the tooltip and "What's This?" information for the first page fields</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="4" column="0">
+                    <widget class="TQLabel" row="4" column="0">
                         <property name="name">
                             <cstring>textLabel11_2</cstring>
                         </property>
@@ -748,7 +748,7 @@
                             <string>See the tooltip and "What's This?" information for the first page fields</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="5" column="0">
+                    <widget class="TQLabel" row="5" column="0">
                         <property name="name">
                             <cstring>textLabel12_2</cstring>
                         </property>
@@ -762,7 +762,7 @@
                             <string>See the tooltip and "What's This?" information for the first page fields</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="7" column="0">
+                    <widget class="TQLabel" row="7" column="0">
                         <property name="name">
                             <cstring>textLabel11_3</cstring>
                         </property>
@@ -776,7 +776,7 @@
                             <string>See the tooltip and "What's This?" information for the first page fields</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="11" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>textLabel12_3_2</cstring>
                         </property>
@@ -801,7 +801,7 @@
                             <string>See the tooltip and "What's This?" information for the first page fields</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="13" column="0">
+                    <widget class="TQLabel" row="13" column="0">
                         <property name="name">
                             <cstring>textLabel11_5</cstring>
                         </property>
@@ -826,7 +826,7 @@
                             <string>See the tooltip and "What's This?" information for the first page fields</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="14" column="0">
+                    <widget class="TQLabel" row="14" column="0">
                         <property name="name">
                             <cstring>textLabel12_5</cstring>
                         </property>
@@ -886,7 +886,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -897,7 +897,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="5">
+                    <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="5">
                         <property name="name">
                             <cstring>enableMinusInWords</cstring>
                         </property>
@@ -911,7 +911,7 @@
                             <string>If enabled &lt;b&gt;this-is-a-word&lt;/b&gt; is treated like a word. Otherwise it is treated like 4 words.</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>textLabel13</cstring>
                         </property>
@@ -929,7 +929,7 @@
 Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="5">
+                    <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="5">
                         <property name="name">
                             <cstring>groupBox7</cstring>
                         </property>
@@ -948,11 +948,11 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
                             <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>rulesWidgetStack</cstring>
                                 </property>
-                                <widget class="QWidget">
+                                <widget class="TQWidget">
                                     <property name="name">
                                         <cstring>WStackPage</cstring>
                                     </property>
@@ -963,7 +963,7 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
                                         <property name="name">
                                             <cstring>unnamed</cstring>
                                         </property>
-                                        <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="7">
+                                        <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="7">
                                             <property name="name">
                                                 <cstring>xmlStyleTags</cstring>
                                             </property>
@@ -980,7 +980,7 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
                                                 <string>Check to use XML style single tags (&lt;b&gt;&amp;lt;single_tag /&amp;gt;&lt;/b&gt;), otherwise HTML style single tags (&lt;b&gt;&amp;lt;single_tag&amp;gt;&lt;/b&gt;) are used.</string>
                                             </property>
                                         </widget>
-                                        <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="7">
+                                        <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="7">
                                             <property name="name">
                                                 <cstring>useCommonRules</cstring>
                                             </property>
@@ -1002,7 +1002,7 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
 &lt;/b&gt;&lt;/p&gt;</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>extendedBooleans</cstring>
                                             </property>
@@ -1059,7 +1059,7 @@ See the &lt;b&gt;True&lt;/b&gt; and &lt;b&gt;False&lt;/b&gt; boxes to define the
                                                 <string>The value of "true" in case of extended booleans</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="3" column="5">
+                                        <widget class="TQLabel" row="3" column="5">
                                             <property name="name">
                                                 <cstring>textLabel39</cstring>
                                             </property>
@@ -1069,11 +1069,11 @@ See the &lt;b&gt;True&lt;/b&gt; and &lt;b&gt;False&lt;/b&gt; boxes to define the
                                             <property name="text">
                                                 <string>False:</string>
                                             </property>
-                                            <property name="alignment">
+                                            <property name="tqalignment">
                                                 <set>AlignVCenter|AlignRight</set>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="3" column="3">
+                                        <widget class="TQLabel" row="3" column="3">
                                             <property name="name">
                                                 <cstring>textLabel38</cstring>
                                             </property>
@@ -1083,7 +1083,7 @@ See the &lt;b&gt;True&lt;/b&gt; and &lt;b&gt;False&lt;/b&gt; boxes to define the
                                             <property name="text">
                                                 <string>True:</string>
                                             </property>
-                                            <property name="alignment">
+                                            <property name="tqalignment">
                                                 <set>AlignVCenter|AlignRight</set>
                                             </property>
                                         </widget>
@@ -1097,7 +1097,7 @@ See the &lt;b&gt;True&lt;/b&gt; and &lt;b&gt;False&lt;/b&gt; boxes to define the
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="sizeHint">
+                                            <property name="tqsizeHint">
                                                 <size>
                                                     <width>40</width>
                                                     <height>20</height>
@@ -1117,7 +1117,7 @@ See the &lt;b&gt;True&lt;/b&gt; and &lt;b&gt;False&lt;/b&gt; boxes to define the
     A special area can be a pseudo DTD, a comment or something like that, for example &lt;i&gt;&amp;lt;!--&amp;nbsp;--&amp;gt;&lt;/i&gt;.</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="0" column="0">
+                                        <widget class="TQLabel" row="0" column="0">
                                             <property name="name">
                                                 <cstring>textLabel27</cstring>
                                             </property>
@@ -1144,7 +1144,7 @@ See the &lt;b&gt;True&lt;/b&gt; and &lt;b&gt;False&lt;/b&gt; boxes to define the
                                                 <string>Comma-separated list of the names for the above-defined special areas</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="1" column="0">
+                                        <widget class="TQLabel" row="1" column="0">
                                             <property name="name">
                                                 <cstring>textLabel28</cstring>
                                             </property>
@@ -1158,7 +1158,7 @@ See the &lt;b&gt;True&lt;/b&gt; and &lt;b&gt;False&lt;/b&gt; boxes to define the
                                                 <string>Comma-separated list of the names for the above-defined special areas</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="2" column="0">
+                                        <widget class="TQLabel" row="2" column="0">
                                             <property name="name">
                                                 <cstring>textLabel40</cstring>
                                             </property>
@@ -1187,7 +1187,7 @@ Example:&lt;b&gt;script(language)&lt;/b&gt; means that any &lt;b&gt;&amp;lt;scri
                                         </widget>
                                     </grid>
                                 </widget>
-                                <widget class="QWidget">
+                                <widget class="TQWidget">
                                     <property name="name">
                                         <cstring>WStackPage</cstring>
                                     </property>
@@ -1198,7 +1198,7 @@ Example:&lt;b&gt;script(language)&lt;/b&gt; means that any &lt;b&gt;&amp;lt;scri
                                         <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>textLabel21</cstring>
                                             </property>
@@ -1212,14 +1212,14 @@ Example:&lt;b&gt;script(language)&lt;/b&gt; means that any &lt;b&gt;&amp;lt;scri
                                                 <string>Tags and attributes defining this DTEP</string>
                                             </property>
                                             <property name="whatsThis" stdset="0">
-                                                <string>Comma separated list of tags that define this DTEP. The format used is &lt;i&gt;tagname(attribute[defaultvalue])&lt;/i&gt;. If the parent (a real) DTEP has a tag with &lt;i&gt;tagname&lt;/i&gt; and
+                                                <string>Comma separated list of tags that define this DTEP. The format used is &lt;i&gt;tagname(attribute[defaultvalue])&lt;/i&gt;. If the tqparent (a real) DTEP has a tag with &lt;i&gt;tagname&lt;/i&gt; and
 the &lt;i&gt;attribute value&lt;/i&gt; of this tag is equal with the name of this DTEP, the tag area
 is parsed according to the rules of this DTEP.&lt;br&gt;
 If &lt;i&gt;[defaultvalue]&lt;/i&gt; is present, it means that if the attribute is not present in the tag it is taken as present with &lt;i&gt;value = defaultvalue&lt;/i&gt;.&lt;br&gt;
 Example: &lt;b&gt;Tags=style(type[text/css])&lt;/b&gt; means that both &lt;b&gt;&amp;lt;style&amp;gt;&lt;/b&gt; and &lt;b&gt;&amp;lt;style&amp;nbsp;type="text/css"&amp;gt;&lt;/b&gt; are treated the same way and the DTEP defined by this tag is named &lt;b&gt;text/css&lt;/b&gt;.</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="0" column="0">
+                                        <widget class="TQLabel" row="0" column="0">
                                             <property name="name">
                                                 <cstring>textLabel20</cstring>
                                             </property>
@@ -1237,7 +1237,7 @@ Example: &lt;b&gt;Tags=style(type[text/css])&lt;/b&gt; means that both &lt;b&gt;
 &lt;b&gt;&amp;lt;?&amp;nbsp;?&amp;gt;,&amp;nbsp;&amp;lt;*&amp;nbsp;*&amp;gt;,&amp;nbsp;&amp;lt;%&amp;nbsp;%&amp;gt;&lt;/b&gt;</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="2" column="0">
+                                        <widget class="TQLabel" row="2" column="0">
                                             <property name="name">
                                                 <cstring>textLabel22</cstring>
                                             </property>
@@ -1254,7 +1254,7 @@ Example: &lt;b&gt;Tags=style(type[text/css])&lt;/b&gt; means that both &lt;b&gt;
                                                 <string>Comma separated list of structure keywords. The keywords used here are used to create new node (nodes for structures) in the structure tree, like for a function, class or if block.</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="5" column="0">
+                                        <widget class="TQLabel" row="5" column="0">
                                             <property name="name">
                                                 <cstring>textLabel26</cstring>
                                             </property>
@@ -1271,7 +1271,7 @@ Example: &lt;b&gt;Tags=style(type[text/css])&lt;/b&gt; means that both &lt;b&gt;
                                                 <string>Regular expression that finds the beginning or end of a structure. This is usually the combination of &lt;b&gt;Structure beginning&lt;/b&gt; and &lt;b&gt;Structure end&lt;/b&gt;, like &lt;b&gt;\{&amp;nbsp;|&amp;nbsp;\}&lt;/b&gt;</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="4" column="0">
+                                        <widget class="TQLabel" row="4" column="0">
                                             <property name="name">
                                                 <cstring>textLabel24</cstring>
                                             </property>
@@ -1288,7 +1288,7 @@ Example: &lt;b&gt;Tags=style(type[text/css])&lt;/b&gt; means that both &lt;b&gt;
                                                 <string>A string specifying the beginning of a structure, like &lt;b&gt;{&lt;/b&gt; in many cases.</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="3" column="0">
+                                        <widget class="TQLabel" row="3" column="0">
                                             <property name="name">
                                                 <cstring>textLabel23</cstring>
                                             </property>
@@ -1302,7 +1302,7 @@ Example: &lt;b&gt;Tags=style(type[text/css])&lt;/b&gt; means that both &lt;b&gt;
                                                 <string>Comma separated list of the local scope defining keywords</string>
                                             </property>
                                             <property name="whatsThis" stdset="0">
-                                                <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list contains &lt;b&gt;function&lt;/b&gt;, it means that elements, like variables found under a &lt;b&gt;function&lt;/b&gt; are local, relative to the node that holds the &lt;b&gt;function&lt;/b&gt;.</string>
+                                                <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list tqcontains &lt;b&gt;function&lt;/b&gt;, it means that elements, like variables found under a &lt;b&gt;function&lt;/b&gt; are local, relative to the node that holds the &lt;b&gt;function&lt;/b&gt;.</string>
                                             </property>
                                         </widget>
                                         <widget class="KLineEdit" row="3" column="1" rowspan="1" colspan="3">
@@ -1313,7 +1313,7 @@ Example: &lt;b&gt;Tags=style(type[text/css])&lt;/b&gt; means that both &lt;b&gt;
                                                 <string>Comma separated list of the local scope defining keywords</string>
                                             </property>
                                             <property name="whatsThis" stdset="0">
-                                                <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list contains &lt;b&gt;function&lt;/b&gt;, it means that elements, like variables found under a &lt;b&gt;function&lt;/b&gt; are local, relative to the node that holds the &lt;b&gt;function&lt;/b&gt;.</string>
+                                                <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list tqcontains &lt;b&gt;function&lt;/b&gt;, it means that elements, like variables found under a &lt;b&gt;function&lt;/b&gt; are local, relative to the node that holds the &lt;b&gt;function&lt;/b&gt;.</string>
                                             </property>
                                         </widget>
                                         <widget class="KLineEdit" row="2" column="1" rowspan="1" colspan="3">
@@ -1335,7 +1335,7 @@ Example: &lt;b&gt;Tags=style(type[text/css])&lt;/b&gt; means that both &lt;b&gt;
                                                 <string>Tags and attributes defining this DTEP</string>
                                             </property>
                                             <property name="whatsThis" stdset="0">
-                                                <string>Comma separated list of tags that define this DTEP. The format used is &lt;i&gt;tagname(attribute[defaultvalue])&lt;/i&gt;. If the parent (a real) DTEP has a tag with &lt;i&gt;tagname&lt;/i&gt; and
+                                                <string>Comma separated list of tags that define this DTEP. The format used is &lt;i&gt;tagname(attribute[defaultvalue])&lt;/i&gt;. If the tqparent (a real) DTEP has a tag with &lt;i&gt;tagname&lt;/i&gt; and
 the &lt;i&gt;attribute value&lt;/i&gt; of this tag is equal with the name of this DTEP, the tag area
 is parsed according to the rules of this DTEP.&lt;br&gt;
 If &lt;i&gt;[defaultvalue]&lt;/i&gt; is present, it means that if the attribute is not present in the tag it is taken as present with &lt;i&gt;value = defaultvalue&lt;/i&gt;.&lt;br&gt;
@@ -1365,7 +1365,7 @@ Example: &lt;b&gt;Tags=style(type[text/css])&lt;/b&gt; means that both &lt;b&gt;
                                                 <string>A string specifying the end of a structure, like &lt;b&gt;}&lt;/b&gt; in many cases.</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="4" column="2">
+                                        <widget class="TQLabel" row="4" column="2">
                                             <property name="name">
                                                 <cstring>textLabel25</cstring>
                                             </property>
@@ -1393,7 +1393,7 @@ Example: &lt;b&gt;Tags=style(type[text/css])&lt;/b&gt; means that both &lt;b&gt;
                                                 <string>A string specifying the beginning of a structure, like &lt;b&gt;{&lt;/b&gt; in many cases.</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>textLabel19</cstring>
                                             </property>
@@ -1424,7 +1424,7 @@ Example:&lt;br&gt;
     The regular expression must be terminated with &lt;b&gt;$&lt;/b&gt; (match end of line).</string>
                                             </property>
                                         </widget>
-                                        <widget class="QLabel" row="6" column="0" rowspan="1" colspan="2">
+                                        <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="2">
                                             <property name="name">
                                                 <cstring>textLabel18</cstring>
                                             </property>
@@ -1487,7 +1487,7 @@ Example:&lt;br&gt;
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QLabel" row="3" column="0">
+                    <widget class="TQLabel" row="3" column="0">
                         <property name="name">
                             <cstring>textLabel15</cstring>
                         </property>
@@ -1516,7 +1516,7 @@ Example:&lt;br&gt;
 Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="5" column="0">
+                    <widget class="TQLabel" row="5" column="0">
                         <property name="name">
                             <cstring>textLabel17</cstring>
                         </property>
@@ -1533,7 +1533,7 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
                             <string>Comma-separated list of DTEPs that can be present inside this DTEP. The list consist usually of pseudo DTEPs.</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2">
+                    <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>textLabel16</cstring>
                         </property>
@@ -1577,7 +1577,7 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
                             <string>The character specifying the end of a tag. See the information for the attribute separator for details.</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="3">
+                    <widget class="TQLabel" row="3" column="3">
                         <property name="name">
                             <cstring>textLabel14</cstring>
                         </property>
@@ -1615,7 +1615,7 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>TabPage</cstring>
                 </property>
@@ -1626,7 +1626,7 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&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>textLabel29</cstring>
                         </property>
@@ -1647,7 +1647,7 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>270</height>
@@ -1678,7 +1678,7 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
                             <string>&amp;Delete</string>
                         </property>
                     </widget>
-                    <widget class="QListBox" row="1" column="0" rowspan="1" colspan="3">
+                    <widget class="TQListBox" row="1" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>structuresList</cstring>
                         </property>
@@ -1957,11 +1957,11 @@ Example: &lt;b&gt;//&amp;nbsp;EOL,&amp;nbsp;/*&amp;nbsp;*/&lt;/b&gt;</string>
     <tabstop>editStructButton</tabstop>
     <tabstop>deleteStructButton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">slotEditStructGroup()</slot>
     <slot>slotAddStructGroup()</slot>
     <slot>slotDeleteStructGroup()</slot>
     <slot>slotFamilyChanged(int)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui
index 12abe665..2e2e4153 100644
--- a/quanta/dialogs/dtepstructureeditdlgs.ui
+++ b/quanta/dialogs/dtepstructureeditdlgs.ui
@@ -9,7 +9,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2005 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DTEPStructureEditDlgS</cstring>
     </property>
@@ -28,7 +28,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>textLabel30</cstring>
             </property>
@@ -50,14 +50,14 @@
                 <string>The user visible name of the group. It will be shown in the structure tree as a top node when there are elements belonging to this group in the document.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="4">
+        <widget class="TQLabel" row="0" column="4">
             <property name="name">
                 <cstring>textLabel32</cstring>
             </property>
             <property name="text">
                 <string>&amp;Icon:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
@@ -76,13 +76,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>50</width>
                     <height>50</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>50</width>
                     <height>50</height>
@@ -92,7 +92,7 @@
                 <string></string>
             </property>
         </widget>
-        <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>textLabel34</cstring>
             </property>
@@ -112,7 +112,7 @@
                 <string>Regular expression to get the filename. The expression is used to &lt;b&gt;remove&lt;/b&gt; the unnecessary strings from the element's text.</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>hasFilename</cstring>
             </property>
@@ -137,7 +137,7 @@
                 <string>Regular expression to get the filename. The expression is used to &lt;b&gt;remove&lt;/b&gt; the unnecessary strings from the element's text.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>textLabel33</cstring>
             </property>
@@ -154,7 +154,7 @@
                 <string>Defines which tags belong to this group. The format is &lt;i&gt;tagname(attribute1, attribute2, ...)&lt;/i&gt;. Tags with name &lt;i&gt;tagname&lt;/i&gt; will appear under this group. The item text of the corresponding node in the tree will be &lt;i&gt;attribute1_value | attribute2_value | ...&lt;/i&gt;Currently only one tag may be listed here.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel31</cstring>
             </property>
@@ -206,14 +206,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="QCheckBox" row="6" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>appendToTags</cstring>
             </property>
@@ -227,7 +227,7 @@
                 <string>Treat elements as new tags, so they will show up during tag autocompletion.</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="7" column="0" rowspan="1" colspan="6">
+        <widget class="TQGroupBox" row="7" column="0" rowspan="1" colspan="6">
             <property name="name">
                 <cstring>pseudoGroupBox</cstring>
             </property>
@@ -250,11 +250,11 @@
 Example (simplified):&lt;br&gt;
 &lt;b&gt;DefinitionRx=\$+([a-zA-Z]+)=new\\s[a-zA-Z]+;&lt;br&gt;
 TypeRx=new\\s([a-zA-Z]+);&lt;/b&gt;&lt;br&gt;&lt;br&gt;
-This will match strings like &lt;b&gt;$fooObj=new foo;&lt;/b&gt;. Now this string is searched and it will find &lt;b&gt;new foo;&lt;/b&gt;, where &lt;b&gt;foo&lt;/b&gt; is the first captured text (the regular expression matching &lt;b&gt;foo&lt;/b&gt; is between brackets).&lt;br&gt;
+This will match strings like &lt;b&gt;$fooObj=new foo;&lt;/b&gt;. Now this string is searched and it will tqfind &lt;b&gt;new foo;&lt;/b&gt;, where &lt;b&gt;foo&lt;/b&gt; is the first captured text (the regular expression matching &lt;b&gt;foo&lt;/b&gt; is between brackets).&lt;br&gt;
 So the type of &lt;b&gt;$fooObj&lt;/b&gt; is &lt;b&gt;foo&lt;/b&gt;.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>textLabel36</cstring>
                     </property>
@@ -280,7 +280,7 @@ Example 3:&lt;br&gt;
 - variables are used as &lt;b&gt;$i&lt;/b&gt;. In this case &lt;i&gt;UsageRx &lt;/i&gt;is the same as &lt;i&gt;DefinitionRx&lt;/i&gt;.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>textLabel37</cstring>
                     </property>
@@ -298,11 +298,11 @@ Example 3:&lt;br&gt;
 Example (simplified):&lt;br&gt;
 &lt;b&gt;DefinitionRx=\$+([a-zA-Z]+)=new\\s[a-zA-Z]+;&lt;br&gt;
 TypeRx=new\\s([a-zA-Z]+);&lt;/b&gt;&lt;br&gt;&lt;br&gt;
-This will match strings like &lt;b&gt;$fooObj=new foo;&lt;/b&gt;. Now this string is searched and it will find &lt;b&gt;new foo;&lt;/b&gt;, where &lt;b&gt;foo&lt;/b&gt; is the first captured text (the regular expression matching &lt;b&gt;foo&lt;/b&gt; is between brackets).&lt;br&gt;
+This will match strings like &lt;b&gt;$fooObj=new foo;&lt;/b&gt;. Now this string is searched and it will tqfind &lt;b&gt;new foo;&lt;/b&gt;, where &lt;b&gt;foo&lt;/b&gt; is the first captured text (the regular expression matching &lt;b&gt;foo&lt;/b&gt; is between brackets).&lt;br&gt;
 So the type of &lt;b&gt;$fooObj&lt;/b&gt; is &lt;b&gt;foo&lt;/b&gt;.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>textLabel35</cstring>
                     </property>
@@ -342,7 +342,7 @@ Example 3:&lt;br&gt;
 - variables are used as &lt;b&gt;$i&lt;/b&gt;. In this case &lt;i&gt;UsageRx &lt;/i&gt;is the same as &lt;i&gt;DefinitionRx&lt;/i&gt;.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel41</cstring>
                     </property>
@@ -350,24 +350,24 @@ Example 3:&lt;br&gt;
                         <string>Parent group:</string>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>The name of the group that may be the parent of this</string>
+                        <string>The name of the group that may be the tqparent of this</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>The name of the group that may be the parent of this. For example &lt;b&gt;classes&lt;/b&gt; might be a parent of &lt;b&gt;functions&lt;/b&gt; in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion.</string>
+                        <string>The name of the group that may be the tqparent of this. For example &lt;b&gt;classes&lt;/b&gt; might be a tqparent of &lt;b&gt;functions&lt;/b&gt; in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion.</string>
                     </property>
                 </widget>
                 <widget class="KLineEdit" row="0" column="1" rowspan="1" colspan="4">
                     <property name="name">
-                        <cstring>parentGroupEdit</cstring>
+                        <cstring>tqparentGroupEdit</cstring>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>The name of the group that may be the parent of this</string>
+                        <string>The name of the group that may be the tqparent of this</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>The name of the group that may be the parent of this. For example &lt;b&gt;classes&lt;/b&gt; might be a parent of &lt;b&gt;functions&lt;/b&gt; in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion.</string>
+                        <string>The name of the group that may be the tqparent of this. For example &lt;b&gt;classes&lt;/b&gt; might be a tqparent of &lt;b&gt;functions&lt;/b&gt; in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>textLabel42</cstring>
                     </property>
@@ -378,7 +378,7 @@ Example 3:&lt;br&gt;
                         <string>Only tags of this type can be part of the group</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="6" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>textLabel44</cstring>
                     </property>
@@ -389,7 +389,7 @@ Example 3:&lt;br&gt;
                         <string>Regular expression used to remove unwanted strings from the completion text</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="5" column="0">
+                <widget class="TQLabel" row="5" column="0">
                     <property name="name">
                         <cstring>textLabel43</cstring>
                     </property>
@@ -482,14 +482,14 @@ Example:&lt;b&gt;\bnew[\\s]+$&lt;/b&gt; tells that after typing &lt;b&gt;new&amp
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>340</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QCheckBox" row="7" column="0">
+                <widget class="TQCheckBox" row="7" column="0">
                     <property name="name">
                         <cstring>parseFile</cstring>
                     </property>
@@ -503,7 +503,7 @@ Example:&lt;b&gt;\bnew[\\s]+$&lt;/b&gt; tells that after typing &lt;b&gt;new&amp
                         <string>Check if the filename that is in the elements text should be parsed. This makes sense only if the element may contain a filename and the &lt;i&gt;FileNameRx&lt;/i&gt; is specified.</string>
                     </property>
                 </widget>
-                <widget class="QButtonGroup" row="8" column="0" rowspan="1" colspan="5">
+                <widget class="TQButtonGroup" row="8" column="0" rowspan="1" colspan="5">
                     <property name="name">
                         <cstring>buttonGroup1</cstring>
                     </property>
@@ -514,7 +514,7 @@ Example:&lt;b&gt;\bnew[\\s]+$&lt;/b&gt; tells that after typing &lt;b&gt;new&amp
                         <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>simpleGroup</cstring>
                             </property>
@@ -525,7 +525,7 @@ Example:&lt;b&gt;\bnew[\\s]+$&lt;/b&gt; tells that after typing &lt;b&gt;new&amp
                                 <string>This is a simple group, nothing special</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="1" column="0">
+                        <widget class="TQRadioButton" row="1" column="0">
                             <property name="name">
                                 <cstring>variableGroup</cstring>
                             </property>
@@ -536,7 +536,7 @@ Example:&lt;b&gt;\bnew[\\s]+$&lt;/b&gt; tells that after typing &lt;b&gt;new&amp
                                 <string>The group's elements are variables</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="0" column="1">
+                        <widget class="TQRadioButton" row="0" column="1">
                             <property name="name">
                                 <cstring>functionGroup</cstring>
                             </property>
@@ -547,7 +547,7 @@ Example:&lt;b&gt;\bnew[\\s]+$&lt;/b&gt; tells that after typing &lt;b&gt;new&amp
                                 <string>The group's elements are functions</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="1" column="1">
+                        <widget class="TQRadioButton" row="1" column="1">
                             <property name="name">
                                 <cstring>classGroup</cstring>
                             </property>
@@ -558,7 +558,7 @@ Example:&lt;b&gt;\bnew[\\s]+$&lt;/b&gt; tells that after typing &lt;b&gt;new&amp
                                 <string>The group's elements are classes</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="0" column="2">
+                        <widget class="TQRadioButton" row="0" column="2">
                             <property name="name">
                                 <cstring>objectGroup</cstring>
                             </property>
@@ -585,7 +585,7 @@ Example for a &lt;i&gt;class&lt;/i&gt; group:&lt;br&gt;
 The first captured area (between "&lt;b&gt;(&lt;/b&gt;" and "&lt;b&gt;)&lt;/b&gt;") holds the class name.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="4">
+                <widget class="TQCheckBox" row="2" column="4">
                     <property name="name">
                         <cstring>definitionRxMinimal</cstring>
                     </property>
@@ -624,7 +624,7 @@ The first captured area (between "&lt;b&gt;(&lt;/b&gt;" and "&lt;b&gt;)&lt;/b&gt
     <tabstop>hasFilename</tabstop>
     <tabstop>fileNameRxEdit</tabstop>
     <tabstop>appendToTags</tabstop>
-    <tabstop>parentGroupEdit</tabstop>
+    <tabstop>tqparentGroupEdit</tabstop>
     <tabstop>tagTypeCombo</tabstop>
     <tabstop>definitionRxEdit</tabstop>
     <tabstop>definitionRxMinimal</tabstop>
@@ -639,7 +639,7 @@ The first captured area (between "&lt;b&gt;(&lt;/b&gt;" and "&lt;b&gt;)&lt;/b&gt
     <tabstop>variableGroup</tabstop>
     <tabstop>classGroup</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kicondialog.h</includehint>
 </includehints>
diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp
index 63fd1e58..818df7ac 100644
--- a/quanta/dialogs/filecombo.cpp
+++ b/quanta/dialogs/filecombo.cpp
@@ -29,13 +29,13 @@
 #include "filecombo.h"
 #include "qextfileinfo.h"
 
-FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name )
-  :TQWidget(parent,name)
+FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *tqparent, const char *name )
+  :TQWidget(tqparent,name)
 {
   baseURL = a_baseURL;
   m_absolutePath = false;
 
-  TQHBoxLayout *layout = new TQHBoxLayout(this);
+  TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
 
   combo   = new TQComboBox(true,this);
   combo->setEditable(true);
@@ -44,8 +44,8 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name )
   button  ->setFixedSize(35,25);
   button  ->setText(i18n("..."));
 
-  layout  ->addWidget( combo );
-  layout  ->addWidget( button );
+  tqlayout  ->addWidget( combo );
+  tqlayout  ->addWidget( button );
 
   connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) );
   connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&)));
@@ -53,12 +53,12 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name )
   setFocusProxy(combo);
 }
 
-FileCombo::FileCombo( TQWidget *parent, const char *name )
-   :TQWidget( parent, name )
+FileCombo::FileCombo( TQWidget *tqparent, const char *name )
+   :TQWidget( tqparent, name )
 {
   baseURL.setPath(".");
 
-  TQHBoxLayout *layout = new TQHBoxLayout(this);
+  TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
 
   combo   = new TQComboBox(true,this);
   button  = new TQPushButton(this);
@@ -66,8 +66,8 @@ FileCombo::FileCombo( TQWidget *parent, const char *name )
   button  ->setFixedSize(35,25);
   button  ->setText(i18n("..."));
 
-  layout  ->addWidget( combo );
-  layout  ->addWidget( button );
+  tqlayout  ->addWidget( combo );
+  tqlayout  ->addWidget( button );
 
   connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) );
   connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&)));
@@ -97,7 +97,7 @@ void FileCombo::slotFileSelect()
   delete dlg;
   if ( !url.isEmpty() )
   {
-    if (!m_absolutePath) url = QExtFileInfo::toRelative(url, baseURL);
+    if (!m_absolutePath) url = TQExtFileInfo::toRelative(url, baseURL);
     combo->setEditText( url.path() );
   }
 }
diff --git a/quanta/dialogs/filecombo.h b/quanta/dialogs/filecombo.h
index 6991243b..e8610816 100644
--- a/quanta/dialogs/filecombo.h
+++ b/quanta/dialogs/filecombo.h
@@ -31,9 +31,10 @@ class KURL;
 
 class FileCombo : public TQWidget  {
    Q_OBJECT
+  TQ_OBJECT
 public:
-  FileCombo(const KURL& a_baseURL, TQWidget *parent=0, const char *name=0);
-  FileCombo(TQWidget *parent=0, const char *name=0);
+  FileCombo(const KURL& a_baseURL, TQWidget *tqparent=0, const char *name=0);
+  FileCombo(TQWidget *tqparent=0, const char *name=0);
   ~FileCombo();
 
   TQString text() const;
diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui
index fba27fc4..22ef785f 100644
--- a/quanta/dialogs/fourbuttonmessagebox.ui
+++ b/quanta/dialogs/fourbuttonmessagebox.ui
@@ -9,7 +9,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2003 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FourButtonMessageBox</cstring>
     </property>
@@ -21,7 +21,7 @@
             <height>150</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>150</height>
@@ -31,18 +31,18 @@
         <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>pixmapLabel</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32</width>
                     <height>32</height>
                 </size>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="1">
+        <widget class="TQLabel" row="0" column="1">
             <property name="name">
                 <cstring>textLabel</cstring>
             </property>
@@ -50,9 +50,9 @@
                 <string></string>
             </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>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -110,7 +110,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -151,14 +151,14 @@
 <variables>
     <variable>int m_status;</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>cancelButton_clicked()</slot>
     <slot>user1Button_clicked()</slot>
     <slot>user2Button_clicked()</slot>
     <slot>user3Button_clicked()</slot>
-</slots>
+</Q_SLOTS>
 <functions>
     <function specifier="non virtual" returnType="int">status()</function>
 </functions>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/fourbuttonmessagebox.ui.h b/quanta/dialogs/fourbuttonmessagebox.ui.h
index 00f31046..85f8c148 100644
--- a/quanta/dialogs/fourbuttonmessagebox.ui.h
+++ b/quanta/dialogs/fourbuttonmessagebox.ui.h
@@ -3,7 +3,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/quanta/dialogs/loadentitydlgs.ui b/quanta/dialogs/loadentitydlgs.ui
index dffdaa17..b2684e01 100644
--- a/quanta/dialogs/loadentitydlgs.ui
+++ b/quanta/dialogs/loadentitydlgs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>LoadEntityDlgS</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>LoadEntityDlgS</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>
@@ -27,7 +27,7 @@
                 <string>Source DTD:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -59,7 +59,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -68,5 +68,5 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp
index 79dc4bc1..1f1728ae 100644
--- a/quanta/dialogs/settings/abbreviation.cpp
+++ b/quanta/dialogs/settings/abbreviation.cpp
@@ -41,8 +41,8 @@
 #include "dtds.h"
 
 
-AbbreviationDlg::AbbreviationDlg(TQWidget *parent, const char *name):
-    AbbreviationDlgS(parent, name)
+AbbreviationDlg::AbbreviationDlg(TQWidget *tqparent, const char *name):
+    AbbreviationDlgS(tqparent, name)
 {
   m_oldItem = 0L;
   m_currentAbbrev = 0L;
@@ -76,8 +76,8 @@ void AbbreviationDlg::slotGroupChanged(const TQString& newGroupName)
   for ( it = m_currentAbbrev->abbreviations.constBegin(); it != m_currentAbbrev->abbreviations.constEnd(); ++it )
   {
     templateStr = it.key();
-    templateName = templateStr.mid(templateStr.find(' ') + 1);
-    templateStr = templateStr.left(templateStr.find(' '));
+    templateName = templateStr.mid(templateStr.tqfind(' ') + 1);
+    templateStr = templateStr.left(templateStr.tqfind(' '));
     new KListViewItem(templatesList, templateStr, templateName);
   }
   for ( TQStringList::ConstIterator dtepit = m_currentAbbrev->dteps.constBegin(); dtepit != m_currentAbbrev->dteps.constEnd(); ++dtepit )
@@ -95,9 +95,9 @@ void AbbreviationDlg::slotNewGroup()
    TQString groupName = KInputDialog::getText(i18n("New Abbreviation Group"), i18n("Group name:"), "", &ok, this);
    if (ok && !groupName.isEmpty())
    {
-      if (qConfig.abbreviations.contains(groupName))
+      if (qConfig.abbreviations.tqcontains(groupName))
       {
-          KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").arg(groupName), i18n("Group already exists"));
+          KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").tqarg(groupName), i18n("Group already exists"));
           TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup()));
       } else
       {
@@ -187,7 +187,7 @@ void AbbreviationDlg::slotRemoveTemplate()
 {
   TQListViewItem *item = templatesList->currentItem();
   if (item &&
-      KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> template?</qt>").arg(item->text(1)),TQString::null,KStdGuiItem::del()) == KMessageBox::Continue)
+      KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> template?</qt>").tqarg(item->text(1)),TQString(),KStdGuiItem::del()) == KMessageBox::Continue)
   {
     m_currentAbbrev->abbreviations.remove(item->text(0)+" "+item->text(1));
     delete item;
@@ -248,7 +248,7 @@ void AbbreviationDlg::saveTemplates()
       el.setAttribute("code", it.data());
       s = it.key();
       s2 = "";
-      pos = s.find(' ');
+      pos = s.tqfind(' ');
       if (pos != -1)
       {
         s2 = s.mid(pos+1);
@@ -270,7 +270,7 @@ void AbbreviationDlg::saveTemplates()
     f.close();
   } else
   {
-    KMessageBox::error(this, i18n("<qt>Cannot open the file <b>%1</b> for writing.\nModified abbreviations will be lost when you quit Quanta.</qt>").arg(s));
+    KMessageBox::error(this, i18n("<qt>Cannot open the file <b>%1</b> for writing.\nModified abbreviations will be lost when you quit Quanta.</qt>").tqarg(s));
   }
 }
 
diff --git a/quanta/dialogs/settings/abbreviation.h b/quanta/dialogs/settings/abbreviation.h
index d2ba7ea6..949ad663 100644
--- a/quanta/dialogs/settings/abbreviation.h
+++ b/quanta/dialogs/settings/abbreviation.h
@@ -27,8 +27,9 @@ struct DTDStruct;
 class AbbreviationDlg : public AbbreviationDlgS
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  AbbreviationDlg(TQWidget *parent, const char *name = 0);
+  AbbreviationDlg(TQWidget *tqparent, const char *name = 0);
   ~AbbreviationDlg();
 
   void saveTemplates();
diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui
index 9274fdc6..8e115d0f 100644
--- a/quanta/dialogs/settings/abbreviations.ui
+++ b/quanta/dialogs/settings/abbreviations.ui
@@ -9,7 +9,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2003 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AbbreviationDlgS</cstring>
     </property>
@@ -52,7 +52,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_2</cstring>
             </property>
@@ -71,7 +71,7 @@
                 <cstring>groupCombo</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -103,7 +103,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QTextEdit" row="10" column="0" rowspan="1" colspan="4">
+        <widget class="TQTextEdit" row="10" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>codeEdit</cstring>
             </property>
@@ -152,7 +152,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="5" column="2" rowspan="1" colspan="2">
+        <widget class="TQPushButton" row="5" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>addButton</cstring>
             </property>
@@ -170,14 +170,14 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="6" column="2" rowspan="1" colspan="2">
+        <widget class="TQPushButton" row="6" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>removeButton</cstring>
             </property>
@@ -185,7 +185,7 @@
                 <string>&amp;Remove</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="7" column="2" rowspan="1" colspan="2">
+        <widget class="TQPushButton" row="7" column="2" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>editButton</cstring>
             </property>
@@ -193,7 +193,7 @@
                 <string>&amp;Edit...</string>
             </property>
         </widget>
-        <widget class="QLabel" row="9" column="0" rowspan="1" colspan="3">
+        <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -210,7 +210,7 @@
                 <cstring>codeEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>textLabel3</cstring>
             </property>
@@ -255,7 +255,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -269,9 +269,9 @@
 <connections>
     <connection>
         <sender>templatesList</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>AbbreviationDlgS</receiver>
-        <slot>slotTemplateSelectionChanged(QListViewItem*)</slot>
+        <slot>slotTemplateSelectionChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>addButton</sender>
@@ -317,7 +317,7 @@
     </connection>
     <connection>
         <sender>templatesList</sender>
-        <signal>doubleClicked(QListViewItem*)</signal>
+        <signal>doubleClicked(TQListViewItem*)</signal>
         <receiver>AbbreviationDlgS</receiver>
         <slot>slotEditTemplate()</slot>
     </connection>
@@ -334,19 +334,19 @@
     <tabstop>editButton</tabstop>
     <tabstop>codeEdit</tabstop>
 </tabstops>
-<slots>
-    <slot>slotTemplateSelectionChanged(QListViewItem*)</slot>
+<Q_SLOTS>
+    <slot>slotTemplateSelectionChanged(TQListViewItem*)</slot>
     <slot>dtdCombo_activated(const QString&amp;)</slot>
     <slot>slotGroupChanged(const QString&amp;)</slot>
     <slot>slotAddTemplate()</slot>
     <slot>slotRemoveTemplate()</slot>
-    <slot>templatesList_currentChanged(QListViewItem*)</slot>
+    <slot>templatesList_currentChanged(TQListViewItem*)</slot>
     <slot>slotEditTemplate()</slot>
     <slot>slotAddDTEP()</slot>
     <slot>slotRemoveDTEP()</slot>
     <slot>slotNewGroup()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>klistbox.h</includehint>
diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui
index 5aa9254f..733b66eb 100644
--- a/quanta/dialogs/settings/codetemplatedlgs.ui
+++ b/quanta/dialogs/settings/codetemplatedlgs.ui
@@ -9,7 +9,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2003 by Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CodeTemplateDlgS</cstring>
     </property>
@@ -21,7 +21,7 @@
             <height>72</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>400</width>
             <height>70</height>
@@ -34,7 +34,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 @@
                 <cstring>templateEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -56,12 +56,12 @@
                 <cstring>descriptionEdit</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>templateEdit</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>descriptionEdit</cstring>
             </property>
@@ -72,10 +72,10 @@
     <tabstop>templateEdit</tabstop>
     <tabstop>descriptionEdit</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>accept()</slot>
     <slot>reject()</slot>
     <slot>pushButton4_clicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp
index fee135f8..5f96a2eb 100644
--- a/quanta/dialogs/settings/filemasks.cpp
+++ b/quanta/dialogs/settings/filemasks.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filesmask.cpp  -  description
+                          filestqmask.cpp  -  description
                              -------------------
     begin                : Fri May 19 2000
     copyright            : (C) 2000 by Yacovlev Alexander & Dmitry Poplavsky <pdima@mail.univ.kiev.ua>
@@ -23,15 +23,15 @@
 //kde includes
 #include <kmimetype.h>
 
-FileMasks::FileMasks(TQWidget *parent, const char *name)
-  :FileMasksS(parent,name)
+FileMasks::FileMasks(TQWidget *tqparent, const char *name)
+  :FileMasksS(tqparent,name)
 {
   connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(setToDefault()));
 }
 
 FileMasks::~FileMasks(){
 }
-/** set masks to default */
+/** set tqmasks to default */
 void FileMasks::setToDefault()
 {
  KMimeType::List list = KMimeType::allMimeTypes();
@@ -43,12 +43,12 @@ void FileMasks::setToDefault()
  for ( it = list.begin(); it != list.end(); ++it )
  {
     name = (*it)->name();
-    if (name.contains("text"))
+    if (name.tqcontains("text"))
     {
-      if (!markup.contains(name) && !script.contains(name))
+      if (!markup.tqcontains(name) && !script.tqcontains(name))
          text += name+"; ";
     }
-    if (name.contains("image"))
+    if (name.tqcontains("image"))
     {
       image += name +"; ";
     }
diff --git a/quanta/dialogs/settings/filemasks.h b/quanta/dialogs/settings/filemasks.h
index 965eb190..cc596259 100644
--- a/quanta/dialogs/settings/filemasks.h
+++ b/quanta/dialogs/settings/filemasks.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          filesmask.h  -  description
+                          filestqmask.h  -  description
                              -------------------
     begin                : Fri May 19 2000
     copyright            : (C) 2000 by Yacovlev Alexander & Dmitry Poplavsky <pdima@mail.univ.kiev.ua>
@@ -24,8 +24,9 @@
 class FileMasks : public FileMasksS
 {
    Q_OBJECT
+  TQ_OBJECT
 public:
-  FileMasks(TQWidget *parent=0, const char *name=0);
+  FileMasks(TQWidget *tqparent=0, const char *name=0);
   ~FileMasks();
 
 public slots:
diff --git a/quanta/dialogs/settings/filemaskss.ui b/quanta/dialogs/settings/filemaskss.ui
index f8cdb4f6..fb7d322a 100644
--- a/quanta/dialogs/settings/filemaskss.ui
+++ b/quanta/dialogs/settings/filemaskss.ui
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 </comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>FileMasksS</cstring>
     </property>
@@ -29,7 +29,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -39,12 +39,12 @@
         <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>encodingCombo</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="2" column="1">
+        <widget class="TQComboBox" row="2" column="1">
             <property name="name">
                 <cstring>defaultDTDCombo</cstring>
             </property>
@@ -52,7 +52,7 @@
                 <string>New files will have the extension and highlighting according to this setting</string>
             </property>
         </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>
@@ -69,23 +69,23 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <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>lineMarkup</cstring>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignLeft</set>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">
+                <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>lineImage</cstring>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignLeft</set>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="4" column="2">
+                <widget class="TQPushButton" row="4" column="2">
                     <property name="name">
                         <cstring>buttonDefault</cstring>
                     </property>
@@ -93,7 +93,7 @@
                         <string>&amp;Reset to Default</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>TextLabel4_2</cstring>
                     </property>
@@ -104,7 +104,7 @@
                         <cstring>lineText</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1_3</cstring>
                     </property>
@@ -115,7 +115,7 @@
                         <cstring>lineMarkup</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>TextLabel3_2</cstring>
                     </property>
@@ -126,15 +126,15 @@
                         <cstring>lineImage</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="2">
+                <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>lineText</cstring>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignLeft</set>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel2_2</cstring>
                     </property>
@@ -146,7 +146,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -172,38 +172,38 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>153</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <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>lineScript</cstring>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignLeft</set>
                     </property>
                 </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>
             <property name="text">
                 <string>Default character &amp;encoding:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignLeft</set>
             </property>
             <property name="buddy" stdset="0">
                 <cstring>encodingCombo</cstring>
             </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>
@@ -224,14 +224,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QButtonGroup" row="5" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="5" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>buttonGroup7</cstring>
             </property>
@@ -242,7 +242,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox" row="3" column="0">
+                <widget class="TQCheckBox" row="3" column="0">
                     <property name="name">
                         <cstring>reloadFiles</cstring>
                     </property>
@@ -250,7 +250,7 @@
                         <string>L&amp;oad last-opened files</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0">
+                <widget class="TQCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>showSplash</cstring>
                     </property>
@@ -258,7 +258,7 @@
                         <string>S&amp;how splashscreen</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0">
+                <widget class="TQCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>reloadProject</cstring>
                     </property>
@@ -268,15 +268,15 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="4" column="0">
+        <widget class="TQLayoutWidget" row="4" 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>tlAutoSave</cstring>
                     </property>
@@ -284,7 +284,7 @@
                         <string>Create backups every</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox">
+                <widget class="TQSpinBox">
                     <property name="name">
                         <cstring>sbAutoSave</cstring>
                     </property>
@@ -298,7 +298,7 @@
                         <number>15</number>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -308,7 +308,7 @@
                 </widget>
             </hbox>
         </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>showDTDSelectDialog</cstring>
             </property>
@@ -332,5 +332,5 @@
     <tabstop>reloadProject</tabstop>
     <tabstop>reloadFiles</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/settings/parseroptions.cpp b/quanta/dialogs/settings/parseroptions.cpp
index 24e3c6a6..c38e2875 100644
--- a/quanta/dialogs/settings/parseroptions.cpp
+++ b/quanta/dialogs/settings/parseroptions.cpp
@@ -22,11 +22,11 @@
 #include <kconfig.h>
 
 /*
- *  Constructs a ParserOptions which is a child of 'parent', with the
+ *  Constructs a ParserOptions which is a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'
  */
-ParserOptions::ParserOptions( KConfig *a_config, TQWidget* parent,  const char* name )
-    : ParserOptionsUI( parent, name )
+ParserOptions::ParserOptions( KConfig *a_config, TQWidget* tqparent,  const char* name )
+    : ParserOptionsUI( tqparent, name )
 {
     config = a_config;
     config->setGroup("Parser options");
@@ -70,7 +70,7 @@ ParserOptions::ParserOptions( KConfig *a_config, TQWidget* parent,  const char*
  */
 ParserOptions::~ParserOptions()
 {
-    // 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/quanta/dialogs/settings/parseroptions.h b/quanta/dialogs/settings/parseroptions.h
index a4c5f6f3..55710161 100644
--- a/quanta/dialogs/settings/parseroptions.h
+++ b/quanta/dialogs/settings/parseroptions.h
@@ -23,9 +23,10 @@ class KConfig;
 class ParserOptions : public ParserOptionsUI
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ParserOptions( KConfig *config, TQWidget* parent = 0, const char* name = 0);
+    ParserOptions( KConfig *config, TQWidget* tqparent = 0, const char* name = 0);
     ~ParserOptions();
 
     void updateConfig();
diff --git a/quanta/dialogs/settings/parseroptionsui.ui b/quanta/dialogs/settings/parseroptionsui.ui
index 34a54cd6..2a5fed0b 100644
--- a/quanta/dialogs/settings/parseroptionsui.ui
+++ b/quanta/dialogs/settings/parseroptionsui.ui
@@ -9,7 +9,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2002 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ParserOptionsUI</cstring>
     </property>
@@ -29,7 +29,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -39,7 +39,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>buttonGroup1</cstring>
             </property>
@@ -50,7 +50,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QSpinBox" row="3" column="2">
+                <widget class="TQSpinBox" row="3" column="2">
                     <property name="name">
                         <cstring>refreshFrequency</cstring>
                     </property>
@@ -74,14 +74,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>122</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3">
+                <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>instantUpdate</cstring>
                     </property>
@@ -102,14 +102,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>122</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3">
+                <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>showClosingTags</cstring>
                     </property>
@@ -117,7 +117,7 @@
                         <string>Show closing tags</string>
                     </property>
                 </widget>
-                <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>showEmptyNodes</cstring>
                     </property>
@@ -125,7 +125,7 @@
                         <string>Show empt&amp;y nodes and groups</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="4" column="2">
+                <widget class="TQSpinBox" row="4" column="2">
                     <property name="name">
                         <cstring>spinExpand</cstring>
                     </property>
@@ -136,7 +136,7 @@
                         <string>Set to 0 in order to expand the whole tree</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>TextLabel1_5</cstring>
                     </property>
@@ -144,7 +144,7 @@
                         <string>Refresh frequency (in seconds):</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>TextLabel2_2</cstring>
                     </property>
@@ -154,7 +154,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -168,7 +168,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QComboBox" row="3" column="1">
+                <widget class="TQComboBox" row="3" column="1">
                     <item>
                         <property name="text">
                             <string>Select Tag Area</string>
@@ -183,7 +183,7 @@
                         <cstring>comboDoubleClick</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <item>
                         <property name="text">
                             <string>Find Tag</string>
@@ -198,7 +198,7 @@
                         <cstring>comboLBM</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -206,7 +206,7 @@
                         <string>Left button:</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="2" column="1">
+                <widget class="TQComboBox" row="2" column="1">
                     <item>
                         <property name="text">
                             <string>Popup Menu</string>
@@ -216,7 +216,7 @@
                         <cstring>comboRBM</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>TextLabel1_4</cstring>
                     </property>
@@ -224,7 +224,7 @@
                         <string>Double click:</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>
@@ -232,7 +232,7 @@
                         <string>Middle button:</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>
@@ -240,7 +240,7 @@
                         <string>Right button:</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <item>
                         <property name="text">
                             <string>Find Tag &amp; Open Tree</string>
@@ -282,7 +282,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -310,5 +310,5 @@
     <tabstop>refreshFrequency</tabstop>
     <tabstop>spinExpand</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/settings/previewoptions.cpp b/quanta/dialogs/settings/previewoptions.cpp
index 2df03ea9..3c0e3c1b 100644
--- a/quanta/dialogs/settings/previewoptions.cpp
+++ b/quanta/dialogs/settings/previewoptions.cpp
@@ -23,17 +23,17 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-PreviewOptions::PreviewOptions(TQWidget *parent, const char *name)
-  : PreviewOptionsS(parent,name)
+PreviewOptions::PreviewOptions(TQWidget *tqparent, const char *name)
+  : PreviewOptionsS(tqparent,name)
 {
 }
 
 PreviewOptions::~PreviewOptions(){
 }
 
-void PreviewOptions::setWindowLayout(const TQString& layout )
+void PreviewOptions::setWindowLayout(const TQString& tqlayout )
 {
-  if ( layout == "Default") resetLayout->setChecked(true);
+  if ( tqlayout == "Default") resetLayout->setChecked(true);
   else resetLayout->setChecked(false);
 }
 
@@ -64,12 +64,12 @@ TQString PreviewOptions::docPosition()
    return position;
 }
 
-TQString PreviewOptions::layout()
+TQString PreviewOptions::tqlayout()
 {
-  TQString layout = "Custom";
+  TQString tqlayout = "Custom";
   if ( resetLayout->isChecked() )
-      layout = "Default";
-  return layout;
+      tqlayout = "Default";
+  return tqlayout;
 }
 
 TQString PreviewOptions::closeButtons()
diff --git a/quanta/dialogs/settings/previewoptions.h b/quanta/dialogs/settings/previewoptions.h
index 3cc5b820..ebddcc32 100644
--- a/quanta/dialogs/settings/previewoptions.h
+++ b/quanta/dialogs/settings/previewoptions.h
@@ -24,12 +24,13 @@ class KConfig;
 
 class PreviewOptions : public PreviewOptionsS  {
    Q_OBJECT
+  TQ_OBJECT
 public:
-  PreviewOptions(TQWidget *parent=0, const char *name=0);
+  PreviewOptions(TQWidget *tqparent=0, const char *name=0);
   ~PreviewOptions();
 
   TQString position();
-  TQString layout();
+  TQString tqlayout();
   TQString closeButtons();
   TQString docPosition();
   uint toolviewTabs();
diff --git a/quanta/dialogs/settings/previewoptionss.ui b/quanta/dialogs/settings/previewoptionss.ui
index a27a164b..e3743258 100644
--- a/quanta/dialogs/settings/previewoptionss.ui
+++ b/quanta/dialogs/settings/previewoptionss.ui
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 </comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PreviewOptionsS</cstring>
     </property>
@@ -21,7 +21,7 @@
             <height>512</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>350</width>
             <height>220</height>
@@ -31,15 +31,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </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>resetLayout</cstring>
             </property>
             <property name="text">
-                <string>Reset window layout to the default on the next startup</string>
+                <string>Reset window tqlayout to the default on the next startup</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>showHidden</cstring>
             </property>
@@ -47,7 +47,7 @@
                 <string>Show hidden files in files tree</string>
             </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>saveLocalTrees</cstring>
             </property>
@@ -55,7 +55,7 @@
                 <string>Save tree status for local trees</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>buttonGroup3</cstring>
             </property>
@@ -66,7 +66,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>radioShowCloseButtons</cstring>
                     </property>
@@ -77,7 +77,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>radioNoCloseButtons</cstring>
                     </property>
@@ -85,7 +85,7 @@
                         <string>&amp;Do not show</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="2" column="0">
+                <widget class="TQRadioButton" row="2" column="0">
                     <property name="name">
                         <cstring>radioDelayedCloseButtons</cstring>
                     </property>
@@ -95,7 +95,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="0" column="1">
+        <widget class="TQButtonGroup" row="0" column="1">
             <property name="name">
                 <cstring>buttonGroup3_2</cstring>
             </property>
@@ -106,7 +106,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>radioNewDocTab</cstring>
                     </property>
@@ -117,7 +117,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>radioSeparateDocView</cstring>
                     </property>
@@ -127,7 +127,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="1" column="1">
+        <widget class="TQButtonGroup" row="1" column="1">
             <property name="name">
                 <cstring>buttonGroup4</cstring>
             </property>
@@ -138,7 +138,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>radioIconText</cstring>
                     </property>
@@ -149,7 +149,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="2" column="0">
+                <widget class="TQRadioButton" row="2" column="0">
                     <property name="name">
                         <cstring>radioText</cstring>
                     </property>
@@ -157,7 +157,7 @@
                         <string>Text</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>radioIcon</cstring>
                     </property>
@@ -167,7 +167,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QButtonGroup" row="0" column="0">
+        <widget class="TQButtonGroup" row="0" column="0">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -184,7 +184,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>radioToolview</cstring>
                     </property>
@@ -192,7 +192,7 @@
                         <string>Separate toolview</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>radioEditor</cstring>
                     </property>
@@ -215,14 +215,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QButtonGroup" row="5" column="0" rowspan="1" colspan="2">
+        <widget class="TQButtonGroup" row="5" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -233,7 +233,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>warnBinaryOpening</cstring>
                     </property>
@@ -241,7 +241,7 @@
                         <string>Warn about opening binar&amp;y/unknown files</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0">
+                <widget class="TQCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>warnEventActions</cstring>
                     </property>
@@ -249,7 +249,7 @@
                         <string>Warn when executing &amp;actions associated with events</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0">
+                <widget class="TQCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>warnAll</cstring>
                     </property>
@@ -276,5 +276,5 @@
     <tabstop>radioNoCloseButtons</tabstop>
     <tabstop>radioDelayedCloseButtons</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/settings/styleoptionss.ui b/quanta/dialogs/settings/styleoptionss.ui
index 13ed198d..242e7e7c 100644
--- a/quanta/dialogs/settings/styleoptionss.ui
+++ b/quanta/dialogs/settings/styleoptionss.ui
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 </comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>StyleOptionsS</cstring>
     </property>
@@ -29,7 +29,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>410</width>
             <height>250</height>
@@ -39,7 +39,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>TextLabel3</cstring>
             </property>
@@ -47,7 +47,7 @@
                 <string>Attribute quotation:</string>
             </property>
         </widget>
-        <widget class="QComboBox" row="2" column="1">
+        <widget class="TQComboBox" row="2" column="1">
             <item>
                 <property name="text">
                     <string>Double Quotes</string>
@@ -62,7 +62,7 @@
                 <cstring>attributeQuotation</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <string>Tag case:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -78,7 +78,7 @@
                 <string>Attribute case:</string>
             </property>
         </widget>
-        <widget class="QComboBox" row="1" column="1">
+        <widget class="TQComboBox" row="1" column="1">
             <item>
                 <property name="text">
                     <string>Default Case</string>
@@ -98,7 +98,7 @@
                 <cstring>attributeCase</cstring>
             </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>optionalTagAutoClose</cstring>
             </property>
@@ -106,7 +106,7 @@
                 <string>Auto-close o&amp;ptional tags</string>
             </property>
         </widget>
-        <widget class="QComboBox" row="0" column="1">
+        <widget class="TQComboBox" row="0" column="1">
             <item>
                 <property name="text">
                     <string>Default Case</string>
@@ -126,7 +126,7 @@
                 <cstring>tagCase</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>tagAutoClose</cstring>
             </property>
@@ -144,14 +144,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>tagUpdateClosing</cstring>
             </property>
@@ -159,7 +159,7 @@
                 <string>&amp;Update opening/closing tag automatically</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>useAutoCompletion</cstring>
             </property>
@@ -175,7 +175,7 @@
                 <string>Use &amp;auto-completion</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>replaceAccented</cstring>
             </property>
@@ -183,8 +183,8 @@
                 <string>Automatic &amp;replacement of the accented characters</string>
             </property>
             <property name="whatsThis" stdset="0">
-                <string>If this option is turned on the accented characters, like &lt;b&gt;&amp;#225;&lt;/b&gt;, will be automatically replaced  by their unicode style notation, for the above case with &lt;b&gt;&amp;#038;#225;&lt;/b&gt;.&lt;br&gt;
-We suggest to leave this option off and use an unicode or locale encoding for your documents.</string>
+                <string>If this option is turned on the accented characters, like &lt;b&gt;&amp;#225;&lt;/b&gt;, will be automatically replaced  by their tqunicode style notation, for the above case with &lt;b&gt;&amp;#038;#225;&lt;/b&gt;.&lt;br&gt;
+We suggest to leave this option off and use an tqunicode or locale encoding for your documents.</string>
             </property>
         </widget>
     </grid>
@@ -197,5 +197,5 @@ We suggest to leave this option off and use an unicode or locale encoding for yo
     <tabstop>tagAutoClose</tabstop>
     <tabstop>useAutoCompletion</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp
index 200b5afe..2caa497e 100644
--- a/quanta/dialogs/specialchardialog.cpp
+++ b/quanta/dialogs/specialchardialog.cpp
@@ -28,8 +28,8 @@
 #include "specialchardialog.h"
 #include "resource.h"
 
-SpecialCharDialog::SpecialCharDialog( TQWidget* parent, const char* name, bool modal, WFlags fl)
-    :SpecialCharDialogS( parent, name, modal, fl )
+SpecialCharDialog::SpecialCharDialog( TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+    :SpecialCharDialogS( tqparent, name, modal, fl )
 {
   connect ( FilterLineEdit, TQT_SIGNAL(textChanged(const TQString&)), 
       TQT_SLOT(filterChars(const TQString&)) );
@@ -52,7 +52,7 @@ void SpecialCharDialog::filterChars(const TQString& filter)
     CharsListBox->insertStringList(charList);
   else {
     for (TQStringList::ConstIterator it = charList.begin(); it != charList.end(); ++it)
-      if ( (*it).contains(filter, false) )
+      if ( (*it).tqcontains(filter, false) )
         CharsListBox->insertItem(*it);
   }
   if (CharsListBox->currentItem() == -1 && CharsListBox->count())
@@ -67,8 +67,8 @@ TQString SpecialCharDialog::selection()
 void SpecialCharDialog::insertCode()
 {
   TQString selected = CharsListBox->text(CharsListBox->currentItem());
-  int begin = selected.find("(&")+1;
-  int length = selected.find(";)") - begin + 1;
+  int begin = selected.tqfind("(&")+1;
+  int length = selected.tqfind(";)") - begin + 1;
   m_selection = selected.mid(begin, length);
   done(TQDialog::Accepted);
 }
diff --git a/quanta/dialogs/specialchardialog.h b/quanta/dialogs/specialchardialog.h
index 4155e081..dec3320e 100644
--- a/quanta/dialogs/specialchardialog.h
+++ b/quanta/dialogs/specialchardialog.h
@@ -24,10 +24,11 @@
 class SpecialCharDialog : public SpecialCharDialogS
 {
   Q_OBJECT
+  TQ_OBJECT
   
 public:
 
-  SpecialCharDialog( TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0);
+  SpecialCharDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = true, WFlags fl = 0);
   ~SpecialCharDialog();
   TQString selection();
 
diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui
index acc52e53..c0ed272f 100644
--- a/quanta/dialogs/specialchardialogs.ui
+++ b/quanta/dialogs/specialchardialogs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>SpecialCharDialogS</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SpecialCharDialogS</cstring>
     </property>
@@ -22,19 +22,19 @@
         <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">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -50,11 +50,11 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonChar</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -74,18 +74,18 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>112</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -103,15 +103,15 @@
                 </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>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -145,7 +145,7 @@
     <tabstop>buttonChar</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klistbox.h</includehint>
diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp
index 878216e3..10ea4273 100644
--- a/quanta/dialogs/tagdialogs/colorcombo.cpp
+++ b/quanta/dialogs/tagdialogs/colorcombo.cpp
@@ -21,10 +21,10 @@
 //
 // 1999-09-27 Espen Sand <espensa@online.no>
 // KColorDialog is now subclassed from KDialogBase. I have also extended
-// KColorDialog::getColor() so that in contains a parent argument. This
+// KColorDialog::getColor() so that in contains a tqparent argument. This
 // improves centering capability.
 //
-// layout management added Oct 1997 by Mario Weilguni
+// tqlayout management added Oct 1997 by Mario Weilguni
 // <mweilguni@sime.com>
 //
 
@@ -66,8 +66,8 @@
 
 #define STANDARD_PAL_SIZE 17
 
-ColorCombo::ColorCombo( TQWidget *parent, const char *name )
-  : TQComboBox( parent, name )
+ColorCombo::ColorCombo( TQWidget *tqparent, const char *name )
+  : TQComboBox( tqparent, name )
 {
   customColor.setRgb( 255, 255, 255 );
   internalcolor.setRgb( 255, 255, 255 );
@@ -165,7 +165,7 @@ void ColorCombo::slotActivated( int index )
       TQPainter painter;
       TQPen pen;
 
-      if ( qGray( customColor.rgb() ) < 128 )
+      if ( tqGray( customColor.rgb() ) < 128 )
         pen.setColor( white );
       else
         pen.setColor( black );
@@ -219,7 +219,7 @@ void ColorCombo::addColors()
 
   insertItem( i18n("None") );
 
-  if ( qGray( customColor.rgb() ) < 128 )
+  if ( tqGray( customColor.rgb() ) < 128 )
     pen.setColor( white );
   else
     pen.setColor( black );
@@ -270,23 +270,23 @@ void ColorCombo::createStandardPalette()
 
     int i = 0;
 
-    standardPalette[i++] = Qt::red;
-    standardPalette[i++] = Qt::green;
-    standardPalette[i++] = Qt::blue;
-    standardPalette[i++] = Qt::cyan;
-    standardPalette[i++] = Qt::magenta;
-    standardPalette[i++] = Qt::yellow;
-    standardPalette[i++] = Qt::darkRed;
-    standardPalette[i++] = Qt::darkGreen;
-    standardPalette[i++] = Qt::darkBlue;
-    standardPalette[i++] = Qt::darkCyan;
-    standardPalette[i++] = Qt::darkMagenta;
-    standardPalette[i++] = Qt::darkYellow;
-    standardPalette[i++] = Qt::white;
-    standardPalette[i++] = Qt::lightGray;
-    standardPalette[i++] = Qt::gray;
-    standardPalette[i++] = Qt::darkGray;
-    standardPalette[i++] = Qt::black;
+    standardPalette[i++] = TQt::red;
+    standardPalette[i++] = TQt::green;
+    standardPalette[i++] = TQt::blue;
+    standardPalette[i++] = TQt::cyan;
+    standardPalette[i++] = TQt::magenta;
+    standardPalette[i++] = TQt::yellow;
+    standardPalette[i++] = TQt::darkRed;
+    standardPalette[i++] = TQt::darkGreen;
+    standardPalette[i++] = TQt::darkBlue;
+    standardPalette[i++] = TQt::darkCyan;
+    standardPalette[i++] = TQt::darkMagenta;
+    standardPalette[i++] = TQt::darkYellow;
+    standardPalette[i++] = TQt::white;
+    standardPalette[i++] = TQt::lightGray;
+    standardPalette[i++] = TQt::gray;
+    standardPalette[i++] = TQt::darkGray;
+    standardPalette[i++] = TQt::black;
 
 
     standardPaletteNames = new TQString [STANDARD_PAL_SIZE];
diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h
index b6f851e0..a1f92a31 100644
--- a/quanta/dialogs/tagdialogs/colorcombo.h
+++ b/quanta/dialogs/tagdialogs/colorcombo.h
@@ -19,7 +19,7 @@
 //-----------------------------------------------------------------------------
 // KDE color selection combo box
 
-// layout management added Oct 1997 by Mario Weilguni
+// tqlayout management added Oct 1997 by Mario Weilguni
 // <mweilguni@sime.com>
 
 
@@ -37,11 +37,12 @@
 /**
  * Combobox for colours.
  */
-class ColorCombo : public QComboBox
+class ColorCombo : public TQComboBox
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  ColorCombo( TQWidget *parent = 0L, const char *name = 0L );
+  ColorCombo( TQWidget *tqparent = 0L, const char *name = 0L );
   ~ColorCombo();
 
   void setColor( const TQColor &col );
diff --git a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp
index 8e52ae01..f45eea8f 100644
--- a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp
+++ b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp
@@ -21,8 +21,8 @@
 #include <tqdict.h>
 #include <tqlineedit.h>
 
-CoreWidgetDlg::CoreWidgetDlg(TQWidget *parent, const char *name)
-  :CoreWidgetDlgS(parent,name), TagWidget(parent,name)
+CoreWidgetDlg::CoreWidgetDlg(TQWidget *tqparent, const char *name)
+  :CoreWidgetDlgS(tqparent,name), TagWidget(tqparent,name)
 {
 }
 
@@ -48,13 +48,13 @@ void CoreWidgetDlg::writeAttributes( TQDict<TQString> *d )
   dict = d;
   TQString *t; // value of attr.
 
-  if (( t=d->find("id") ))    setValue(*t, lineId);
-  if (( t=d->find("class") )) setValue(*t, lineClass);
-  if (( t=d->find("style") )) setValue(*t, lineStyle);
-  if (( t=d->find("title") )) setValue(*t, lineTitle);
+  if (( t=d->tqfind("id") ))    setValue(*t, lineId);
+  if (( t=d->tqfind("class") )) setValue(*t, lineClass);
+  if (( t=d->tqfind("style") )) setValue(*t, lineStyle);
+  if (( t=d->tqfind("title") )) setValue(*t, lineTitle);
 
-  if (( t=d->find("lang") ))  setValue(*t, lineLang);
-  if (( t=d->find("dir") ))   setValue(*t, lineDir);
+  if (( t=d->tqfind("lang") ))  setValue(*t, lineLang);
+  if (( t=d->tqfind("dir") ))   setValue(*t, lineDir);
 }
 
 
diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp
index 713ccf2c..a7954793 100644
--- a/quanta/dialogs/tagdialogs/listdlg.cpp
+++ b/quanta/dialogs/tagdialogs/listdlg.cpp
@@ -24,8 +24,8 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name )
-  :KDialogBase(parent,name),    listbox(new KListBox(this))
+ListDlg::ListDlg(TQStringList &entryList,TQWidget* tqparent, const char *name )
+  :KDialogBase(tqparent,name),    listbox(new KListBox(this))
 {
    Q_CHECK_PTR(listbox);
    setMainWidget(listbox);
@@ -40,7 +40,7 @@ ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name )
     }
    listbox->setMinimumSize(350,150);
    adjustSize();
-   resize(sizeHint());
+   resize(tqsizeHint());
 
    connect(listbox,TQT_SIGNAL(doubleClicked( TQListBoxItem * )), TQT_SLOT(slotOk()));
 }
diff --git a/quanta/dialogs/tagdialogs/listdlg.h b/quanta/dialogs/tagdialogs/listdlg.h
index ea455d70..4615e495 100644
--- a/quanta/dialogs/tagdialogs/listdlg.h
+++ b/quanta/dialogs/tagdialogs/listdlg.h
@@ -32,8 +32,9 @@ selected item with the getEntry() method.
 
 class ListDlg : public KDialogBase  {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  ListDlg(TQStringList &entryList,TQWidget* parent=0, const char *name =0);
+  ListDlg(TQStringList &entryList,TQWidget* tqparent=0, const char *name =0);
   ~ListDlg();
   TQString getEntry();
   int getEntryNum();
diff --git a/quanta/dialogs/tagdialogs/pictureview.cpp b/quanta/dialogs/tagdialogs/pictureview.cpp
index 65102ba8..7579c47a 100644
--- a/quanta/dialogs/tagdialogs/pictureview.cpp
+++ b/quanta/dialogs/tagdialogs/pictureview.cpp
@@ -20,7 +20,7 @@
 #include "tqpainter.h"
 #include <tqimage.h>
 
-PictureView::PictureView(TQWidget *parent, char *file, const char *name ) : TQFrame(parent,name)
+PictureView::PictureView(TQWidget *tqparent, char *file, const char *name ) : TQFrame(tqparent,name)
 {
     if ( file ) {
       pix = new TQImage(file);
@@ -69,7 +69,7 @@ void PictureView::slotSetImage(const TQString& file)
   picheight = pix->height();
 
   scale();
-  repaint();
+  tqrepaint();
 }
 
 /** try scale  image */
diff --git a/quanta/dialogs/tagdialogs/pictureview.h b/quanta/dialogs/tagdialogs/pictureview.h
index 59a71609..e8fadc31 100644
--- a/quanta/dialogs/tagdialogs/pictureview.h
+++ b/quanta/dialogs/tagdialogs/pictureview.h
@@ -29,8 +29,9 @@ used by TagImgDlg
 
 class PictureView : public TQFrame  {
    Q_OBJECT
+  TQ_OBJECT
 public:
-  PictureView(TQWidget *parent=0, char *file=0, const char *name=0);
+  PictureView(TQWidget *tqparent=0, char *file=0, const char *name=0);
   /** try scale  image */
   void scale();
 public slots: // Public slots
diff --git a/quanta/dialogs/tagdialogs/tagattr.cpp b/quanta/dialogs/tagdialogs/tagattr.cpp
index 251c4b8b..1ab0bdde 100644
--- a/quanta/dialogs/tagdialogs/tagattr.cpp
+++ b/quanta/dialogs/tagdialogs/tagattr.cpp
@@ -39,7 +39,7 @@ TQString Attr::attrName() const
 }
 
 
-Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, QTag *dtdTag )
+Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, TQTag *dtdTag )
   : Attr(el, w, dtdTag)
 {
    combo = (TQComboBox *)w;
@@ -50,7 +50,7 @@ Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, QTag *dtdTag )
      TQString method = el.attribute("method");
      TQString interface = el.attribute("interface", "QuantaIf");
      TQString arguments = el.attribute("arguments");
-     arguments.replace("%tagname%", m_dtdTag->name());
+     arguments.tqreplace("%tagname%", m_dtdTag->name());
      DCOPReply reply = QuantaCommon::callDCOPMethod(interface, method, arguments);
      if (reply.isValid())
      {
@@ -87,9 +87,9 @@ void Attr_list::setValue(const TQString &value)
 }
 
 
-TQDomNode findChild( TQDomNode &parent, const TQString &name )
+TQDomNode tqfindChild( TQDomNode &tqparent, const TQString &name )
 {
-  for ( TQDomNode n = parent.firstChild(); !n.isNull(); n = n.nextSibling() )
+  for ( TQDomNode n = tqparent.firstChild(); !n.isNull(); n = n.nextSibling() )
     if ( n.nodeName() == name )
          return n;
   return TQDomNode();
diff --git a/quanta/dialogs/tagdialogs/tagattr.h b/quanta/dialogs/tagdialogs/tagattr.h
index bbd562c6..c9567eda 100644
--- a/quanta/dialogs/tagdialogs/tagattr.h
+++ b/quanta/dialogs/tagdialogs/tagattr.h
@@ -34,16 +34,16 @@
 
 class TQDomElement;
 class TQWidget;
-class QTag;
+class TQTag;
 
 
-TQDomNode findChild( TQDomNode &parent, const TQString &name );
+TQDomNode tqfindChild( TQDomNode &tqparent, const TQString &name );
 
 
 class Attr
 {
   public:
-    Attr( TQDomElement const& el, TQWidget *, QTag *dtdTag )
+    Attr( TQDomElement const& el, TQWidget *, TQTag *dtdTag )
     : domEl(el), name(domEl.attribute("name","")), m_dtdTag(dtdTag) {}
     //{ domEl = el; name = domEl->attribute("name",""); m_dtdTag = dtdTag;}
     virtual ~Attr(){}
@@ -57,7 +57,7 @@ class Attr
   protected:
      TQDomElement domEl;
      TQString name;
-     QTag *m_dtdTag;
+     TQTag *m_dtdTag;
 };
 
 
@@ -67,7 +67,7 @@ class Attr_line : public Attr
     TQLineEdit *line;
 
   public:
-    Attr_line( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) : Attr(el, w, dtdTag)
+    Attr_line( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag)
         {  line = (TQLineEdit *)w; }
     virtual ~Attr_line(){};
 
@@ -82,7 +82,7 @@ class Attr_color : public Attr
     ColorCombo *color;
 
   public:
-    Attr_color( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) : Attr(el, w, dtdTag)
+    Attr_color( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag)
         { color = (ColorCombo *)w; }
     virtual ~Attr_color(){};
 
@@ -96,7 +96,7 @@ class Attr_file : public Attr
     FileCombo *file;
 
   public:
-    Attr_file( TQDomElement const& el, TQWidget *w , QTag * dtdTag ) : Attr(el, w, dtdTag)
+    Attr_file( TQDomElement const& el, TQWidget *w , TQTag * dtdTag ) : Attr(el, w, dtdTag)
         { file = (FileCombo *)w; }
     virtual ~Attr_file(){};
 
@@ -110,7 +110,7 @@ class Attr_list : public Attr
     TQComboBox *combo;
 
   public:
-    Attr_list( TQDomElement const& el, TQWidget *w, QTag *dtdTag );
+    Attr_list( TQDomElement const& el, TQWidget *w, TQTag *dtdTag );
     virtual ~Attr_list(){};
 
     virtual TQString value() { return combo->currentText(); }
@@ -124,7 +124,7 @@ class Attr_check : public Attr
     TQCheckBox *check;
 
   public:
-    Attr_check( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) : Attr(el, w, dtdTag)
+    Attr_check( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag)
         { check = (TQCheckBox *)w; }
     virtual ~Attr_check(){};
 
diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp
index bc5800ae..12ecec0d 100644
--- a/quanta/dialogs/tagdialogs/tagdialog.cpp
+++ b/quanta/dialogs/tagdialogs/tagdialog.cpp
@@ -42,7 +42,7 @@
 #include "qtag.h"
 #include "kafkacommon.h"
 
-TagDialog::TagDialog(QTag* dtdTag, Tag *tag, KURL a_baseURL)
+TagDialog::TagDialog(TQTag* dtdTag, Tag *tag, KURL a_baseURL)
     : TQTabDialog( 0L, "tagdialog", true)
 {
   init(dtdTag, a_baseURL);
@@ -60,7 +60,7 @@ TagDialog::TagDialog(QTag* dtdTag, Tag *tag, KURL a_baseURL)
 
 }
 
-TagDialog::TagDialog(QTag* dtdTag, Tag *tag, const TQString& selection, KURL a_baseURL)
+TagDialog::TagDialog(TQTag* dtdTag, Tag *tag, const TQString& selection, KURL a_baseURL)
     : TQTabDialog( 0L, "tagdialog", true), m_selection(selection)
 {
     init(dtdTag, a_baseURL);
@@ -77,7 +77,7 @@ TagDialog::TagDialog(QTag* dtdTag, Tag *tag, const TQString& selection, KURL a_b
     parseTag();
 }
 
-TagDialog::TagDialog(QTag* dtdTag, TQString attrs, KURL a_baseURL)
+TagDialog::TagDialog(TQTag* dtdTag, TQString attrs, KURL a_baseURL)
     : TQTabDialog( 0L, "tagdialog", true)
 {
   init(dtdTag, a_baseURL);
@@ -90,7 +90,7 @@ TagDialog::TagDialog(QTag* dtdTag, TQString attrs, KURL a_baseURL)
   parseTag();
 }
 
-TagDialog::TagDialog(QTag* dtdTag, const TQString& selection, TQString attrs, KURL a_baseURL)
+TagDialog::TagDialog(TQTag* dtdTag, const TQString& selection, TQString attrs, KURL a_baseURL)
     : TQTabDialog( 0L, "tagdialog", true), m_selection(selection)
 {
     init(dtdTag, a_baseURL);
@@ -113,7 +113,7 @@ TagDialog::~TagDialog()
 }
 
 
-void TagDialog::init(QTag *a_dtdTag, KURL a_baseURL)
+void TagDialog::init(TQTag *a_dtdTag, KURL a_baseURL)
 {
   setOkButton(KStdGuiItem::ok().text());
   setCancelButton(KStdGuiItem::cancel().text());
@@ -123,7 +123,7 @@ void TagDialog::init(QTag *a_dtdTag, KURL a_baseURL)
 
   if (!a_dtdTag)   //the tag is invalid, let's create a default one
   {
-    dtdTag = new QTag();
+    dtdTag = new TQTag();
     dtdTag->setName(i18n("Unknown tag"));
     deleteTag = true;
   } else
@@ -148,7 +148,7 @@ void TagDialog::parseTag()
     TQDomDocument doc;
     if (dtdTag->name().lower() == "img") //NOTE: HTML specific code!
     {
-       mainDlg = new TagImgDlg(dtdTag->parentDTD, this);
+       mainDlg = new TagImgDlg(dtdTag->tqparentDTD, this);
       ((TagImgDlg *)mainDlg)->writeAttributes( dict );
     }
     //read the tag file it is available
@@ -164,7 +164,7 @@ void TagDialog::parseTag()
        {
           TQDomNode n = nodeList.item(i);
           TQString nodeTagName = n.toElement().attribute("name");
-          if (!dtdTag->parentDTD->caseSensitive)
+          if (!dtdTag->tqparentDTD->caseSensitive)
               nodeTagName = nodeTagName.upper();
           if (nodeTagName == tagName && n.toElement().elementsByTagName("attr").count() > 0) //read a tag
           {
@@ -179,7 +179,7 @@ void TagDialog::parseTag()
     else
     {
       TQString docString = "<!DOCTYPE TAGS>\n<TAGS>\n";
-      docString += TQString("<tag name=\"%1\">\n").arg(dtdTag->name());
+      docString += TQString("<tag name=\"%1\">\n").tqarg(dtdTag->name());
       docString += QuantaCommon::xmlFromAttributes(dtdTag->attributes());
       docString += "</tag>\n</TAGS>\n";
       doc.setContent(docString);
@@ -192,7 +192,7 @@ void TagDialog::parseTag()
     addTab( mainDlg, i18n("Main") );
   }
 
-  KConfig *dtdConfig = new KConfig(dtdTag->parentDTD->fileName);
+  KConfig *dtdConfig = new KConfig(dtdTag->tqparentDTD->fileName);
   dtdConfig->setGroup("General");
   int numOfPages = dtdConfig->readNumEntry("NumOfPages");
   extraPageList = new TQPtrList<Tagxml>();
@@ -200,14 +200,14 @@ void TagDialog::parseTag()
   for (int i = 1; i <= numOfPages; i++)
   {
     Tagxml *extraPage = 0L;
-    dtdConfig->setGroup(TQString("Page%1").arg(i));
+    dtdConfig->setGroup(TQString("Page%1").tqarg(i));
     TQString title = dtdConfig->readEntry("Title");
     TQStringList groupList;
     groupList = dtdConfig->readListEntry("Groups");
     TQDomDocument extraDoc; //build an internal tag XML for the groups
     bool addPage = false;
     TQString docString = "<!DOCTYPE TAGS>\n<TAGS>\n";
-    docString += TQString("<tag name=\"Page%1\">\n").arg(i);
+    docString += TQString("<tag name=\"Page%1\">\n").tqarg(i);
     for (uint j = 0; j < groupList.count(); j++)
     {
        groupList[j] = groupList[j].stripWhiteSpace();
@@ -226,7 +226,7 @@ void TagDialog::parseTag()
         {
           TQDomNode node = nodeList.item(j);
           TQString nodeTagName = node.toElement().attribute("name");
-          if (groupList.contains(nodeTagName) && dtdTag->commonGroups.contains(nodeTagName)) //add the attributes of this common tag to a new tab
+          if (groupList.tqcontains(nodeTagName) && dtdTag->commonGroups.tqcontains(nodeTagName)) //add the attributes of this common tag to a new tab
           {
             TQString s;
             TQTextStream str(&s, IO_ReadWrite);
@@ -325,15 +325,15 @@ TQString TagDialog::getAttributeString()
 TQString TagDialog::getAttribute(const TQString& attr)
 {
  TQString attrStr = getAttributeString()+" ";
- int pos = attrStr.upper().find(attr.upper());
+ int pos = attrStr.upper().tqfind(attr.upper());
  if (pos != -1)
  {
-   pos = attrStr.find("=",pos+1) + 1;
-   return attrStr.mid(pos, attrStr.find(" ",pos) - pos);
+   pos = attrStr.tqfind("=",pos+1) + 1;
+   return attrStr.mid(pos, attrStr.tqfind(" ",pos) - pos);
  }
  else
  {
-  return TQString::null;
+  return TQString();
  }
 
 }
@@ -429,7 +429,7 @@ void TagDialog::insertTag(Document *w, bool insertInLine)
     TQString newTag = getAttributeString();
     newTag = TQString("<")+QuantaCommon::tagCase(dtdTag->name())+newTag;
 
-    if ( dtdTag->parentDTD->singleTagStyle == "xml" &&
+    if ( dtdTag->tqparentDTD->singleTagStyle == "xml" &&
           (dtdTag->isSingle() || (!qConfig.closeOptionalTags && dtdTag->isOptional()))
         )
     {
diff --git a/quanta/dialogs/tagdialogs/tagdialog.h b/quanta/dialogs/tagdialogs/tagdialog.h
index c715085f..c3e6c2d4 100644
--- a/quanta/dialogs/tagdialogs/tagdialog.h
+++ b/quanta/dialogs/tagdialogs/tagdialog.h
@@ -32,13 +32,14 @@
 class Document;
 class TagWidget;
 class Tagxml;
-class QTag;
+class TQTag;
 class Tag;
 class KURL;
 class TQShowEvent;
 
 class TagDialog : public TQTabDialog  {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
@@ -50,10 +51,10 @@ public:
                </a>
 
   */
-  TagDialog(QTag* dtdTag, Tag* tag, KURL a_baseURL = KURL());
-  TagDialog(QTag* dtdTag, Tag* tag, const TQString& selection, KURL a_baseURL = KURL());
-  TagDialog(QTag* dtdTag, TQString attrs=TQString::null, KURL a_baseURL = KURL());
-  TagDialog(QTag* dtdTag, const TQString& selection, TQString attrs=TQString::null, KURL a_baseURL = KURL());
+  TagDialog(TQTag* dtdTag, Tag* tag, KURL a_baseURL = KURL());
+  TagDialog(TQTag* dtdTag, Tag* tag, const TQString& selection, KURL a_baseURL = KURL());
+  TagDialog(TQTag* dtdTag, TQString attrs=TQString(), KURL a_baseURL = KURL());
+  TagDialog(TQTag* dtdTag, const TQString& selection, TQString attrs=TQString(), KURL a_baseURL = KURL());
   ~TagDialog();
   /** Insert an attribute to dict*/
   void insertAttribute(TQString *attr, TQString *value);
@@ -90,12 +91,12 @@ protected slots:
 private:
   bool deleteTag;
   Tag *m_tag;
-  QTag* dtdTag;
+  TQTag* dtdTag;
   TQString m_selection;
 
   TQPtrList<Tagxml> *extraPageList;
 
-  void init(QTag* dtdTag, KURL a_baseURL);
+  void init(TQTag* dtdTag, KURL a_baseURL);
   void parseAttributes(const TQString &attrs);
 };
 
diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
index 9448f48d..b8f08324 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
@@ -35,8 +35,8 @@
 #include "tagimgdlg.moc"
 
 
-TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name)
-  : TQWidget(parent,name), TagWidget(parent,name)
+TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *tqparent, const char *name)
+  : TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name)
 {
   m_dtd = dtd;
   img = 0L;
@@ -108,7 +108,7 @@ void TagImgDlg::slotFileSelect()
  if ( !url.isEmpty() )
   {
     slotImageSet( url );
-    url = QExtFileInfo::toRelative(url, baseURL);
+    url = TQExtFileInfo::toRelative(url, baseURL);
     lineImgSource->setText( url.path() );
   }
 }
@@ -145,26 +145,26 @@ void TagImgDlg::writeAttributes( TQDict<TQString> *d )
   dict = d;
   TQString *t; // value of attr.
 
-  if (( t=d->find("src") ))
+  if (( t=d->tqfind("src") ))
   {
     lineImgSource->setText(*t);
     KURL url = baseURL;
     QuantaCommon::setUrl(url, *t);
-    url = QExtFileInfo::toAbsolute(url, baseURL);
+    url = TQExtFileInfo::toAbsolute(url, baseURL);
     slotImageSet( url );
   }
-  if ( (t=d->find("alt")) )
+  if ( (t=d->tqfind("alt")) )
     setValue(*t, lineAltText);
-  if ( (t=d->find("width")) && lineWidth )
+  if ( (t=d->tqfind("width")) && lineWidth )
     setValue(*t, lineWidth);
-  if ( (t=d->find("height")) && lineHeight )
+  if ( (t=d->tqfind("height")) && lineHeight )
     setValue(*t, lineHeight);
-  if ( (t=d->find("hspace")) && lineHSpace)
+  if ( (t=d->tqfind("hspace")) && lineHSpace)
     setValue(*t, lineHSpace);
-  if ( (t=d->find("vspace")) && lineVSpace )
+  if ( (t=d->tqfind("vspace")) && lineVSpace )
     setValue(*t, lineVSpace);
-  if ( (t=d->find("align")) && comboAlign )
+  if ( (t=d->tqfind("align")) && comboAlign )
     setValue(*t, comboAlign);
-  if ( (t=d->find("border")) && spinBorder )
+  if ( (t=d->tqfind("border")) && spinBorder )
     setValue(*t, spinBorder);
 }
diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.h b/quanta/dialogs/tagdialogs/tagimgdlg.h
index 9f67d0f9..488d2377 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlg.h
+++ b/quanta/dialogs/tagdialogs/tagimgdlg.h
@@ -40,8 +40,9 @@ class TQImage;
 
 class TagImgDlg : public TQWidget, TagWidget {
    Q_OBJECT
+  TQ_OBJECT
 public: 
-  TagImgDlg(const DTDStruct *dtd, TQWidget *parent=0, const char *name=0);
+  TagImgDlg(const DTDStruct *dtd, TQWidget *tqparent=0, const char *name=0);
   ~TagImgDlg();
 
 public:
@@ -51,19 +52,19 @@ public:
   KLineEdit *lineImgSource;
   TQPushButton *buttonImgSource;
   TQPushButton *buttonRecalcImgSize;
-  TQLabel *QLabel_4;
+  TQLabel *TQLabel_4;
   KLineEdit *lineWidth;
-  TQLabel *QLabel_5;
+  TQLabel *TQLabel_5;
   KLineEdit *lineHeight;
-  TQLabel *QLabel_6;
+  TQLabel *TQLabel_6;
   KLineEdit *lineHSpace;
-  TQLabel *QLabel_7;
+  TQLabel *TQLabel_7;
   KLineEdit *lineVSpace;
-  TQLabel *QLabel_8;
+  TQLabel *TQLabel_8;
   KLineEdit *lineAltText;
-  TQLabel *QLabel_9;
+  TQLabel *TQLabel_9;
   TQSpinBox *spinBorder;
-  TQLabel *QLabel_10;
+  TQLabel *TQLabel_10;
   TQComboBox *comboAlign;
   PictureView *widgetImg;
   TQPushButton *buttonOk;
diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
index 69d6a72e..07a44394 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
@@ -34,7 +34,7 @@ void  TagImgDlg::initDialog(){
   buttonImgSource->setText(i18n("..."));
   grid->addMultiCellWidget(buttonImgSource, 0, 0, 4, 4);
 
-  QTag *imgTag = m_dtd->tagsList->find("img");
+  TQTag *imgTag = m_dtd->tagsList->tqfind("img");
 
   if (!imgTag)
     return;
@@ -42,9 +42,9 @@ void  TagImgDlg::initDialog(){
   lineWidth = 0L;
   if (imgTag->attribute("width"))
   {
-    QLabel_4= new TQLabel(this,"NoName");
-    QLabel_4->setText(i18n("Width:"));
-    grid->addMultiCellWidget(QLabel_4, 1, 1, 0, 0);
+    TQLabel_4= new TQLabel(this,"NoName");
+    TQLabel_4->setText(i18n("Width:"));
+    grid->addMultiCellWidget(TQLabel_4, 1, 1, 0, 0);
   
     lineWidth= new KLineEdit(this,"NoName");
     lineWidth->setValidator( new KFloatValidator( lineWidth ) );
@@ -54,9 +54,9 @@ void  TagImgDlg::initDialog(){
   lineHeight = 0L;
   if (imgTag->attribute("height"))
   {
-    QLabel_5= new TQLabel(this,"NoName");
-    QLabel_5->setText(i18n("Height:"));
-    grid->addMultiCellWidget(QLabel_5, 1, 1, 2, 2);
+    TQLabel_5= new TQLabel(this,"NoName");
+    TQLabel_5->setText(i18n("Height:"));
+    grid->addMultiCellWidget(TQLabel_5, 1, 1, 2, 2);
   
     lineHeight= new KLineEdit(this,"NoName");
     lineHeight->setValidator( new KFloatValidator( lineHeight ) );
@@ -70,9 +70,9 @@ void  TagImgDlg::initDialog(){
   lineHSpace = 0L;
   if (imgTag->attribute("hspace"))
   {
-    QLabel_6= new TQLabel(this,"NoName");
-    QLabel_6->setText(i18n("HSpace:"));
-    grid->addMultiCellWidget(QLabel_6, 2, 2, 0, 0);
+    TQLabel_6= new TQLabel(this,"NoName");
+    TQLabel_6->setText(i18n("HSpace:"));
+    grid->addMultiCellWidget(TQLabel_6, 2, 2, 0, 0);
   
     lineHSpace= new KLineEdit(this,"NoName");
     grid->addMultiCellWidget(lineHSpace, 2, 2, 1, 1);
@@ -81,17 +81,17 @@ void  TagImgDlg::initDialog(){
   lineVSpace = 0L;
   if (imgTag->attribute("vspace"))
   {
-    QLabel_7= new TQLabel(this,"NoName");
-    QLabel_7->setText(i18n("VSpace:"));
-    grid->addMultiCellWidget(QLabel_7, 2, 2, 2, 2);
+    TQLabel_7= new TQLabel(this,"NoName");
+    TQLabel_7->setText(i18n("VSpace:"));
+    grid->addMultiCellWidget(TQLabel_7, 2, 2, 2, 2);
   
     lineVSpace= new KLineEdit(this,"NoName");
     grid->addMultiCellWidget(lineVSpace, 2, 2, 3, 3);
   }
 
-  QLabel_8= new TQLabel(this,"NoName");
-  QLabel_8->setText(i18n("Alternate text:"));
-  grid->addMultiCellWidget(QLabel_8, 3, 3, 0, 0);
+  TQLabel_8= new TQLabel(this,"NoName");
+  TQLabel_8->setText(i18n("Alternate text:"));
+  grid->addMultiCellWidget(TQLabel_8, 3, 3, 0, 0);
 
   lineAltText= new KLineEdit(this,"NoName");
   grid->addMultiCellWidget(lineAltText, 3, 3, 1, 4);
@@ -99,9 +99,9 @@ void  TagImgDlg::initDialog(){
   spinBorder = 0L;
   if (imgTag->attribute("border"))
   {
-    QLabel_9= new TQLabel(this,"NoName");
-    QLabel_9->setText(i18n("Border:"));
-    grid->addMultiCellWidget(QLabel_9, 4, 4, 0, 0);
+    TQLabel_9= new TQLabel(this,"NoName");
+    TQLabel_9->setText(i18n("Border:"));
+    grid->addMultiCellWidget(TQLabel_9, 4, 4, 0, 0);
   
     spinBorder= new TQSpinBox(this,"NoName");
     spinBorder->setRange(0,20);
@@ -111,9 +111,9 @@ void  TagImgDlg::initDialog(){
   comboAlign = 0L;
   if (imgTag->attribute("align"))
   {
-    QLabel_10= new TQLabel(this,"NoName");
-    QLabel_10->setText(i18n("Align:"));
-    grid->addMultiCellWidget(QLabel_10, 4, 4, 2, 2);
+    TQLabel_10= new TQLabel(this,"NoName");
+    TQLabel_10->setText(i18n("Align:"));
+    grid->addMultiCellWidget(TQLabel_10, 4, 4, 2, 2);
   
     comboAlign= new TQComboBox(this,"NoName");
     grid->addMultiCellWidget(comboAlign, 4, 4, 3, 4);
diff --git a/quanta/dialogs/tagdialogs/tagmail.ui b/quanta/dialogs/tagdialogs/tagmail.ui
index 1ec00314..d3e03fd5 100644
--- a/quanta/dialogs/tagdialogs/tagmail.ui
+++ b/quanta/dialogs/tagdialogs/tagmail.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>TagMail</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>TagMail</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>AddressLabel</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <string>Email address:</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="0" column="4">
+        <widget class="TQPushButton" row="0" column="4">
             <property name="name">
                 <cstring>buttonAddressSelect</cstring>
             </property>
@@ -39,7 +39,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32</width>
                     <height>32767</height>
@@ -49,17 +49,17 @@
                 <string>...</string>
             </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>lineEmail</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>lineSubject</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>SubjectLabel</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <string>Subject:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>TitleLabel</cstring>
             </property>
@@ -83,7 +83,7 @@
                 <string>Title:</string>
             </property>
         </widget>
-        <widget class="QTextEdit" row="2" column="1" rowspan="1" colspan="4">
+        <widget class="TQTextEdit" row="2" column="1" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>titleEdit</cstring>
             </property>
@@ -117,7 +117,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -126,5 +126,5 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp
index 3ed62c57..0aa689d2 100644
--- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp
@@ -34,8 +34,8 @@
 #include <tqregexp.h>
 
 
-TagMailDlg::TagMailDlg(TQWidget *parent, const char *name)
-  :TagMail(parent, name)
+TagMailDlg::TagMailDlg(TQWidget *tqparent, const char *name)
+  :TagMail(tqparent, name)
 {
   setCaption(name);
   setModal(true);
@@ -68,18 +68,18 @@ void TagMailDlg::slotSelectAddress()
     n = n.simplifyWhiteSpace();
     for( unsigned int i = 0; i < emails.count(); ++i ) {
       if (!emails[i].isEmpty()) {
-  if (n.isEmpty() || (emails[i].find( "<" ) != -1))
+  if (n.isEmpty() || (emails[i].tqfind( "<" ) != -1))
     addr = "";
   else { /* do we really need quotes around this name ? */
-    if (n.find(TQRegExp("[^ 0-9A-Za-z\\x0080-\\xFFFF]")) != -1)
+    if (n.tqfind(TQRegExp("[^ 0-9A-Za-z\\x0080-\\xFFFF]")) != -1)
       addr = qConfig.attrValueQuotation + n + qConfig.attrValueQuotation + " ";
     else
       addr = n + " ";
   }
   email = emails[i];
-  if (!addr.isEmpty() && (email.find( "<" ) == -1)
-      && (email.find( ">" ) == -1)
-      && (email.find( "," ) == -1))
+  if (!addr.isEmpty() && (email.tqfind( "<" ) == -1)
+      && (email.tqfind( ">" ) == -1)
+      && (email.tqfind( "," ) == -1))
     addr += "<" + email + ">";
   else
     addr += email;
diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.h b/quanta/dialogs/tagdialogs/tagmaildlg.h
index 32dffaa5..1b739954 100644
--- a/quanta/dialogs/tagdialogs/tagmaildlg.h
+++ b/quanta/dialogs/tagdialogs/tagmaildlg.h
@@ -24,8 +24,9 @@
 
 class TagMailDlg : public TagMail  {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  TagMailDlg(TQWidget *parent=0, const char *name=0);
+  TagMailDlg(TQWidget *tqparent=0, const char *name=0);
   ~TagMailDlg();
 private slots: // Private slots
   /** Select a mail address, using the KABC */
diff --git a/quanta/dialogs/tagdialogs/tagmisc.ui b/quanta/dialogs/tagdialogs/tagmisc.ui
index 39f044c9..4d39033d 100644
--- a/quanta/dialogs/tagdialogs/tagmisc.ui
+++ b/quanta/dialogs/tagdialogs/tagmisc.ui
@@ -9,7 +9,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2001, 2003 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>TagMisc</cstring>
     </property>
@@ -21,7 +21,7 @@
             <height>61</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>350</width>
             <height>60</height>
@@ -34,12 +34,12 @@
         <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>elementName</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -47,7 +47,7 @@
                 <string>Element name:</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>addClosingTag</cstring>
             </property>
@@ -64,5 +64,5 @@
     <tabstop>elementName</tabstop>
     <tabstop>addClosingTag</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp
index 9313bb08..70c5600c 100644
--- a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp
@@ -19,8 +19,8 @@
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 
-TagMiscDlg::TagMiscDlg( TQWidget* parent, const char* name, bool addClosingTag, const TQString &element )
-    :KDialogBase( parent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel )
+TagMiscDlg::TagMiscDlg( TQWidget* tqparent, const char* name, bool addClosingTag, const TQString &element )
+    :KDialogBase( tqparent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel )
 {
     miscWidget = new TagMisc(this);
     connect( miscWidget->elementName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotMiscTagChanged(const TQString & ) ) );
diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.h b/quanta/dialogs/tagdialogs/tagmiscdlg.h
index e8d68c3d..4ac7c2a8 100644
--- a/quanta/dialogs/tagdialogs/tagmiscdlg.h
+++ b/quanta/dialogs/tagdialogs/tagmiscdlg.h
@@ -24,9 +24,10 @@ class TagMisc;
 class TagMiscDlg : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TagMiscDlg( TQWidget* parent = 0, const char* name = 0, bool addClosingTag=true, const TQString &element=TQString::null );
+    TagMiscDlg( TQWidget* tqparent = 0, const char* name = 0, bool addClosingTag=true, const TQString &element=TQString() );
     ~TagMiscDlg();
 
     TQString elementTagName() const;
diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp
index 7a9edbdb..2b116855 100644
--- a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp
@@ -23,8 +23,8 @@
 #include <tqradiobutton.h>
 #include <tqgroupbox.h>
 
-TagQuickListDlg::TagQuickListDlg(TQWidget *parent, const char *name)
-    : TQDialog(parent,name,true)
+TagQuickListDlg::TagQuickListDlg(TQWidget *tqparent, const char *name)
+    : TQDialog(tqparent,name,true)
 {
   setCaption(name);
 
diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.h b/quanta/dialogs/tagdialogs/tagquicklistdlg.h
index 15f0f21d..e9c13189 100644
--- a/quanta/dialogs/tagdialogs/tagquicklistdlg.h
+++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.h
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef TAGQUICKLISTDLG_H
-#define TAGQUICKLISTDLG_H
+#ifndef TAGTQUICKLISTDLG_H
+#define TAGTQUICKLISTDLG_H
 
 #include <tqwidget.h>
 
@@ -33,16 +33,17 @@ class TQButtonGroup;
 
 class TagQuickListDlg : public TQDialog  {
    Q_OBJECT
+  TQ_OBJECT
 public:
-  TagQuickListDlg(TQWidget *parent=0, const char *name=0);
+  TagQuickListDlg(TQWidget *tqparent=0, const char *name=0);
   ~TagQuickListDlg();
 
 public:
   void initDialog();
-  TQLabel *QLabel_1;
+  TQLabel *TQLabel_1;
   TQSpinBox *spinBoxRows;
   TQPushButton *buttonOk;
-  TQLabel *QLabel_2;
+  TQLabel *TQLabel_2;
   TQRadioButton *radioOrdered;
   TQRadioButton *radioUnordered;
   TQPushButton *buttonCancel;
diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp
index f7e7b713..7f499c14 100644
--- a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp
+++ b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp
@@ -21,10 +21,10 @@ void  TagQuickListDlg::initDialog()
 {
   resize(230,150);
 
-  QLabel_1= new TQLabel(this,"NoName");
-  QLabel_1->setGeometry(10,10,100,30);
-  QLabel_1->setMinimumSize(0,0);
-  QLabel_1->setText(i18n("Rows:"));
+  TQLabel_1= new TQLabel(this,"NoName");
+  TQLabel_1->setGeometry(10,10,100,30);
+  TQLabel_1->setMinimumSize(0,0);
+  TQLabel_1->setText(i18n("Rows:"));
 
   spinBoxRows= new TQSpinBox(this,"NoName");
   spinBoxRows->setGeometry(120,10,100,25);
@@ -35,10 +35,10 @@ void  TagQuickListDlg::initDialog()
   buttonOk->setGeometry(10,110,100,30);
   buttonOk->setMinimumSize(0,0);
 
-  QLabel_2= new TQLabel(this,"NoName");
-  QLabel_2->setGeometry(10,40,100,30);
-  QLabel_2->setMinimumSize(0,0);
-  QLabel_2->setText(i18n("Style:"));
+  TQLabel_2= new TQLabel(this,"NoName");
+  TQLabel_2->setGeometry(10,40,100,30);
+  TQLabel_2->setMinimumSize(0,0);
+  TQLabel_2->setText(i18n("Style:"));
 
   buttonCancel= new TQPushButton(this,"NoName");
   buttonCancel->setGeometry(120,110,100,30);
diff --git a/quanta/dialogs/tagdialogs/tagwidget.cpp b/quanta/dialogs/tagdialogs/tagwidget.cpp
index 014549bc..4eb79f24 100644
--- a/quanta/dialogs/tagdialogs/tagwidget.cpp
+++ b/quanta/dialogs/tagdialogs/tagwidget.cpp
@@ -30,9 +30,9 @@
 #include "tagdialog.h"
 #include "resource.h"
 
-TagWidget::TagWidget(TQObject *parent, const char *)
+TagWidget::TagWidget(TQObject *tqparent, const char *)
 {
-  baseURL = ((TagDialog *)parent)->baseURL();
+  baseURL = ((TagDialog *)tqparent)->baseURL();
 }
 
 TagWidget::~TagWidget(){
@@ -47,7 +47,7 @@ void TagWidget::updateDict(const TQString &attr, TQComboBox *combo )
     delete s;
   }
   else
-    dict->replace(attr, s);
+    dict->tqreplace(attr, s);
 }
 
 void TagWidget::setValue(const TQString &val, TQComboBox *combo)
@@ -92,7 +92,7 @@ void TagWidget::updateDict(const TQString &attr, TQLineEdit *line )
     delete s;
   }
   else
-    dict->replace(attr, s);
+    dict->tqreplace(attr, s);
 }
 
 void TagWidget::updateDict(const TQString &attr, TQSpinBox *spin )
@@ -104,7 +104,7 @@ void TagWidget::updateDict(const TQString &attr, TQSpinBox *spin )
     delete s;
   } 
   else
-    dict->replace(attr, s);
+    dict->tqreplace(attr, s);
 }
 
 void TagWidget::updateDict(const TQString &attr, TQCheckBox *check )
@@ -113,7 +113,7 @@ void TagWidget::updateDict(const TQString &attr, TQCheckBox *check )
     dict->remove(attr);
   else
   {
-    if (!dict->find(attr))
+    if (!dict->tqfind(attr))
       dict->insert(attr, new TQString(""));
   }
 }
diff --git a/quanta/dialogs/tagdialogs/tagwidget.h b/quanta/dialogs/tagdialogs/tagwidget.h
index b73c6782..38f67877 100644
--- a/quanta/dialogs/tagdialogs/tagwidget.h
+++ b/quanta/dialogs/tagdialogs/tagwidget.h
@@ -33,7 +33,7 @@ class KURL;
 
 class TagWidget {
 public:
-  TagWidget(TQObject *parent=0, const char *name=0);
+  TagWidget(TQObject *tqparent=0, const char *name=0);
   virtual ~TagWidget();
 
   virtual void readAttributes(TQDict<TQString> *) {};
diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp
index 5c07b341..41388efc 100644
--- a/quanta/dialogs/tagdialogs/tagxml.cpp
+++ b/quanta/dialogs/tagdialogs/tagxml.cpp
@@ -29,14 +29,14 @@
 
 #include "styleeditor.h"
 
-Tagxml::Tagxml( TQDomNode &d, QTag *dtdTag, TQWidget *parent, const char *name)
-    :TQWidget(parent,name), TagWidget(parent,name), doc(d)
+Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, TQWidget *tqparent, const char *name)
+    :TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name), doc(d)
 {
     initialize(d, dtdTag);
 }
 
-Tagxml::Tagxml( TQDomNode &d, QTag *dtdTag, const TQString& selection, TQWidget *parent, const char *name)
-    : TQWidget(parent,name), TagWidget(parent,name), doc(d), m_selection(selection)
+Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget *tqparent, const char *name)
+    : TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name), doc(d), m_selection(selection)
 {
     initialize(d, dtdTag);
 }
@@ -45,9 +45,9 @@ Tagxml::~Tagxml()
 {
 }
 
-void Tagxml::initialize(TQDomNode &d, QTag *dtdTag)
+void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag)
 {
-    m_dtd = dtdTag->parentDTD;
+    m_dtd = dtdTag->tqparentDTD;
     m_dtdTag = dtdTag;
     TQGridLayout *grid = new TQGridLayout( this );
     grid->setSpacing( 13 );
@@ -56,7 +56,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag)
 //parse the tag XML file, in order to build up the dialog
     for ( TQDomNode n = d.firstChild(); !n.isNull(); n = n.nextSibling() )
     {
-        TQDomNode location = findChild(n,"location");
+        TQDomNode location = tqfindChild(n,"location");
         if ( location.isNull() )
             continue;
 
@@ -69,7 +69,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag)
         int colspan = el.attribute("colspan","1").toInt()-1;
         int rowspan = el.attribute("rowspan","1").toInt()-1;
 
-        location = findChild(n,"textlocation");
+        location = tqfindChild(n,"textlocation");
         el = location.toElement();
         int textrow = el.attribute("row","0").toInt();
         int textcol = el.attribute("col","0").toInt();
@@ -79,7 +79,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag)
      // qDebug("%s col:%d row:%d cs:%d, rs:%d", n.nodeName().data(), col,row,colspan,rowspan );
 
         TQString tip;
-        TQDomNode tooltip = findChild( n ,"tooltip" );
+        TQDomNode tooltip = tqfindChild( n ,"tooltip" );
         if ( !tooltip.isNull() ) {
             if ( tooltip.firstChild().isText() ) {
                 TQDomText text = tooltip.firstChild().toText();
@@ -87,7 +87,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag)
             }
         }
         TQString whatsThis;
-        TQDomNode what = findChild( n ,"whatsthis" );
+        TQDomNode what = tqfindChild( n ,"whatsthis" );
         if ( !what.isNull() ) {
             if ( what.firstChild().isText() ) {
                 TQDomText text = what.firstChild().toText();
@@ -98,7 +98,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag)
         if ( n.nodeName() == "label" ) //a static label
         {
             TQLabel *label = new TQLabel(this);
-            TQDomElement ltext = findChild(n,"text").toElement();
+            TQDomElement ltext = tqfindChild(n,"text").toElement();
             if ( !ltext.isNull() )
                 label->setText( ltext.text().isEmpty() ? TQString("") : (ltext.text()+":") );
 
@@ -116,7 +116,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag)
             TQDomElement el(n.toElement());
             TQString type = el.attribute("type","input");
 
-            TQDomElement ltext = findChild(n,"text").toElement();
+            TQDomElement ltext = tqfindChild(n,"text").toElement();
             if ( !ltext.isNull() && (type != "check") ) //if there is a text label for the attribute
             {
                 TQLabel *label = new TQLabel(this);
@@ -152,7 +152,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag)
                 TQCheckBox *w = new TQCheckBox(this);
                 grid->addMultiCellWidget( w, row, row+rowspan, col,  col+colspan );
 
-                TQDomElement ltext = findChild(n,"text").toElement();
+                TQDomElement ltext = tqfindChild(n,"text").toElement();
                 if ( !ltext.isNull() )
                     w->setText( ltext.text() );
                 if ( !tip.isNull() )
@@ -270,10 +270,10 @@ void Tagxml::readAttributes( TQDict<TQString> *d )
         {
           if (m_dtd->booleanAttributes == "simple")
           {
-            d->replace(name, new TQString("") );
+            d->tqreplace(name, new TQString("") );
           } else
           {
-            d->replace(name, new TQString(m_dtd->booleanTrue)); //it seems that browsers don't like <input disabled="false">, so if a checkbox is false, don't put in the tag at all
+            d->tqreplace(name, new TQString(m_dtd->booleanTrue)); //it seems that browsers don't like <input disabled="false">, so if a checkbox is false, don't put in the tag at all
           }
         }  
         else  
@@ -283,16 +283,16 @@ void Tagxml::readAttributes( TQDict<TQString> *d )
 /*        } else
         {
           value = (value == "checked")?m_dtd->booleanTrue:m_dtd->booleanFalse;
-          d->replace(name, new TQString(value));
+          d->tqreplace(name, new TQString(value));
         } */
       } else
       if (dynamic_cast<Attr_file *>(attr))
       {
 //        value = KURL::encode_string(value);
-        d->replace(name, new TQString(value));
+        d->tqreplace(name, new TQString(value));
       } else {
-        value.replace(TQRegExp("&(?!amp;)"), "&amp;");
-        d->replace(name, new TQString(value) );
+        value.tqreplace(TQRegExp("&(?!amp;)"), "&amp;");
+        d->tqreplace(name, new TQString(value) );
       }
     }
 
@@ -313,9 +313,9 @@ void Tagxml::writeAttributes( TQDict<TQString> *d )
 
         name = attr->attrName();
 
-        TQString *v = d->find(name);
+        TQString *v = d->tqfind(name);
         if ( v ) {
-            v->replace("&amp;","&");
+            v->tqreplace("&amp;","&");
             if ( dynamic_cast<Attr_check *>(attr) ) // checkbox
                 value = "checked";
             else
diff --git a/quanta/dialogs/tagdialogs/tagxml.h b/quanta/dialogs/tagdialogs/tagxml.h
index 780b6b91..c08853a0 100644
--- a/quanta/dialogs/tagdialogs/tagxml.h
+++ b/quanta/dialogs/tagdialogs/tagxml.h
@@ -28,10 +28,11 @@
 
 class Tagxml : public TQWidget, TagWidget {
   Q_OBJECT
+  TQ_OBJECT
   public:
     /** construtor */
-    Tagxml(TQDomNode &d, QTag *dtdTag, TQWidget* parent=0, const char *name=0);
-    Tagxml(TQDomNode &d, QTag *dtdTag, const TQString& selection, TQWidget* parent=0, const char *name=0);
+    Tagxml(TQDomNode &d, TQTag *dtdTag, TQWidget* tqparent=0, const char *name=0);
+    Tagxml(TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget* tqparent=0, const char *name=0);
     /** destructor */
     ~Tagxml();
 
@@ -42,12 +43,12 @@ class Tagxml : public TQWidget, TagWidget {
     void focusToFirstItem();
 
   private:
-    void initialize(TQDomNode &d, QTag *dtdTag);
+    void initialize(TQDomNode &d, TQTag *dtdTag);
       
     TQDomNode doc;
     const DTDStruct *m_dtd;
     TQWidget *m_firstItem;
-    QTag *m_dtdTag;
+    TQTag *m_dtdTag;
     TQString m_selection;
 };
 
diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp
index 48ebb7fd..b666f7b6 100644
--- a/quanta/messages/annotationoutput.cpp
+++ b/quanta/messages/annotationoutput.cpp
@@ -35,8 +35,8 @@
 #include "quantacommon.h"
 #include "viewmanager.h"
 
-AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name)
- : KTabWidget(parent, name)
+AnnotationOutput::AnnotationOutput(TQWidget *tqparent, const char *name)
+ : KTabWidget(tqparent, name)
 {
   m_currentFileAnnotations = new MessageOutput(this);
   addTab(m_currentFileAnnotations, i18n("Current File"));
@@ -81,11 +81,11 @@ void AnnotationOutput::tabChanged(TQWidget *w)
   readAnnotations();
 }
 
-void AnnotationOutput::insertAnnotation(uint line, const TQString& fileName, const QPair<TQString, TQString>& annotation)
+void AnnotationOutput::insertAnnotation(uint line, const TQString& fileName, const TQPair<TQString, TQString>& annotation)
 {
   line++;
-  TQString s = i18n("Line %1: %2").arg(line).arg(annotation.first);
-  s.replace('\n', ' ');
+  TQString s = i18n("Line %1: %2").tqarg(line).tqarg(annotation.first);
+  s.tqreplace('\n', ' ');
   m_currentFileAnnotations->showMessage(line, 1, fileName, s);
 }
 
@@ -147,15 +147,15 @@ void AnnotationOutput::readAnnotations()
     TQString fileName = el.attribute("url");
     KURL u = baseURL;
     QuantaCommon::setUrl(u, fileName);
-    u = QExtFileInfo::toAbsolute(u, baseURL);
-    if (Project::ref()->contains(u))
+    u = TQExtFileInfo::toAbsolute(u, baseURL);
+    if (Project::ref()->tqcontains(u))
     {
       bool ok;
       int line = el.attribute("line").toInt(&ok, 10);
       TQString text = el.attribute("text");
       TQString receiver = el.attribute("receiver");
-      text.replace('\n',' ');
-      TQString lineText = TQString("%1").arg(line);
+      text.tqreplace('\n',' ');
+      TQString lineText = TQString("%1").tqarg(line);
       if (lineText.length() < 20)
       {
         TQString s;
@@ -170,12 +170,12 @@ void AnnotationOutput::readAnnotations()
         m_fileNames[fileIt] = u.url();
       }
       KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText);
-      if (openedItems.contains(fileName))
+      if (openedItems.tqcontains(fileName))
         fileIt->setOpen(true);
       m_fileNames[it] = u.url();
       m_lines[it] = line;
    
-      if (!yourself.isEmpty() && (receiver == yourself || roles.contains(receiver)))
+      if (!yourself.isEmpty() && (receiver == yourself || roles.tqcontains(receiver)))
       {
         m_yourAnnotationsNum++;
         KListViewItem *fileIt = m_yourFileItems[fileName];
@@ -186,7 +186,7 @@ void AnnotationOutput::readAnnotations()
           m_yourFileNames[fileIt] = u.url();
         }
         KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText);
-        if (yourOpenedItems.contains(fileName))
+        if (yourOpenedItems.tqcontains(fileName))
           fileIt->setOpen(true);
         m_yourFileNames[it] = u.url();
         m_yourLines[it] = line;
@@ -198,14 +198,14 @@ void AnnotationOutput::readAnnotations()
   }
   if (m_yourAnnotationsNum > 0)
   {
-    setTabLabel(m_yourAnnotations, i18n("For You: %1").arg(m_yourAnnotationsNum));
+    setTabLabel(m_yourAnnotations, i18n("For You: %1").tqarg(m_yourAnnotationsNum));
   } else
   {
     setTabLabel(m_yourAnnotations, i18n("For You"));
   }
 }
 
-void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<uint, QPair<TQString, TQString> > &a_annotations)
+void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<uint, TQPair<TQString, TQString> > &a_annotations)
 {
   m_annotatedFileItems.clear();
   m_fileNames.clear();
@@ -215,7 +215,7 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<ui
   m_yourLines.clear();
 
   bool modified = false;
-  TQMap<uint, QPair<TQString, TQString> > annotations = a_annotations;
+  TQMap<uint, TQPair<TQString, TQString> > annotations = a_annotations;
   TQDomDocument *dom = Project::ref()->dom();
   TQDomElement annotationElement = dom->firstChild().firstChild().namedItem("annotations").toElement();
   if (annotationElement.isNull())
@@ -234,16 +234,16 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<ui
       TQString text = el.attribute("text");
       bool ok;
       int line = el.attribute("line").toInt(&ok, 10);
-      if (!annotations.contains(line) || (annotations[line].first != text))
+      if (!annotations.tqcontains(line) || (annotations[line].first != text))
       {
-        n.parentNode().removeChild(n);
+        n.tqparentNode().removeChild(n);
         modified = true;
       } else
         annotations.remove(line);
     }
     n = n2;
   }
-  for (TQMap<uint, QPair<TQString, TQString> >::ConstIterator it = annotations.constBegin(); it != annotations.constEnd(); ++it)
+  for (TQMap<uint, TQPair<TQString, TQString> >::ConstIterator it = annotations.constBegin(); it != annotations.constEnd(); ++it)
   {
     TQDomElement el = dom->createElement("annotation");
     el.setAttribute("url", fileName);
@@ -261,7 +261,7 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<ui
 
 void AnnotationOutput::allAnnotationsItemExecuted(TQListViewItem *item)
 {
-  if (dynamic_cast<KListView*> (item->parent()) != m_allAnnotations)
+  if (dynamic_cast<KListView*> (item->tqparent()) != m_allAnnotations)
   {
     emit clicked(m_fileNames[item], m_lines[item], 0);
   } else
@@ -270,7 +270,7 @@ void AnnotationOutput::allAnnotationsItemExecuted(TQListViewItem *item)
 
 void AnnotationOutput::yourAnnotationsItemExecuted(TQListViewItem *item)
 {
-  if (dynamic_cast<KListView*> (item->parent()) != m_yourAnnotations)
+  if (dynamic_cast<KListView*> (item->tqparent()) != m_yourAnnotations)
   {
     emit clicked(m_yourFileNames[item], m_yourLines[item], 0);
   } else
@@ -299,7 +299,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url)
     TQFile f(url.path());
     if (f.open(IO_ReadOnly))
     {
-      TQMap<uint, QPair<TQString, TQString> > annotations;
+      TQMap<uint, TQPair<TQString, TQString> > annotations;
       uint i = 0;
       TQTextStream stream(&f);
       stream.setEncoding(TQTextStream::UnicodeUTF8);
@@ -307,7 +307,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url)
       while (!stream.atEnd())
       {
         line = stream.readLine();
-        int pos = line.find("@annotation");
+        int pos = line.tqfind("@annotation");
         if (pos != -1)
         {
           TQString receiver;
@@ -315,7 +315,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url)
           if (line[pos] == '(')
           {
             int p = pos;
-            pos = line.find(')');
+            pos = line.tqfind(')');
             if (pos != -1)
             {
               receiver = line.mid(p + 1, pos - p - 1);
@@ -323,15 +323,15 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url)
             }
           } else
             pos++;
-          int pos2 = line.find(rx);
-          annotations.insert(i, qMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver));
+          int pos2 = line.tqfind(rx);
+          annotations.insert(i, tqMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver));
         }
         ++i;
       }
       f.close();
       if (!annotations.isEmpty())
       {
-        KURL u = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL());
+        KURL u = TQExtFileInfo::toRelative(url, Project::ref()->projectBaseURL());
         writeAnnotations(QuantaCommon::qUrl(u), annotations);
       }
     }
diff --git a/quanta/messages/annotationoutput.h b/quanta/messages/annotationoutput.h
index 51c08ead..ac87d705 100644
--- a/quanta/messages/annotationoutput.h
+++ b/quanta/messages/annotationoutput.h
@@ -37,13 +37,14 @@ enum AnnotationScope
 class AnnotationOutput : public KTabWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    AnnotationOutput(TQWidget *parent = 0, const char *name = 0);
+    AnnotationOutput(TQWidget *tqparent = 0, const char *name = 0);
 
     ~AnnotationOutput();
     MessageOutput *currentFileAnnotations() const {return m_currentFileAnnotations;}
     KListView *allAnnotations() const {return m_allAnnotations;}
-    void writeAnnotations(const TQString &fileName, const TQMap<uint, QPair<TQString, TQString> > &annotations);
+    void writeAnnotations(const TQString &fileName, const TQMap<uint, TQPair<TQString, TQString> > &annotations);
 
 public slots:
     /**
@@ -52,7 +53,7 @@ public slots:
     void updateAnnotations();
     void readAnnotations(); 
     void clearAnnotations();
-    void insertAnnotation(uint line, const TQString& fileName, const QPair<TQString, TQString>& annotation);
+    void insertAnnotation(uint line, const TQString& fileName, const TQPair<TQString, TQString>& annotation);
 
 private slots:
     void tabChanged(TQWidget *w);
diff --git a/quanta/messages/messageitem.cpp b/quanta/messages/messageitem.cpp
index dc1c7ad8..ab8c1ef1 100644
--- a/quanta/messages/messageitem.cpp
+++ b/quanta/messages/messageitem.cpp
@@ -31,7 +31,7 @@ int MessageItem::line()
   }
   else {  // try to find first number in text
     TQString s = text();
-    int pos = s.find( TQRegExp("[0-9]"));
+    int pos = s.tqfind( TQRegExp("[0-9]"));
     if ( pos == -1 )
       return lineNumber;
     int pos2 = pos;
@@ -70,10 +70,10 @@ TQString MessageItem::fileName()
   {
     TQString fname;
     TQString s = text();
-    int pos = s.find(i18n("File: "));
+    int pos = s.tqfind(i18n("File: "));
     if (pos != -1)
     {
-      int pos2 = s.find(i18n(", "), pos);
+      int pos2 = s.tqfind(i18n(", "), pos);
       if (pos2 != -1)
         fname = s.mid(pos, pos2-pos);
       else
diff --git a/quanta/messages/messageitem.h b/quanta/messages/messageitem.h
index 64894e25..82653fab 100644
--- a/quanta/messages/messageitem.h
+++ b/quanta/messages/messageitem.h
@@ -28,7 +28,7 @@
 class MessageItem : public TQListBoxText {
   public:
 
-    MessageItem( TQListBox *listbox, const TQString &text = TQString::null, int line = -1, int column = -1, const TQString &fname = TQString::null);
+    MessageItem( TQListBox *listbox, const TQString &text = TQString(), int line = -1, int column = -1, const TQString &fname = TQString());
 
     /** return line number for file , associated with this message */
     int line();
diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp
index de4627ca..666d98d3 100644
--- a/quanta/messages/messageoutput.cpp
+++ b/quanta/messages/messageoutput.cpp
@@ -24,7 +24,7 @@
 #include <kpopupmenu.h>
 #include <kiconloader.h>
 
-// Qt includes
+// TQt includes
 #include <tqclipboard.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
@@ -32,8 +32,8 @@
 #include "messageoutput.h"
 #include "messageitem.h"
 
-MessageOutput::MessageOutput(TQWidget *parent, const char *name )
-  : TQListBox(parent,name)
+MessageOutput::MessageOutput(TQWidget *tqparent, const char *name )
+  : TQListBox(tqparent,name)
 {
   m_maxItems = 2000;
 
@@ -41,7 +41,7 @@ MessageOutput::MessageOutput(TQWidget *parent, const char *name )
   pal.setColor(TQColorGroup::HighlightedText, pal.color(TQPalette::Normal, TQColorGroup::Text));
   pal.setColor(TQColorGroup::Highlight,       pal.color(TQPalette::Normal, TQColorGroup::Mid));
   setPalette(pal);
-  setFocusPolicy( NoFocus );
+  setFocusPolicy( TQ_NoFocus );
 
   m_popupMenu = new KPopupMenu(this);
   connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
@@ -85,7 +85,7 @@ void MessageOutput::showMessage(int line, int col, const TQString &fileName, con
   int endPos;
   if ( !count() || (!append && !text(count()-1).stripWhiteSpace().isEmpty()) )
     it = insertItem("");
-  while ( ( endPos = message.find('\n') ) != -1 ) {
+  while ( ( endPos = message.tqfind('\n') ) != -1 ) {
     if (it)
     {
       it->setLine(line);
@@ -146,7 +146,7 @@ TQString MessageOutput::content()
 
 void MessageOutput::copyContent()
 {
-  kapp->clipboard()->setText(content(), QClipboard::Clipboard);
+  kapp->tqclipboard()->setText(content(), TQClipboard::Clipboard);
 }
 
 void MessageOutput::saveContent()
@@ -159,13 +159,13 @@ void MessageOutput::saveContent()
   TQFileInfo fileinfo(url.path());
   if (fileinfo.exists() && KMessageBox::warningContinueCancel(0,
       i18n("<qt>File<br><b>%1</b><br>already exists. Overwrite it?</qt>")
-      .arg(url.path()), TQString::null, i18n("Overwrite")) == KMessageBox::Cancel)
+      .tqarg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel)
     return;
 
   TQFile file(url.path());
   if (!file.open(IO_WriteOnly)) {
      KMessageBox::error(0, i18n("<qt>Cannot save log file<br><b>%1</b></qt>")
-         .arg(url.url()));
+         .tqarg(url.url()));
      return;
    }
 
diff --git a/quanta/messages/messageoutput.h b/quanta/messages/messageoutput.h
index 125b85e2..b90198f7 100644
--- a/quanta/messages/messageoutput.h
+++ b/quanta/messages/messageoutput.h
@@ -32,8 +32,9 @@ weblint output
 
 class MessageOutput : public TQListBox  {
    Q_OBJECT
+  TQ_OBJECT
 public:
-  MessageOutput(TQWidget *parent=0, const char *name=0);
+  MessageOutput(TQWidget *tqparent=0, const char *name=0);
   ~MessageOutput();
   // Return whole content as a single string with EOLs
   TQString content();
diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp
index 964c35fb..c0942441 100644
--- a/quanta/parsers/dtd/dtd.cpp
+++ b/quanta/parsers/dtd/dtd.cpp
@@ -30,8 +30,8 @@
 #include <ktempfile.h>
 
 #include "dtd.h"
-#include "../quantacommon.h"
-#include "../qextfileinfo.h"
+#include "../tquantacommon.h"
+#include "../tqextfileinfo.h"
 
 
 DTD::DTD(const KURL &dtdURL, const TQString &dtepDir)
@@ -51,7 +51,7 @@ TQStringList DTD::getTags()
 
 AttributeList* DTD::getTagAttributes(TQString tag)
 {
-  return tagAttributes.find(tag);
+  return tagAttributes.tqfind(tag);
 }
 
 
@@ -84,7 +84,7 @@ void DTD::writeTagFiles()
   TQString dirName = m_dtepDir;
   KURL u;
   u.setPath(dirName);
-  if (!QExtFileInfo::createDir(dirName)) {
+  if (!TQExtFileInfo::createDir(dirName)) {
     QuantaCommon::dirCreationError(0, u);
     return;
   }
@@ -121,10 +121,10 @@ void DTD::writeTagFiles()
 
 bool DTD::parseDTD(const KURL &url)
 {
- TQString fileName = TQString::null;
+ TQString fileName = TQString();
  if (!KIO::NetAccess::download(url, fileName))
  {
-   KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
+   KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
    return false;
  }
   TQFile file(fileName);
@@ -183,7 +183,7 @@ bool DTD::parseDTD(const KURL &url)
         parseDTD(entityURL);
       } else
       {
-        kdDebug(24000) << TQString("Unknown tag: [%1]").arg(line) << endl;
+        kdDebug(24000) << TQString("Unknown tag: [%1]").tqarg(line) << endl;
       }
 
       if (it != lines.end()) ++it;
@@ -195,14 +195,14 @@ void DTD::parseDTDEntity(TQString line) {
   TQString name;
   TQString *value;
 
-  line.replace("\\end", " ");
+  line.tqreplace("\\end", " ");
   name = line.mid(11);
-  int firstSpace = name.find(' ');
+  int firstSpace = name.tqfind(' ');
   name = name.remove(firstSpace, name.length()-firstSpace);
 
   value = new TQString(line.mid(11+firstSpace));
-  value->remove(0, value->find("\"")+1);
-  value->remove(value->findRev("\""), value->length());
+  value->remove(0, value->tqfind("\"")+1);
+  value->remove(value->tqfindRev("\""), value->length());
 
   parseDTDReplace(value);
   stripSpaces(value);
@@ -217,14 +217,14 @@ void DTD::parseDTDElement(const TQString &l) {
   TQString *value;
 
   TQString line = l;
-  line.replace("\\end", " ");
+  line.tqreplace("\\end", " ");
   name = line.mid(10);
-  int firstSpace = name.find(' ');
+  int firstSpace = name.tqfind(' ');
   name.remove(firstSpace, name.length()-firstSpace);
 
   value = new TQString(line.mid(10+firstSpace));
-  //value->remove(0, value->find("\"")+1);
-  value->remove(value->find(">"), 10000);
+  //value->remove(0, value->tqfind("\"")+1);
+  value->remove(value->tqfind(">"), 10000);
 
   parseDTDReplace(&name);
   parseDTDReplace(value);
@@ -254,14 +254,14 @@ void DTD::parseDTDAttlist(const TQString &l) {
   TQString *value;
 
   TQString line = l;
-  line.replace("\\end", " ");
+  line.tqreplace("\\end", " ");
   name = line.mid(10);
-  int firstSpace = name.find(' ');
+  int firstSpace = name.tqfind(' ');
   name.remove(firstSpace, name.length()-firstSpace);
 
   value = new TQString(line.mid(10+firstSpace));
-  //value->remove(0, value->find("\"")+1);
-  value->remove(value->find(">"), 10000);
+  //value->remove(0, value->tqfind("\"")+1);
+  value->remove(value->tqfind(">"), 10000);
 
   parseDTDReplace(&name);
   parseDTDReplace(value);
@@ -362,51 +362,51 @@ void DTD::parseTagAttributeValues(const TQString &name, TQString *value) {
 
 void DTD::parseDTDReplace(TQString *value) {
   int begin, end;
-  begin = value->find("%");
-  end = value->find(";");
+  begin = value->tqfind("%");
+  end = value->tqfind(";");
   while (begin != -1 && end != -1) {
     TQString replaceText = value->mid(begin+1, end-begin-1);
-    TQString *replaceValue = entities.find(replaceText);
+    TQString *replaceValue = entities.tqfind(replaceText);
 
     if (replaceValue != 0L) {
-      value->replace(begin, end-begin+1, *replaceValue);
+      value->tqreplace(begin, end-begin+1, *replaceValue);
     } else {
       kdDebug(24000) << "Can not find entity: " << replaceText << endl;
       return;
     }
 
-    begin = value->find("%");
-    end = value->find(";");
+    begin = value->tqfind("%");
+    end = value->tqfind(";");
   }
 }
 
 void DTD::stripSpaces(TQString *value) {
   int index=-1;
-  while ( (index=value->find(' ',++index)) != -1 ) {
-    if ( value->findRev('(',index) != -1 && value->find(')',index) != -1)
+  while ( (index=value->tqfind(' ',++index)) != -1 ) {
+    if ( value->tqfindRev('(',index) != -1 && value->tqfind(')',index) != -1)
       value->remove(index,1);
   }
 }
 
 void DTD::removeComments(TQString &value) {
   int begin, end;
-  begin = value.find("<!--");
-  end = value.find("-->",begin+2);
+  begin = value.tqfind("<!--");
+  end = value.tqfind("-->",begin+2);
   while (begin != -1 && end != -1) {
     value.remove(begin, end-begin+3);
-    begin = value.find("<!--");
-    end = value.find("-->",begin+2);
+    begin = value.tqfind("<!--");
+    end = value.tqfind("-->",begin+2);
   }
 
-  begin = value.find("--");
-  end = value.find("--",begin+2);
+  begin = value.tqfind("--");
+  end = value.tqfind("--",begin+2);
   while (begin != -1 && end != -1) {
     value.remove(begin, end-begin+2);
-    begin = value.find("--");
-    end = value.find("--",begin+2);
+    begin = value.tqfind("--");
+    end = value.tqfind("--",begin+2);
   }
 
-  value.replace(TQRegExp("<!>"), "");
+  value.tqreplace(TQRegExp("<!>"), "");
 }
 
 bool DTD::parseDTD()
diff --git a/quanta/parsers/dtd/dtd.h b/quanta/parsers/dtd/dtd.h
index cc0cf238..723ee4b6 100644
--- a/quanta/parsers/dtd/dtd.h
+++ b/quanta/parsers/dtd/dtd.h
@@ -22,7 +22,7 @@
 #include <tqdict.h>
 
 //app includes
-#include "qtag.h"
+#include "tqtag.h"
 
 class KURL;
 
diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp
index 0d623978..577d2734 100644
--- a/quanta/parsers/dtd/dtdparser.cpp
+++ b/quanta/parsers/dtd/dtdparser.cpp
@@ -72,10 +72,10 @@ DTDParser::~DTDParser()
 bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
 {
   bool fineTune = false;
-  TQString fileName = TQString::null;
+  TQString fileName = TQString();
   if (!KIO::NetAccess::download(m_dtdURL, fileName, 0))
   {
-    KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").arg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol)));
+    KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").tqarg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol)));
     return false;
   }
   DTD::dtd_ptr = xmlParseDTD(NULL, xmlCharStrndup(fileName.utf8(), fileName.utf8().length()));
@@ -86,23 +86,23 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
     xmlErrorPtr errorPtr = xmlGetLastError();
     if (errorPtr != NULL)
     {
-      TQString s = TQString::fromLatin1(errorPtr->message);
+      TQString s = TQString::tqfromLatin1(errorPtr->message);
       if (!s.isEmpty())
         errorStr = s;
-      s = TQString::fromLatin1(errorPtr->str1);
+      s = TQString::tqfromLatin1(errorPtr->str1);
       if (!s.isEmpty())
         errorStr += "<br>" + s;
-      s = TQString::fromLatin1(errorPtr->str2);
+      s = TQString::tqfromLatin1(errorPtr->str2);
       if (!s.isEmpty())
         errorStr += "<br>" + s;
-      s = TQString::fromLatin1(errorPtr->str2);
+      s = TQString::tqfromLatin1(errorPtr->str2);
       if (!s.isEmpty())
         errorStr += "<br>" + s;
-      errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2);
+      errorStr += TQString("(%1, %2)").tqarg(errorPtr->line).tqarg(errorPtr->int2);
       xmlResetError(errorPtr);
     }
 #endif
-    KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").arg(errorStr));
+    KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").tqarg(errorStr));
     return false;
   }
   if (targetDir.isEmpty())
@@ -123,8 +123,8 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
     m_name = w.dtdName->text();
     m_nickName = w.nickName->text();
     m_doctype = w.doctype->text();
-    m_doctype.replace(TQRegExp("<!doctype", false), "");
-    m_doctype = m_doctype.left(m_doctype.findRev(">"));
+    m_doctype.tqreplace(TQRegExp("<!doctype", false), "");
+    m_doctype = m_doctype.left(m_doctype.tqfindRev(">"));
     m_dtdURLLine = w.dtdURL->text();
     m_defaultExtension = w.defaultExtension->text();
     m_caseSensitive = w.caseSensitive->isChecked();
@@ -134,7 +134,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
     DTD::dirName = targetDir;
   KURL u;
   u.setPath(DTD::dirName);
-  if (!QExtFileInfo::createDir(u, 0L)) {
+  if (!TQExtFileInfo::createDir(u, 0L)) {
     QuantaCommon::dirCreationError(0L, u);
     return false;
   }
@@ -144,7 +144,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
     TQFile file( DTD::dirName + "entities.tag" );
     if ( file.open( IO_WriteOnly ) )
     {
-      DTD::entityStream.setDevice(&file);
+      DTD::entityStream.setDevice(TQT_TQIODEVICE(&file));
       DTD::entityStream.setEncoding(TQTextStream::UnicodeUTF8);
       DTD::entityStream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
       DTD::entityStream << "<!DOCTYPE TAGS>" << endl
@@ -154,8 +154,8 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
       file.close();
     } else
     {
-      KMessageBox::error(0L, i18n("<qt>Cannot create the <br><b>%1</b> file.<br>Check that you have write permission in the parent folder.</qt>")
-                             .arg(file.name()));
+      KMessageBox::error(0L, i18n("<qt>Cannot create the <br><b>%1</b> file.<br>Check that you have write permission in the tqparent folder.</qt>")
+                             .tqarg(file.name()));
       return false;
     }
   }
@@ -235,7 +235,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf)
           attr->name = TQString((const char*)at_ptr->name);
           switch (at_ptr->def) {
             case 1: {attr->status = "optional"; break;} //NONE
-            case 2: {attr->status = "required"; break;} //REQUIRED
+            case 2: {attr->status = "required"; break;} //RETQUIRED
             case 3: {attr->status = "implied"; break;} //IMPLIED
             case 4: {attr->status = "fixed"; break;} //FIXED
           }
@@ -265,7 +265,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf)
 
         if (childNum > 0)
         {
-          stream << "<children>" << endl;
+          stream << "<tqchildren>" << endl;
           for( int i = 0; i < childNum; i++ )
           {
             stream << "  <child name=\"" << TQString((const char*)list_ptr[i]) << "\"";
@@ -293,14 +293,14 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf)
             stream << " />" << endl;
           }
 
-          stream << "</children>" << endl;
+          stream << "</tqchildren>" << endl;
           stream << endl;
         }
         /*
         xmlElementContentPtr content_ptr = el_ptr->content;
         if (content_ptr)
         {
-          stream << "<children>" << endl;
+          stream << "<tqchildren>" << endl;
           while (content_ptr)
           {
             if (!TQString((const char*)content_ptr->name).isEmpty())
@@ -325,17 +325,17 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf)
             {
               if (content_ptr == el_ptr->content)
                 break;
-              if (content_ptr->parent)
+              if (content_ptr->tqparent)
               {
-                if (content_ptr == content_ptr->parent->c1)
+                if (content_ptr == content_ptr->tqparent->c1)
                     content_ptr->c1 = 0L;
                 else
                     content_ptr->c2 = 0L;
               }
-              content_ptr = content_ptr->parent;
+              content_ptr = content_ptr->tqparent;
             }
           }
-          stream << "</children>" << endl;
+          stream << "</tqchildren>" << endl;
         } */
       }
       stream << "</tag>" << endl
diff --git a/quanta/parsers/dtd/dtdparser.h b/quanta/parsers/dtd/dtdparser.h
index 800fa445..b9948ea6 100644
--- a/quanta/parsers/dtd/dtdparser.h
+++ b/quanta/parsers/dtd/dtdparser.h
@@ -35,7 +35,7 @@ public:
    * @param entitiesOnly if true, only the entities are extracted from the DTD into the entities.tag file 
    * @return true on success, false if some error happened
    */
-  bool parse(const TQString &targetDir = TQString::null, bool entitiesOnly = false);
+  bool parse(const TQString &targetDir = TQString(), bool entitiesOnly = false);
 
 protected:
   void writeDescriptionRC();
diff --git a/quanta/parsers/dtd/dtepcreationdlg.ui b/quanta/parsers/dtd/dtepcreationdlg.ui
index 3247c7ae..adaeabc4 100644
--- a/quanta/parsers/dtd/dtepcreationdlg.ui
+++ b/quanta/parsers/dtd/dtepcreationdlg.ui
@@ -9,7 +9,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2003 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DTEPCreationDlg</cstring>
     </property>
@@ -21,7 +21,7 @@
             <height>285</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>500</width>
             <height>200</height>
@@ -37,17 +37,17 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLineEdit" row="2" column="1">
+        <widget class="TQLineEdit" row="2" column="1">
             <property name="name">
                 <cstring>nickName</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="4" column="1">
+        <widget class="TQLineEdit" row="4" column="1">
             <property name="name">
                 <cstring>dtdURL</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -55,7 +55,7 @@
                 <string>Name: </string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -63,7 +63,7 @@
                 <string>Nickname:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>textLabel3</cstring>
             </property>
@@ -71,22 +71,22 @@
                 <string>!DOCTYPE definition line:</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="0" column="1">
+        <widget class="TQLineEdit" row="0" column="1">
             <property name="name">
                 <cstring>directory</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="3" column="1">
+        <widget class="TQLineEdit" row="3" column="1">
             <property name="name">
                 <cstring>doctype</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="1">
+        <widget class="TQLineEdit" row="1" column="1">
             <property name="name">
                 <cstring>dtdName</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>textLabel5</cstring>
             </property>
@@ -94,7 +94,7 @@
                 <string>DTD URL:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel4</cstring>
             </property>
@@ -102,7 +102,7 @@
                 <string>Target directory name:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -110,12 +110,12 @@
                 <string>Default extension:</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="5" column="1">
+        <widget class="TQLineEdit" row="5" column="1">
             <property name="name">
                 <cstring>defaultExtension</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>caseSensitive</cstring>
             </property>
@@ -126,7 +126,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>fineTune</cstring>
             </property>
@@ -148,5 +148,5 @@
     <tabstop>defaultExtension</tabstop>
     <tabstop>caseSensitive</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/parsers/node.cpp b/quanta/parsers/node.cpp
index 219716e9..ef7599b8 100644
--- a/quanta/parsers/node.cpp
+++ b/quanta/parsers/node.cpp
@@ -33,9 +33,9 @@ int NN = 0; //for debugging purposes: count the Node objects
 
 GroupElementMapList globalGroupMap;
 
-Node::Node(Node *parent)
+Node::Node(Node *tqparent)
 {
-  this->parent = parent;
+  this->tqparent = tqparent;
   prev = next = child = 0L;
   tag = 0L;
   mainListItem = 0L;
@@ -48,7 +48,7 @@ Node::Node(Node *parent)
   m_leafNode = 0L;
   m_groupElements.clear();
   NN++;
-//   if (nodes.contains(this) == 0)
+//   if (nodes.tqcontains(this) == 0)
   nodes[this] = 1;
 //   else
 //   {
@@ -60,7 +60,7 @@ bool Node::deleteNode(Node *node)
 {
   if (!node)
     return true;
-  if (!nodes.contains(node))
+  if (!nodes.tqcontains(node))
   {     
     kdDebug(24000) << "Trying to delete a node with address " << node << " that was not allocated!" << endl; 
     return false;
@@ -71,7 +71,7 @@ bool Node::deleteNode(Node *node)
 
 Node::~Node()
 {
-//   if (!nodes.contains(this))
+//   if (!nodes.tqcontains(this))
 //   {     
 //     kdError(24000) << "No node with this address " << this << " was allocated!" << endl; 
 //     return;
@@ -89,8 +89,8 @@ Node::~Node()
   nodes.erase(this);
   if (prev && prev->next == this)
       prev->next = 0L;
-  if (parent && parent->child == this)
-      parent->child = 0L;
+  if (tqparent && tqparent->child == this)
+      tqparent->child = 0L;
   if (removeAll)
   {
     deleteNode(child);
@@ -101,8 +101,8 @@ Node::~Node()
   {
     if (next && next->prev == this)
       next->prev = 0L;
-    if (child && child->parent == this)
-      child->parent = 0L;
+    if (child && child->tqparent == this)
+      child->tqparent = 0L;
   }
 
   delete tag;
@@ -148,7 +148,7 @@ void Node::save(TQDomElement& element) const
     element.setAttribute("removeAll", removeAll); // bool
     element.setAttribute("insideSpecial", insideSpecial);             // bool
     element.setAttribute("specialInsideXml", specialInsideXml);             // bool
-    element.setAttribute("fileName", fileName);                         // QString
+    element.setAttribute("fileName", fileName);                         // TQString
 
 /*    TQString s_element;
     TQTextStream stream(&s_element, IO_WriteOnly);
@@ -174,13 +174,13 @@ bool Node::load(TQDomElement const& element)
             {
                 next = new Node(0);
                 next->prev = this;
-                next->parent = this->parent;
+                next->tqparent = this->tqparent;
                 next->load(e);
             }
             else if(e.tagName() == "nodeChild")
             {
                 child = new Node(0);
-                child->parent = this;
+                child->tqparent = this;
                 child->load(e);
             }
             else if(e.tagName() == "nodeClosing")
@@ -201,7 +201,7 @@ bool Node::load(TQDomElement const& element)
     removeAll = TQString(element.attribute("removeAll")).toInt(); // bool
     insideSpecial = TQString(element.attribute("insideSpecial")).toInt();    // bool
     specialInsideXml = TQString(element.attribute("specialInsideXml")).toInt();  // bool
-    fileName = element.attribute("fileName");                         // QString
+    fileName = element.attribute("fileName");                         // TQString
 
     //kafkaCommon::coutTree(this, 3);
 
@@ -225,14 +225,14 @@ Node *Node::nextSibling()
             Node *n = this;
             while (n)
             {
-                if (n->parent && n->parent->next)
+                if (n->tqparent && n->tqparent->next)
                 {
-                    result = n->parent->next;
+                    result = n->tqparent->next;
                     break;
                 }
                 else
                 {
-                    n = n->parent;
+                    n = n->tqparent;
                 }
             }
         }
@@ -257,7 +257,7 @@ Node *Node::previousSibling()
     }
     else
     {
-        result = parent;
+        result = tqparent;
     }
 
     return result;
@@ -272,14 +272,14 @@ Node *Node::nextNotChild()
         Node *n = this;
         while (n)
         {
-            if (n->parent && n->parent->next)
+            if (n->tqparent && n->tqparent->next)
             {
-                n = n->parent->next;
+                n = n->tqparent->next;
                 break;
             }
             else
             {
-                n = n->parent;
+                n = n->tqparent;
             }
         }
 
@@ -291,14 +291,14 @@ TQString Node::nodeName()
 {
     if(tag)
         return tag->name;
-    return TQString::null;
+    return TQString();
 }
 
 TQString Node::nodeValue()
 {
     if(tag)
         return tag->tagStr();
-    return TQString::null;
+    return TQString();
 }
 
 void Node::setNodeValue(const TQString &value)
@@ -358,15 +358,15 @@ Node *Node::SPrev()
     Node *node = prev;
     int bCol, bLine, eCol, eLine, col, line;
 
-    if(parent)
+    if(tqparent)
     {
-        parent->tag->beginPos(bLine, bCol);
-        parent->tag->endPos(eLine, eCol);
+        tqparent->tag->beginPos(bLine, bCol);
+        tqparent->tag->endPos(eLine, eCol);
     }
 
     while(node && node->tag->type != Tag::XmlTag && node->tag->type != Tag::Text)
     {
-        if (parent && node->tag->type == Tag::ScriptTag)
+        if (tqparent && node->tag->type == Tag::ScriptTag)
         {
             //Check if it is an embedded ScriptTag. If it is, continue.
             node->tag->beginPos(line, col);
@@ -384,7 +384,7 @@ Node *Node::SNext()
     Node *node = next;
     int bCol, bLine, eCol, eLine, col, line;
 
-    if(parent)
+    if(tqparent)
     {
         tag->beginPos(bLine, bCol);
         tag->endPos(eLine, eCol);
@@ -392,7 +392,7 @@ Node *Node::SNext()
 
     while(node && node->tag->type != Tag::XmlTag && node->tag->type != Tag::Text)
     {
-        if (parent && node->tag->type == Tag::ScriptTag)
+        if (tqparent && node->tag->type == Tag::ScriptTag)
         {
             //Check if it is an embedded ScriptTag. If it is, continue.
             node->tag->beginPos(line, col);
@@ -509,7 +509,7 @@ void Node::operator =(Node* node)
   (*this) = (*node);
   prev = 0L;
   next = 0L;
-  parent = 0L;
+  tqparent = 0L;
   child = 0L;
   mainListItem = 0L;
   m_groupElements.clear();
@@ -520,7 +520,7 @@ void Node::operator =(Node* node)
 
 void Node::detachNode()
 {
-  if (nodes.contains(this) == 0)
+  if (nodes.tqcontains(this) == 0)
   {
     kdError(24000) << "No node with this address " << this << " was allocated!" << endl; 
     return;
diff --git a/quanta/parsers/node.h b/quanta/parsers/node.h
index 4e3451af..ab8e6267 100644
--- a/quanta/parsers/node.h
+++ b/quanta/parsers/node.h
@@ -36,8 +36,8 @@ struct GroupElement{
     Node *node;
     /* The tag which point to the actual place in the node */
     Tag *tag;
-    /*The parent node indicating the beginning of a structure */
-    Node *parentNode;
+    /*The tqparent node indicating the beginning of a structure */
+    Node *tqparentNode;
     bool global;
     bool deleted;
     TQString type;
@@ -48,7 +48,7 @@ typedef TQValueList<GroupElement*> GroupElementList;
 typedef TQMap<TQString, GroupElementList> GroupElementMapList;
 
 /**
- * A Node is a basic unit of a Tree. It keeps track of his parent, his left neighbour, his right neighbour
+ * A Node is a basic unit of a Tree. It keeps track of his tqparent, his left neighbour, his right neighbour
  * and his first child.
  * It contains some functions to navigate through the tree, but some more are located at kafkacommon.h
  * (and should be moved here...)
@@ -61,7 +61,7 @@ typedef TQMap<TQString, GroupElementList> GroupElementMapList;
 class Node {
 
 public:
- Node( Node *parent );
+ Node( Node *tqparent );
  ~Node();
  
  /** 
@@ -73,7 +73,7 @@ public:
  static bool deleteNode(Node *node);
 
  /**
-  * Copy everything from node except prev, next, child, parent, listItem, group, groupTag, which are set to Null
+  * Copy everything from node except prev, next, child, tqparent, listItem, group, groupTag, which are set to Null
   * The groupElementsList is cleared.
   */
  void operator =(Node* node);
@@ -84,22 +84,22 @@ public:
 
  Node *next;
  Node *prev;
- Node *parent;
+ Node *tqparent;
  Node *child;
 
- /** Returns the child if available, else the next node, else the next node of the first parent which has one, else 0L.
+ /** Returns the child if available, else the next node, else the next node of the first tqparent which has one, else 0L.
        WARNING: it doesn't behave like DOM::Node::nextSibling() which give the next Node, or 0L if there is no next Node */
  Node *nextSibling();
  Node *previousSibling();
- /** Returns the next node, or the parent's next, if next doesn't exists,
-  or the granparent's next, if parent's next doesn't exists, etc. */
+ /** Returns the next node, or the tqparent's next, if next doesn't exists,
+  or the grantqparent's next, if tqparent's next doesn't exists, etc. */
  Node *nextNotChild();
 
 /** DOM like functions cf dom/dom_node.h */
  TQString nodeName();
  TQString nodeValue();
  void setNodeValue(const TQString &value);
- Node* parentNode() {return parent;}
+ Node* tqparentNode() {return tqparent;}
  Node* firstChild() {return child;}
  Node* lastChild();
  Node* DOMpreviousSibling() {return prev;}
@@ -113,7 +113,7 @@ public:
  /** Others functions. */
  // check if Node has node in its child subtree (and grand-child,...)
  bool hasForChild(Node *node);
- void setParent(Node *nodeParent) {parent = nodeParent;}
+ void setParent(Node *nodeParent) {tqparent = nodeParent;}
  //If Node is of type XmlTag or ScriptTag, return the corresponding XmlTagEnd if available
  Node *getClosingNode();
  //If Node is of type XmlTagEnd, return the corresponding XmlTag or ScriptTag if available
@@ -130,7 +130,7 @@ public:
  Node *lastChildNE();
 
 /**
- * The main problem manipulating the default links prev/next/parent/child is that we often want
+ * The main problem manipulating the default links prev/next/tqparent/child is that we often want
  * to manipulate only the "significant" Nodes e.g. XmlTag, Text, ScriptNode, like in a DOM::Node tree.
  * These functions, prefixed with "S" which stands for "simplified" or "significant", will only return
  * and manipulate XmlTag, Text and ScriptNode.
diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp
index 707d97b0..0a9441db 100644
--- a/quanta/parsers/parser.cpp
+++ b/quanta/parsers/parser.cpp
@@ -115,13 +115,13 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
   bool nodeFound = false;
   bool goUp;
   Node *rootNode = 0L;
-  Node *parentNode = a_node;
+  Node *tqparentNode = a_node;
   Node *currentNode = a_node;
   if (currentNode && (currentNode->tag->type != Tag::XmlTag ||
       currentNode->tag->single))
-      parentNode = currentNode->parent;
+      tqparentNode = currentNode->tqparent;
   Tag *tag = 0L;
-  QTag *qTag = 0L;
+  TQTag *qTag = 0L;
   textLine.append(write->text(startLine, startCol, startLine, write->editIf->lineLength(startLine)));
   if (line == endLine)
   {
@@ -137,21 +137,21 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
       nodeFound = false;
       goUp = false;
       //find the first "<" and the first special area start definition in this line
-      tagStartPos = textLine.find('<', col);
-      specialStartPos = specialAreaCount ? textLine.find(m_dtd->specialAreaStartRx, col): -1;
+      tagStartPos = textLine.tqfind('<', col);
+      specialStartPos = specialAreaCount ? textLine.tqfind(m_dtd->specialAreaStartRx, col): -1;
       //if the special area start definition is before the first "<" it means
       //that we have found a special area
       if ( specialStartPos != -1 &&
           (specialStartPos <= tagStartPos || tagStartPos == -1) )
       {
-        currentNode = ParserCommon::createTextNode(write, currentNode, line, specialStartPos, parentNode);
+        currentNode = ParserCommon::createTextNode(write, currentNode, line, specialStartPos, tqparentNode);
         if (!rootNode)
             rootNode = currentNode;
         TQString foundText = m_dtd->specialAreaStartRx.cap();
         //create a toplevel node for the special area
         AreaStruct area(line, specialStartPos, line, specialStartPos + foundText.length() - 1);
-        Node *node = ParserCommon::createScriptTagNode(write, area, foundText, m_dtd, parentNode, currentNode);
-        if (node->parent && node->prev == node->parent) //some strange cases, but it's possible, eg.: <a href="<? foo ?>""></a><input size="<? foo ?>" >
+        Node *node = ParserCommon::createScriptTagNode(write, area, foundText, m_dtd, tqparentNode, currentNode);
+        if (node->tqparent && node->prev == node->tqparent) //some strange cases, but it's possible, eg.: <a href="<? foo ?>""></a><input size="<? foo ?>" >
         {
            node->prev->next = 0L;
            node->prev = 0L;
@@ -263,37 +263,37 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
               tag->name.truncate(tag->name.length() - 1);
         }
         //the tag we found indicates the beginning of a special area, like <script type=... >
-        if (m_dtd->specialTags.contains(tag->name.lower()) && !tag->single)
+        if (m_dtd->specialTags.tqcontains(tag->name.lower()) && !tag->single)
         {
         //TODO: handle goUp here
-          Node *node = new Node(parentNode);
+          Node *node = new Node(tqparentNode);
           nodeNum++;
           node->tag = tag;
           node->insideSpecial = true;
-          if (currentNode && currentNode != parentNode)
+          if (currentNode && currentNode != tqparentNode)
           {
             currentNode->next = node;
             node->prev = currentNode;
           } else
           {
-            if (parentNode)
-                parentNode->child = node;
+            if (tqparentNode)
+                tqparentNode->child = node;
           }
           if (!rootNode)
               rootNode = node;
           //find the DTD that needs to be used for the special area
           TQString tmpStr = m_dtd->specialTags[tag->name.lower()];
-          int defPos = tmpStr.find('[');
+          int defPos = tmpStr.tqfind('[');
           TQString defValue;
           if (defPos != 0)
           {
-            defValue = tmpStr.mid(defPos+1, tmpStr.findRev(']')-defPos-1).stripWhiteSpace();
+            defValue = tmpStr.mid(defPos+1, tmpStr.tqfindRev(']')-defPos-1).stripWhiteSpace();
             tmpStr = tmpStr.left(defPos);
           }
           TQString s = tag->attributeValue(tmpStr);
           if (s.isEmpty())
             s = defValue;
-          const DTDStruct *dtd = DTDs::ref()->find(s);
+          const DTDStruct *dtd = DTDs::ref()->tqfind(s);
           if (!dtd)
               dtd = m_dtd;
           //a trick here: replace the node's DTD with this one //Note: with the new SAParser, the top level nodes must be Tag::ScriptTag-s!
@@ -315,21 +315,21 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
         }
 
         qTag = 0L;
-        goUp = ( parentNode &&
-                ( (tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(parentNode->tag, tag)
+        goUp = ( tqparentNode &&
+                ( (tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(tqparentNode->tag, tag)
                   ) ||
-                    parentNode->tag->single )
+                    tqparentNode->tag->single )
               );
-        if (parentNode && !goUp)
+        if (tqparentNode && !goUp)
         {
-          qTag = QuantaCommon::tagFromDTD(m_dtd, parentNode->tag->name);
+          qTag = QuantaCommon::tagFromDTD(m_dtd, tqparentNode->tag->name);
           if ( qTag )
           {
             TQString searchFor = (m_dtd->caseSensitive)?tag->name:tag->name.upper();
             searchFor.remove('/');
-            if ( qTag->stoppingTags.contains(searchFor))
+            if ( qTag->stoppingTags.tqcontains(searchFor))
             {
-              parentNode->tag->closingMissing = true; //parent is single...
+              tqparentNode->tag->closingMissing = true; //tqparent is single...
               goUp = true;
             }
           }
@@ -340,9 +340,9 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
       if (nodeFound)
       {
         //first create a text/empty node between the current position and the last node
-        Node *savedParentNode = parentNode;
-        currentNode = ParserCommon::createTextNode(write, currentNode, tagStartLine, tagStartPos, parentNode);
-        if (savedParentNode != parentNode)
+        Node *savedParentNode = tqparentNode;
+        currentNode = ParserCommon::createTextNode(write, currentNode, tagStartLine, tagStartPos, tqparentNode);
+        if (savedParentNode != tqparentNode)
             goUp = false;
         if (!rootNode)
             rootNode = currentNode;
@@ -351,31 +351,31 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
         if (goUp)
         {
           //handle cases like <ul><li></ul>
-          if (tag->type == Tag::XmlTagEnd && !QuantaCommon::closesTag(parentNode->tag, tag))
+          if (tag->type == Tag::XmlTagEnd && !QuantaCommon::closesTag(tqparentNode->tag, tag))
           {
-            while ( parentNode->parent &&
-                    QuantaCommon::closesTag(parentNode->parent->tag, tag)
+            while ( tqparentNode->tqparent &&
+                    QuantaCommon::closesTag(tqparentNode->tqparent->tag, tag)
                   )
             {
-              parentNode = parentNode->parent;
+              tqparentNode = tqparentNode->tqparent;
             }
           } else
           if (qTag && tag->type != Tag::XmlTagEnd)
           {
-            //handle the case when a tag is a stopping tag for parent, and grandparent and so on.
-            Node *n = parentNode;
+            //handle the case when a tag is a stopping tag for tqparent, and grandtqparent and so on.
+            Node *n = tqparentNode;
             TQString searchFor = (m_dtd->caseSensitive)?tag->name:tag->name.upper();
             while (qTag && n)
             {
               qTag = QuantaCommon::tagFromDTD(m_dtd, n->tag->name);
               if ( qTag )
               {
-                if ( qTag->stoppingTags.contains(searchFor) )
+                if ( qTag->stoppingTags.tqcontains(searchFor) )
                 {
-                  n->tag->closingMissing = true; //parent is single...
-                  if (n->parent)
-                    parentNode = n;
-                  n = n->parent;
+                  n->tag->closingMissing = true; //tqparent is single...
+                  if (n->tqparent)
+                    tqparentNode = n;
+                  n = n->tqparent;
                 } else
                 {
                   break;
@@ -384,29 +384,29 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
             }
           }
 
-          node = new Node(parentNode->parent);
+          node = new Node(tqparentNode->tqparent);
           nodeNum++;
-          node->prev = parentNode;
-          parentNode->next = node;
-          parentNode = parentNode->parent;
+          node->prev = tqparentNode;
+          tqparentNode->next = node;
+          tqparentNode = tqparentNode->tqparent;
           node->closesPrevious = true;
         } else
         {
-          node = new Node(parentNode);
+          node = new Node(tqparentNode);
           nodeNum++;
-          if (currentNode && currentNode != parentNode)
+          if (currentNode && currentNode != tqparentNode)
           {
             currentNode->next = node;
             node->prev = currentNode;
           } else
           {
-            if (parentNode)
+            if (tqparentNode)
             {
-              if (!parentNode->child)
-                parentNode->child = node;
+              if (!tqparentNode->child)
+                tqparentNode->child = node;
               else
               {
-                Node *n = parentNode->child;
+                Node *n = tqparentNode->child;
                 while (n->next)
                   n = n->next;
                 n->next = node;
@@ -416,7 +416,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
           }
         }
         if (!tag->single)
-            parentNode = node;
+            tqparentNode = node;
 
         node->tag = tag;
         if (tag->type == Tag::NeedsParsing)
@@ -467,7 +467,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
 #endif
     cleanGroups();
     m_saParser->setParsingEnabled(true);
-    currentNode = m_saParser->parseArea(area, "", "", parentNode, true, true); //TODO: don't parse in detail here
+    currentNode = m_saParser->parseArea(area, "", "", tqparentNode, true, true); //TODO: don't parse in detail here
     m_saParser->setParsingEnabled(false);
     el = m_saParser->lastParsedLine();
     ec = m_saParser->lastParsedColumn();
@@ -484,16 +484,16 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No
       el = endLine;
       ec = endCol + 1;
     }
-    currentNode = ParserCommon::createTextNode(write, currentNode, el, ec, parentNode);
+    currentNode = ParserCommon::createTextNode(write, currentNode, el, ec, tqparentNode);
   } else
   if (el != endLine || ec != endCol)
   {
     if (currentNode && currentNode->tag->type == Tag::ScriptTag)
     {
-      parentNode = currentNode;
+      tqparentNode = currentNode;
       currentNode = 0L;
     }
-    currentNode = ParserCommon::createTextNode(write, currentNode, endLine, endCol, parentNode);
+    currentNode = ParserCommon::createTextNode(write, currentNode, endLine, endCol, tqparentNode);
   }
   if (!rootNode)
     rootNode = currentNode;
@@ -621,13 +621,13 @@ Node *Parser::nodeAt(int line, int col, bool findDeepest, bool exact)
         node = node->child;
       } else
       {
-        if (node->parent)
+        if (node->tqparent)
         {
-          int parentEl, parentEc;
-          node->parent->tag->endPos(parentEl, parentEc);
-          if (!exact && QuantaCommon::isBetween(line, col, bl, bc, parentEl, parentEc) == 0)
+          int tqparentEl, tqparentEc;
+          node->tqparent->tag->endPos(tqparentEl, tqparentEc);
+          if (!exact && QuantaCommon::isBetween(line, col, bl, bc, tqparentEl, tqparentEc) == 0)
           {
-            node = node->parent;
+            node = node->tqparent;
           }
         }
         break; //we found the node
@@ -635,8 +635,8 @@ Node *Parser::nodeAt(int line, int col, bool findDeepest, bool exact)
     } else
     if (result == -1)
     {
-      if (node->parent)
-          node = node->parent;
+      if (node->tqparent)
+          node = node->tqparent;
       break; //we found the node
     } else
     {
@@ -653,9 +653,9 @@ Node *Parser::nodeAt(int line, int col, bool findDeepest, bool exact)
   if (node && node->tag->type == Tag::Empty &&
      (findDeepest || (bl == el && ec < bc)) )
   {
-     if (node->parent)
+     if (node->tqparent)
      {
-       node = node->parent;
+       node = node->tqparent;
      } else
      if (node->prev)
      {
@@ -807,7 +807,7 @@ bool Parser::invalidArea(Document *w, AreaStruct &area, Node **firstNode, Node *
 
 void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
 {
-  Node *nextNode, *child, *parent, *next, *prev;
+  Node *nextNode, *child, *tqparent, *next, *prev;
   int i, j;
   Node *node = firstNode;
   bool closesPrevious = false;
@@ -819,7 +819,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
     nextNode = node->nextSibling();
     node->removeAll = false;
     child = node->child;
-    parent = node->parent;
+    tqparent = node->tqparent;
     next = node->next;
     prev = node->prev;
     closesPrevious = node->closesPrevious;
@@ -827,9 +827,9 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
     {
       nextNode->prev = prev;
     }
-    if (nextNode && nextNode->parent == node)
+    if (nextNode && nextNode->tqparent == node)
     {
-      nextNode->parent = parent;
+      nextNode->tqparent = tqparent;
     }
     if (next)
       next->prev = prev;
@@ -845,9 +845,9 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
     modif->setLocation(kafkaCommon::getLocation(node));
     if (prev && prev->next == node)
       prev->next = 0L;
-    if(parent && parent->child == node)
-      parent->child = 0L;
-    node->parent = 0L;
+    if(tqparent && tqparent->child == node)
+      tqparent->child = 0L;
+    node->tqparent = 0L;
     node->next = 0L;
     node->prev = 0L;
     
@@ -860,17 +860,17 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
     j = 0;
     if (!closesPrevious)
     {
-      //move the children up one level
+      //move the tqchildren up one level
       Node *n = child;
       Node *m = child;
       while (n)
       {
         m = n;
-        n->parent = parent;
+        n->tqparent = tqparent;
         n = n->next;
         i++;
       }
-      //connect the first child to the tree (after prev, or as the first child of the parent)
+      //connect the first child to the tree (after prev, or as the first child of the tqparent)
       if (prev && child)
       {
         prev->next = child;
@@ -882,7 +882,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
         }
       } else
       {
-        if (!child)      //when there is no child, connect the next as the first child of the parent
+        if (!child)      //when there is no child, connect the next as the first child of the tqparent
           child = next;
         else
         if (next)
@@ -893,14 +893,14 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
           n->next = next;
           next->prev = n;
         }
-        if (parent && !parent->child)
+        if (tqparent && !tqparent->child)
         {
-          parent->child = child;
+          tqparent->child = child;
         }
       }
     } else
     {
-      //change the parent of children, so the prev will be the new parent
+      //change the tqparent of tqchildren, so the prev will be the new tqparent
       if (child)
       {
         Node *n = child;
@@ -908,7 +908,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
         while (n)
         {
           m = n;
-          n->parent = prev;
+          n->tqparent = prev;
           n = n->next;
           i++;
         }
@@ -928,7 +928,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
           prev->child = child;
         }
       }
-      //move down the nodes starting with next one level and append to the list of children of prev
+      //move down the nodes starting with next one level and append to the list of tqchildren of prev
       if (next)
       {
         if (prev->child) //if the previous node has a child, append the next node after the last child
@@ -953,7 +953,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
         Node *n = next;
         while (n)
         {
-          n->parent = prev;
+          n->tqparent = prev;
           n = n->next;
           j++;
         }
@@ -1020,7 +1020,7 @@ Node *Parser::rebuild(Document *w)
        return n;
    }
 
-   kdDebug(24000) << TQString("Invalid area: %1,%2,%3,%4").arg(area.bLine).arg(area.bCol).arg(area.eLine).arg(area.eCol) << "\n";
+   kdDebug(24000) << TQString("Invalid area: %1,%2,%3,%4").tqarg(area.bLine).tqarg(area.bCol).tqarg(area.eLine).tqarg(area.eCol) << "\n";
 
 //    kdDebug(24000) << "lastNode1: " << lastNode << " " << lastNode->tag << endl;
    deleteNodes(firstNode->nextSibling(), lastNode, modifs);
@@ -1053,8 +1053,8 @@ Node *Parser::rebuild(Document *w)
      {
        if (lastNode->prev )
            lastNode->prev->next = 0L;
-       if (lastNode->parent && lastNode->parent->child == lastNode)
-           lastNode->parent->child = 0L;
+       if (lastNode->tqparent && lastNode->tqparent->child == lastNode)
+           lastNode->tqparent->child = 0L;
      }
      Node::deleteNode(lastNode);
      nodeNum--;
@@ -1077,7 +1077,7 @@ Node *Parser::rebuild(Document *w)
         lastNode->prev = lastInserted->prev;
         if (lastInserted->prev)
             lastInserted->prev->next = lastNode;
-        lastNode->parent = lastInserted->parent;
+        lastNode->tqparent = lastInserted->tqparent;
         lastInserted->tag->beginPos(area.bLine, area.bCol);
         lastNode->tag->endPos(area.eLine, area.eCol);
         Tag *_tag = new Tag(*(lastNode->tag));
@@ -1091,9 +1091,9 @@ Node *Parser::rebuild(Document *w)
         {
           lastNode->tag->type = Tag::Empty;
         }
-        if (lastInserted->parent && lastInserted->parent->child == lastInserted)
-            //lastInserted->parent->child = lastInserted->next; lastInserted has no next!
-           lastInserted->parent->child = lastNode;
+        if (lastInserted->tqparent && lastInserted->tqparent->child == lastInserted)
+            //lastInserted->tqparent->child = lastInserted->next; lastInserted has no next!
+           lastInserted->tqparent->child = lastNode;
 
         //here, lastNode is at the pos of lastInserted.
         modif = new NodeModif();
@@ -1102,11 +1102,11 @@ Node *Parser::rebuild(Document *w)
 
         if(lastInserted->prev)
           lastInserted->prev->next = 0L;
-        if(lastInserted->parent && lastInserted->parent->child == lastInserted)
-          lastInserted->parent->child = 0L;
+        if(lastInserted->tqparent && lastInserted->tqparent->child == lastInserted)
+          lastInserted->tqparent->child = 0L;
         lastInserted->prev = 0L;
         lastInserted->next = 0L;
-        lastInserted->parent = 0L;
+        lastInserted->tqparent = 0L;
         lastInserted->child = 0L;
 //        delete lastInserted;
 
@@ -1127,63 +1127,63 @@ Node *Parser::rebuild(Document *w)
     node = lastInserted;
 
 //     kdDebug(24000) << "lastNode5: " << lastNode << " " << lastNode->tag << endl;
-    QTag *qTag = 0L;
+    TQTag *qTag = 0L;
     while (node && lastNode)
     {
 //       kdDebug(24000) << "lastNode6: " << lastNode << " " << lastNode->tag << endl;
       qTag = 0L;
-      goUp = ( node->parent &&
-               ( (lastNode->tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(node->parent->tag, lastNode->tag) ) ||
-                  node->parent->tag->single )
+      goUp = ( node->tqparent &&
+               ( (lastNode->tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(node->tqparent->tag, lastNode->tag) ) ||
+                  node->tqparent->tag->single )
              );
-      if (node->parent && !goUp)
+      if (node->tqparent && !goUp)
       {
-        qTag = QuantaCommon::tagFromDTD(m_dtd, node->parent->tag->name);
+        qTag = QuantaCommon::tagFromDTD(m_dtd, node->tqparent->tag->name);
         if ( qTag )
         {
           TQString searchFor = (m_dtd->caseSensitive)?lastNode->tag->name:lastNode->tag->name.upper();
           searchFor.remove('/');
-          if ( qTag->stoppingTags.contains( searchFor ) )
+          if ( qTag->stoppingTags.tqcontains( searchFor ) )
           {
-            node->parent->tag->closingMissing = true; //parent is single...
+            node->tqparent->tag->closingMissing = true; //tqparent is single...
             goUp = true;
           }
         }
       }
       if (goUp &&
-          ( (m_dtd->caseSensitive && node->tag->name == node->parent->tag->name) ||
-            (!m_dtd->caseSensitive && node->tag->name.lower() == node->parent->tag->name.lower())) )
-          goUp = false; //it can happen that the tag closes the previous and not the parent
+          ( (m_dtd->caseSensitive && node->tag->name == node->tqparent->tag->name) ||
+            (!m_dtd->caseSensitive && node->tag->name.lower() == node->tqparent->tag->name.lower())) )
+          goUp = false; //it can happen that the tag closes the previous and not the tqparent
 
-      if (goUp) //lastnode closes the node->parent
+      if (goUp) //lastnode closes the node->tqparent
       {
           //handle cases like <ul><li></ul>
           if (lastNode->tag->type == Tag::XmlTagEnd &&
-              !QuantaCommon::closesTag(node->parent->tag, lastNode->tag))
+              !QuantaCommon::closesTag(node->tqparent->tag, lastNode->tag))
           {
-            while ( node->parent->parent &&
-                    QuantaCommon::closesTag(node->parent->parent->tag, lastNode->tag)
+            while ( node->tqparent->tqparent &&
+                    QuantaCommon::closesTag(node->tqparent->tqparent->tag, lastNode->tag)
                   )
             {
-              node = node->parent;
+              node = node->tqparent;
             }
           } else
           if (qTag && lastNode->tag->type != Tag::XmlTagEnd)
           {
-            //handle the case when a tag is a stopping tag for parent, and grandparent and so on. I'm not sure it's needed here, but anyway...
-            Node *n = node->parent;
+            //handle the case when a tag is a stopping tag for tqparent, and grandtqparent and so on. I'm not sure it's needed here, but anyway...
+            Node *n = node->tqparent;
             TQString searchFor = (m_dtd->caseSensitive) ? lastNode->tag->name : lastNode->tag->name.upper();
             while (qTag && n)
             {
               qTag = QuantaCommon::tagFromDTD(m_dtd, n->tag->name);
               if ( qTag )
               {
-                if ( qTag->stoppingTags.contains(searchFor) )
+                if ( qTag->stoppingTags.tqcontains(searchFor) )
                 {
-                  n->tag->closingMissing = true; //parent is single...
-                  if (n->parent)
+                  n->tag->closingMissing = true; //tqparent is single...
+                  if (n->tqparent)
                     node = n;
-                  n = n->parent;
+                  n = n->tqparent;
                 } else
                 {
                   break;
@@ -1193,15 +1193,15 @@ Node *Parser::rebuild(Document *w)
           }
         if (lastNode->prev && lastNode->prev->next == lastNode)
           lastNode->prev->next = 0L;
-        if (lastNode->parent && lastNode->parent->child == lastNode)
-            lastNode->parent->child = 0L;
-        if (node->parent)
-          node->parent->next = lastNode;
-        lastNode->prev = node->parent;
-        if (node->parent)
-          lastNode->parent = node->parent->parent;
+        if (lastNode->tqparent && lastNode->tqparent->child == lastNode)
+            lastNode->tqparent->child = 0L;
+        if (node->tqparent)
+          node->tqparent->next = lastNode;
+        lastNode->prev = node->tqparent;
+        if (node->tqparent)
+          lastNode->tqparent = node->tqparent->tqparent;
         else
-          lastNode->parent = 0L;
+          lastNode->tqparent = 0L;
         node->next = 0L;
         lastNode->closesPrevious = true;
       } else
@@ -1210,14 +1210,14 @@ Node *Parser::rebuild(Document *w)
             lastNode->prev->next = 0L;
         node->next = lastNode;
         lastNode->prev = node;
-        lastNode->parent = node->parent;
+        lastNode->tqparent = node->tqparent;
 //         kdDebug(24000) << "lastNode7: " << lastNode << " " << lastNode->tag << endl;
       }
       node = lastNode;
       lastNode = lastNode->nextNotChild();
       //For some reason this can happen, the lastNode can point to an invalid place. 
       //To avoid crashes, forget the rebuild and do a full parse instead.
-      if (!nodes.contains(lastNode)) 
+      if (!nodes.tqcontains(lastNode)) 
       {
         kdDebug(24000) << "Lastnode is invalid, do a full reparse!" << endl;
         logReparse(modifs, w);
@@ -1433,12 +1433,12 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd)
       TQString specialEndStr;
       while (areaPos != -1)
       {
-        areaPos = content.find(dtd->specialAreaStartRx, lastAreaPos);
+        areaPos = content.tqfind(dtd->specialAreaStartRx, lastAreaPos);
         if (areaPos != -1)
         {
           foundStr = dtd->specialAreaStartRx.cap();
           specialEndStr = dtd->specialAreas[foundStr];
-          int areaPos2 = content.find(specialEndStr, areaPos);
+          int areaPos2 = content.tqfind(specialEndStr, areaPos);
           if (areaPos2 == -1)
           {
             areaPos2 = content.length();
@@ -1456,7 +1456,7 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd)
           int structPos = 0;
           while (structPos !=-1)
           {
-            structPos = foundStr.find(dtd->structBeginStr, structPos);
+            structPos = foundStr.tqfind(dtd->structBeginStr, structPos);
             if (structPos != -1)
             {
               structPositions.append(structPos);
@@ -1494,14 +1494,14 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd)
             foundStr = foundStr.left(pos);
             TQString spaces;
             spaces.fill(' ', pos - structPos + 1);
-            foundStr.replace(structPos, pos - structPos + 1, spaces);
+            foundStr.tqreplace(structPos, pos - structPos + 1, spaces);
             
             //FIXME: This code replaces the content between ( ) with
             //empty spaces. This is quite PHP (or functions) //specific, and it's done in order to not find variables
             //declared as function arguments. A generic way is needed
             //to exclude unwanted areas.
-            int openBracketPos = foundStr.findRev(dtd->structKeywordsRx, structPos);
-            openBracketPos = foundStr.find('(', openBracketPos);
+            int openBracketPos = foundStr.tqfindRev(dtd->structKeywordsRx, structPos);
+            openBracketPos = foundStr.tqfind('(', openBracketPos);
             openNum = 1;
             if (openBracketPos != -1)
             {
@@ -1517,7 +1517,7 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd)
               }
               closeBracketPos--;
               spaces.fill(' ', closeBracketPos - openBracketPos);
-              foundStr.replace(openBracketPos, closeBracketPos - openBracketPos, spaces);
+              foundStr.tqreplace(openBracketPos, closeBracketPos - openBracketPos, spaces);
             }
 
             //now check which groups are present in this area
@@ -1548,29 +1548,29 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd)
                   }
                   TQString s = content.mid(areaPos + pos, l);
                   pos += l;
-                  if (!(*elements)[group.name].contains(s))
+                  if (!(*elements)[group.name].tqcontains(s))
                   {
                     Tag *tag = new Tag();
                     tag->name = s;
                     tag->setDtd(dtd);
                     tag->setWrite(write);
                     TQString s2 = content.left(areaPos + pos);
-                    int newLineNum = s2.contains('\n');
-                    int tmpCol = s2.length() - s2.findRev('\n') - 1;
+                    int newLineNum = s2.tqcontains('\n');
+                    int tmpCol = s2.length() - s2.tqfindRev('\n') - 1;
                     tag->setTagPosition(newLineNum, tmpCol - s.length(), newLineNum, tmpCol);
                     Node *node = new Node(0L);
                     node->tag = tag;
                     node->fileName = fileName;
                     GroupElement *groupElement = new GroupElement;
                     groupElement->node = node;
-                    groupElement->parentNode = 0L;
+                    groupElement->tqparentNode = 0L;
                     int minPos = areaPos + pos + 1;
                     for (TQValueList<GroupElementPosition>::Iterator gPosIt = gPositions.begin(); gPosIt != gPositions.end(); ++gPosIt)
                     {
                       GroupElementPosition gPos = (*gPosIt);
                       if ( (areaPos + pos > gPos.startPos) && (areaPos + pos < gPos.endPos) && (gPos.startPos < minPos))
                       {
-                        groupElement->parentNode = gPos.element->node;          
+                        groupElement->tqparentNode = gPos.element->node;          
                         minPos = gPos.startPos; 
                       }
                     }
@@ -1585,12 +1585,12 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd)
                     
                     if (group.appendToTags)
                     {
-                      QTag *qTag = new QTag();
-                      qTag->setName(s.left(s.find('(')));
+                      TQTag *qTag = new TQTag();
+                      qTag->setName(s.left(s.tqfind('(')));
                       qTag->className = "";
-                      if (groupElement->parentNode)
-                        qTag->className = groupElement->parentNode->tag->name;
-                      write->userTagList.replace(s.lower(), qTag);
+                      if (groupElement->tqparentNode)
+                        qTag->className = groupElement->tqparentNode->tag->name;
+                      write->userTagList.tqreplace(s.lower(), qTag);
                     }
                   }
                 }
@@ -1606,7 +1606,7 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd)
 
 void Parser::slotIncludedFileChanged(const TQString& fileName)
 {
-  int pos = ParserCommon::includedFiles.findIndex(fileName);
+  int pos = ParserCommon::includedFiles.tqfindIndex(fileName);
   if (pos != -1)
   {
     const DTDStruct *dtd = ParserCommon::includedFilesDTD.at(pos);
@@ -1635,7 +1635,7 @@ void Parser::slotIncludedFileChanged(const TQString& fileName)
 
 void Parser::parseForXMLGroup(Node *node)
 {
-  xmlGroupIt = node->tag->dtd()->xmlStructTreeGroups.find(node->tag->name.lower());
+  xmlGroupIt = node->tag->dtd()->xmlStructTreeGroups.tqfind(node->tag->name.lower());
   if (xmlGroupIt != node->tag->dtd()->xmlStructTreeGroups.end())
   {
     XMLStructGroup group = xmlGroupIt.data();
@@ -1658,7 +1658,7 @@ void Parser::parseForXMLGroup(Node *node)
     groupElement->deleted = false;
     groupElement->tag = newTag;
     groupElement->node = node;
-    groupElement->parentNode = 0L;
+    groupElement->tqparentNode = 0L;
     groupElement->global = true;
     groupElement->group = const_cast<XMLStructGroup*>(&(xmlGroupIt.data()));
     node->m_groupElements.append(groupElement);
@@ -1690,17 +1690,17 @@ bool Parser::parseScriptInsideTag(Node *startNode)
 
     while (pos != -1)
     {
-      pos = text.find(dtd->specialAreaStartRx, col);
+      pos = text.tqfind(dtd->specialAreaStartRx, col);
       if (pos != -1)
       {
         foundText = dtd->specialAreaStartRx.cap();
         //Calculate the beginning coordinates
         s = text.left(pos);
-        n = s.contains('\n');
+        n = s.tqcontains('\n');
         bl = node_bl + n;
         if (n > 0)
         {
-          bc = pos - s.findRev('\n') - 1;
+          bc = pos - s.tqfindRev('\n') - 1;
         } else
         {
           bc = node_bc + pos;
diff --git a/quanta/parsers/parser.h b/quanta/parsers/parser.h
index 8c4b2335..37716379 100644
--- a/quanta/parsers/parser.h
+++ b/quanta/parsers/parser.h
@@ -45,6 +45,7 @@ typedef TQMap<TQString, IncludedGroupElements> IncludedGroupElementsMap;
 class Parser: public TQObject {
 
 Q_OBJECT
+  TQ_OBJECT
 
 public:
   Parser();
diff --git a/quanta/parsers/parsercommon.cpp b/quanta/parsers/parsercommon.cpp
index be660255..8a9a4be5 100644
--- a/quanta/parsers/parsercommon.cpp
+++ b/quanta/parsers/parsercommon.cpp
@@ -78,7 +78,7 @@ void appendAreaToTextNode(Document *write, const AreaStruct &area, Node *node)
   node->tag->setTagPosition(bLine, bCol, area.eLine, area.eCol);
 }
 
-Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *parentNode)
+Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqparentNode)
 {
   Tag *textTag = 0L;
   Node *textNode = 0L;
@@ -89,10 +89,10 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *par
   {
     node->tag->endPos(bLine, bCol);
   } else
-  if (parentNode)
-    parentNode->tag->endPos(bLine, bCol);
-  if (parentNode)
-    dtd = parentNode->tag->dtd();
+  if (tqparentNode)
+    tqparentNode->tag->endPos(bLine, bCol);
+  if (tqparentNode)
+    dtd = tqparentNode->tag->dtd();
   eCol--;
   if (bLine == 0 && bCol == 0)
     bCol = -1;
@@ -110,13 +110,13 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *par
       textTag->type = Tag::Text;
     }
 
-    if (parentNode && parentNode->tag->single)
+    if (tqparentNode && tqparentNode->tag->single)
     {
-      textNode = new Node(parentNode->parent);
+      textNode = new Node(tqparentNode->tqparent);
       nodeNum++;
-      textNode->prev = parentNode;
-      parentNode->next = textNode;
-      parentNode = parentNode->parent;
+      textNode->prev = tqparentNode;
+      tqparentNode->next = textNode;
+      tqparentNode = tqparentNode->tqparent;
     } else
     {
       if ( node &&
@@ -129,21 +129,21 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *par
         textTag = 0L;
       } else
       {
-        textNode = new Node(parentNode);
+        textNode = new Node(tqparentNode);
         nodeNum++;
-        if (node && node != parentNode)
+        if (node && node != tqparentNode)
         {
           node->next = textNode;
           textNode->prev = node;
         } else
         {
-          if (parentNode)
+          if (tqparentNode)
           {
-            Node *n = parentNode->child;
+            Node *n = tqparentNode->child;
             while (n && n->next)
               n = n->next;
             if (!n)
-              parentNode->child = textNode;
+              tqparentNode->child = textNode;
             else
             {
               n->next = textNode;
@@ -163,32 +163,32 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *par
 }
 
 Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQString &areaName,
-                          const DTDStruct *dtd, Node *parentNode, Node *currentNode)
+                          const DTDStruct *dtd, Node *tqparentNode, Node *currentNode)
 {
   Tag *tag = new Tag();
   tag->setTagPosition(area);
   tag->setStr(areaName);
   tag->setWrite(write);
-  const DTDStruct *d = DTDs::ref()->find(dtd->specialAreaNames[areaName]);
+  const DTDStruct *d = DTDs::ref()->tqfind(dtd->specialAreaNames[areaName]);
   if (d)
      tag->setDtd(d);
   else
       tag->setDtd(dtd);
-  tag->name = i18n("%1 block").arg(dtd->specialAreaNames[areaName].upper());
+  tag->name = i18n("%1 block").tqarg(dtd->specialAreaNames[areaName].upper());
   tag->type = Tag::ScriptTag;
   tag->validXMLTag = false;
 
-  Node *node = new Node(parentNode);
+  Node *node = new Node(tqparentNode);
   nodeNum++;
   node->tag = tag;
   node->insideSpecial = true;
-  if (parentNode)
+  if (tqparentNode)
   {
-    if (!parentNode->child)
-        parentNode->child = node;
+    if (!tqparentNode->child)
+        tqparentNode->child = node;
     else
     {
-        Node *n = parentNode->child;
+        Node *n = tqparentNode->child;
         while (n->next)
           n = n->next;
         n->next = node;
@@ -216,11 +216,11 @@ void coutTree(Node *node, int indent)
             node->tag->beginPos(bLine, bCol);
             node->tag->endPos(eLine, eCol);
             if (node->tag->type != Tag::Text)
-                    output += node->tag->name.replace('\n'," ");
+                    output += node->tag->name.tqreplace('\n'," ");
             else
-                    output+= node->tag->tagStr().replace('\n'," ");
+                    output+= node->tag->tagStr().tqreplace('\n'," ");
             kdDebug(24000) << output <<" (" << node->tag->type << ") at pos " <<
-                    bLine << ":" << bCol << " - " << eLine << ":" << eCol << " This: "<< node << " Parent: " << node->parent << " Prev: " << node->prev << " Next: " << node->next << " Child: " << node->child << " Tag:" << node->tag << endl;
+                    bLine << ":" << bCol << " - " << eLine << ":" << eCol << " This: "<< node << " Parent: " << node->tqparent << " Prev: " << node->prev << " Next: " << node->next << " Child: " << node->child << " Tag:" << node->tag << endl;
  /*           for(j = 0; j < node->tag->attrCount(); j++)
             {
                     kdDebug(24000)<< " attr" << j << " " <<
@@ -245,7 +245,7 @@ void verifyTree(Node *node)
     if (!node->tag)
     {
       kdDebug(24000) << "Bad node: " << node << endl;
-      kdDebug(24000) << "Parent: " << node->parent << " " << node->parent->tag->tagStr() << endl;
+      kdDebug(24000) << "Parent: " << node->tqparent << " " << node->tqparent->tag->tagStr() << endl;
     }      
     if (node->child)
       verifyTree(node->child);
diff --git a/quanta/parsers/parsercommon.h b/quanta/parsers/parsercommon.h
index 9b0c01f4..021541b0 100644
--- a/quanta/parsers/parsercommon.h
+++ b/quanta/parsers/parsercommon.h
@@ -39,16 +39,16 @@ namespace ParserCommon{
   /** Appends a text area to a text node. */
   void appendAreaToTextNode(Document *write, const AreaStruct &area, Node *node);
   /** Creates a text/empty node between node and the provided position */
-  Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *parentNode);
+  Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqparentNode);
   /** Creates a head node for special areas.
       area: the area belonging to this node
       areaName: the special area name (type)
-      dtd: the parent DTD
-      parentNode: the parent of the node
-      currentNode: the last child of the parent, if it exists
+      dtd: the tqparent DTD
+      tqparentNode: the tqparent of the node
+      currentNode: the last child of the tqparent, if it exists
   */
   Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQString &areaName,
-                            const DTDStruct *dtd, Node *parentNode, Node *currentNode);
+                            const DTDStruct *dtd, Node *tqparentNode, Node *currentNode);
 
 /** Print the doc structure tree to the standard output.
     Only for debugging purposes. */
diff --git a/quanta/parsers/qtag.cpp b/quanta/parsers/qtag.cpp
index 46b5b411..d31f91b8 100644
--- a/quanta/parsers/qtag.cpp
+++ b/quanta/parsers/qtag.cpp
@@ -18,22 +18,22 @@
 #include "tag.h"
 #include <kdebug.h>
 
-QTag::QTag()
+TQTag::TQTag()
 {
  attrs.setAutoDelete(true);
  single = false;
  optional = false;
  type = "xmltag";
- parentDTD = 0L;
+ tqparentDTD = 0L;
 }
 
-QTag::QTag( QTag &t)
+TQTag::TQTag( TQTag &t)
 {
   tagName = t.tagName;
   single = t.single;
   optional = t.optional;
   m_fileName = t.m_fileName;
-  parentDTD = t.parentDTD;
+  tqparentDTD = t.tqparentDTD;
   type = t.type;
   returnType = t.returnType;
   comment = t.comment;
@@ -48,12 +48,12 @@ QTag::QTag( QTag &t)
   }
 }
 
-QTag::~QTag()
+TQTag::~TQTag()
 {
 }
 
 /** Add an attribute to the tag. */
-void QTag::addAttribute(Attribute* attr)
+void TQTag::addAttribute(Attribute* attr)
 {
  if (attr)
  {
@@ -79,24 +79,24 @@ void QTag::addAttribute(Attribute* attr)
  }
 }
 /** Returns the number of attributes for the tag. */
-int QTag::attributeCount()
+int TQTag::attributeCount()
 {
   return attrs.count();
 }
 /** Returns the attribute at index. */
-Attribute* QTag::attributeAt(int index)
+Attribute* TQTag::attributeAt(int index)
 {
   return attrs.at(index);
 }
 
 /** Returns true if the attribute exists */
-bool QTag::isAttribute(const TQString &attrName)
+bool TQTag::isAttribute(const TQString &attrName)
 {
   Attribute *a;
   int i;
   AttributeList *groupAttrs;
 
-  //Check in the QTag specific attributes
+  //Check in the TQTag specific attributes
   for(a = attrs.first(); a; a = attrs.next())
   {
     if(a->name == attrName)
@@ -105,7 +105,7 @@ bool QTag::isAttribute(const TQString &attrName)
   //Check in the common attributes
   for(i = 0; i < (signed)commonGroups.count(); i++)
   {
-    groupAttrs = parentDTD->commonAttrs->find(commonGroups[i]);
+    groupAttrs = tqparentDTD->commonAttrs->tqfind(commonGroups[i]);
     if(groupAttrs)
     {
       for(a = groupAttrs->first(); a; a = groupAttrs->next())
@@ -119,57 +119,57 @@ bool QTag::isAttribute(const TQString &attrName)
 }
 
 /** No descriptions */
-void QTag::setSingle(bool isSingle)
+void TQTag::setSingle(bool isSingle)
 {
  single = isSingle;
 }
 /** No descriptions */
-void QTag::setOptional(bool isOptional)
+void TQTag::setOptional(bool isOptional)
 {
  optional = isOptional;
 }
 /** No descriptions */
-void QTag::setName(const TQString& theName)
+void TQTag::setName(const TQString& theName)
 {
   tagName = theName;
 }
 /** No descriptions */
-TQString QTag::name(bool doNotConvert)
+TQString TQTag::name(bool doNotConvert)
 {
-  if (doNotConvert || !parentDTD || parentDTD->caseSensitive)
+  if (doNotConvert || !tqparentDTD || tqparentDTD->caseSensitive)
       return tagName;
   else
       return tagName.upper();
 }
 /** No descriptions */
-bool QTag::isSingle()
+bool TQTag::isSingle()
 {
   return single;
 }
 /** No descriptions */
-bool QTag::isOptional()
+bool TQTag::isOptional()
 {
   return optional;
 }
 /** No descriptions */
-void QTag::setFileName(const TQString& fileName)
+void TQTag::setFileName(const TQString& fileName)
 {
   m_fileName = fileName;
 }
 
 /** No descriptions */
-TQString QTag::fileName()
+TQString TQTag::fileName()
 {
  return m_fileName;
 }
 
-QTag QTag::operator = (QTag &t)
+TQTag TQTag::operator = (TQTag &t)
 {
   tagName = t.tagName;
   single = t.single;
   optional = t.optional;
   m_fileName = t.m_fileName;
-  parentDTD = t.parentDTD;
+  tqparentDTD = t.tqparentDTD;
   type = t.type;
   returnType = t.returnType;
   comment = t.comment;
@@ -186,7 +186,7 @@ QTag QTag::operator = (QTag &t)
 }
 
 /** Returns the attribute with name, or 0 if the tag does not have any attribute with name. */
-Attribute* QTag::attribute(const TQString& name)
+Attribute* TQTag::attribute(const TQString& name)
 {
  Attribute *attr = 0L;
  for (uint i = 0; i < attrs.count(); i++)
@@ -201,17 +201,17 @@ Attribute* QTag::attribute(const TQString& name)
  return attr;
 }
 
-bool QTag::isChild(const TQString& tag, bool trueIfNoChildsDefined)
+bool TQTag::isChild(const TQString& tag, bool trueIfNoChildsDefined)
 {
  TQString tagName = tag;
-  tagName = parentDTD->caseSensitive ? tagName : tagName.upper();
+  tagName = tqparentDTD->caseSensitive ? tagName : tagName.upper();
   if(trueIfNoChildsDefined)
-    return (childTags.isEmpty() || childTags.contains(tagName));
+    return (childTags.isEmpty() || childTags.tqcontains(tagName));
   else
-    return (!childTags.isEmpty() && childTags.contains(tagName));
+    return (!childTags.isEmpty() && childTags.tqcontains(tagName));
 }
 
-bool QTag::isChild(Node *node, bool trueIfNoChildsDefined, bool treatEmptyNodesAsText)
+bool TQTag::isChild(Node *node, bool trueIfNoChildsDefined, bool treatEmptyNodesAsText)
 {
   TQString nodeName;
 
@@ -220,18 +220,18 @@ bool QTag::isChild(Node *node, bool trueIfNoChildsDefined, bool treatEmptyNodesA
   else if(node->tag->type == Tag::Text)
   {
     if(trueIfNoChildsDefined)
-      return(childTags.isEmpty() || childTags.contains("#text") || childTags.contains("#TEXT"));
+      return(childTags.isEmpty() || childTags.tqcontains("#text") || childTags.tqcontains("#TEXT"));
     else
-      return(!childTags.isEmpty() && (childTags.contains("#text") || childTags.contains("#TEXT")));
+      return(!childTags.isEmpty() && (childTags.tqcontains("#text") || childTags.tqcontains("#TEXT")));
   }
   else if(node->tag->type == Tag::Empty && !treatEmptyNodesAsText)
       return true;
   else if(node->tag->type == Tag::Empty && treatEmptyNodesAsText)
   {
       if(trueIfNoChildsDefined)
-          return(childTags.isEmpty() || childTags.contains("#text") || childTags.contains("#TEXT"));
+          return(childTags.isEmpty() || childTags.tqcontains("#text") || childTags.tqcontains("#TEXT"));
       else
-          return(!childTags.isEmpty() && (childTags.contains("#text") || childTags.contains("#TEXT")));      
+          return(!childTags.isEmpty() && (childTags.tqcontains("#text") || childTags.tqcontains("#TEXT")));      
   }
   else if(node->tag->type == Tag::XmlTagEnd)
   {
@@ -247,10 +247,10 @@ bool QTag::isChild(Node *node, bool trueIfNoChildsDefined, bool treatEmptyNodesA
     return isChild(node->tag->name, trueIfNoChildsDefined);
 }
 
-TQPtrList<QTag> QTag::parents()
+TQPtrList<TQTag> TQTag::tqparents()
 {
-  TQPtrList<QTag> qTagList;
-  TQDictIterator<QTag> it((*parentDTD->tagsList));
+  TQPtrList<TQTag> qTagList;
+  TQDictIterator<TQTag> it((*tqparentDTD->tagsList));
   for(; it.current(); ++it)
   {
     if(it.current()->isChild(name()))
diff --git a/quanta/parsers/qtag.h b/quanta/parsers/qtag.h
index c7839c23..679fbc55 100644
--- a/quanta/parsers/qtag.h
+++ b/quanta/parsers/qtag.h
@@ -13,8 +13,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QTAG_H
-#define QTAG_H
+#ifndef TQTAG_H
+#define TQTAG_H
 
 
 /**Quanta style tag (XML tag or code tag), as they are defined in the DTD. Contains
@@ -33,7 +33,7 @@
 
 //app includes
 
-class QTag;
+class TQTag;
 class Node;
 
 //an attribute of a tag looks like:
@@ -58,7 +58,7 @@ class XMLStructGroup {
     bool hasFileName;     ///<the group contains filename(s)
     TQRegExp fileNameRx;   ///<delete the matches of this regexp to obtain a filename (eg. linked, included file name)
     bool appendToTags; ///<true if the group elements must be used as normal tags in autocompletion
-    TQString parentGroup; ///<if the group element can be a child of another group (eg. member function of a class), holds the parent name. Makes sense only if appentToTags is true
+    TQString tqparentGroup; ///<if the group element can be a child of another group (eg. member function of a class), holds the tqparent name. Makes sense only if appentToTags is true
 };
 
 
@@ -80,7 +80,7 @@ class StructTreeGroup:public XMLStructGroup {
 typedef TQPtrList<Attribute> AttributeList;
 typedef TQDict<AttributeList> AttributeListDict;
 
-typedef TQDict<QTag> QTagList;
+typedef TQDict<TQTag> TQTagList;
 
 enum DTDFamily{Unknown = 0, Xml, Script};
 
@@ -101,7 +101,7 @@ struct DTDStruct
      int family;                      ///< xml, script type
      bool toplevel;                   ///< true if the DTD can be the main DTD of a document. Always true for XML like DTD's
      TQString documentation;           ///< the name of the documentation package 
-     QTagList* tagsList;              ///< the list of all defined tags in the DTD
+     TQTagList* tagsList;              ///< the list of all defined tags in the DTD
      TQString fileName;                ///< the DTD decription.rc with path
      AttributeListDict* commonAttrs;  ///< the attributes of the common groups
 
@@ -205,12 +205,12 @@ defined in the structure after the keyword have local scope */
 
     };
 
-class QTag {
+class TQTag {
 public:
-  QTag();
-  QTag(  QTag&);
-  ~QTag();
-  QTag operator = ( QTag& );
+  TQTag();
+  TQTag(  TQTag&);
+  ~TQTag();
+  TQTag operator = ( TQTag& );
   /** Add an attribute to the tag. */
   void addAttribute(Attribute* attr);
   /** Returns the number of attributes for the tag. */
@@ -243,12 +243,12 @@ public:
   void setScope(TQString const& scope) {m_scope = scope;}
   
   /** Returns true if tag is a possible child of this tag, or if
-  there are no children defined and if trueIfNoChildsDefined is set to true. */
+  there are no tqchildren defined and if trueIfNoChildsDefined is set to true. */
   bool isChild(const TQString& tag, bool trueIfNoChildsDefined = true);
   //prefer using this variant, it handle Text, Empty, XmlTagEnd nodes!
   bool isChild(Node *node, bool trueIfNoChildsDefined = true, bool treatEmptyNodesAsText = false);
-  /*** Returns the list of parent of this tag. */
-  TQPtrList<QTag> parents();
+  /*** Returns the list of tqparent of this tag. */
+  TQPtrList<TQTag> tqparents();
 
   /** No descriptions */
   TQString fileName();
@@ -258,7 +258,7 @@ public:
   Attribute* attribute(const TQString& name);
 
   /** The tag belongs to this DTD */
-  const DTDStruct *parentDTD;
+  const DTDStruct *tqparentDTD;
   /** The tag has the attributes of the above common groups */
   TQStringList commonGroups;
   TQStringList stoppingTags;
diff --git a/quanta/parsers/sagroupparser.cpp b/quanta/parsers/sagroupparser.cpp
index 6e409509..e28abe78 100644
--- a/quanta/parsers/sagroupparser.cpp
+++ b/quanta/parsers/sagroupparser.cpp
@@ -35,14 +35,14 @@
 
 extern GroupElementMapList globalGroupMap;
 
-SAGroupParser::SAGroupParser(SAParser *parent, Document *write, Node *startNode, Node *endNode, bool synchronous, bool parsingLastNode, bool paringLastGroup)
+SAGroupParser::SAGroupParser(SAParser *tqparent, Document *write, Node *startNode, Node *endNode, bool synchronous, bool parsingLastNode, bool paringLastGroup)
 {
   g_node = startNode;
   g_endNode = endNode;
   m_synchronous = synchronous;
   m_lastGroupParsed = paringLastGroup;
   m_parsingLastNode = parsingLastNode;
-  m_parent = parent;
+  m_parent = tqparent;
   m_write = write;
   m_count = 0;
   m_parseForGroupTimer = new TQTimer(this);
@@ -117,7 +117,7 @@ void SAGroupParser::parseForScriptGroup(Node *node)
   StructTreeGroup group;
   GroupElement *groupElement;
   GroupElementList* groupElementList;
-  KURL baseURL = QExtFileInfo::path(m_write->url());
+  KURL baseURL = TQExtFileInfo::path(m_write->url());
   TQString str = node->tag->cleanStr;
   TQString tagStr = node->tag->tagStr();
   const DTDStruct* dtd = node->tag->dtd();
@@ -144,20 +144,20 @@ void SAGroupParser::parseForScriptGroup(Node *node)
         title = tagStr.mid(pos, group.definitionRx.matchedLength());
         node->tag->beginPos(bl, bc);
         tmpStr = tagStr.left(pos);
-        int newLines = tmpStr.contains('\n');
+        int newLines = tmpStr.tqcontains('\n');
         bl += newLines;
-        int l = tmpStr.findRev('\n'); //the last EOL
+        int l = tmpStr.tqfindRev('\n'); //the last EOL
         bc = (l == -1) ? bc + pos : pos - l - 1;
-        newLines = title.contains('\n');
+        newLines = title.tqcontains('\n');
         l = title.length();
         el = bl + newLines;
-        ec = (newLines > 0) ? l - title.findRev('\n') : bc + l - 1;
+        ec = (newLines > 0) ? l - title.tqfindRev('\n') : bc + l - 1;
         pos += l;
         AreaStruct area(bl, bc, el, ec);
         //get the list of elements which are present in this group and
         //have the same title. For example get the list of all group
         //element which are variable and the matched string was "$i"
-        int cap1Pos = str.find(group.definitionRx.cap(1));
+        int cap1Pos = str.tqfind(group.definitionRx.cap(1));
         TQString s = tagStr.mid(cap1Pos, group.definitionRx.cap(1).length());
         groupElementList = & (globalGroupMap[group.name + "|" + s]);
         //Create a new tag which point to the exact location of the matched string.
@@ -178,40 +178,40 @@ void SAGroupParser::parseForScriptGroup(Node *node)
         Node *tmpNode = node;
         while (tmpNode && tmpNode->tag->dtd() == dtd && tmpNode->tag->type != Tag::ScriptStructureBegin)
         {
-          tmpNode = tmpNode->parent;
+          tmpNode = tmpNode->tqparent;
         }
         if (tmpNode && tmpNode->tag->type == Tag::ScriptStructureBegin)
         {
-          groupElement->parentNode = tmpNode;
+          groupElement->tqparentNode = tmpNode;
         } else
         {
-          groupElement->parentNode = 0L;
+          groupElement->tqparentNode = 0L;
         }
         groupElement->global = true;
-        tmpNode = node->parent;
+        tmpNode = node->tqparent;
         while (tmpNode && tmpNode->tag->dtd() == dtd)
         {
           if ( tmpNode->tag->type == Tag::ScriptStructureBegin && tmpNode->tag->dtd()->localScopeKeywordsRx.search(tmpNode->tag->cleanStr) != -1)
           {
             groupElement->global = false;
-            groupElement->parentNode = tmpNode;
+            groupElement->tqparentNode = tmpNode;
             break;
           }
-          tmpNode = tmpNode->parent;
+          tmpNode = tmpNode->tqparent;
         }
 
         if (group.appendToTags)
         {
-          QTag *qTag = new QTag();
+          TQTag *qTag = new TQTag();
           // The location of the first open bracket '(', also the end of the tag name
-          int nameEnd = s.find('(');
+          int nameEnd = s.tqfind('(');
           qTag->setName(s.left(nameEnd));
           qTag->className = "";
-          if (groupElement->parentNode)
+          if (groupElement->tqparentNode)
           {
-            for (GroupElementList::ConstIterator it2 = groupElement->parentNode->m_groupElements.constBegin(); it2 != groupElement->parentNode->m_groupElements.constEnd(); ++it2)
+            for (GroupElementList::ConstIterator it2 = groupElement->tqparentNode->m_groupElements.constBegin(); it2 != groupElement->tqparentNode->m_groupElements.constEnd(); ++it2)
             {
-              if ((*it2)->group->name == group.parentGroup)
+              if ((*it2)->group->name == group.tqparentGroup)
               {
                 qTag->className = (*it2)->tag->name;
                 break;
@@ -219,24 +219,24 @@ void SAGroupParser::parseForScriptGroup(Node *node)
             }
           }
            // Test for variable or function Type by checking for an opening bracket "(" used by functions
-           // and store the type in the QTag type variable.
+           // and store the type in the TQTag type variable.
           bool isArgument=false;
           if (nameEnd == -1)
           {
             qTag->type="variable";
             // If this tag is a class function argument, it should not belong to the class, so we need to remove it
-            if(qTag->className.length() != 0 && tagStr.contains('(') && tagStr.contains(')'))
+            if(qTag->className.length() != 0 && tagStr.tqcontains('(') && tagStr.tqcontains(')'))
             {
             // First we want to determine the whole line the tag is on
               TQString tagWholeLineStr = tagStr;
             // Remove lines before target line
               while(tagWholeLineStr.length() > 0) // this stops infinit looping in case something goes wrong!
               {
-                int firstNewline = tagWholeLineStr.find('\n');
+                int firstNewline = tagWholeLineStr.tqfind('\n');
                 if(firstNewline == -1) //no new lines so we must be on the last
                   break; 
                 TQString checkLineStr = tagWholeLineStr.mid(firstNewline+1,tagWholeLineStr.length());
-                if(checkLineStr.contains(s))
+                if(checkLineStr.tqcontains(s))
                   tagWholeLineStr = checkLineStr;
                 else
                   break;
@@ -244,23 +244,23 @@ void SAGroupParser::parseForScriptGroup(Node *node)
             // Remove lines after target line - essentially same as above
               while(tagWholeLineStr.length() > 0)
               {
-                int lastNewLine = tagWholeLineStr.findRev('\n');
+                int lastNewLine = tagWholeLineStr.tqfindRev('\n');
                 if(lastNewLine == -1)
                   break;
                 TQString checkLineStr = tagWholeLineStr.mid(0,lastNewLine);
-                if(checkLineStr.contains(s))
+                if(checkLineStr.tqcontains(s))
                   tagWholeLineStr = checkLineStr;
                 else
                   break;
               }
-            // Now we are left with the current line, lets check if the variable is inside parentheses
-              int lineOpenParenth=tagWholeLineStr.find('(');
+            // Now we are left with the current line, lets check if the variable is inside tqparentheses
+              int lineOpenParenth=tagWholeLineStr.tqfind('(');
               if(lineOpenParenth != -1)
               {
-                int lineCloseParenth=tagWholeLineStr.find(')');
+                int lineCloseParenth=tagWholeLineStr.tqfind(')');
                 if(lineCloseParenth != -1)
                 {
-                  int lineNameLocation=tagWholeLineStr.find(s);
+                  int lineNameLocation=tagWholeLineStr.tqfind(s);
                   if(lineNameLocation > lineOpenParenth || lineNameLocation < lineCloseParenth) // Write the current tag to the list
                     isArgument=true;
                 }
@@ -272,7 +272,7 @@ void SAGroupParser::parseForScriptGroup(Node *node)
             qTag->type="function";
           }
           if(!isArgument)
-            m_write->userTagList.replace(s.lower(), qTag);
+            m_write->userTagList.tqreplace(s.lower(), qTag);
         }
 
 
@@ -294,7 +294,7 @@ void SAGroupParser::parseForScriptGroup(Node *node)
           s.remove(group.fileNameRx);
           KURL url;
           QuantaCommon::setUrl(url, s.stripWhiteSpace());
-          url = QExtFileInfo::toAbsolute(url, baseURL);
+          url = TQExtFileInfo::toAbsolute(url, baseURL);
           ParserCommon::includedFiles += url.path();
           ParserCommon::includedFilesDTD.append(dtd);
           ParserCommon::includeWatch->addFile(url.path());
diff --git a/quanta/parsers/sagroupparser.h b/quanta/parsers/sagroupparser.h
index 1045cc74..35e8d1f9 100644
--- a/quanta/parsers/sagroupparser.h
+++ b/quanta/parsers/sagroupparser.h
@@ -29,12 +29,13 @@ class SAParser;
 /**
   This class is used to parse for special area (script) groups in the node tree.
  */
-class SAGroupParser : public QObject
+class SAGroupParser : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   public:
-    SAGroupParser(SAParser *parent, Document *write, Node *startNode, Node *endNode, bool synchronous, bool parsingLastNode, bool paringLastGroup);
+    SAGroupParser(SAParser *tqparent, Document *write, Node *startNode, Node *endNode, bool synchronous, bool parsingLastNode, bool paringLastGroup);
     ~SAGroupParser() {};
 
     TQTimer *m_parseForGroupTimer;
diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp
index f402e0c8..e562d47b 100644
--- a/quanta/parsers/saparser.cpp
+++ b/quanta/parsers/saparser.cpp
@@ -86,29 +86,29 @@ bool SAParser::slotParseOneLine()
           //search for different s_contexts
           if (s_searchContent) //search for quoted strings, comments, groups only in non-comment special areas
           {
-            quotedStringPos = s_textLine.find(m_quotesRx, s_col); //quoted strings
+            quotedStringPos = s_textLine.tqfind(m_quotesRx, s_col); //quoted strings
             s_searchedString = s_textLine.left(quotedStringPos);
-            commentPos = s_searchedString.find(s_dtd->commentsStartRx, s_col); //comments
+            commentPos = s_searchedString.tqfind(s_dtd->commentsStartRx, s_col); //comments
             s_searchedString = s_textLine.left(commentPos);
             if (s_fullParse)
-              groupKeywordPos = s_searchedString.find(s_dtd->structRx, s_col); //groups, like { }
+              groupKeywordPos = s_searchedString.tqfind(s_dtd->structRx, s_col); //groups, like { }
           } else
             s_searchedString = s_textLine;
           int specialAreaPos = -1;
           if (s_searchForSpecialAreas)  //special area inside special area
           {
             s_searchedString = s_textLine.left(groupKeywordPos);
-            specialAreaPos = s_searchedString.find(s_dtd->specialAreaStartRx, s_col);
+            specialAreaPos = s_searchedString.tqfind(s_dtd->specialAreaStartRx, s_col);
           }
           if (s_searchForAreaEnd) //the end of the special area
           {
             s_searchedString = s_textLine.left(specialAreaPos);
-            areaEndPos = s_searchedString.find(s_areaEndString, s_col);
+            areaEndPos = s_searchedString.tqfind(s_areaEndString, s_col);
           } else
           if (s_searchForForcedAreaEnd) //the end of the special area if a forcing string was specified
           {
             s_searchedString = s_textLine.left(specialAreaPos);
-            areaEndPos = s_searchedString.find(s_forcedAreaRx, s_col);
+            areaEndPos = s_searchedString.tqfind(s_forcedAreaRx, s_col);
             if (areaEndPos != -1)
               s_areaEndString = s_forcedAreaRx.cap();
           }
@@ -157,7 +157,7 @@ bool SAParser::slotParseOneLine()
                      s_currentNode->tag->type == Tag::Empty) )
                   ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
                 else
-                  s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, s_currentContext.area.eCol + 1, s_currentContext.parentNode);
+                  s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, s_currentContext.area.eCol + 1, s_currentContext.tqparentNode);
 
                 s_currentNode->tag->type = Tag::ScriptStructureBegin;
                 s_currentNode->tag->single = false;
@@ -166,7 +166,7 @@ bool SAParser::slotParseOneLine()
                 s_currentContext.lastNode = s_currentNode;
 
                 s_contextStack.push(s_currentContext);
-                s_currentContext.parentNode = s_currentNode;
+                s_currentContext.tqparentNode = s_currentNode;
                 s_col = s_context.area.bCol + s_context.startString.length();
                 s_currentContext.area.bLine = s_line;
                 s_currentContext.area.bCol = s_col;
@@ -201,21 +201,21 @@ bool SAParser::slotParseOneLine()
                 }
                 s_currentContext.area.eLine = s_line;
                 s_currentContext.area.eCol = groupKeywordPos - 1;
-                //kdDebug(24000) << TQString("Group Struct s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
+                //kdDebug(24000) << TQString("Group Struct s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl;
 
                 if (s_currentNode &&
                     (s_currentNode->tag->type == Tag::Text ||
                      s_currentNode->tag->type == Tag::Empty) )
                   ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
                 else
-                  s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, groupKeywordPos, s_currentContext.parentNode);
+                  s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, groupKeywordPos, s_currentContext.tqparentNode);
                 if (s_currentNode)
                 {
                   s_currentNode->insideSpecial = true;
                   s_currentNode->specialInsideXml = m_specialInsideXml;
                 }
                 s_previousContext = s_contextStack.pop();
-                s_currentContext.parentNode = s_previousContext.parentNode;
+                s_currentContext.tqparentNode = s_previousContext.tqparentNode;
                 s_currentContext.lastNode = s_previousContext.lastNode;
                 s_currentContext.type = s_previousContext.type;
                 s_currentContext.area.bLine = s_line;
@@ -232,14 +232,14 @@ bool SAParser::slotParseOneLine()
                 tag->setDtd(s_dtd);
                 tag->type = Tag::ScriptStructureEnd;
                 tag->single = true;
-                Node *node = new Node(s_currentContext.parentNode);
+                Node *node = new Node(s_currentContext.tqparentNode);
                 nodeNum++;
                 node->tag = tag;
                 node->insideSpecial = true;
                 node->specialInsideXml = m_specialInsideXml;
-                if (s_currentContext.parentNode && !s_currentContext.parentNode->child)
+                if (s_currentContext.tqparentNode && !s_currentContext.tqparentNode->child)
                 {
-                  s_currentContext.parentNode->child = node;
+                  s_currentContext.tqparentNode->child = node;
                 }
                 else if (s_currentContext.lastNode)
                 {
@@ -275,7 +275,7 @@ bool SAParser::slotParseOneLine()
                     s_currentNode->tag->type == Tag::Empty) )
                   ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
                 else
-                  s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, specialAreaPos, s_currentContext.parentNode);
+                  s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, specialAreaPos, s_currentContext.tqparentNode);
                 if (s_currentNode)
                 {
                   s_currentNode->insideSpecial = true;
@@ -284,7 +284,7 @@ bool SAParser::slotParseOneLine()
               }
               //create a toplevel node for the included special area
               AreaStruct area(s_line, specialAreaPos, s_line, specialAreaPos + foundText.length() - 1);
-              Node *node = ParserCommon::createScriptTagNode(m_write, area, foundText, s_dtd, s_currentContext.parentNode, s_currentNode);
+              Node *node = ParserCommon::createScriptTagNode(m_write, area, foundText, s_dtd, s_currentContext.tqparentNode, s_currentNode);
 #ifdef DEBUG_PARSER
               kdDebug(24001) << "Parsing a nested area." << endl;
 #endif
@@ -316,11 +316,11 @@ bool SAParser::slotParseOneLine()
         } else //when we look only for the area end string
         if (s_searchForAreaEnd)
         {
-          areaEndPos = s_textLine.find(s_areaEndString, s_col);
+          areaEndPos = s_textLine.tqfind(s_areaEndString, s_col);
         } else
         if (s_searchForForcedAreaEnd)
         {
-          areaEndPos = s_textLine.find(s_forcedAreaRx, s_col);
+          areaEndPos = s_textLine.tqfind(s_forcedAreaRx, s_col);
           if (areaEndPos != -1)
             s_areaEndString = s_forcedAreaRx.cap();
         }
@@ -351,7 +351,7 @@ bool SAParser::slotParseOneLine()
               s_currentNode->specialInsideXml = m_specialInsideXml;
             }
           }
-          //kdDebug(24000) << TQString("Special area %1 ends at %2, %3").arg(s_dtd->name).arg(s_line).arg(lastCol) << endl;
+          //kdDebug(24000) << TQString("Special area %1 ends at %2, %3").tqarg(s_dtd->name).tqarg(s_line).tqarg(lastCol) << endl;
 
           //create a closing node for the special area
           Tag *tag = new Tag();
@@ -363,7 +363,7 @@ bool SAParser::slotParseOneLine()
           tag->single = true;
           //at this point s_parentNode = the opening node of the special area (eg. <?)
           //and it should always exist
-          Node *node = new Node(s_parentNode->parent);
+          Node *node = new Node(s_parentNode->tqparent);
           nodeNum++;
           s_parentNode->next = node;
           node->prev = s_parentNode;
@@ -419,10 +419,10 @@ bool SAParser::slotParseOneLine()
         {
           s_context.area.bLine = s_line;
           s_context.area.eLine = s_context.area.eCol = -1;
-          s_context.parentNode = s_currentContext.parentNode;
+          s_context.tqparentNode = s_currentContext.tqparentNode;
           s_currentContext.area.eLine = s_context.area.bLine;
           s_currentContext.area.eCol = s_context.area.bCol - 1;
-       //   s_currentContext.parentNode = s_parentNode;
+       //   s_currentContext.tqparentNode = s_parentNode;
           s_contextStack.push(s_currentContext);
           if (s_fullParse)
           {
@@ -451,14 +451,14 @@ bool SAParser::slotParseOneLine()
               }
               tag->single = true;
               //create a node with the above tag
-              Node *node = new Node(s_currentContext.parentNode);
+              Node *node = new Node(s_currentContext.tqparentNode);
               nodeNum++;
               node->tag = tag;
               node->insideSpecial = true;
               node->specialInsideXml = m_specialInsideXml;
-              if (s_currentContext.parentNode && !s_currentContext.parentNode->child)
+              if (s_currentContext.tqparentNode && !s_currentContext.tqparentNode->child)
               {
-                s_currentContext.parentNode->child = node;
+                s_currentContext.tqparentNode->child = node;
               }
               else if (s_currentNode)
               {
@@ -468,7 +468,7 @@ bool SAParser::slotParseOneLine()
               s_currentNode = node;
             }
           }
-          //kdDebug(24000) << TQString("%1 s_context: %2, %3, %4, %5").arg(s_currentContext.type).arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
+          //kdDebug(24000) << TQString("%1 s_context: %2, %3, %4, %5").tqarg(s_currentContext.type).tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl;
 
           s_currentContext = s_context;
           s_col = s_context.area.bCol + s_context.startString.length();
@@ -487,7 +487,7 @@ bool SAParser::slotParseOneLine()
         int l = s_textLine.length();
         while (p < l)
         {
-          p = s_textLine.find(s_currentContext.startString, p);
+          p = s_textLine.tqfind(s_currentContext.startString, p);
           if (p != -1)
           {
             if (p >= 0)
@@ -514,7 +514,7 @@ bool SAParser::slotParseOneLine()
       //    if (pos != 0) pos++;
           s_currentContext.area.eLine = s_line;
           s_currentContext.area.eCol = pos;
-          //kdDebug(24000) << TQString("Quoted String s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
+          //kdDebug(24000) << TQString("Quoted String s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl;
           if (s_fullParse)
           {
             if ( s_currentNode  &&
@@ -522,12 +522,12 @@ bool SAParser::slotParseOneLine()
                 s_currentNode->tag->type == Tag::Empty) )
               ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode);
             else
-              s_currentNode = ParserCommon::createTextNode(m_write, 0L, s_line, pos, s_currentContext.parentNode);
+              s_currentNode = ParserCommon::createTextNode(m_write, 0L, s_line, pos, s_currentContext.tqparentNode);
             s_currentNode->insideSpecial = true;
             s_currentNode->specialInsideXml = m_specialInsideXml;
           }
           s_previousContext = s_contextStack.pop();
-          s_currentContext.parentNode = s_previousContext.parentNode;
+          s_currentContext.tqparentNode = s_previousContext.tqparentNode;
           s_currentContext.type = s_previousContext.type;
           s_currentContext.area.bLine = s_line;
           s_currentContext.area.bCol = pos + 1;
@@ -544,10 +544,10 @@ bool SAParser::slotParseOneLine()
       }
      case Comment:
       {
-        int pos = s_textLine.find(s_dtd->comments[s_currentContext.startString], s_col);
+        int pos = s_textLine.tqfind(s_dtd->comments[s_currentContext.startString], s_col);
         if (pos == -1 && s_dtd->comments[s_currentContext.startString] == "\n")
         {
-          int pos2 = s_textLine.find(s_areaEndString, s_col);
+          int pos2 = s_textLine.tqfind(s_areaEndString, s_col);
           if (pos2 != -1)
           {
             pos = pos2 - 1;
@@ -561,7 +561,7 @@ bool SAParser::slotParseOneLine()
           s_currentContext.area.eLine = s_line;
           s_currentContext.area.eCol = pos + s_dtd->comments[s_currentContext.startString].length() - 1;
           s_currentContext.type = s_previousContext.type;
-          //kdDebug(24000) << TQString("Comment s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl;
+          //kdDebug(24000) << TQString("Comment s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl;
 
           if (s_fullParse)
           {
@@ -570,22 +570,22 @@ bool SAParser::slotParseOneLine()
             tag->type = Tag::Comment;
             tag->single = true;
             //create a node with the above tag
-            Node *node = new Node(s_currentContext.parentNode);
+            Node *node = new Node(s_currentContext.tqparentNode);
             nodeNum++;
             node->tag = tag;
             node->insideSpecial = true;
             node->specialInsideXml = m_specialInsideXml;
-            if (s_currentNode && s_currentNode != node->parent)
+            if (s_currentNode && s_currentNode != node->tqparent)
             {
               s_currentNode->next = node;
               node->prev = s_currentNode;
             } else
-            if (node->parent && !node->parent->child)
-              node->parent->child = node;
+            if (node->tqparent && !node->tqparent->child)
+              node->tqparent->child = node;
             s_currentNode = node;
           }
           s_previousContext = s_contextStack.pop();
-          s_currentContext.parentNode = s_previousContext.parentNode;
+          s_currentContext.tqparentNode = s_previousContext.tqparentNode;
           s_currentContext.type = s_previousContext.type;
           s_currentContext.area.bLine = s_line;
           s_currentContext.area.bCol = s_currentContext.area.eCol + 1;
@@ -635,11 +635,11 @@ bool SAParser::slotParseOneLine()
 Node* SAParser::parseArea(const AreaStruct &specialArea,
                           const TQString &areaStartString,
                           const TQString &forcedAreaEndString,
-                          Node *parentNode,
+                          Node *tqparentNode,
                           bool fullParse, bool synchronous)
 {
   m_synchronous = synchronous;
-  s_parentNode = parentNode;
+  s_parentNode = tqparentNode;
   s_fullParse = fullParse;
 #ifdef DEBUG_PARSER
   kdDebug(24001) << "parseArea full: " << s_fullParse << "  synch: " << m_synchronous <<endl;
@@ -649,18 +649,18 @@ Node* SAParser::parseArea(const AreaStruct &specialArea,
   int s_startCol = specialArea.bCol;
   s_endLine = specialArea.eLine;
   s_endCol = specialArea.eCol;
-  //kdDebug(24000) << TQString("Starting to parse at %1, %2 for %3").arg(s_startLine).arg(s_startCol).arg(areaStartString) << endl;
+  //kdDebug(24000) << TQString("Starting to parse at %1, %2 for %3").tqarg(s_startLine).tqarg(s_startCol).tqarg(areaStartString) << endl;
 
   s_searchForAreaEnd = false;
   s_searchForForcedAreaEnd = false;
   s_dtd = 0L;
   if (s_parentNode && !areaStartString.isEmpty())
   {
-    const DTDStruct *parentDTD = m_dtd;
-    if (s_parentNode->parent)
-      parentDTD = s_parentNode->parent->tag->dtd();
-    s_dtd = DTDs::ref()->find(parentDTD->specialAreaNames[areaStartString]);
-    s_areaEndString = parentDTD->specialAreas[areaStartString];
+    const DTDStruct *tqparentDTD = m_dtd;
+    if (s_parentNode->tqparent)
+      tqparentDTD = s_parentNode->tqparent->tag->dtd();
+    s_dtd = DTDs::ref()->tqfind(tqparentDTD->specialAreaNames[areaStartString]);
+    s_areaEndString = tqparentDTD->specialAreas[areaStartString];
     s_searchForAreaEnd = true;
   }
   if (!forcedAreaEndString.isEmpty())
@@ -702,7 +702,7 @@ Node* SAParser::parseArea(const AreaStruct &specialArea,
   s_currentContext.area.bLine = s_line;
   s_currentContext.area.bCol = s_col;
   s_currentContext.area.eLine = s_currentContext.area.eCol = -1;
-  s_currentContext.parentNode = s_parentNode;
+  s_currentContext.tqparentNode = s_parentNode;
   s_currentNode = s_parentNode;
   m_lastParsedNode = 0L;
   s_useReturnVars = false;
diff --git a/quanta/parsers/saparser.h b/quanta/parsers/saparser.h
index 74b00b3e..d344fb55 100644
--- a/quanta/parsers/saparser.h
+++ b/quanta/parsers/saparser.h
@@ -38,9 +38,10 @@ class SAGroupParser;
 /**
   This class is used to parse a special area (script) in the document.
 */
-class SAParser: public QObject
+class SAParser: public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   SAParser();
@@ -56,7 +57,7 @@ public:
                area. It may end before the end position.
   areaStartString: the special area starting string
   forcedAreaEndString: force this as the special area ending string.
-  parentNode: the Node under where the special area goes
+  tqparentNode: the Node under where the special area goes
   fullParse: the script node will be fully parsed for groups, structures or so. If false, only the script beginning and end will be determined.
   synchronous: if true, the function does not return until the parsing is finished, otherwise
   return immediately.
@@ -65,7 +66,7 @@ public:
   Node* parseArea(const AreaStruct &specialArea,
                   const TQString &areaStartString,
                   const TQString &forcedAreaEndString,
-                  Node *parentNode,
+                  Node *tqparentNode,
                   bool fullParse, bool synchronous);
   /** Returns the line where the last parsing run ended. */
   int lastParsedLine() {return m_lastParsedLine;}
@@ -96,7 +97,7 @@ private:
     int type;
     AreaStruct area;
     TQString startString;
-    Node *parentNode;
+    Node *tqparentNode;
     Node *lastNode;
   };
   enum ContextType {
diff --git a/quanta/parsers/tag.cpp b/quanta/parsers/tag.cpp
index 54779d57..f6460fce 100644
--- a/quanta/parsers/tag.cpp
+++ b/quanta/parsers/tag.cpp
@@ -33,8 +33,8 @@
 
 void TagAttr::save(TQDomElement& element) const
 {
-    element.setAttribute("name", name);             // QString
-    element.setAttribute("value", value);           // QString
+    element.setAttribute("name", name);             // TQString
+    element.setAttribute("value", value);           // TQString
     element.setAttribute("nameLine", nameLine);     // int
     element.setAttribute("nameCol", nameCol);       // int
     element.setAttribute("valueLine", valueLine);   // int
@@ -127,13 +127,13 @@ void Tag::init()
 
 void Tag::save(TQDomElement& element) const
 {
-    element.setAttribute("name", name);                         // QString
-    element.setAttribute("nameSpace", nameSpace);               // QString
-    element.setAttribute("cleanStr", cleanStr);                 // QString
+    element.setAttribute("name", name);                         // TQString
+    element.setAttribute("nameSpace", nameSpace);               // TQString
+    element.setAttribute("cleanStr", cleanStr);                 // TQString
     element.setAttribute("type", type);                         // int
     element.setAttribute("single", single);                     // bool
     element.setAttribute("closingMissing", closingMissing);     // bool
-    element.setAttribute("structBeginStr", structBeginStr);     // QString
+    element.setAttribute("structBeginStr", structBeginStr);     // TQString
     element.setAttribute("validXMLTag", validXMLTag);           // bool
     element.setAttribute("cleanStrBuilt", m_cleanStrBuilt);     // bool
     element.setAttribute("indentationDone", m_indentationDone); // bool
@@ -149,18 +149,18 @@ void Tag::save(TQDomElement& element) const
         (*it).save(child_element);
     }
 
-    element.setAttribute("tagStr", m_tagStr);                   // QString
+    element.setAttribute("tagStr", m_tagStr);                   // TQString
 }
 
 bool Tag::load(TQDomElement const& element)
 {
-    name = element.attribute("name");                         // QString
-    nameSpace = element.attribute("nameSpace");               // QString
-    cleanStr = element.attribute("cleanStr");                 // QString
+    name = element.attribute("name");                         // TQString
+    nameSpace = element.attribute("nameSpace");               // TQString
+    cleanStr = element.attribute("cleanStr");                 // TQString
     type = TQString(element.attribute("type")).toInt();                         // int
     single = TQString(element.attribute("single")).toInt();                     // bool
     closingMissing = TQString(element.attribute("closingMissing")).toInt();     // bool
-    structBeginStr = element.attribute("structBeginStr");     // QString
+    structBeginStr = element.attribute("structBeginStr");     // TQString
     validXMLTag = TQString(element.attribute("validXMLTag")).toInt();           // bool
     m_cleanStrBuilt = TQString(element.attribute("cleanStrBuilt")).toInt();     // bool
     m_indentationDone = TQString(element.attribute("indentationDone")).toInt(); // bool
@@ -183,7 +183,7 @@ bool Tag::load(TQDomElement const& element)
         }
     }
 
-    m_tagStr = element.attribute("tagStr");                   // QString
+    m_tagStr = element.attribute("tagStr");                   // TQString
 
     return true;
 }
@@ -209,7 +209,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write)
    pos++;
  }
  name = m_tagStr.mid(1, pos - 1);
- int nameSpacePos = name.find(':');
+ int nameSpacePos = name.tqfind(':');
  if (nameSpacePos != -1)
  {
    nameSpace = name.left(nameSpacePos);
@@ -237,7 +237,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write)
       attr.name = attr.name.left(attr.name.length() - 1).lower();
       if (!attr.name.stripWhiteSpace().isEmpty())
       {
-        attr.nameLine = m_tagStr.left(sPos).contains('\n') + m_area.bLine;
+        attr.nameLine = m_tagStr.left(sPos).tqcontains('\n') + m_area.bLine;
         if (attr.nameLine == m_area.bLine)
             attr.nameCol = sPos + m_area.bCol;
         else
@@ -252,7 +252,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write)
     }
     if (m_dtd && !m_dtd->caseSensitive)
         attr.name = attr.name.lower();
-    attr.nameLine = m_tagStr.left(sPos).contains('\n') + m_area.bLine;
+    attr.nameLine = m_tagStr.left(sPos).tqcontains('\n') + m_area.bLine;
     if (attr.nameLine == m_area.bLine)
         attr.nameCol = sPos + m_area.bCol;
     else
@@ -298,7 +298,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write)
           pos--;
         attr.value = m_tagStr.mid(valueStartPos, pos - valueStartPos);
       }
-      attr.valueLine = m_tagStr.left(valueStartPos).contains('\n') + m_area.bLine;
+      attr.valueLine = m_tagStr.left(valueStartPos).tqcontains('\n') + m_area.bLine;
       if (attr.valueLine == m_area.bLine)
           attr.valueCol = valueStartPos + m_area.bCol;
       else
@@ -322,13 +322,13 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write)
     if ( !QuantaCommon::isKnownTag(m_dtd->name, tagName) &&
           name[0] != '/' )
     {
-      QTag *newTag = m_write->userTagList.find(tagName);
+      TQTag *newTag = m_write->userTagList.tqfind(tagName);
       bool insertNew = !newTag;
       if (insertNew)
       {
-        newTag = new QTag();
+        newTag = new TQTag();
         newTag->setName(name);
-        newTag->parentDTD = m_dtd;
+        newTag->tqparentDTD = m_dtd;
       }
       for (int i = 0; i >attrCount(); i++)
       {
@@ -340,7 +340,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write)
       }
       if (insertNew)
       {
-        m_write->userTagList.replace(tagName, newTag);
+        m_write->userTagList.tqreplace(tagName, newTag);
       }
     }
   }
@@ -566,7 +566,7 @@ void Tag::deleteAttribute(const TQString& attrName)
 
 void Tag::modifyAttributes(TQDict<TQString> *attrDict)
 {
-  QTag *qTag = QuantaCommon::tagFromDTD(m_dtd, name);
+  TQTag *qTag = QuantaCommon::tagFromDTD(m_dtd, name);
   TQDictIterator<TQString> it(*attrDict);
   TQString attribute;
   TQString value;
@@ -574,7 +574,7 @@ void Tag::modifyAttributes(TQDict<TQString> *attrDict)
   {
     attribute = it.currentKey();
     value = *(it.current());
-    if (qTag && qTag->parentDTD->singleTagStyle == "xml" && attribute=="/")
+    if (qTag && qTag->tqparentDTD->singleTagStyle == "xml" && attribute=="/")
     {
      ++it;
      continue;
@@ -584,7 +584,7 @@ void Tag::modifyAttributes(TQDict<TQString> *attrDict)
   }
   for (uint i = 0 ; i < attrs.count(); i++)
   {
-    if ( !attrDict->find(attrs[i].name) )
+    if ( !attrDict->tqfind(attrs[i].name) )
     {
       attrs.remove(attrs.at(i));
     }
@@ -593,7 +593,7 @@ void Tag::modifyAttributes(TQDict<TQString> *attrDict)
 
 TQString Tag::toString()
 {
-  QTag *qTag = QuantaCommon::tagFromDTD(m_dtd, name);
+  TQTag *qTag = QuantaCommon::tagFromDTD(m_dtd, name);
   TQValueList<TagAttr>::Iterator it;
   TagAttr attr;
   TQString attrString;
@@ -622,7 +622,7 @@ TQString Tag::toString()
   attrString.append(QuantaCommon::tagCase(name));
   tagString.prepend(attrString);
 
-  if (attrs.isEmpty() && qTag && qTag->parentDTD->singleTagStyle == "xml" &&
+  if (attrs.isEmpty() && qTag && qTag->tqparentDTD->singleTagStyle == "xml" &&
       (qTag->isSingle() ||
       (!qConfig.closeOptionalTags && qTag->isOptional()) || single)
      )
@@ -660,10 +660,10 @@ bool Tag::isInsideScript(const TQString &str)
   //This detects if the last char from str is inside a script area or not, to
   //treat cases like <a href="<? echo "foo" ?>"> correctly
   //TODO: speed up if you can...
-  if (str.find(m_dtd->specialAreaStartRx) != -1)
+  if (str.tqfind(m_dtd->specialAreaStartRx) != -1)
   {
     TQString foundString = m_dtd->specialAreaStartRx.cap();
-    if (str.find(m_dtd->specialAreas[foundString]) == -1)
+    if (str.tqfind(m_dtd->specialAreas[foundString]) == -1)
     {
       return true;
     }
diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp
index 5ed55a1b..33ad81ac 100644
--- a/quanta/parts/kafka/domtreeview.cpp
+++ b/quanta/parts/kafka/domtreeview.cpp
@@ -27,7 +27,7 @@
 
 #include "domtreeview.moc"
 
-DOMTreeView::DOMTreeView(TQWidget *parent, KHTMLPart *currentpart, const char * name) : KListView(parent, name)
+DOMTreeView::DOMTreeView(TQWidget *tqparent, KHTMLPart *currentpart, const char * name) : KListView(tqparent, name)
 {
     setCaption(name);
     setRootIsDecorated(true);
@@ -137,10 +137,10 @@ void DOMTreeView::slotItemClicked(TQListViewItem *cur_item)
     }
 }
 
-KafkaDOMTreeDialog::KafkaDOMTreeDialog(TQWidget *parent, KHTMLPart *part, const char* name, bool modal, WFlags fl )
-	: TQDialog(parent, name, modal, fl)
+KafkaDOMTreeDialog::KafkaDOMTreeDialog(TQWidget *tqparent, KHTMLPart *part, const char* name, bool modal, WFlags fl )
+	: TQDialog(tqparent, name, modal, fl)
 {
-	setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) );
+	tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) );
 	DialogLayout = new TQGridLayout( this, 1, 1, 11, 6, "DialogLayout");
 	domview = new DOMTreeView(this, part, name);
 	domview->setTitle(i18n( "Debugging KafkaWidget DOM Tree " ));
diff --git a/quanta/parts/kafka/domtreeview.h b/quanta/parts/kafka/domtreeview.h
index e8899b59..2f3ea65a 100644
--- a/quanta/parts/kafka/domtreeview.h
+++ b/quanta/parts/kafka/domtreeview.h
@@ -38,8 +38,9 @@ class TQGridLayout;
 class DOMTreeView : public KListView
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
-	DOMTreeView(TQWidget *parent, KHTMLPart *part, const char * name = 0);
+	DOMTreeView(TQWidget *tqparent, KHTMLPart *part, const char * name = 0);
 	~DOMTreeView();
         void setTitle(const TQString &str);
 	void recursive(const DOM::Node &pNode, const DOM::Node &node);
@@ -63,11 +64,12 @@ class DOMTreeView : public KListView
 
 };
 
-class KafkaDOMTreeDialog : public QDialog
+class KafkaDOMTreeDialog : public TQDialog
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	KafkaDOMTreeDialog(TQWidget *parent = 0, KHTMLPart *part = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	KafkaDOMTreeDialog(TQWidget *tqparent = 0, KHTMLPart *part = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~KafkaDOMTreeDialog();
 	DOMTreeView *domview;
 	TQGridLayout *DialogLayout;
diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp
index d8fee439..a6fdd8bb 100644
--- a/quanta/parts/kafka/htmldocumentproperties.cpp
+++ b/quanta/parts/kafka/htmldocumentproperties.cpp
@@ -44,9 +44,9 @@
 
 #include "viewmanager.h"
 
-htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInsertionOfBasicNodes, const char* name,
+htmlDocumentProperties::htmlDocumentProperties( TQWidget* tqparent, bool forceInsertionOfBasicNodes, const char* name,
  	bool modal, WFlags fl) :
-	htmlDocumentPropertiesui(parent, name, modal, fl), titleNode( 0L ), htmlNode( 0L ),
+	htmlDocumentPropertiesui(tqparent, name, modal, fl), titleNode( 0L ), htmlNode( 0L ),
 	headNode( 0L ), linkNode( 0L ), bodyNode( 0L), doctypeNode( 0L ), CSSNode ( 0L ),
 	xmlNode( 0L ), titleDirty(false), linkDirty(false)
 {
@@ -69,7 +69,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse
 	ok->setAutoDefault(true);
 
 	//set the taborder and disable focus for some widgets.
-	currentDTD->setFocusPolicy(TQWidget::NoFocus);
+	currentDTD->setFocusPolicy(TQ_NoFocus);
 	TQWidget::setTabOrder(title, metaItems);
 	TQWidget::setTabOrder(metaItems, metaItemsAdd);
 	TQWidget::setTabOrder(metaItemsAdd, metaItemsDelete);
@@ -98,7 +98,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse
 	cssRules->addColumn(i18n("Rule"));
 	cssRules->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
 	cssRules->setLineWidth( 2 );
-	//cssRules->setFocusPolicy(TQWidget::ClickFocus);
+	//cssRules->setFocusPolicy(TQ_ClickFocus);
 	cssRules->setSorting(-1);
 
 	//search for the head, html, title Node
@@ -108,7 +108,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse
 		while(node)
 		{
 			nodeName = node->tag->name.lower();
-			if(nodeName == "?xml" || nodeName.contains("xml pi block"))
+			if(nodeName == "?xml" || nodeName.tqcontains("xml pi block"))
 				xmlNode = node;
 			if(nodeName == "html")
 				htmlNode = node;
@@ -116,7 +116,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse
 				headNode = node;
 			if(nodeName == "body")
 				bodyNode = node;
-			if(nodeName == "!doctype" || nodeName.contains("dtd block"))
+			if(nodeName == "!doctype" || nodeName.tqcontains("dtd block"))
 				doctypeNode = node;
 			if(nodeName == "title")
 				titleNode = node;
@@ -219,7 +219,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse
 					cssStylesheet->setMode(KFile::File | KFile::ExistingOnly );
 					baseURL.setPath(ViewManager::ref()->activeDocument()->url().directory());
 					QuantaCommon::setUrl(url, linkNode->tag->attributeValue(index));
-					url = QExtFileInfo::toAbsolute(url, baseURL);
+					url = TQExtFileInfo::toAbsolute(url, baseURL);
 					cssStylesheet->setURL(url.url());
 				}
 			}
@@ -285,10 +285,10 @@ void htmlDocumentProperties::loadCSS(Node *node)
 		if(node->tag->type == Tag::ScriptStructureBegin)
 		{
 			selector = node->tag->tagStr();
-			selector = selector.left((uint)selector.find("{")).stripWhiteSpace();
+			selector = selector.left((uint)selector.tqfind("{")).stripWhiteSpace();
 			if(node->child)
 				item = new NodeLinkedViewItem(cssRules, selector,
-					node->child->tag->tagStr().replace('\n'," "));
+					node->child->tag->tagStr().tqreplace('\n'," "));
 			else
 				item = new NodeLinkedViewItem(cssRules, selector, "");
 			item->node = node;
@@ -537,7 +537,7 @@ void htmlDocumentProperties::accept()
 		QuantaCommon::setUrl(url, cssStylesheet->url());
 		baseURL = view->document()->url();
 		baseURL.setPath(baseURL.directory());
-		url = QExtFileInfo::toRelative(url, baseURL);
+		url = TQExtFileInfo::toRelative(url, baseURL);
 		finalURL = url.url();
 		if (url.protocol() == view->document()->url().protocol())
 			finalURL.remove(0, url.protocol().length() + 1);
@@ -594,7 +594,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs)
 	Node *allTheNodes, *lastHeadChild, *lastBodyChild, *lastHtmlChild;
 	Node *n, *nextNode;
 	bool htmlNodeCreated = false, bodyNodeCreated = false;
-	QTag *qHead, *qBody;
+	TQTag *qHead, *qBody;
 	TQString tagName;
 
 	if(headNode)
@@ -602,7 +602,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs)
 
         QuantaView *view = ViewManager::ref()->activeView();
 
-	if(!xmlNode && view->document()->defaultDTD()->name.contains("XHTML", false))
+	if(!xmlNode && view->document()->defaultDTD()->name.tqcontains("XHTML", false))
 	{
 		//if the xml node is not present and the current DTD is a xhtml like, create it.
 		allTheNodes = baseNode;
@@ -618,7 +618,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs)
 	if(!doctypeNode)
 	{
 		//if the !doctype node is not present, create it
-		if(!view->document()->defaultDTD()->name.contains("XHTML", false))
+		if(!view->document()->defaultDTD()->name.tqcontains("XHTML", false))
 		{
 			allTheNodes = baseNode;
 			baseNode = 0L;
@@ -645,13 +645,13 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs)
 
 		//TODO: hardcoded
 		//If it is XML, it add the namespace.
-		if(view->document()->defaultDTD()->name.contains("XHTML", false))
+		if(view->document()->defaultDTD()->name.tqcontains("XHTML", false))
 			htmlNode->tag->editAttribute("xmlns", "http://www.w3.org/1999/xhtml");
 
 		htmlNode->child = allTheNodes;
 		while(allTheNodes)
 		{
-			allTheNodes->parent = htmlNode;
+			allTheNodes->tqparent = htmlNode;
 			allTheNodes = allTheNodes->next;
 		}
 		htmlNodeCreated = true;
@@ -685,7 +685,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs)
 		if(qHead->isChild(allTheNodes))
 		{
 			/*//TODO:LOG this into the modif!!
-			allTheNodes->parent = headNode;
+			allTheNodes->tqparent = headNode;
 			if(lastHeadChild)
 			{
 				lastHeadChild->next = allTheNodes;
@@ -701,7 +701,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs)
 		else if(bodyNodeCreated && htmlNodeCreated && qBody->isChild(allTheNodes))
 		{
 			//TODO:log!!
-			/**allTheNodes->parent = bodyNode;
+			/**allTheNodes->tqparent = bodyNode;
 			if(lastBodyChild)
 			{
 				lastBodyChild->next = allTheNodes;
@@ -717,7 +717,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs)
 		else
 		{
 			//TODO:log? no.
-			/**allTheNodes->parent = htmlNode;
+			/**allTheNodes->tqparent = htmlNode;
 			lastHtmlChild->next = allTheNodes;
 			allTheNodes->prev = lastHtmlChild;
 			lastHtmlChild = allTheNodes;*/
diff --git a/quanta/parts/kafka/htmldocumentproperties.h b/quanta/parts/kafka/htmldocumentproperties.h
index 3bcfdcb1..bc0c9423 100644
--- a/quanta/parts/kafka/htmldocumentproperties.h
+++ b/quanta/parts/kafka/htmldocumentproperties.h
@@ -45,12 +45,13 @@ public:
 class htmlDocumentProperties : public htmlDocumentPropertiesui
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
         /**
          * @param forceInsertionOfBasicNodes Force the insertion of the basic Nodes (HTML, BODY, HEAD, ...) if pressing OK
          * without having made any changes.
          */
-	htmlDocumentProperties( TQWidget* parent = 0, bool forceInsertionOfBasicNodes = false, 
+	htmlDocumentProperties( TQWidget* tqparent = 0, bool forceInsertionOfBasicNodes = false, 
           const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~htmlDocumentProperties();
 	
diff --git a/quanta/parts/kafka/htmldocumentpropertiesui.ui b/quanta/parts/kafka/htmldocumentpropertiesui.ui
index 6314ca62..e83d6303 100644
--- a/quanta/parts/kafka/htmldocumentpropertiesui.ui
+++ b/quanta/parts/kafka/htmldocumentpropertiesui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>htmlDocumentPropertiesui</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>htmlDocumentPropertiesui</cstring>
     </property>
@@ -19,7 +19,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>Column 1</string>
@@ -42,7 +42,7 @@
             <property name="name">
                 <cstring>listView1</cstring>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -63,7 +63,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -79,7 +79,7 @@
                 <string>Current DTD: </string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -95,7 +95,7 @@
                 <string>Title: </string>
             </property>
         </widget>
-        <widget class="QLabel" row="8" column="0">
+        <widget class="TQLabel" row="8" column="0">
             <property name="name">
                 <cstring>textLabel1_2</cstring>
             </property>
@@ -111,7 +111,7 @@
                 <string>Link CSS stylesheet:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel3</cstring>
             </property>
@@ -137,14 +137,14 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>86</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>textLabel4</cstring>
             </property>
@@ -170,7 +170,7 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>84</height>
@@ -187,7 +187,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>226</width>
                     <height>21</height>
@@ -220,7 +220,7 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -374,7 +374,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>250</width>
                     <height>0</height>
@@ -393,7 +393,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>250</width>
                     <height>0</height>
@@ -441,16 +441,16 @@
     <tabstop>ok</tabstop>
     <tabstop>cancel</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected" specifier="pure virtual">newMetaItem()</slot>
     <slot access="protected" specifier="pure virtual">deleteCurrentMetaItem()</slot>
     <slot access="protected" specifier="pure virtual">newCSSRule()</slot>
     <slot access="protected" specifier="pure virtual">editCSSRule()</slot>
     <slot access="protected" specifier="pure virtual">deleteCurrentCSSRule()</slot>
-    <slot access="protected" specifier="pure virtual">titleChanged(const QString &amp;)</slot>
-    <slot access="protected" specifier="pure virtual">metaChanged(QListViewItem * )</slot>
-    <slot access="protected" specifier="pure virtual">CSSChanged(QListViewItem * )</slot>
-    <slot access="protected" specifier="pure virtual">linkChanged( const QString&amp; )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot access="protected" specifier="pure virtual">titleChanged(const TQString &amp;)</slot>
+    <slot access="protected" specifier="pure virtual">metaChanged(TQListViewItem * )</slot>
+    <slot access="protected" specifier="pure virtual">CSSChanged(TQListViewItem * )</slot>
+    <slot access="protected" specifier="pure virtual">linkChanged( const TQString&amp; )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/parts/kafka/htmlenhancer.cpp b/quanta/parts/kafka/htmlenhancer.cpp
index d900d77d..3f757a48 100644
--- a/quanta/parts/kafka/htmlenhancer.cpp
+++ b/quanta/parts/kafka/htmlenhancer.cpp
@@ -47,7 +47,7 @@ HTMLEnhancer::~HTMLEnhancer()
 	delete m_stddirs;
 }
 
-bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode)
+bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node nextDNode)
 {
 	DOM::Node domNode, domNode2, attr, *ptDomNode;
 	bool tbody, goUp;
@@ -64,7 +64,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next
 		{
 			baseURL.setPath(ViewManager::ref()->activeDocument()->url().directory());
 			QuantaCommon::setUrl(url, domNode.nodeValue().string());
-			url = QExtFileInfo::toAbsolute(url, baseURL);
+			url = TQExtFileInfo::toAbsolute(url, baseURL);
 			domNode.setNodeValue(url.url());
 #ifdef HEAVY_DEBUG
 			kdDebug(25001)<< "HTMLTranslator::translateNode() - new src : " << url.url() << endl;
@@ -80,7 +80,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next
           {
             baseURL.setPath(ViewManager::ref()->activeDocument()->url().directory());
             QuantaCommon::setUrl(url, domNode.nodeValue().string());
-            url = QExtFileInfo::toAbsolute(url, baseURL);
+            url = TQExtFileInfo::toAbsolute(url, baseURL);
             domNode.setNodeValue(url.url());
 #ifdef HEAVY_DEBUG
             kdDebug(25001)<< "HTMLTranslator::translateNode() - new href : " << url.url() << endl;
@@ -91,7 +91,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next
 	//THEN if it is the style element, add a DOM::Node::TEXT_NODE child gathering all the CSS
 	//by default, the parser parse it as a script, which can't be translated in DOM::Nodes.
 	if((node->tag->type == Tag::XmlTag && node->tag->name.lower() == "style") ||
-		(node->tag->type == Tag::ScriptTag && node->tag->name.lower().contains("style") != 0))
+		(node->tag->type == Tag::ScriptTag && node->tag->name.lower().tqcontains("style") != 0))
 	{
 		//If the style Node doesn't exists, create it
 		if(!node->rootNode())
@@ -126,13 +126,13 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next
 		}
 	}
     
-    QTag* qTag = QuantaCommon::tagFromDTD(m_wkafkapart->getCurrentDoc()->defaultDTD(),
-                                          parentDNode.nodeName().string());
+    TQTag* qTag = QuantaCommon::tagFromDTD(m_wkafkapart->getCurrentDoc()->defaultDTD(),
+                                          tqparentDNode.nodeName().string());
 
-	//THEN replace, if asked, scripts by a little icon.
+	//THEN tqreplace, if asked, scripts by a little icon.
     if(node->tag->type == Tag::ScriptTag && m_showIconForScripts && qTag->isChild("IMG", false))
 	{
-		script = node->tag->name.left(node->tag->name.find("block", 0, false) - 1).lower();
+		script = node->tag->name.left(node->tag->name.tqfind("block", 0, false) - 1).lower();
 #ifdef LIGHT_DEBUG
 		kdDebug(25001)<< "HTMLTranslator::translateNode() - BLOCK:" << script << ":" << endl;
 #endif
@@ -160,7 +160,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next
 			kafkaCommon::editDomNodeAttribute(domNode, "img", m_wkafkapart->defaultDTD(),
 				"title", text, m_wkafkapart->getKafkaWidget()->document());
 
-			if(!kafkaCommon::insertDomNode(domNode, parentDNode, nextDNode))
+			if(!kafkaCommon::insertDomNode(domNode, tqparentDNode, nextDNode))
 				return false;
 			m_wkafkapart->connectDomNodeToQuantaNode(domNode, node);
 		}
@@ -196,7 +196,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next
             kafkaCommon::editDomNodeAttribute(domNode, "img", m_wkafkapart->defaultDTD(),
                 "title", text, m_wkafkapart->getKafkaWidget()->document());
 
-            if(!kafkaCommon::insertDomNode(domNode, parentDNode, nextDNode))
+            if(!kafkaCommon::insertDomNode(domNode, tqparentDNode, nextDNode))
                 return false;
             m_wkafkapart->connectDomNodeToQuantaNode(domNode, node);
         }
@@ -282,13 +282,13 @@ void HTMLEnhancer::postEnhanceNode(DOM::Node domNode)
 {
 	DOM::Node textNode;
 	kNodeAttrs *props;
-	QTag *qTag;
+	TQTag *qTag;
 	bool isInline;
 
 	if(domNode.isNull())
 		return;
 
-	//If domNode is a Block and there is no text around, and if domNode's parent can handle
+	//If domNode is a Block and there is no text around, and if domNode's tqparent can handle
 	//text or a P tag, add an empty text DOM::Node
 	// so that the user can access this area.
 	qTag = QuantaCommon::tagFromDTD(m_wkafkapart->getCurrentDoc()->defaultDTD(),
diff --git a/quanta/parts/kafka/htmlenhancer.h b/quanta/parts/kafka/htmlenhancer.h
index 29ebe82f..73c62251 100644
--- a/quanta/parts/kafka/htmlenhancer.h
+++ b/quanta/parts/kafka/htmlenhancer.h
@@ -47,10 +47,10 @@ public:
 	 * The DOM::Node must be built before calling this
 	 * function.
 	 * @param node The Node we want to enhance.
-	 * @param parentDNode the parent DOM::Node of the root DOM::Node of node.
+	 * @param tqparentDNode the tqparent DOM::Node of the root DOM::Node of node.
 	 * @param nextDNode the DOM::Node next to the root DOM::Node of node.
 	 */
-	virtual bool enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode);
+	virtual bool enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node nextDNode);
 
 	/**
 	 * This functions is called once the whole DOM::Node tree is built. It will add empty
diff --git a/quanta/parts/kafka/kafkacommon.cpp b/quanta/parts/kafka/kafkacommon.cpp
index 5d4c5714..0d15ca02 100644
--- a/quanta/parts/kafka/kafkacommon.cpp
+++ b/quanta/parts/kafka/kafkacommon.cpp
@@ -52,9 +52,9 @@ Node *kafkaCommon::getNextNode(Node *node, bool &goUp, Node *endNode)
         }
         else
         {
-            if(node->parent == endNode)
+            if(node->tqparent == endNode)
                 return 0L;
-            return getNextNode(node->parent, goUp);
+            return getNextNode(node->tqparent, goUp);
         }
     }
     else
@@ -74,9 +74,9 @@ Node *kafkaCommon::getNextNode(Node *node, bool &goUp, Node *endNode)
         else
         {
             goUp = true;
-            if(node->parent == endNode)
+            if(node->tqparent == endNode)
                 return 0L;
-            return getNextNode(node->parent, goUp);
+            return getNextNode(node->tqparent, goUp);
         }
     }
 }
@@ -119,7 +119,7 @@ Node* kafkaCommon::getPrevNode(Node *node, Node *endNode)
     }
     else
     {
-        n = n->parent;
+        n = n->tqparent;
         if(n == endNode)
             return 0L;
     }
@@ -171,13 +171,13 @@ Node* kafkaCommon::DTDGetCommonParent(Node* startNode, Node* endNode,
     if(commonParent && (commonParent->tag->type == Tag::Text || commonParent->tag->type == Tag::Empty))
     {
         Node* oldCommonParent = commonParent;
-        commonParent = commonParent->parent;
+        commonParent = commonParent->tqparent;
         commonParentStartChild = oldCommonParent;
         commonParentEndChild = oldCommonParent;
     }
     //startNode or endNode can't be the commonParent.
     else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end()))
-        commonParent = commonParent->parent;
+        commonParent = commonParent->tqparent;
 
     commonParentStartChildLocation = getLocation(commonParentStartChild);
     commonParentEndChildLocation = getLocation(commonParentEndChild);
@@ -222,18 +222,18 @@ Node* kafkaCommon::DTDGetNonInlineCommonParent(Node* startNode, Node* endNode,
        commonParent->tag->type == Tag::Text || commonParent->tag->type == Tag::Empty))
     {
         Node* oldCommonParent = commonParent;
-        commonParent = commonParent->parent;
+        commonParent = commonParent->tqparent;
         while(commonParent && isInline(commonParent->tag->name))
         {
             oldCommonParent = commonParent;
-            commonParent = commonParent->parent;
+            commonParent = commonParent->tqparent;
         }
         commonParentStartChild = oldCommonParent;
         commonParentEndChild = oldCommonParent;
     }
     //startNode or endNode can't be the commonParent.
     else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end()))
-        commonParent = commonParent->parent;
+        commonParent = commonParent->tqparent;
 
     commonParentStartChildLocation = getLocation(commonParentStartChild);
     commonParentEndChildLocation = getLocation(commonParentEndChild);
@@ -365,7 +365,7 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod
     kdDebug(25001)<< "kafkaCommon::applyIndentation()" << endl;
 #endif
 
-    Node *parent, *nextNE, *prevNE, *realPrevNE, *realNextNE, *realPrev, *realNext, *prev, *next;
+    Node *tqparent, *nextNE, *prevNE, *realPrevNE, *realNextNE, *realPrev, *realNext, *prev, *next;
     int nonInlineDepth = 0, nonInlineDepth2 = 0, i;
     bool b = false;
     TQString indentation1, indentation2, text;
@@ -383,12 +383,12 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod
     realNext = node->next;
 
     if(inlineNodeIndentation &&
-       !node->prev && getNodeDisplay(node->parent, true) == kafkaCommon::blockDisplay)
+       !node->prev && getNodeDisplay(node->tqparent, true) == kafkaCommon::blockDisplay)
     {
         AreaStruct node_area = node->tag->area();
-        AreaStruct parent_area = node->parent->tag->area();
+        AreaStruct tqparent_area = node->tqparent->tag->area();
 
-        if(node_area.bLine == parent_area.bLine)
+        if(node_area.bLine == tqparent_area.bLine)
         {
             node->tag->setIndentationDone(true);
             return;
@@ -400,30 +400,30 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod
         setTagString(node, removeUnnecessaryWhitespaces(node->tag->tagStr()), modifs);
 
     //compute the "non-inline depth" of the Node and of the next NE (not Empty) Node
-    // i.e. we count how many non-inline parent they have.
-    parent = node->parent;
-    while(parent)
+    // i.e. we count how many non-inline tqparent they have.
+    tqparent = node->tqparent;
+    while(tqparent)
     {
-        if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay)
+        if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay)
             ++nonInlineDepth;
-        parent = parent->parent;
+        tqparent = tqparent->tqparent;
     }
 
     //compute the "non-inline depth" of the next non-empty Node.
     if (nextNE)
-        parent = nextNE->parent;
+        tqparent = nextNE->tqparent;
     else
-        parent = 0L;
-    while(parent)
+        tqparent = 0L;
+    while(tqparent)
     {
-        if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay)
+        if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay)
             ++nonInlineDepth2;
-        parent = parent->parent;
+        tqparent = tqparent->tqparent;
     }
 
-    parent = node->parent;
+    tqparent = node->tqparent;
 
-    if(!parent || getNodeDisplay(parent, true) == kafkaCommon::blockDisplay)
+    if(!tqparent || getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay)
     {
         //prepare the indentation
         indentation1 = "\n";
@@ -507,7 +507,7 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod
     }
     else
     {
-        //The parent is inline, so no indentation.
+        //The tqparent is inline, so no indentation.
         //Nothing to do.
     }
     node->tag->setIndentationDone(true);
@@ -519,7 +519,7 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
     kdDebug(25001)<< "kafkaCommon::fitIndentationNodes()" << endl;
 #endif
 
-    Node *parent, *child, *node, *emptyNode = 0L, *emptyNode2 = 0L;
+    Node *tqparent, *child, *node, *emptyNode = 0L, *emptyNode2 = 0L;
     int nbEmptyNodes = 0, n1Depth, n2Depth;
     bool lastChild = false, firstChild = false;
 
@@ -534,16 +534,16 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
         if(n1Depth > n2Depth)
         {
             child = n1;
-            parent = n2;
+            tqparent = n2;
         }
         else
         {
             child = n2;
-            parent = n1;
+            tqparent = n1;
         }
-        if(child->parent->firstChildNE() == child)
+        if(child->tqparent->firstChildNE() == child)
             firstChild = true;
-        if(child->parent->lastChildNE() == child)
+        if(child->tqparent->lastChildNE() == child)
             lastChild = true;
 
         //counting the Empty Nodes and deleting them to have only one empty node.
@@ -591,11 +591,11 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
         //adding/deleting a empty node if necessary
         if(firstChild)
         {
-            if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay)
+            if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay)
             {
                 if(child->tag->type != Tag::Text && !emptyNode)
                 {
-                    createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->parent,
+                    createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->tqparent,
                                         child, child, modifs);
                 }
             }
@@ -610,11 +610,11 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
 
         if(lastChild)
         {
-            if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay)
+            if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay)
             {
                 if(child->tag->type != Tag::Text && !emptyNode2)
                 {
-                    createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->parent,
+                    createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->tqparent,
                                         0L, 0L, modifs);
                 }
             }
@@ -654,8 +654,8 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
         }
 
         //adding/deleting a empty node if necessary
-        parent = n1->parent;
-        if(!parent || getNodeDisplay(parent, true) == kafkaCommon::blockDisplay)
+        tqparent = n1->tqparent;
+        if(!tqparent || getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay)
         {
             if(getNodeDisplay(n1, true) == kafkaCommon::blockDisplay &&
                     n1->tag->type != Tag::Text)
@@ -672,7 +672,7 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
                     }
                     else
                     {
-                        createAndInsertNode("", "", Tag::Empty, n2->tag->write(), parent, n2, n2, modifs);
+                        createAndInsertNode("", "", Tag::Empty, n2->tag->write(), tqparent, n2, n2, modifs);
                     }
                 }
             }
@@ -694,7 +694,7 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
                     }
                     else
                     {
-                        createAndInsertNode("", "", Tag::Empty, n2->tag->write(), parent, n2, n2, modifs);
+                        createAndInsertNode("", "", Tag::Empty, n2->tag->write(), tqparent, n2, n2, modifs);
                     }
                 }
             }
@@ -770,7 +770,7 @@ int kafkaCommon::getNodeDisplay(Node *node, bool closingNodeToo)
             closingNodeToo))
     {
         //If we areusing a non (X)HTML DTD, make everything blockDisplay by default
-        if(node->tag->dtd() && node->tag->dtd()->name.contains("HTML", false) == 0)
+        if(node->tag->dtd() && node->tag->dtd()->name.tqcontains("HTML", false) == 0)
             return kafkaCommon::blockDisplay;
 
         nodeName = node->tag->name.lower();
@@ -948,7 +948,7 @@ Node *kafkaCommon::createXmlDeclarationNode(Document *doc, const TQString &encod
 
 Node* kafkaCommon::createMandatoryNodeSubtree(Node *node, Document *doc)
 {
-    QTag *nodeQTag, *oldNodeQTag;
+    TQTag *nodeTQTag, *oldNodeTQTag;
     bool searchForMandatoryNode;
     Node *currentParent;
     TQMap<TQString, bool>::iterator it;
@@ -956,28 +956,28 @@ Node* kafkaCommon::createMandatoryNodeSubtree(Node *node, Document *doc)
     if(!node)
         return 0L;
 
-    nodeQTag = QuantaCommon::tagFromDTD(node);
-    if(!nodeQTag)
+    nodeTQTag = QuantaCommon::tagFromDTD(node);
+    if(!nodeTQTag)
         return false;
 
     searchForMandatoryNode = true;
     currentParent = node;
     while(searchForMandatoryNode)
     {
-        oldNodeQTag = nodeQTag;
-        for(it = nodeQTag->childTags.begin(); it != nodeQTag->childTags.end(); ++it)
+        oldNodeTQTag = nodeTQTag;
+        for(it = nodeTQTag->childTags.begin(); it != nodeTQTag->childTags.end(); ++it)
         {
             if(it.data())
             {
-                nodeQTag = QuantaCommon::tagFromDTD(nodeQTag->parentDTD, it.key());
-                if(!nodeQTag)
+                nodeTQTag = QuantaCommon::tagFromDTD(nodeTQTag->tqparentDTD, it.key());
+                if(!nodeTQTag)
                     return node;
-                currentParent = createAndInsertNode(nodeQTag->name(), "", Tag::XmlTag, doc,
+                currentParent = createAndInsertNode(nodeTQTag->name(), "", Tag::XmlTag, doc,
                                                     currentParent, 0L, 0L, (NodeModifsSet*)0L);
                 break;
             }
         }
-        if(oldNodeQTag == nodeQTag)
+        if(oldNodeTQTag == nodeTQTag)
             searchForMandatoryNode = false;
     }
 
@@ -998,7 +998,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling,
     if(!node)
         return 0L;
 
-    //Reset the listviews items pointers for node and its children
+    //Reset the listviews items pointers for node and its tqchildren
     n = node;
     b = false;
     while(n)
@@ -1028,7 +1028,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling,
         nodeIsFirstChild = true;
         parentNode->child = node;
     }
-    node->parent = parentNode;
+    node->tqparent = parentNode;
 
     if(nextSibling && nextSibling->prev)
     {
@@ -1099,7 +1099,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, N
     if(!node)
         return 0L;
 
-    //Reset the listviews items pointers for node and its children
+    //Reset the listviews items pointers for node and its tqchildren
     n = node;
     b = false;
     while(n)
@@ -1129,7 +1129,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, N
         nodeIsFirstChild = true;
         parentNode->child = node;
     }
-    node->parent = parentNode;
+    node->tqparent = parentNode;
 
     if(nextSibling && nextSibling->prev)
     {
@@ -1186,7 +1186,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, N
     return node;
 }
 
-Node *kafkaCommon::insertNode(Node *newNode, Node *parent, Node *nextSibling, Node *nextEndSibling,
+Node *kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *nextSibling, Node *nextEndSibling,
                               NodeModifsSet *modifs, bool merge)
 {
 #ifdef LIGHT_DEBUG
@@ -1199,7 +1199,7 @@ Node *kafkaCommon::insertNode(Node *newNode, Node *parent, Node *nextSibling, No
         return 0L;
 
     //place the new Node.
-    newNode = insertNode(newNode, parent, nextSibling, modifs, merge);
+    newNode = insertNode(newNode, tqparent, nextSibling, modifs, merge);
 
     if(!newNode->tag->single && newNode->tag->type == Tag::XmlTag)
     {
@@ -1208,7 +1208,7 @@ Node *kafkaCommon::insertNode(Node *newNode, Node *parent, Node *nextSibling, No
         nodeEnd->closesPrevious = true;
 
         //place the new closing Node.
-        nodeEnd = insertNode(nodeEnd, parent, nextEndSibling, modifs, merge);
+        nodeEnd = insertNode(nodeEnd, tqparent, nextEndSibling, modifs, merge);
     }
 
     //If nextSibling != nextEndSibling, move all Nodes between node and nodeEnd as child of node
@@ -1222,7 +1222,7 @@ Node *kafkaCommon::insertNode(Node *newNode, Node *parent, Node *nextSibling, No
     return newNode;
 }
 
-Node* kafkaCommon::insertNode(Node *newNode, Node *parent, Node *startNodeToSurround,
+Node* kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *startNodeToSurround,
                               Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs)
 {
 #ifdef LIGHT_DEBUG
@@ -1246,7 +1246,7 @@ Node* kafkaCommon::insertNode(Node *newNode, Node *parent, Node *startNodeToSurr
         endNodeToSurround = endNodeToSurround->next;
 
     //Then create and insert the new Node.
-    return insertNode(newNode, parent, startNodeToSurround,
+    return insertNode(newNode, tqparent, startNodeToSurround,
                       endNodeToSurround, modifs);
 }
 
@@ -1389,13 +1389,13 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti
     {
         *cursorNode = newNode;
         cursorOffset = newNode->tag->tagStr().length();
-        return insertNodeSubtree(newNode, startNode->parent, endNode, modifs);
+        return insertNodeSubtree(newNode, startNode->tqparent, endNode, modifs);
     }
 
     //Then we "split" the lastValidStartParent - startNode subtree into two : the first part is untouched
     // and the second will be surrounded by the new Node. Same thing for endNode.
     Node* node = startNode;
-    Node* parentNode = startNode->parent;
+    Node* parentNode = startNode->tqparent;
     Node* newParentNode = 0, *child = 0, *next = 0;
     while(parentNode && commonParent && parentNode != commonParent)
     {
@@ -1404,10 +1404,10 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti
             //node is not the first Child of parentNode, we have to duplicate parentNode, and put node and
             //all its next sibling as child of the new parentNode.
             /**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(),
-            parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(),
+            parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(),
             parentNode, parentNode, modifs);*/
             newParentNode = duplicateNode(parentNode);
-            insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
+            insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
             child = parentNode->firstChild();
             if(cursorOffset != 0)
             {
@@ -1433,13 +1433,13 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti
         }
         //commonParentStartChild = parentNode;
         node = parentNode;
-        parentNode = parentNode->parent;
+        parentNode = parentNode->tqparent;
     }
 
     if(endNode)
     {
         node = endNode;
-        parentNode = endNode->parent;
+        parentNode = endNode->tqparent;
         while(parentNode && commonParent && parentNode != commonParent)
         {
             if(true/*node != parentNode->firstChild()*/)
@@ -1447,10 +1447,10 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti
             //node is not the first Child of parentNode, we have to duplicate parentNode, and put node and
             //all its next sibling as child of the new parentNode.
             /**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(),
-                parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(),
+                parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(),
                 parentNode, parentNode, modifs);*/
                 newParentNode = duplicateNode(parentNode);
-                insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
+                insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
                 child = parentNode->firstChild();
                 while(child /*&& child == endNode*/ &&
                       (child == endNode || child->hasForChild(endNode)/* ||
@@ -1464,7 +1464,7 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti
             commonParentStartChild = newParentNode;
             node = parentNode;
             Node* aux = parentNode;
-            parentNode = parentNode->parent;
+            parentNode = parentNode->tqparent;
             // Remove node subtree if empty
             if(!aux->hasChildNodes())
                 extractAndDeleteNode(aux, modifs);
@@ -1487,8 +1487,8 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti
 Node* kafkaCommon::DTDInsertNodeSubtree(Node* newNode, Node* parentNode, Node* nextSibling,
                                         NodeSelection& /*cursorHolder*/, NodeModifsSet *modifs)
 {
-    QTag* nodeQTag = QuantaCommon::tagFromDTD(parentNode);
-    if(!nodeQTag || !nodeQTag->isChild(newNode))
+    TQTag* nodeTQTag = QuantaCommon::tagFromDTD(parentNode);
+    if(!nodeTQTag || !nodeTQTag->isChild(newNode))
         return 0;
     else
         return insertNodeSubtree(newNode, parentNode, nextSibling, modifs);
@@ -1506,7 +1506,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
     Node *commonParent = 0L, *commonParentStartChild, *commonParentEndChild, *parentNode, *node;
     Node *lastValidStartParent = 0L, *lastValidEndParent = 0L, *newParentNode, *child, *next;
     Node *oldCommonParent, *lastNewNode, *oldParentNode;
-    QTag *parentNodeQTag = 0, *newNodeQTag, *lastNewNodeQTag;
+    TQTag *parentNodeTQTag = 0, *newNodeTQTag, *lastNewNodeTQTag;
     NodeModif modif;
     int locOffset = 1;
     bool newNodeIsInline, isAfter;
@@ -1519,16 +1519,16 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
 
     //FIrst get the mandatory Nodes if necessary, and get the qTag of the first and last Node.
     lastNewNode = createMandatoryNodeSubtree(newNode, doc);
-    lastNewNodeQTag = QuantaCommon::tagFromDTD(lastNewNode);
-    newNodeQTag = QuantaCommon::tagFromDTD(newNode);
-    if(!newNodeQTag || !lastNewNodeQTag)
+    lastNewNodeTQTag = QuantaCommon::tagFromDTD(lastNewNode);
+    newNodeTQTag = QuantaCommon::tagFromDTD(newNode);
+    if(!newNodeTQTag || !lastNewNodeTQTag)
     {
       Node::deleteNode(newNode);
       return false;
     }
 
-    //Then search for the common parent of startNode and endNode (commonParent)
-    //and for the childs of commonParent which are parent of startNode and endNode
+    //Then search for the common tqparent of startNode and endNode (commonParent)
+    //and for the childs of commonParent which are tqparent of startNode and endNode
     //(commonParentStartChild && commonParentEndChild)
     //CommonParent will be the limit (startNode -- commonNode) where Nodes can
     //be splitted in order to insert the newNode.
@@ -1559,51 +1559,51 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
                                             commonParent->tag->type == Tag::Text || commonParent->tag->type == Tag::Empty))
     {
         oldCommonParent = commonParent;
-        commonParent = commonParent->parent;
+        commonParent = commonParent->tqparent;
         while(commonParent && isInline(commonParent->tag->name))
         {
             oldCommonParent = commonParent;
-            commonParent = commonParent->parent;
+            commonParent = commonParent->tqparent;
         }
         commonParentStartChild = oldCommonParent;
         commonParentEndChild = oldCommonParent;
     }
     //startNode or endNode can't be the commonParent.
     else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end()))
-        commonParent = commonParent->parent;
+        commonParent = commonParent->tqparent;
 
-    //Now look if at least one of the parent Nodes between startNode and commonParent
+    //Now look if at least one of the tqparent Nodes between startNode and commonParent
     //can have nodeName as child. If so for startNode and endNode, let's find the last
-    //parent Nodes which can have nodeName as child.
-    parentNode = startNode->parent;
+    //tqparent Nodes which can have nodeName as child.
+    parentNode = startNode->tqparent;
     oldParentNode = startNode;
-    while(parentNode && commonParent && parentNode != commonParent->parent)
+    while(parentNode && commonParent && parentNode != commonParent->tqparent)
     {
-        parentNodeQTag = QuantaCommon::tagFromDTD(parentNode);
-        if(parentNodeQTag && parentNodeQTag->isChild(newNode) &&
-                lastNewNodeQTag->isChild(oldParentNode))
+        parentNodeTQTag = QuantaCommon::tagFromDTD(parentNode);
+        if(parentNodeTQTag && parentNodeTQTag->isChild(newNode) &&
+                lastNewNodeTQTag->isChild(oldParentNode))
             lastValidStartParent = parentNode;
         else if(newNodeIsInline || !isInline(parentNode->tag->name))
             break;
         //else if(!newNodeIsInline && isInline(parentNode)), we continue : BLOCK element can
         //cut some inline tag in order to be inserted.
         oldParentNode = parentNode;
-        parentNode = parentNode->parent;
+        parentNode = parentNode->tqparent;
     }
-    parentNode = endNode->parent;
+    parentNode = endNode->tqparent;
     oldParentNode = endNode;
-    while(parentNode && commonParent &&  parentNode != commonParent->parent)
+    while(parentNode && commonParent &&  parentNode != commonParent->tqparent)
     {
-        parentNodeQTag = QuantaCommon::tagFromDTD(parentNode);
-        if(parentNodeQTag && parentNodeQTag->isChild(newNode) &&
-                lastNewNodeQTag->isChild(oldParentNode))
+        parentNodeTQTag = QuantaCommon::tagFromDTD(parentNode);
+        if(parentNodeTQTag && parentNodeTQTag->isChild(newNode) &&
+                lastNewNodeTQTag->isChild(oldParentNode))
             lastValidEndParent = parentNode;
         else if(newNodeIsInline || !isInline(parentNode->tag->name))
             break;
         //else if(!newNodeIsInline && isInline(parentNode)), we continue : BLOCK element can
         //cut some inline tag in order to be inserted.
         oldParentNode = parentNode;
-        parentNode = parentNode->parent;
+        parentNode = parentNode->tqparent;
     }
 
     /**if(!lastValidEndParent || !lastValidStartParent)
@@ -1662,7 +1662,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
     node = startNode;
     if (!startNode) //Andras: it can happen.
       return false;
-    parentNode = startNode->parent;
+    parentNode = startNode->tqparent;
     while(lastValidStartParent && parentNode && parentNode != lastValidStartParent)
     {
         if(node != parentNode->firstChild())
@@ -1670,10 +1670,10 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
             //node is not the first Child of parentNode, we have to duplicate parentNode, and put node and
             //all its next sibling as child of the new parentNode.
             /**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(),
-            	parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(),
+            	parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(),
             	parentNode, parentNode, modifs);*/
             newParentNode = duplicateNode(parentNode);
-            insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
+            insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
             child = parentNode->firstChild();
             while(child && child != startNode && !child->hasForChild(startNode))
             {
@@ -1683,10 +1683,10 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
             }
         }
         node = parentNode;
-        parentNode = parentNode->parent;
+        parentNode = parentNode->tqparent;
     }
     node = endNode;
-    parentNode = endNode->parent;
+    parentNode = endNode->tqparent;
     while(lastValidEndParent && parentNode && parentNode != lastValidEndParent)
     {
         if(node != parentNode->lastChild())
@@ -1694,10 +1694,10 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
             //node is not the last Child of parentNode, we have to duplicate parentNode, and put all
             //the next sibling of node as child of the new parentNode
             /**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(),
-            	parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(),
+            	parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(),
             	parentNode, parentNode, modifs);*/
             newParentNode = duplicateNode(parentNode);
-            insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
+            insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
             if(parentNode == commonParentStartChild)
                 commonParentStartChild = newParentNode;
             if(parentNode == commonParentEndChild)
@@ -1717,7 +1717,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
             }
         }
         node = parentNode;
-        parentNode = parentNode->parent;
+        parentNode = parentNode->tqparent;
     }
 
     //Now if startNode is after endNode, this means that a selectionless insertion is being done.
@@ -1728,19 +1728,19 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
                    (signed)startNode->tag->tagStr().length() == startOffset))
     {
         if(isAfter)
-            parentNodeQTag = QuantaCommon::tagFromDTD(commonParent);
+            parentNodeTQTag = QuantaCommon::tagFromDTD(commonParent);
         else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTag)
-            parentNodeQTag = QuantaCommon::tagFromDTD(startNode);
+            parentNodeTQTag = QuantaCommon::tagFromDTD(startNode);
         else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTagEnd)
-            parentNodeQTag = QuantaCommon::tagFromDTD(startNode->parent);
-        if(!parentNodeQTag || (parentNodeQTag && parentNodeQTag->isChild(newNode)))
+            parentNodeTQTag = QuantaCommon::tagFromDTD(startNode->tqparent);
+        if(!parentNodeTQTag || (parentNodeTQTag && parentNodeTQTag->isChild(newNode)))
         {
             if(isAfter)
                 insertNodeSubtree(newNode, commonParent, commonParentStartChild, modifs);
             else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTag)
                 insertNodeSubtree(newNode, startNode, 0L, modifs);
             else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTagEnd)
-                insertNodeSubtree(newNode, startNode->parent, startNode->next, modifs);
+                insertNodeSubtree(newNode, startNode->tqparent, startNode->next, modifs);
             //<TEMPORARY>
             (*cursorNode) = lastNewNode;
             cursorOffset = 0;
@@ -1798,7 +1798,7 @@ bool kafkaCommon::DTDinsertRemoveNode(Node *newNode, Node *startNode, int startO
 }
 
 Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString &tagString,
-                                       int nodeType, Document *doc, Node* parent, Node* nextSibling, NodeModifsSet *modifs,
+                                       int nodeType, Document *doc, Node* tqparent, Node* nextSibling, NodeModifsSet *modifs,
                                        bool merge)
 {
 #ifdef LIGHT_DEBUG
@@ -1812,13 +1812,13 @@ Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString
     node = createNode(nodeName, tagString, nodeType, doc);
 
     //insert the new Node.
-    insertNode(node, parent, nextSibling, modifs, merge);
+    insertNode(node, tqparent, nextSibling, modifs, merge);
 
     return node;
 }
 
 Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString &tagString,
-                                       int nodeType, Document *doc, Node *parent, Node *nextSibling, Node *nextEndSibling,
+                                       int nodeType, Document *doc, Node *tqparent, Node *nextSibling, Node *nextEndSibling,
                                        NodeModifsSet *modifs)
 {
 #ifdef LIGHT_DEBUG
@@ -1832,13 +1832,13 @@ Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString
     node = createNode(nodeName, tagString, nodeType, doc);
 
     //insert the new Node.
-    insertNode(node, parent, nextSibling, nextEndSibling, modifs);
+    insertNode(node, tqparent, nextSibling, nextEndSibling, modifs);
 
     return node;
 }
 
 Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString &tagString,
-                                       int nodeType, Document *doc, Node *parent, Node *startNodeToSurround,
+                                       int nodeType, Document *doc, Node *tqparent, Node *startNodeToSurround,
                                        Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs)
 {
 #ifdef LIGHT_DEBUG
@@ -1855,7 +1855,7 @@ Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString
     node = createNode(nodeName, tagString, nodeType, doc);
 
     //insert the new Node.
-    insertNode(node, parent, startNodeToSurround, endNodeToSurround, startOffset, endOffset,
+    insertNode(node, tqparent, startNodeToSurround, endNodeToSurround, startOffset, endOffset,
                modifs);
 
     return node;
@@ -1891,18 +1891,18 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode,
                                      NodeModifsSet *modifs)
 {
 
-    QTag *leafNodeQTag, *currentNodeParentQTag;
+    TQTag *leafNodeTQTag, *currentNodeParentTQTag;
     Node *startSelection = 0L, *endSelection = 0L, *oldCurrentNode, *copyNewNode;
     bool selectionInProgress = false, validCurNodeParent = false;
 
-    leafNodeQTag = QuantaCommon::tagFromDTD(leafNode);
-    if(!leafNodeQTag)
+    leafNodeTQTag = QuantaCommon::tagFromDTD(leafNode);
+    if(!leafNodeTQTag)
         return false;
 
-    if(currentNode && currentNode->parent)
+    if(currentNode && currentNode->tqparent)
     {
-        currentNodeParentQTag = QuantaCommon::tagFromDTD(currentNode->parent);
-        if(currentNodeParentQTag && currentNodeParentQTag->isChild(newNode))
+        currentNodeParentTQTag = QuantaCommon::tagFromDTD(currentNode->tqparent);
+        if(currentNodeParentTQTag && currentNodeParentTQTag->isChild(newNode))
             validCurNodeParent = true;
     }
 
@@ -1924,7 +1924,7 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode,
         //if the examination has started and currentNode doesn't have endExaminationNode as
         //child, let's start/extend the selection over this node.
         if((currentNode->tag->type == Tag::XmlTag || currentNode->tag->type == Tag::Text) &&
-                leafNodeQTag->isChild(currentNode) && validCurNodeParent && examinationStarted &&
+                leafNodeTQTag->isChild(currentNode) && validCurNodeParent && examinationStarted &&
                 !currentNode->hasForChild(endExaminationNode))
         {
 #ifdef HEAVY_DEBUG
@@ -1986,10 +1986,10 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode,
                     if (startSelection && endSelection)
                     {
                       /**copyNewNode = duplicateNode(newNode);
-                      insertNode(copyNewNode, startSelection->parentNode(), startSelection,
+                      insertNode(copyNewNode, startSelection->tqparentNode(), startSelection,
                         endSelection->next, modifs);*/
                       copyNewNode = duplicateNodeSubtree(newNode);
-                      insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection,
+                      insertNodeSubtree(copyNewNode, startSelection->tqparentNode(), startSelection,
                                         endSelection->next, modifs);
                       nodeInserted = true;
                     }
@@ -2067,10 +2067,10 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode,
                 if (startSelection && endSelection)
                 {
                   /**copyNewNode = duplicateNode(newNode);
-                  insertNode(copyNewNode, startSelection->parentNode(), startSelection,
+                  insertNode(copyNewNode, startSelection->tqparentNode(), startSelection,
                     endSelection->next, modifs);*/
                   copyNewNode = duplicateNodeSubtree(newNode);
-                  insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection,
+                  insertNodeSubtree(copyNewNode, startSelection->tqparentNode(), startSelection,
                                     endSelection->next, modifs);
                   nodeInserted = true;
                 }
@@ -2097,10 +2097,10 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode,
             while(endSelection && endSelection->tag->type == Tag::Empty)
                 endSelection = endSelection->prev;
             /**copyNewNode = duplicateNode(newNode);
-            insertNode(copyNewNode, startSelection->parentNode(), startSelection,
+            insertNode(copyNewNode, startSelection->tqparentNode(), startSelection,
             	endSelection->next, modifs);*/
             copyNewNode = duplicateNodeSubtree(newNode);
-            insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection,
+            insertNodeSubtree(copyNewNode, startSelection->tqparentNode(), startSelection,
                               endSelection->next, modifs);
             nodeInserted = true;
         }
@@ -2184,7 +2184,7 @@ Node *kafkaCommon::duplicateNodeSubtree(Node *node, bool childAndClosingTagOnly)
         newPrev = 0L;
         for(link = nodeLinkList.first(); link; link = nodeLinkList.next())
         {
-            if(link->m_n1 == currentNode->parent)
+            if(link->m_n1 == currentNode->tqparent)
                 newParent = link->m_n2;
             else if(link->m_n1 == currentNode->next)
                 newNext = link->m_n2;
@@ -2217,7 +2217,7 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh
 {
     NodeModif *modif = 0, *modifChild;
     Node *lastChild, *curNode;
-    Node *parent, *next, *child, *n;
+    Node *tqparent, *next, *child, *n;
     //Node *prev;
     bool isSingle;
     int type;
@@ -2231,7 +2231,7 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh
     if(!node->child)
         extractChildren = true;
 
-    parent = node->parent;
+    tqparent = node->tqparent;
     next = node->next;
     //prev = node->prev; //Should this be used at all?
     child = node->child;
@@ -2252,7 +2252,7 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh
             modif->setType(NodeModif::NodeRemoved);
         modif->setLocation(getLocation(node));
 
-        //log the children move if we don't extract the children
+        //log the tqchildren move if we don't extract the tqchildren
         if(!extractChildren)
         {
           location = getLocation(node);
@@ -2284,18 +2284,18 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh
         curNode = node->child;
         while(curNode)
         {
-            curNode->parent = node->parent;
+            curNode->tqparent = node->tqparent;
             curNode = curNode->next;
         }
     }
-    if(node->parent && node->parent->child == node)
+    if(node->tqparent && node->tqparent->child == node)
     {
         if(extractChildren)
-            node->parent->child = node->next;
+            node->tqparent->child = node->next;
         else
-            node->parent->child = node->child;
+            node->tqparent->child = node->child;
     }
-    node->parent = 0L;
+    node->tqparent = 0L;
     if(node->prev)
     {
         if(extractChildren)
@@ -2643,7 +2643,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
                                 int startOffset, Node *endNode, int endOffset, Node **cursorNode, long &cursorOffset,
                                 NodeModifsSet *modifs)
 {
-    QTag *nodeNameQTag, *parentQTag;
+    TQTag *nodeNameTQTag, *tqparentTQTag;
     Node *node, *lastNodeNameStartNode, *lastNodeNameEndNode;
     Node *parentNode, *newParentNode, *child, *next;
     bool goUp, nodesRemoved = false, DTDError = false, result;
@@ -2653,8 +2653,8 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
         return kafkaCommon::extractionBadParameters;
 
     //First check that nodeName is really inline and that an area is selected.
-    nodeNameQTag = QuantaCommon::tagFromDTD(doc->defaultDTD(), nodeName);
-    if(!nodeNameQTag)
+    nodeNameTQTag = QuantaCommon::tagFromDTD(doc->defaultDTD(), nodeName);
+    if(!nodeNameTQTag)
         return kafkaCommon::extractionBadParameters;
     if(!isInline(nodeName))
         return kafkaCommon::extractionBadParameters;
@@ -2671,8 +2671,8 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
     if(startNode == endNode && startOffset == endOffset)
         return kafkaCommon::extractionBadParameters;
 
-    //Then, process startNode and endNode : look if a nodeName parent is one of
-    //startNode/endNode's inline parents and if it is the case, split the necessary Nodes.
+    //Then, process startNode and endNode : look if a nodeName tqparent is one of
+    //startNode/endNode's inline tqparents and if it is the case, split the necessary Nodes.
     //The comparaison is made in lowercase, even in xml : it could be strange, for an user, to have
     //its nodes not removed because there are in the wrong case.
     node = startNode;
@@ -2681,7 +2681,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
     {
         if(node->tag->name.lower() == nodeName.lower())
             lastNodeNameStartNode = node;
-        node = node->parent;
+        node = node->tqparent;
     }
     node = endNode;
     lastNodeNameEndNode = 0L;
@@ -2689,7 +2689,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
     {
         if(node->tag->name.lower() == nodeName.lower())
             lastNodeNameEndNode = node;
-        node = node->parent;
+        node = node->tqparent;
     }
 
     if(startNode->tag->type == Tag::Text)
@@ -2724,13 +2724,13 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
     if(lastNodeNameStartNode)
     {
         node = startNode;
-        parentNode = startNode->parent;
-        while(parentNode && parentNode != lastNodeNameStartNode->parent)
+        parentNode = startNode->tqparent;
+        while(parentNode && parentNode != lastNodeNameStartNode->tqparent)
         {
             if(node != parentNode->firstChild())
             {
                 newParentNode = duplicateNode(parentNode);
-                insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
+                insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
                 child = parentNode->firstChild();
                 while(child && child != startNode && !child->hasForChild(startNode))
                 {
@@ -2740,19 +2740,19 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
                 }
             }
             node = parentNode;
-            parentNode = parentNode->parent;
+            parentNode = parentNode->tqparent;
         }
     }
     if(lastNodeNameEndNode)
     {
         node = endNode;
-        parentNode = endNode->parent;
-        while(parentNode && parentNode != lastNodeNameEndNode->parent)
+        parentNode = endNode->tqparent;
+        while(parentNode && parentNode != lastNodeNameEndNode->tqparent)
         {
             if(node != parentNode->SLastChild())
             {
                 newParentNode = duplicateNode(parentNode);
-                insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
+                insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
                 if(parentNode == lastNodeNameStartNode)
                     lastNodeNameStartNode = newParentNode;
                 child = parentNode->firstChild();
@@ -2770,7 +2770,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
                 }
             }
             node = parentNode;
-            parentNode = parentNode->parent;
+            parentNode = parentNode->tqparent;
         }
     }
 
@@ -2782,13 +2782,13 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
         next = getNextNode(node, goUp);
         if(node->tag->type == Tag::XmlTag && node->tag->name.lower() == nodeName.lower())
         {
-            parentQTag = QuantaCommon::tagFromDTD(node->parent);
-            if(parentQTag)
+            tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
+            if(tqparentTQTag)
             {
                 child = node->firstChild();
                 while(child)
                 {
-                    if(!parentQTag->isChild(child))
+                    if(!tqparentTQTag->isChild(child))
                         DTDError = true;
                     child = child->next;
                 }
@@ -2927,10 +2927,10 @@ bool kafkaCommon::splitNode(Node *n, int offset, NodeModifsSet *modifs)
 
     if(n->tag->type == Tag::Text)
         node = createAndInsertNode("#text", tagStr.right(tagStr.length() - offset), Tag::Text, n->tag->write(),
-                                   n->parent, n->next, modifs, false);
+                                   n->tqparent, n->next, modifs, false);
     else
         node = createAndInsertNode("", tagStr.right(tagStr.length() - offset), Tag::Empty, n->tag->write(),
-                                   n->parent, n->next, modifs, false);
+                                   n->tqparent, n->next, modifs, false);
 
     //Node's string is a part of n's clean string
     node->tag->setCleanStrBuilt(true);
@@ -2944,14 +2944,14 @@ void kafkaCommon::splitStartNodeSubtree(Node* startNode, Node* commonParent,
     //Then we "split" the lastValidStartParent - startNode subtree into two : the first part is untouched
     // and the second will be surrounded by the new Node. Same thing for endNode.
     Node* node = startNode;
-    Node* parentNode = startNode->parent;
+    Node* parentNode = startNode->tqparent;
     Node* commonParentStartChild = 0;
     while(parentNode && commonParent && parentNode != commonParent)
     {
         if(node != parentNode->firstChild())
         {
             Node* newParentNode = duplicateNode(parentNode);
-            insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
+            insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
             Node* child = parentNode->firstChild();
             while(child && child != startNode && !child->hasForChild(startNode))
             {
@@ -2962,7 +2962,7 @@ void kafkaCommon::splitStartNodeSubtree(Node* startNode, Node* commonParent,
         }
         commonParentStartChild = parentNode;
         node = parentNode;
-        parentNode = parentNode->parent;
+        parentNode = parentNode->tqparent;
     }
 
     if(commonParentStartChild)
@@ -2975,7 +2975,7 @@ void kafkaCommon::splitEndNodeSubtree(Node* endNode, Node* commonParent,
                                       bool subTree, NodeModifsSet* modifs)
 {
     Node* node = endNode;
-    Node* parentNode = endNode->parent;
+    Node* parentNode = endNode->tqparent;
 
     Node* aux = 0;
     if(subTree)
@@ -2989,7 +2989,7 @@ void kafkaCommon::splitEndNodeSubtree(Node* endNode, Node* commonParent,
         if(node != parentNode->lastChild())
         {
             Node* newParentNode = duplicateNode(parentNode);
-            insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs);
+            insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs);
             if(parentNode == commonParentStartChild)
                 commonParentStartChild = newParentNode;
             if(parentNode == commonParentEndChild)
@@ -3009,7 +3009,7 @@ void kafkaCommon::splitEndNodeSubtree(Node* endNode, Node* commonParent,
             }
         }
         node = parentNode;
-        parentNode = parentNode->parent;
+        parentNode = parentNode->tqparent;
     }
     commonParentStartChildLocation = getLocation(commonParentStartChild);
     commonParentEndChildLocation = getLocation(commonParentEndChild);
@@ -3029,11 +3029,11 @@ void kafkaCommon::splitStartAndEndNodeSubtree(Node*& startNode, int startOffset,
     startNode = getCorrectStartNode(startNode, startOffset);
     endNode = getCorrectEndNode(endNode, endOffset);
 
-    // look for common parent
+    // look for common tqparent
     if(!commonParent)
     {
         if(extractInlineParentNodes)
-            // get the non inline common parent
+            // get the non inline common tqparent
             commonParent =
                     DTDGetNonInlineCommonParent(startNode, endNode, commonParentStartChildLocation, commonParentEndChildLocation, subTree);
         else
@@ -3075,7 +3075,7 @@ void kafkaCommon::splitStartAndEndNodeSubtree(Node*& startNode, int startOffset,
     }
     splitNode(endNode, endOffset, modifs);
 
-    // split start and end nodes subtree in function of common parent
+    // split start and end nodes subtree in function of common tqparent
     commonParentStartChildLocation = kafkaCommon::getLocation(commonParentStartChild);
     splitStartNodeSubtree(startNode, commonParent, commonParentStartChildLocation, modifs);
 
@@ -3208,21 +3208,21 @@ bool kafkaCommon::mergeNodes(Node *n, Node *n2, NodeSelection& cursorHolder, Nod
 void kafkaCommon::mergeInlineNode(Node *startNode, Node *endNode, Node **cursorNode,
                                   long &cursorOffset, NodeModifsSet *modifs)
 {
-    Node *startNodeLastInlineParent, *parent, *node, *next;
+    Node *startNodeLastInlineParent, *tqparent, *node, *next;
     bool goUp, success, isCursorNode, isEndNode;
     int nodeLength;
 
     if(!startNode || !endNode)
         return;
 
-    //first search for the last inline parent of startNode, and then its last prev neighbour
+    //first search for the last inline tqparent of startNode, and then its last prev neighbour
     // which is also inline : the merge will start from this Node.
     startNodeLastInlineParent = startNode;
-    parent = startNode->parent;
-    while(parent && isInline(parent->tag->name))
+    tqparent = startNode->tqparent;
+    while(tqparent && isInline(tqparent->tag->name))
     {
-        startNodeLastInlineParent = parent;
-        parent = parent->parent;
+        startNodeLastInlineParent = tqparent;
+        tqparent = tqparent->tqparent;
     }
     if(startNodeLastInlineParent->prev)
     {
@@ -3297,7 +3297,7 @@ void kafkaCommon::getEndPosition(const TQString &tagString, int bLine, int bCol,
 {
     /**int result, oldResult;
 
-    result = tagString.find("\n", 0);
+    result = tagString.tqfind("\n", 0);
     if(result == -1)
     {
     	eLine = bLine;
@@ -3310,7 +3310,7 @@ void kafkaCommon::getEndPosition(const TQString &tagString, int bLine, int bCol,
     	{
     		eLine++;
     		oldResult = result;
-    		result = tagString.find("\n", result + 1);
+    		result = tagString.tqfind("\n", result + 1);
     	}
     	eCol = tagString.length() - oldResult - 2;
     }*/
@@ -3420,7 +3420,7 @@ TQValueList<int> kafkaCommon::getLocation(Node * node)
             node = node->prev;
         }
         loc.prepend(i);
-        node = node->parent;
+        node = node->tqparent;
     }
     return loc;
 }
@@ -3634,11 +3634,11 @@ int kafkaCommon::nodeDepth(Node *node)
     if(!node)
         return -1;
 
-    node = node->parent;
+    node = node->tqparent;
     while(node)
     {
         depth++;
-        node = node->parent;
+        node = node->tqparent;
     }
 
     return depth;
@@ -3646,12 +3646,12 @@ int kafkaCommon::nodeDepth(Node *node)
 
 Node* kafkaCommon::hasParent(Node *node, const TQString &name)
 {
-    node = node->parent;
+    node = node->tqparent;
     while(node)
     {
         if(node->tag->name.lower() == name.lower())
             return node;
-        node = node->parent;
+        node = node->tqparent;
     }
 
     return 0L;
@@ -3673,31 +3673,31 @@ Node* kafkaCommon::hasParent(Node* startNode, Node* endNode, const TQString &nam
     {
         if(node->tag->name.lower() == name.lower())
             return node;
-        node = node->parent;
+        node = node->tqparent;
     }
 
     return 0;
 }
 
-bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node parent, DOM::Node nextSibling,
+bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node tqparent, DOM::Node nextSibling,
                                 DOM::Node rootNode)
 {
     if(node.isNull())
         return false;
 
-    if(parent.isNull())
+    if(tqparent.isNull())
     {
         if(rootNode.isNull())
             return false;
-        parent = rootNode;
+        tqparent = rootNode;
     }
     //Andras: avoid exceptions
-    if (!nextSibling.isNull() && nextSibling.parentNode() != parent)
+    if (!nextSibling.isNull() && nextSibling.parentNode() != tqparent)
     {
       kdDebug(25001)<< "kafkaCommon::insertDomNode() - invalid nextSibling!" << endl;
       return false;
     }
-    if (node.ownerDocument() != parent.ownerDocument())
+    if (node.ownerDocument() != tqparent.ownerDocument())
     {
       kdDebug(25001)<< "kafkaCommon::insertDomNode() - ownerDocument is different!" << endl;
       return false;
@@ -3705,7 +3705,7 @@ bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node parent, DOM::Node next
 
     try
     {
-        parent.insertBefore(node, nextSibling);
+        tqparent.insertBefore(node, nextSibling);
     }
     catch(DOM::DOMException e)
     {
@@ -3716,12 +3716,12 @@ bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node parent, DOM::Node next
 
 bool kafkaCommon::removeDomNode(DOM::Node node)
 {
-    DOM::Node parent = node.parentNode();
+    DOM::Node tqparent = node.parentNode();
 
-    if(parent.isNull())
+    if(tqparent.isNull())
         return false;
 
-    parent.removeChild(node);
+    tqparent.removeChild(node);
 
     return true;
 }
@@ -3733,7 +3733,7 @@ DOM::Node kafkaCommon::createDomNode(const TQString &nodeName, const DTDStruct*
     //this will change with the futur multi-DTDs support
     //It does not use exceptions handling, so everything is checked via the DTEP definitions.
     DOM::Node dn;
-    QTag *qTag = 0L;
+    TQTag *qTag = 0L;
 
     qTag = QuantaCommon::tagFromDTD(dtd, nodeName);
 
@@ -3766,7 +3766,7 @@ DOM::Node kafkaCommon::createDomNodeAttribute(const TQString &nodeName, const DT
         const TQString &attrName, const TQString &attrValue, DOM::Document rootNode)
 {
     DOM::Node attr;
-    QTag *qTag = 0L;
+    TQTag *qTag = 0L;
 
     qTag = QuantaCommon::tagFromDTD(dtd, nodeName);
     if(!qTag)
@@ -3908,24 +3908,24 @@ bool kafkaCommon::isInline(DOM::Node domNode)
     return isInline(domNode.nodeName().string());
 }
 
-bool kafkaCommon::parentSupports(DOM::Node parent, DOM::Node startNode, DOM::Node endNode,
+bool kafkaCommon::tqparentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode,
                                  const DTDStruct* dtd)
 {
-    QTag *parentQTag;
+    TQTag *tqparentTQTag;
     DOM::Node child;
 
-    if(!dtd || parent.isNull())
+    if(!dtd || tqparent.isNull())
         return false;
 
-    parentQTag = QuantaCommon::tagFromDTD(dtd, parent.nodeName().string());
+    tqparentTQTag = QuantaCommon::tagFromDTD(dtd, tqparent.nodeName().string());
 
-    if(!parentQTag)
+    if(!tqparentTQTag)
         return false;
 
     child = startNode;
     while(!child.isNull())
     {
-        if(!parentQTag->isChild(child.nodeName().string()))
+        if(!tqparentTQTag->isChild(child.nodeName().string()))
             return false;
         if(child == endNode)
             return true;
@@ -3974,17 +3974,17 @@ void kafkaCommon::coutDomTree(DOM::Node, int)
         dots.fill('_', indent);
         output = dots;
         if (node.nodeType() != DOM::Node::TEXT_NODE)
-            output += node.nodeName().string().replace('\n'," ");
+            output += node.nodeName().string().tqreplace('\n'," ");
         else
         {
             output += "\"";
-            output+= node.nodeValue().string().replace('\n'," ");
+            output+= node.nodeValue().string().tqreplace('\n'," ");
             output += "\"";
         }
         kdDebug(25001) << output <<" (" << node.nodeType() << ") "<<
         node.handle() <<  endl;
         kdDebug(25001)<< dots << "  +++ prev " << node.previousSibling().handle() << " next " <<
-        node.nextSibling().handle() << " parent " <<
+        node.nextSibling().handle() << " tqparent " <<
         node.parentNode().handle() << " child " << node.firstChild().handle() << endl;
         for(j = 0; j < (int)node.attributes().length(); ++j)
         {
@@ -4016,18 +4016,18 @@ void kafkaCommon::coutTree(Node *node, int indent)
         node->tag->endPos(eLine, eCol);
         if (node->tag->type == Tag::XmlTag || node->tag->type == Tag::XmlTagEnd ||
                 node->tag->type == Tag::ScriptTag)
-            output += node->tag->name.replace('\n',"<return>");
+            output += node->tag->name.tqreplace('\n',"<return>");
         else
         {
             output += "\"";
-            output+= node->tag->tagStr().replace('\n',"<return>");
+            output+= node->tag->tagStr().tqreplace('\n',"<return>");
             output += "\"";
         }
         kdDebug(25001) << output <<" (" << node->tag->type << ", " << node->tag->cleanStrBuilt() << ", " <<
         node->tag->indentationDone() << ") "<< node << " at pos " << bLine << ":" << bCol << " - " <<
         eLine << ":" << eCol << endl;
-        kdDebug(25001)<< dots << "  +++ prev " << node->prev << " next " << node->next << " parent " <<
-        node->parent << " child " << node->child << endl;
+        kdDebug(25001)<< dots << "  +++ prev " << node->prev << " next " << node->next << " tqparent " <<
+        node->tqparent << " child " << node->child << endl;
         for(j = 0; j < node->tag->attrCount(); ++j)
         {
             kdDebug(25001)<< dots << " *** attr" << j << " " <<
@@ -4069,13 +4069,13 @@ int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, TQString const& t
 
     tag_start = hasParent(start_node, tag_name);
     if(tag_start)
-        return 0; // only start_node has tag_name as parent
+        return 0; // only start_node has tag_name as tqparent
 
     tag_start = hasParent(end_node, tag_name);
     if(tag_start)
-        return 0; // only end_node has tag_name as parent
+        return 0; // only end_node has tag_name as tqparent
 
-    return -1; // neither the nodes have tag_name as parent
+    return -1; // neither the nodes have tag_name as tqparent
 }
 
 int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, TQString const& tag_name,
@@ -4092,13 +4092,13 @@ int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, TQString const& t
 
     tag_start = hasParent(start_node, tag_name);
     if(tag_start && tag_start->tag->hasAttribute(attribute_name) && tag_start->tag->attributeValue(attribute_name, true) == attribute_value)
-        return 0; // only start_node has tag_name as parent
+        return 0; // only start_node has tag_name as tqparent
 
     tag_start = hasParent(end_node, tag_name);
     if(tag_start && tag_start->tag->hasAttribute(attribute_name) && tag_start->tag->attributeValue(attribute_name, true) == attribute_value)
-        return 0; // only end_node has tag_name as parent
+        return 0; // only end_node has tag_name as tqparent
 
-    return -1; // neither the nodes have tag_name as parent
+    return -1; // neither the nodes have tag_name as tqparent
 }
 
 bool kafkaCommon::isBetweenWords(Node* node, int offset)
diff --git a/quanta/parts/kafka/kafkacommon.h b/quanta/parts/kafka/kafkacommon.h
index 7de7d77e..0a1d25bd 100644
--- a/quanta/parts/kafka/kafkacommon.h
+++ b/quanta/parts/kafka/kafkacommon.h
@@ -58,7 +58,7 @@ public:
 	/**
 	 * This function returns the next Node after node : the first child of
 	 * node if available, else its next sibling if available, else the next
-	 * available next sibling of a parent of node.
+	 * available next sibling of a tqparent of node.
 	 * @param _node It is the Node from which we want the next Node.
 	 * @param goUp This boolean specifies if we should go up (torwards the root Node)
 	 * i.e. not looking at the childs of node, or make a standart iteration.
@@ -87,20 +87,20 @@ public:
 
     
     /**
-     * Returns the first common parent to startNode and endNode that isn't inline.
+     * Returns the first common tqparent to startNode and endNode that isn't inline.
      * @param startNode Start node.
      * @param endNode End node.
-     * @param commonParentStartChildLocation  Is the child of commonParent which is parent of startNode
-     * @param commonParentEndChildLocation Is the child of commonParent which is parent of endNode
+     * @param commonParentStartChildLocation  Is the child of commonParent which is tqparent of startNode
+     * @param commonParentEndChildLocation Is the child of commonParent which is tqparent of endNode
      * @param nodeSubtree When startNode and endNode doesn't belong to the current document tree. Pass 0 if they do.
-     * @return The first, non inline, common parent of startNode and endNode.
+     * @return The first, non inline, common tqparent of startNode and endNode.
      */
     static Node* DTDGetNonInlineCommonParent(Node* startNode, Node* endNode, 
                                              TQValueList<int>& commonParentStartChildLocation, 
                                              TQValueList<int>& commonParentEndChildLocation, Node* nodeSubtree);
 
     /**
-     * Same as above, only that the common parent can be inline.
+     * Same as above, only that the common tqparent can be inline.
      */
     static Node* DTDGetCommonParent(Node* startNode, Node* endNode, 
                                     TQValueList<int>& commonParentStartChildLocation, 
@@ -109,14 +109,14 @@ public:
 	/**
 	 * This function returns the next DOM::Node after node : the first child of
 	 * DOM::Node if available, else its next sibling if available, else the next
-	 * available next sibling of a parent of node.
+	 * available next sibling of a tqparent of node.
 	 * @param node The DOM::Node the search starts from.
 	 * @param goUp This boolean specifies if we should go up or down in the tree.
 	 * For a normal use, It must be set to false at the
 	 * beginning and then the same boolean must be used when using
 	 * several times this function.
 	 * @param returnParentNode Specifies if there are no child and next sibling, if
-	 * we should return the parent.
+	 * we should return the tqparent.
 	 * @param endNode Specifies at which DOM::Node the search should end. It is useful
 	 * when setting returnParentNode to false.
 	 * @return the next Node.
@@ -153,7 +153,7 @@ public:
      static Node* getCorrectEndNode(Node* endNode, int& endOffset);
      
      /**
-      * Get the first child of commonParent which is parent of node
+      * Get the first child of commonParent which is tqparent of node
       * @param node 
       * @param commonParent 
       * @return 
@@ -186,7 +186,7 @@ public:
 	 * generated by the undoRedo system. The undoRedo system can't create itself these Nodes
 	 * because it will create them only during the synchronization, making all the TQValueList<int>
 	 * Nodes location wrong.
-	 * WARNING n1 and n2 must be siblings or parent-child. If there are sibling and n1 is a XmlTag,
+	 * WARNING n1 and n2 must be siblings or tqparent-child. If there are sibling and n1 is a XmlTag,
 	 * n1 should not have non empty childs.
 	 * @param n1 The start node.
 	 * @param n2 The end node.
@@ -290,29 +290,29 @@ public:
 	 * WARNING : baseNode is used as the rootNode.
 	 * It will also try to merge text/Empty Nodes.
 	 * @param node The node to insert.
-	 * @param parentNode This Node will be the parent of node.
+	 * @param tqparentNode This Node will be the tqparent of node.
 	 * @param nextSibling This Node will be the next Sibling of Node. If null, node will be appended at
-	 * the child list of parentNode.
+	 * the child list of tqparentNode.
 	 * TODO: @param rootNode The rootNode of the tree we want to insert the Node (usually &baseNode).
 	 * @param modifs The changes made are logged into modifs. Put 0L if you don't want to log
 	 * and if you know what you're doing!
 	 * @param merge Try to merge with the siblings if possible.
 	 * @return Returns a pointer to the node inserted.
 	 */
-	static Node* insertNode(Node *node, Node* parentNode, Node* nextSibling,
+	static Node* insertNode(Node *node, Node* tqparentNode, Node* nextSibling,
                             NodeModifsSet *modifs/**, Node **rootNode*/, bool merge = true);
 
-    static Node* insertNode(Node *node, Node* parentNode, Node* nextSibling, NodeSelection& selection, 
+    static Node* insertNode(Node *node, Node* tqparentNode, Node* nextSibling, NodeSelection& selection, 
                             NodeModifsSet *modifs, bool merge = true);
  
 	/**
 	 * It behaves essentially like the above function except that it can "surround" a set of Nodes with the
 	 * new Node. Thus, the closing Node is created if necessary.
-	 * nextSibling and nextEndSibling MUST have the same parent. If not, use the
+	 * nextSibling and nextEndSibling MUST have the same tqparent. If not, use the
 	 * DTDinsertNode.
 	 * This function does not try to know if the location of the new Node is DTD valid.
 	 * @param newNode The new Node to insert.
-	 * @param parent The parent of the Node.
+	 * @param tqparent The tqparent of the Node.
 	 * @param nextSibling The next sibling of the Node.
 	 * @param nextEndSibling The next sibling of the closing Node if created. If nextEndSibling ==
 	 * nextSibling, the closing Node will be placed at the right of the newly created Node.
@@ -320,13 +320,13 @@ public:
 	 * @param modifs The changes made are logged into modifs.
 	 * @return Returns a pointer to the node inserted.
 	 */
-	static Node *insertNode(Node *newNode, Node *parent, Node *nextSibling, Node *nextEndSibling,
+	static Node *insertNode(Node *newNode, Node *tqparent, Node *nextSibling, Node *nextEndSibling,
 		NodeModifsSet *modifs, bool merge = true);
 
 	/**
 	 * It behaves essentially like the above function except that it can split the endNodeToSurround and
 	 * startNodeToSurround if necessary, according to the offsets.
-	 * startNodeToSurround et endNodeToSurround MUST have the same parent. If not, use the last
+	 * startNodeToSurround et endNodeToSurround MUST have the same tqparent. If not, use the last
 	 * DTDinsertNode.
 	 * This function does not try to know if the location of the new Node is valid.
 	 * @param startNodeToSurround The first Node which will be enclosed by the new Node.
@@ -334,7 +334,7 @@ public:
 	 * @param startOffset The first Node will be splitted at offset startOffset, the right part will be enclosed.
 	 * @param endOffset The last Node will be splitted at offset endOffset, the left part will be enclosed.
 	 */
-	static Node* insertNode(Node *newNode, Node *parent, Node *startNodeToSurround,
+	static Node* insertNode(Node *newNode, Node *tqparent, Node *startNodeToSurround,
 		Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs);
 
 	/**
@@ -353,7 +353,7 @@ public:
 	 * @param cursorNode The cursor is inside cursorNode.
 	 * @param cursorOffset The offset of the cursor inside cursorNode.
 	 * </TEMPORARY>
-	 * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid parent.
+	 * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid tqparent.
 	 */
 	static bool DTDinsertNode(Node *newNode, Node *startNode, int startOffset, Node *endNode,
 		int endOffset, Document *doc, Node **cursorNode, long &cursorOffset, NodeModifsSet *modifs);
@@ -373,26 +373,26 @@ public:
 	 * WARNING : baseNode is used as the rootNode.
 	 * It will also try to merge text/Empty Nodes.
 	 * @param node The root node of the Node subtree to insert.
-	 * @param parentNode This Node will be the parent of node.
+	 * @param tqparentNode This Node will be the tqparent of node.
 	 * @param nextSibling This Node will be the next Sibling of Node. If null, node will be appended at
-	 * the child list of parentNode.
+	 * the child list of tqparentNode.
 	 * @param modifs The changes made are logged into modifs. Put 0L if you don't want to log
 	 * and if you know what you're doing!
 	 * @param merge Try to merge with the siblings if possible.
 	 * @return Returns a pointer to the node inserted.
 	 */
-	static Node* insertNodeSubtree(Node *node, Node* parentNode, Node* nextSibling,
+	static Node* insertNodeSubtree(Node *node, Node* tqparentNode, Node* nextSibling,
 		NodeModifsSet *modifs, bool merge = true);
 
 	/**
 	 * It behaves essentially like the above function except that it can "surround" a set of Nodes with the
 	 * new Node. Thus, the closing Node is created if necessary.
-	 * nextSibling and nextEndSibling MUST have the same parent. If not, use the
+	 * nextSibling and nextEndSibling MUST have the same tqparent. If not, use the
 	 * DTDinsertNode.
-	 * The Node Subtree MUST be a single-Node-per-parent subtree.
+	 * The Node Subtree MUST be a single-Node-per-tqparent subtree.
 	 * This function does not try to know if the location of the new Node is DTD valid.
 	 * @param node The root node of the Node subtree to insert.
-	 * @param parent The parent of the Node.
+	 * @param tqparent The tqparent of the Node.
 	 * @param nextSibling The next sibling of the Node.
 	 * @param nextEndSibling The next sibling of the closing Node if created. If nextEndSibling ==
 	 * nextSibling, the closing Node will be placed at the right of the newly created Node.
@@ -401,7 +401,7 @@ public:
 	 * @param modifs The changes made are logged into modifs.
 	 * @return Returns a pointer to the node inserted.
 	 */
-	static Node* insertNodeSubtree(Node *node, Node* parentNode, Node* nextSibling,
+	static Node* insertNodeSubtree(Node *node, Node* tqparentNode, Node* nextSibling,
                                    Node* nextEndSibling, NodeModifsSet *modifs, bool merge = true);
 
 	/**
@@ -414,7 +414,7 @@ public:
     static Node* DTDInsertNodeSubtree(Node *node, NodeSelectionInd& selection, 
                                       Node **cursorNode, long& cursorOffset, NodeModifsSet *modifs);
 	
-    static Node* DTDInsertNodeSubtree(Node* newNode, Node* parentNode, Node* nextSibling, 
+    static Node* DTDInsertNodeSubtree(Node* newNode, Node* tqparentNode, Node* nextSibling, 
                                       NodeSelection& cursorHolder, NodeModifsSet *modifs);
     
     /**
@@ -425,17 +425,17 @@ public:
 	 * @param tagString The string of the tag.
 	 * @param nodeType The type of the Node cf Tag::TokenType.
 	 * @param doc The Node belongs to this Document.
-	 * @param parent The parent of the Node.
+	 * @param tqparent The tqparent of the Node.
 	 * @param nextSibling The next sibling of the Node.
 	 * @return Returns a pointer to the newly created Node.
 	 */
 	static Node *createAndInsertNode(const TQString &nodeName, const TQString &tagString, int nodeType,
-		Document *doc, Node* parent, Node* nextSibling, NodeModifsSet *modifs, bool merge = true);
+		Document *doc, Node* tqparent, Node* nextSibling, NodeModifsSet *modifs, bool merge = true);
 
 	/**
 	 * It behaves essentially like the above function except that it reate its closing Node if necessary
-	 *  and then insert them with parent as Node's parent.
-	 * nextSibling and nextEndSibling MUST have the same parent. If not, use the
+	 *  and then insert them with tqparent as Node's tqparent.
+	 * nextSibling and nextEndSibling MUST have the same tqparent. If not, use the
 	 * DTDcreateAndInsertNode.
 	 * @param nextEndSibling The next sibling of the closing Node if created. If nextEndSibling ==
 	 * nextSibling, the closing Node will be placed at the right of the newly created Node.
@@ -443,11 +443,11 @@ public:
 	 * @param modifs The changes made are logged into modifs.
 	 */
 	static Node *createAndInsertNode(const TQString &nodeName, const TQString &tagString, int nodeType,
-		Document *doc, Node *parent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs);
+		Document *doc, Node *tqparent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs);
 
 	/**
 	 * It behaves essentially like the above function except that if necessary, it will split the Nodes.
-	 * startNodeToSurround et endNodeToSurround MUST have the same parent. If not, use the
+	 * startNodeToSurround et endNodeToSurround MUST have the same tqparent. If not, use the
 	 * DTDcreateAndInsertNode.
 	 * This function does not try to know if the location of the new Node is valid.
 	 * @param startNodeToSurround The first Node which will be enclosed by the new Node.
@@ -456,7 +456,7 @@ public:
 	 * @param endOffset The last Node will be splitted at offset endOffset, the left part will be enclosed.
 	 */
 	static Node *createAndInsertNode(const TQString &nodeName, const TQString &tagString,
-		int nodeType, Document *doc, Node *parent, Node *startNodeToSurround,
+		int nodeType, Document *doc, Node *tqparent, Node *startNodeToSurround,
 		Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs);
 
 	/**
@@ -470,7 +470,7 @@ public:
 	 * @param startOffset If firstNode is a text, specify at which offset the new Node must begin to surround.
 	 * @param endNode The last Node which must be surrounded by the new Node.
 	 * @param endOffset If endNode is a text, specify at which offset the new Node must stop to surround.
-	 * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid parent.
+	 * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid tqparent.
 	 */
 	static bool DTDcreateAndInsertNode(const TQString &nodeName, const TQString &tagString, int nodeType,
 		Document *doc, Node *startNode, int startOffset, Node *endNode, int endOffset,
@@ -522,8 +522,8 @@ public:
 	 * This mean that the undo/redo system will delete it when necessary so don't reuse it!!!!
 	 * @param node The node to delete.
 	 * @param modifs The changes made are logged into modifs.
-	 * @param extractChilds If we extract or move up the children. WARNING: it don't check
-	 * if the children of node are legal childs of the parent of node.
+	 * @param extractChilds If we extract or move up the tqchildren. WARNING: it don't check
+	 * if the tqchildren of node are legal childs of the tqparent of node.
 	 * @param removeClosingTag Extract the closingTag if node isn't single and is Tag::XmlTag.
 	 * TODO: @param removeEmbeddedTags Specifies if we delete the embedded Nodes e.g.
 	 * <a href="<? boo ?>" > : the PHP block is an embedded block.
@@ -544,7 +544,7 @@ public:
     
     /**
      * Extract a node subtree in the tree. WARNING This function will log that the nodes were added.
-     * This funtion not only extract the start node but also will extract inline parents.
+     * This funtion not only extract the start node but also will extract inline tqparents.
      * @param startNode The node from which we start the removal.
      * @param startOffset The offset of startNode from which we start the removal.
      * @param endNode The node from which we end the removal.
@@ -576,7 +576,7 @@ public:
      * Get a node subtree from the tree. It is similar to extractNodeSubtree() 
      * but it doesn't extract anything. 
      * It's useful to get a copy of the Node subtree from a selection, for example.
-     * This funtion not only extract the start node but also will extract inline parents.
+     * This funtion not only extract the start node but also will extract inline tqparents.
      * @param startNode The starting Node.
      * @param startOffset If firstNode is a text, specify at which offset the new start Node will be splitted.
      * @param endNode The ending Node.
@@ -588,12 +588,12 @@ public:
     /**
 	 * An enumeration of all the possible return states of DTDExtractNode
 	 */
-	enum extractNodeStatus
+	enum extractNodetqStatus
 	{
 		//The node to extract was not found.
 		nothingExtracted = 0,
 		//The extract operation stopped because of a DTD error : if the node was removed, the child
-		//weren't able to be childs of the node's parent, according to the DTD. Should not occur
+		//weren't able to be childs of the node's tqparent, according to the DTD. Should not occur
 		//except really bad HTML.
 		extractionStoppedDueToBadNodes,
 		//everything has gone fine
@@ -619,7 +619,7 @@ public:
 	 * @param cursorOffset The offset of the cursor inside cursorNode.
 	 * </TEMPORARY>
 	 * @param modifs The usual modifs to log the modifications made for the undo/redo system.
-	 * @return Returns a kafkaCommon::extractNodeStatus.
+	 * @return Returns a kafkaCommon::extractNodetqStatus.
 	 */
 	static int DTDExtractNode(const TQString &nodeName, Document *doc, Node *startNode,
 		int startOffset, Node *endNode, int endOffset, Node **cursorNode, long &cursorOffset,
@@ -628,9 +628,9 @@ public:
 	/**
 	 * Moves a Node somewhere else.
 	 * @param nodeToMove The node to move :-)
-	 * @param newParent The new parent of nodeToMove.
+	 * @param newParent The new tqparent of nodeToMove.
      * @param newNextSibling The new next Sibling of nodeToMove. If null, node will be appended at
-     * the child list of parentNode.
+     * the child list of tqparentNode.
 	 * @param modifs The changes made are logged into modifs.
 	 * @param merge Specifies if it should try to merge the Node at its new location.
 	 */
@@ -695,10 +695,10 @@ public:
      * @param startOffset
      * @param endNode The node where a selection ends, for example.
      * @param endOffset
-     * @param commonParent This is the common parent between start and end node. 
+     * @param commonParent This is the common tqparent between start and end node. 
      * If 0, it tries to find the commonParent, else it uses the passed node.
-     * @param commonParentStartChildLocation The first child of commonParent which is parent of startNode is stored here.
-     * @param commonParentEndChildLocation The first child of commonParent which is parent of endNode is stored here.
+     * @param commonParentStartChildLocation The first child of commonParent which is tqparent of startNode is stored here.
+     * @param commonParentEndChildLocation The first child of commonParent which is tqparent of endNode is stored here.
      * @param cursorNode The cursor node is stored here.
      * @param cursorOffset The cursor offset is stored here.
      * @param subTree The node corresponding to the start of a subtree that doesn't belong to the current document, or 0.
@@ -809,8 +809,8 @@ public:
 	/**
 	 * Get the node corresponding to a sublocation.
 	 * @param loc A location of a Node.
-	 * @locOffset We want the (totalNumberOfParent - locOffset)th parent of Node.
-	 * @return Returns a parent of the node pointed by loc.
+	 * @locOffset We want the (totalNumberOfParent - locOffset)th tqparent of Node.
+	 * @return Returns a tqparent of the node pointed by loc.
 	 */
 	static Node* getNodeFromSubLocation(TQValueList<int> loc, int locOffset);
 
@@ -855,19 +855,19 @@ public:
 	/**
 	 * Get the node's depth in the tree.
 	 * @param node The node we want the depth.
-	 * @return Returns the depth of node. It is basically the number of parents of node.
-	 * It will return 0 if node has no parent Nodes, and -1 if node doesn't exists.
+	 * @return Returns the depth of node. It is basically the number of tqparents of node.
+	 * It will return 0 if node has no tqparent Nodes, and -1 if node doesn't exists.
 	 */
 	static int nodeDepth(Node *node);
 
 	/**
-	 * Looks if node has a parent which is named name.
-	 * @return Returns the first parent which is named name or 0L if not found.
+	 * Looks if node has a tqparent which is named name.
+	 * @return Returns the first tqparent which is named name or 0L if not found.
 	 */
 	static Node* hasParent(Node *node, const TQString &name);
 
     /**
-     * Tries to find the common parent to startNode and endNode, in the same conditions as above.
+     * Tries to find the common tqparent to startNode and endNode, in the same conditions as above.
      */
     static Node* hasParent(Node* startNode, Node* endNode, const TQString &name);
 
@@ -879,12 +879,12 @@ public:
 	 * WARNING : The postEnhancement is not done (cf htmlenhancer.h)
 	 * Prefer using KafkaDocument::insertDomNode()
 	 * @param node The node to insert.
-	 * @param parent The new parent of node. If null, insert node at the top level.
+	 * @param tqparent The new tqparent of node. If null, insert node at the top level.
 	 * @param nextSibling The new next sibling of node. If null, append node at the end of the child list.
-	 * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no parent is provided.
+	 * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no tqparent is provided.
 	 * @return Returns true if the operation was successfull.
 	 */
-	static bool insertDomNode(DOM::Node node, DOM::Node parent = DOM::Node(),
+	static bool insertDomNode(DOM::Node node, DOM::Node tqparent = DOM::Node(),
 		DOM::Node nextSibling = DOM::Node(), DOM::Node rootNode = DOM::Node());
 
 
@@ -978,25 +978,25 @@ public:
 		const TQString &attrName, const TQString &attrValue, DOM::Document rootNode);
 	
     /**
-	 * Looks if domNode has a parent which is named name.
-	 * @return Returns the first parent which is named name or an empty DOM::Node if not found.
+	 * Looks if domNode has a tqparent which is named name.
+	 * @return Returns the first tqparent which is named name or an empty DOM::Node if not found.
 	 */
 	static DOM::Node hasParent(DOM::Node domNode, const TQString &name);
 
 	/**
 	 * Returns the position of the child domNode.
 	 * @param domNode This is the DOM::Node we want the position.
-	 * @return Returns the position of domNode inside domNode's parent's children or -1 if not found.
+	 * @return Returns the position of domNode inside domNode's tqparent's tqchildren or -1 if not found.
 	 */
 	static int childPosition(DOM::Node domNode);
 
 	/**
-	 * Returns the position'th child of parentNode.
-	 * @param parentNode The parent Node of the node to return.
+	 * Returns the position'th child of tqparentNode.
+	 * @param tqparentNode The tqparent Node of the node to return.
 	 * @param position We return the position'th child Node.
 	 * @param fallback If set to true, it will always return a valid Node (except if there is no child!!)
 	 */
-	static DOM::Node getChildNode(DOM::Node parentNode, int position, bool fallback = false);
+	static DOM::Node getChildNode(DOM::Node tqparentNode, int position, bool fallback = false);
 
 	/**
 	 * Specify if a DOM::Node is inline (as specified in isInline()) or text.
@@ -1005,10 +1005,10 @@ public:
 	static bool isInline(DOM::Node domNode);
 
 	/**
-	 * Specify if parent supports the siblings DOM::Nodes starting from startNode to endNode
+	 * Specify if tqparent supports the siblings DOM::Nodes starting from startNode to endNode
 	 * according to the DTD dtd.
 	 */
-	static bool parentSupports(DOM::Node parent, DOM::Node startNode, DOM::Node endNode,
+	static bool tqparentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode,
 		const DTDStruct* dtd);
     
 
@@ -1030,7 +1030,7 @@ public:
 	/**
 	 * Prints in stdout the current Node tree.
 	 * @param node The startNode
-	 * @param indent The number of little dots per parent relationship.
+	 * @param indent The number of little dots per tqparent relationship.
 	 */
 	static void coutTree(Node *node, int indent);
  
@@ -1085,7 +1085,7 @@ public:
     
 private:
     /**
-     * Split the last valid start parent (commonParentStartChild) into two.
+     * Split the last valid start tqparent (commonParentStartChild) into two.
      * This and the method above are related and are used in sequence.
      * The following tree:
      *  <body>
@@ -1120,14 +1120,14 @@ private:
      *      </b>
      *  </body>
      * @param startNode The node where a selection starts, for example.
-     * @param commonParent This is the common parent between start and end node.
-     * @param commonParentStartChildLocation The first child of commonParent which is parent of startNode
+     * @param commonParent This is the common tqparent between start and end node.
+     * @param commonParentStartChildLocation The first child of commonParent which is tqparent of startNode
      * @param modifs The changes made are logged into modifs.
      */
     static void splitStartNodeSubtree(Node* startNode, Node* commonParent, 
                                       TQValueList<int>& commonParentStartChildLocation, NodeModifsSet* modifs);
     /**
-     * Split the last valid start parent (commonParentStartChild) into two.
+     * Split the last valid start tqparent (commonParentStartChild) into two.
      * The following tree:
      *  <body>
      *      <b>                     --> commonParent
@@ -1162,9 +1162,9 @@ private:
      *      </b>
      *  </body>
      * @param endNode The node where a selection ends, for example.
-     * @param commonParent This is the common parent between start and end node.
-     * @param commonParentStartChildLocation The first child of commonParent which is parent of startNode.
-     * @param commonParentEndChildLocation The first child of commonParent which is parent of endNode.
+     * @param commonParent This is the common tqparent between start and end node.
+     * @param commonParentStartChildLocation The first child of commonParent which is tqparent of startNode.
+     * @param commonParentEndChildLocation The first child of commonParent which is tqparent of endNode.
      * @param subTree True if we are dealing with a tree that doesn't belong to the current document.
      * @param modifs The changes made are logged into modifs.
      */
diff --git a/quanta/parts/kafka/kafkadragobject.cpp b/quanta/parts/kafka/kafkadragobject.cpp
index 7d546036..4b609998 100644
--- a/quanta/parts/kafka/kafkadragobject.cpp
+++ b/quanta/parts/kafka/kafkadragobject.cpp
@@ -51,7 +51,7 @@ KafkaDragObject::KafkaDragObject(Node const* item, TQWidget* dragSource, const c
 KafkaDragObject::~KafkaDragObject()
 {}
 
-TQByteArray KafkaDragObject::encodedData(const char* mimetype) const
+TQByteArray KafkaDragObject::tqencodedData(const char* mimetype) const
 {
     if(m_mimetype == mimetype)
         return m_array;
@@ -74,7 +74,7 @@ bool KafkaDragObject::decode(TQMimeSource* e, Node* node)
     if(!node || !e->provides(m_mimetype))
         return false;
     
-    TQByteArray data = e->encodedData(m_mimetype);    
+    TQByteArray data = e->tqencodedData(m_mimetype);    
     //kdDebug(25001) << TQString(data) << endl;
     TQDomDocument doc;
     doc.setContent(data, false);
diff --git a/quanta/parts/kafka/kafkadragobject.h b/quanta/parts/kafka/kafkadragobject.h
index 8b6c2e6e..f9c0b540 100644
--- a/quanta/parts/kafka/kafkadragobject.h
+++ b/quanta/parts/kafka/kafkadragobject.h
@@ -26,15 +26,16 @@ class Node;
 /**
 @author Paulo Moura Guedes
 */
-class KafkaDragObject: public QStoredDrag
+class KafkaDragObject: public TQStoredDrag
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     KafkaDragObject(Node const* item, TQWidget* dragSource = 0, const char* name = 0);
     ~KafkaDragObject();
 
-    TQByteArray encodedData(const char* c) const;
+    TQByteArray tqencodedData(const char* c) const;
     Node const* getItem() const;
     
     static bool canDecode(TQMimeSource*);
diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp
index bcbc7611..4dfe3f7d 100644
--- a/quanta/parts/kafka/kafkahtmlpart.cpp
+++ b/quanta/parts/kafka/kafkahtmlpart.cpp
@@ -83,9 +83,9 @@ public:
 #endif
 };
 
-KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part,
+KafkaWidget::KafkaWidget(TQWidget *tqparent, TQWidget *widgetParent, KafkaDocument *part,
                          const char *name)
-        : KHTMLPart(widgetParent, name, parent, name),
+        : KHTMLPart(widgetParent, name, TQT_TQOBJECT(tqparent), name),
         w(part)
 {
     m_contextPopupMenu = new TQPopupMenu();
@@ -205,10 +205,10 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position)
     else if(position == 0)
     {
         DOM::Text textNode = document().createTextNode(text);
-        DOM::Node parent = node.parentNode();
-//FIXME: Andras: safety checks, as parent  can be null. Maybe it just hides the error...
-        if (!parent.isNull())
-          parent.insertBefore(textNode, node);
+        DOM::Node tqparent = node.parentNode();
+//FIXME: Andras: safety checks, as tqparent  can be null. Maybe it just hides the error...
+        if (!tqparent.isNull())
+          tqparent.insertBefore(textNode, node);
         else
           node.appendChild(textNode);
         m_currentNode = textNode;
@@ -223,15 +223,15 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position)
     else if(position == 3 || (position == 1 && (focus == kNodeAttrs::singleNodeAndItself)))
     {
         DOM::Text textNode = document().createTextNode(text);
-        DOM::Node parent = node.parentNode();
-//FIXME: Andras: safety checks, as parent and node.nextSibling can be null. Maybe it just hides the error...
+        DOM::Node tqparent = node.parentNode();
+//FIXME: Andras: safety checks, as tqparent and node.nextSibling can be null. Maybe it just hides the error...
 //Also it seems that position can be 3 and node is "body". See bug 112733.
-        if (node.nodeName().string().lower() != "body" && !parent.isNull())
+        if (node.nodeName().string().lower() != "body" && !tqparent.isNull())
         {
           if (!node.nextSibling().isNull())
-            parent.insertBefore(textNode, node.nextSibling());
+            tqparent.insertBefore(textNode, node.nextSibling());
           else
-            parent.insertBefore(textNode, node);
+            tqparent.insertBefore(textNode, node);
         }
         else
           node.appendChild(textNode);
@@ -308,7 +308,7 @@ void KafkaWidget::keyReturn(bool specialPressed)
     //WARNING : HTML-specific function
     DOM::Node text, text2, pDomNode, pDomNode2, brDomNode, brDomNode2, tmp, PNode, emptyText;
     int focus;
-    //	QTag *qTag;
+    //	TQTag *qTag;
     bool childOfP;
     //kNodeAttrs *props;
 
@@ -506,7 +506,7 @@ bool KafkaWidget::eventFilter(TQObject *, TQEvent *event)
     
     if(event->type() == TQEvent::KeyPress)
     {
-        TQKeyEvent *keyevent = static_cast<TQKeyEvent *>(event);
+        TQKeyEvent *keyevent = TQT_TQKEYEVENT(event);
 
         //Create a new NodeModifsSet where the changes will be logged.
         m_modifs = new NodeModifsSet();
@@ -655,7 +655,7 @@ bool KafkaWidget::eventFilter(TQObject *, TQEvent *event)
                 kdDebug(25001) << "KafkaWidget::eventFilter() Text - " <<
                 keyevent->text() << endl;
 #endif
-                //if(( keyevent->state() & Qt::ShiftButton) || ( keyevent->state() == Qt::NoButton))
+                //if(( keyevent->state() & TQt::ShiftButton) || ( keyevent->state() == Qt::NoButton))
                 if( keyevent->text().length() &&
                         ( !( keyevent->state() & ControlButton ) &&
                           !( keyevent->state() & AltButton ) &&
@@ -947,7 +947,7 @@ void KafkaWidget::keyDelete()
 #endif
 
                 _nodeParent = _nodeNext.parentNode();
-                //If this empty text contains the cursor, change node to its parent.
+                //If this empty text contains the cursor, change node to its tqparent.
                 if(_nodeNext == _node && _nodeParent.firstChild() == _nodeNext &&
                         _nodeNext.nextSibling().isNull())
                 {
@@ -964,7 +964,7 @@ void KafkaWidget::keyDelete()
         //Else if the current Node is a BLOCK which can be entered/leaved e.g. H1
         else if(attrs->chCurFoc() == kNodeAttrs::blockNode)
         {
-            //First look if it is one of _node's parent
+            //First look if it is one of _node's tqparent
             isParent = false;
             temp = _node;
             while(!temp.isNull())
@@ -1034,12 +1034,12 @@ void KafkaWidget::keyDelete()
             }
             else if(isParent && !nextIsBlock)
             {
-                if(kafkaCommon::parentSupports(toplevelBlock, startNode2, endNode2,
+                if(kafkaCommon::tqparentSupports(toplevelBlock, startNode2, endNode2,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(toplevelBlock, startNode2, endNode2, DOM::Node(), false);
                 else
                 {
-                    if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
+                    if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
                                                    w->getCurrentDoc()->defaultDTD()))
                         moveDomNodes(commonParent, startNode, endNode, childOfCommonParent2,
                                      true);
@@ -1051,13 +1051,13 @@ void KafkaWidget::keyDelete()
             }
             else if(isParent && nextIsBlock)
             {
-                if(kafkaCommon::parentSupports(toplevelBlock, startNode2, endNode2,
+                if(kafkaCommon::tqparentSupports(toplevelBlock, startNode2, endNode2,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(toplevelBlock, startNode2, endNode2, DOM::Node(), false);
                 else
                 {
-                    if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
-                                                   w->getCurrentDoc()->defaultDTD()) && kafkaCommon::parentSupports(
+                    if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
+                                                   w->getCurrentDoc()->defaultDTD()) && kafkaCommon::tqparentSupports(
                                 commonParent, startNode2, endNode2, w->getCurrentDoc()->defaultDTD()))
                     {
                         moveDomNodes(commonParent, startNode, endNode, childOfCommonParent,
@@ -1073,7 +1073,7 @@ void KafkaWidget::keyDelete()
             }
             else if(!isParent && nextIsBlock)
             {
-                if(kafkaCommon::parentSupports(commonParent, startNode2, endNode2,
+                if(kafkaCommon::tqparentSupports(commonParent, startNode2, endNode2,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(commonParent, startNode2, endNode2, childOfCommonParent2, true);
                 else
@@ -1127,7 +1127,7 @@ void KafkaWidget::keyDelete()
 #endif
 
             _nodeParent = _nodeNext.parentNode();
-            //If this block is used to define the cursor pos, change node to its parent.
+            //If this block is used to define the cursor pos, change node to its tqparent.
             if(_nodeNext == _node && _nodeParent.firstChild() == _nodeNext &&
                     _nodeNext.nextSibling().isNull())
             {
@@ -1392,7 +1392,7 @@ void KafkaWidget::keyBackspace()
         //Else if the current Node if a BLOCK which can be entered/leaved e.g. H1, P
         else if(attrs->chCurFoc() == kNodeAttrs::blockNode)
         {
-            //First look if it is one of _node's parent
+            //First look if it is one of _node's tqparent
             isParent = false;
             temp = _node;
             while(!temp.isNull())
@@ -1460,13 +1460,13 @@ void KafkaWidget::keyBackspace()
             }
             else if(isParent && !prevIsBlock)
             {
-                if(kafkaCommon::parentSupports(toplevelBlock2, startNode, endNode,
+                if(kafkaCommon::tqparentSupports(toplevelBlock2, startNode, endNode,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(toplevelBlock2, startNode, endNode, toplevelBlock2.firstChild(),
                                  true);
                 else
                 {
-                    if(kafkaCommon::parentSupports(commonParent, startNode2, endNode2,
+                    if(kafkaCommon::tqparentSupports(commonParent, startNode2, endNode2,
                                                    w->getCurrentDoc()->defaultDTD()))
                         moveDomNodes(commonParent, startNode2, endNode2,
                                      childOfCommonParent2, true);
@@ -1478,14 +1478,14 @@ void KafkaWidget::keyBackspace()
             }
             else if(isParent && prevIsBlock)
             {
-                if(kafkaCommon::parentSupports(toplevelBlock2, startNode, endNode,
+                if(kafkaCommon::tqparentSupports(toplevelBlock2, startNode, endNode,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(toplevelBlock2, startNode, endNode, toplevelBlock2.firstChild(),
                                  true);
                 else
                 {
-                    if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
-                                                   w->getCurrentDoc()->defaultDTD()) && kafkaCommon::parentSupports(
+                    if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
+                                                   w->getCurrentDoc()->defaultDTD()) && kafkaCommon::tqparentSupports(
                                 commonParent, startNode2, endNode2, w->getCurrentDoc()->defaultDTD()))
                     {
                         moveDomNodes(commonParent, startNode, endNode, childOfCommonParent,
@@ -1501,7 +1501,7 @@ void KafkaWidget::keyBackspace()
             }
             else if(!isParent && prevIsBlock)
             {
-                if(kafkaCommon::parentSupports(commonParent, startNode, endNode,
+                if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode,
                                                w->getCurrentDoc()->defaultDTD()))
                     moveDomNodes(commonParent, startNode, endNode, childOfCommonParent, false);
                 else
@@ -2039,9 +2039,9 @@ void KafkaWidget::khtmlMouseMoveEvent(khtml::MouseMoveEvent *event)
       return;
     }
     if(mouseNode.nodeType() == DOM::Node::TEXT_NODE)
-      view()->setCursor(Qt::ibeamCursor);
+      view()->setCursor(TQt::ibeamCursor);
     else
-      view()->setCursor(Qt::arrowCursor);
+      view()->setCursor(TQt::arrowCursor);
 
     KHTMLPart::khtmlMouseMoveEvent(event);
 }
diff --git a/quanta/parts/kafka/kafkahtmlpart.h b/quanta/parts/kafka/kafkahtmlpart.h
index 53a872dc..9365f925 100644
--- a/quanta/parts/kafka/kafkahtmlpart.h
+++ b/quanta/parts/kafka/kafkahtmlpart.h
@@ -46,8 +46,9 @@ class TQPopupMenu;
 class KafkaWidget : public KHTMLPart
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part,
+    KafkaWidget(TQWidget *tqparent, TQWidget *widgetParent, KafkaDocument *part,
                 const char *name = 0);
     ~KafkaWidget();
 
@@ -84,7 +85,7 @@ public:
     * @param goUp A needed boolean for several consecutive call to
     * this function. Setting it to false by default, or to true if we don't want to go through
     * the childs of _node.
-    * @param skipParentNodes Specifies if we should skip the parent Node when going up :
+    * @param skipParentNodes Specifies if we should skip the tqparent Node when going up :
     * this implies that Nodes will not be returned two times.
     * @param dontBlock Specifies if the search should or not be blocked by BlockingTags.
     * @param _endNode Specifies at which DOM::Node the search should end. It is useful
@@ -112,9 +113,9 @@ public:
     /** --------------- DOM::Node modifications -------------------------- */
 
     /**
-     * It will move DOM::Nodes from startNode to endNode as children of newParent. It does NOT check
-     * if the move is valid, so it may crash. Please check before with kafkaCommon::parentSupports().
-     * @param newParent The new parent of the DOM::Nodes.
+     * It will move DOM::Nodes from startNode to endNode as tqchildren of newParent. It does NOT check
+     * if the move is valid, so it may crash. Please check before with kafkaCommon::tqparentSupports().
+     * @param newParent The new tqparent of the DOM::Nodes.
      * @param startNode The first node to move.
      * @param endNode Starting from endNode, the last sibling to move.
      * @param refNode The reference DOM::Node.
@@ -150,7 +151,7 @@ public slots:
     * sections, and entity references) separates Text nodes, i.e., there are
     * neither adjacent Text nodes nor empty Text nodes.
     * Should be used instead of DOM::Node::normalize().
-    * @param _node This node is the parent node of the childs normalized
+    * @param _node This node is the tqparent node of the childs normalized
     */
     void normalize(DOM::Node _node);
 
@@ -210,7 +211,7 @@ signals:
     /**
      * Is emitted whenever a DOM::Node is about to be moved in the tree.
      * @param node The DOM::Node which will be moved.
-     * @param newParent The new parent of domNode.
+     * @param newParent The new tqparent of domNode.
      * @param before domNode will be placed before before.
             * @param modifs The changes made are logged into modifs.
      */
diff --git a/quanta/parts/kafka/kafkasyncoptions.cpp b/quanta/parts/kafka/kafkasyncoptions.cpp
index e7066187..45170859 100644
--- a/quanta/parts/kafka/kafkasyncoptions.cpp
+++ b/quanta/parts/kafka/kafkasyncoptions.cpp
@@ -25,8 +25,8 @@
 #include "kafkasyncoptions.h"
 #include "kafkasyncoptions.moc"
 
-KafkaSyncOptions::KafkaSyncOptions( KConfig *a_config, TQWidget* parent,  const char* name )
-    : KafkaSyncOptionsUI( parent, name )
+KafkaSyncOptions::KafkaSyncOptions( KConfig *a_config, TQWidget* tqparent,  const char* name )
+    : KafkaSyncOptionsUI( tqparent, name )
 {
 	config = a_config;
 
diff --git a/quanta/parts/kafka/kafkasyncoptions.h b/quanta/parts/kafka/kafkasyncoptions.h
index daf67117..85a1eb88 100644
--- a/quanta/parts/kafka/kafkasyncoptions.h
+++ b/quanta/parts/kafka/kafkasyncoptions.h
@@ -25,9 +25,10 @@ class KConfig;
 class KafkaSyncOptions : public KafkaSyncOptionsUI
 { 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KafkaSyncOptions( KConfig *config, TQWidget* parent = 0, const char* name = 0);
+    KafkaSyncOptions( KConfig *config, TQWidget* tqparent = 0, const char* name = 0);
     ~KafkaSyncOptions();
 
     void updateConfig();
diff --git a/quanta/parts/kafka/kafkasyncoptionsui.ui b/quanta/parts/kafka/kafkasyncoptionsui.ui
index 2fb73661..54d7d5d0 100644
--- a/quanta/parts/kafka/kafkasyncoptionsui.ui
+++ b/quanta/parts/kafka/kafkasyncoptionsui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>KafkaSyncOptionsUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KafkaSyncOptionsUI</cstring>
     </property>
@@ -16,7 +16,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>views</cstring>
             </property>
@@ -27,7 +27,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>kafkaGroup</cstring>
                     </property>
@@ -51,14 +51,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>120</width>
                                     <height>31</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel" row="1" column="3">
+                        <widget class="TQLabel" row="1" column="3">
                             <property name="name">
                                 <cstring>ms2</cstring>
                             </property>
@@ -66,7 +66,7 @@
                                 <string>ms</string>
                             </property>
                         </widget>
-                        <widget class="QSpinBox" row="1" column="2">
+                        <widget class="TQSpinBox" row="1" column="2">
                             <property name="name">
                                 <cstring>kafkaDelay</cstring>
                             </property>
@@ -77,7 +77,7 @@
                                 <number>10</number>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+                        <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>kafkaFocusRefresh</cstring>
                             </property>
@@ -85,7 +85,7 @@
                                 <string>Refresh the VPL editor on click</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="1" column="0">
+                        <widget class="TQRadioButton" row="1" column="0">
                             <property name="name">
                                 <cstring>kafkaDelayRefresh</cstring>
                             </property>
@@ -95,7 +95,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QButtonGroup" row="0" column="0">
+                <widget class="TQButtonGroup" row="0" column="0">
                     <property name="name">
                         <cstring>sourceGroup</cstring>
                     </property>
@@ -119,14 +119,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>27</width>
                                     <height>31</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel" row="1" column="3">
+                        <widget class="TQLabel" row="1" column="3">
                             <property name="name">
                                 <cstring>ms</cstring>
                             </property>
@@ -134,7 +134,7 @@
                                 <string>ms</string>
                             </property>
                         </widget>
-                        <widget class="QSpinBox" row="1" column="2">
+                        <widget class="TQSpinBox" row="1" column="2">
                             <property name="name">
                                 <cstring>sourceDelay</cstring>
                             </property>
@@ -145,7 +145,7 @@
                                 <number>10</number>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="4">
+                        <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="4">
                             <property name="name">
                                 <cstring>sourceFocusRefresh</cstring>
                             </property>
@@ -153,7 +153,7 @@
                                 <string>Refresh the source editor on click</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="1" column="0">
+                        <widget class="TQRadioButton" row="1" column="0">
                             <property name="name">
                                 <cstring>sourceDelayRefresh</cstring>
                             </property>
@@ -175,14 +175,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>167</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QCheckBox" row="0" column="0">
+        <widget class="TQCheckBox" row="0" column="0">
             <property name="name">
                 <cstring>showScriptsIcon</cstring>
             </property>
@@ -192,5 +192,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/parts/kafka/nodeenhancer.h b/quanta/parts/kafka/nodeenhancer.h
index 376379f1..22737082 100644
--- a/quanta/parts/kafka/nodeenhancer.h
+++ b/quanta/parts/kafka/nodeenhancer.h
@@ -45,10 +45,10 @@ public:
 	 * The DOM::Node must be built before calling this
 	 * function.
 	 * @param node The Node we want to enhance.
-	 * @param parentDNode the parent DOM::Node of the root DOM::Node of node.
+	 * @param tqparentDNode the tqparent DOM::Node of the root DOM::Node of node.
 	 * @param nextDNode the DOM::Node next to the root DOM::Node of node.
 	 */
-	virtual bool enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode) = 0;
+	virtual bool enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node nextDNode) = 0;
 
 	/**
 	 * This function apply some modifications once the whole DOM::Node tree is built.
diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp
index dfe07142..8eb6cfbe 100644
--- a/quanta/parts/kafka/undoredo.cpp
+++ b/quanta/parts/kafka/undoredo.cpp
@@ -51,7 +51,7 @@ NodeModif::NodeModif()
   m_type = -1;
   m_node = 0L;
   m_tag = 0L;
-  m_childrenMovedUp = 0;
+  m_tqchildrenMovedUp = 0;
   m_neighboursMovedDown = 0;
 }
 
@@ -59,7 +59,7 @@ NodeModif::~NodeModif()
 {
   if(m_node)
   {
-    m_node->parent = 0L;
+    m_node->tqparent = 0L;
     m_node->next = 0L;
     m_node->prev = 0L;
     if(m_type == NodeRemoved)
@@ -87,7 +87,7 @@ void NodeModif::setNode(Node *node)
     m_node = node;
     if(m_node)
     {
-      m_node->parent = 0L;
+      m_node->tqparent = 0L;
       m_node->next = 0L;
       m_node->prev = 0L;
       if(m_type == NodeRemoved)
@@ -544,14 +544,14 @@ bool undoRedo::undoNodeModif(NodeModif *nodeModif)
     node = kafkaCommon::getNodeFromLocation(nodeModif->location());
     if(!node)
     {
-      // No node at this location, getting the parent Node and appending newNode after
-      // the last child of the parent.
+      // No node at this location, getting the tqparent Node and appending newNode after
+      // the last child of the tqparent.
       ref = nodeModif->location();
       TQValueList<int> loc(ref);
       loc.remove(loc.fromLast());
       if(loc.empty())
       {
-        // No parent, adding it on top of the tree.
+        // No tqparent, adding it on top of the tree.
         kafkaCommon::insertNode(newNode, 0L, 0L, 0L, false);
       }
       else
@@ -568,7 +568,7 @@ bool undoRedo::undoNodeModif(NodeModif *nodeModif)
     else
     {
       // A node is already here. Moving it to the right and adding newNode here.
-      kafkaCommon::insertNode(newNode, node->parent, node, 0L, false);
+      kafkaCommon::insertNode(newNode, node->tqparent, node, 0L, false);
     }
   }
   if(nodeModif->type() == NodeModif::NodeTreeRemoved)
@@ -703,10 +703,10 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                                   {
                                           //try
                                           //{
-                                                  dn = n->_rootNode.parentNode().removeChild(n->_rootNode);
+                                                  dn = n->_rootNode.tqparentNode().removeChild(n->_rootNode);
                                           //} catch(DOM::DOMException e) {kafkaSyncError();}
                                           //try{
-                                                  domNode.parentNode().insertBefore(dn, domNode);
+                                                  domNode.tqparentNode().insertBefore(dn, domNode);
                                           //} catch(DOM::DOMException e) {}
                                   }
                                   else if(n->tag->type == Tag::XmlTag || n->tag->type == Tag::Text)
@@ -733,7 +733,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                           }
                   }
                   //try{
-                          domNode.parentNode().removeChild(domNode);
+                          domNode.tqparentNode().removeChild(domNode);
                   //} catch(DOM::DOMException e) {kafkaSyncError();}
           }
           else if(_node->tag->type == Tag::XmlTagEnd && _node->closesPrevious &&
@@ -756,7 +756,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                                   while(n->next)
                                           n = n->next;
                           }
-                          if(n->parent->_leafNode.isNull())
+                          if(n->tqparent->_leafNode.isNull())
                           {
                                   dm = domNode.nextSibling();
                                   goUp = false;
@@ -764,18 +764,18 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                                   {
                                           kafkaInterface->disconnectDomNodeFromQuantaNode(dm);
                                           //try{
-                                                  dm.parentNode().removeChild(dm);
+                                                  dm.tqparentNode().removeChild(dm);
                                           //} catch(DOM::DOMException e) {kafkaSyncError();}
-                                          dm = kafkaCommon::getNextDomNode(dm, goUp, false, domNode.parentNode());
+                                          dm = kafkaCommon::getNextDomNode(dm, goUp, false, domNode.tqparentNode());
                                   }
                           }
                           else
                           {
-                                  domNode2 = n->parent->_leafNode;
+                                  domNode2 = n->tqparent->_leafNode;
                                   while(!domNode.nextSibling().isNull())
                                   {
                                           //try{
-                                                  dn = domNode.parentNode().removeChild(domNode.nextSibling());
+                                                  dn = domNode.tqparentNode().removeChild(domNode.nextSibling());
                                           //} catch(DOM::DOMException e) {kafkaSyncError();}
                                           //try{
                                                   domNode2.appendChild(dn);
@@ -788,7 +788,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                           while(!domNode.nextSibling().isNull())
                           {
                                   //try{
-                                          dn = domNode.parentNode().removeChild(domNode.nextSibling());
+                                          dn = domNode.tqparentNode().removeChild(domNode.nextSibling());
                                   //} catch(DOM::DOMException e) {kafkaSyncError();}
                                   //try{
                                           domNode2.appendChild(dn);
@@ -810,7 +810,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                   return true;//no kafka node here, due to an invalid pos.
           domNode = _node->_rootNode;
           //try{
-                  domNode.parentNode().removeChild(domNode);
+                  domNode.tqparentNode().removeChild(domNode);
           //} catch(DOM::DOMException e) {kafkaSyncError();}
           kafkaInterface->disconnectDomNodeFromQuantaNode(domNode);
           kafkaInterface->buildKafkaNodeFromNode(_node);
@@ -837,7 +837,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                                   if(!n->_rootNode.isNull())
                                   {
                                           //try{
-                                                  dn = n->_rootNode.parentNode().removeChild(n->_rootNode);
+                                                  dn = n->_rootNode.tqparentNode().removeChild(n->_rootNode);
                                           //} catch(DOM::DOMException e) {kafkaSyncError();}
                                           //try{
                                                   domNode.appendChild(dn);
@@ -857,10 +857,10 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                           if(!n->_rootNode.isNull())
                           {
                                   //try{
-                                          dn = n->_rootNode.parentNode().removeChild(n->_rootNode);
+                                          dn = n->_rootNode.tqparentNode().removeChild(n->_rootNode);
                                   //} catch(DOM::DOMException e) {kafkaSyncError();}
                                   //try{
-                                          domNode.parentNode().appendChild(dn);
+                                          domNode.tqparentNode().appendChild(dn);
                                   //} catch(DOM::DOMException e) {}
                           }
                           else if(n->tag->type == Tag::XmlTag || n->tag->type == Tag::Text)
@@ -968,15 +968,15 @@ void undoRedo::reloadQuantaEditor(bool force, bool syncQuantaCursor, bool encode
   while(node)
   {
     //kdDebug(25001)<< "CurNode : " << _node->tag->name << " - " << _node->tag->tagStr() << endl;
-    if(node->parent)
+    if(node->tqparent)
     {
-      node->parent->tag->beginPos(bLine3, bCol3);
-      node->parent->tag->endPos(eLine3, eCol3);
+      node->tqparent->tag->beginPos(bLine3, bCol3);
+      node->tqparent->tag->endPos(eLine3, eCol3);
     }
     node->tag->beginPos(bLine2, bCol2);
 
     //if we are in a Script inside a tag e.g. <a href="<? PHP stuff here ?>">, skip it
-    if(node->tag->type == Tag::ScriptTag && node->parent &&
+    if(node->tag->type == Tag::ScriptTag && node->tqparent &&
         QuantaCommon::isBetween(bLine2, bCol2, bLine3, bCol3, eLine3,eCol3) == 0)
     {
       goUp = true;
@@ -990,7 +990,7 @@ void undoRedo::reloadQuantaEditor(bool force, bool syncQuantaCursor, bool encode
       allText += node->tag->tagStr();
 
       //If a child is a Script inside this Tag e.g. <a href="<? PHP stuff here ?>">, make
-      //its position fits inside the parent
+      //its position fits inside the tqparent
       node->tag->beginPos(bLine3, bCol3);
       node->tag->endPos(eLine3, eCol3);
       child = node->firstChild();
@@ -1477,7 +1477,7 @@ void undoRedo::debugOutput()
         " - contents: " << (*it2)->tag()->tagStr() << endl;
       if(((*it2)->type() == NodeModif::NodeRemoved && !afterEditorIt) ||
           ((*it2)->type() == NodeModif::NodeAdded && afterEditorIt))
-        kdDebug(24000)<< "==== ChildsNumber1 : " << (*it2)->childrenMovedUp() <<
+        kdDebug(24000)<< "==== ChildsNumber1 : " << (*it2)->tqchildrenMovedUp() <<
         " - ChildsNumber2 : " << (*it2)->neighboursMovedDown() << endl;
     }
     kdDebug(24000)<< "== End Node Modifications set #" << i << endl;
diff --git a/quanta/parts/kafka/undoredo.h b/quanta/parts/kafka/undoredo.h
index 390dc5bb..1bd0cff5 100644
--- a/quanta/parts/kafka/undoredo.h
+++ b/quanta/parts/kafka/undoredo.h
@@ -95,17 +95,17 @@ public:
 
   /**
           * TODO:REMOVE
-   * For non-XmlEnd Node deletion without its children.
-   * @param childrenNumber The number of children which are moved up
+   * For non-XmlEnd Node deletion without its tqchildren.
+   * @param tqchildrenNumber The number of tqchildren which are moved up
    * at the location where was the deleted Node.
    */
-  void setChildrenMovedUp(int childrenNumber) {m_childrenMovedUp = childrenNumber;}
+  void setChildrenMovedUp(int tqchildrenNumber) {m_tqchildrenMovedUp = tqchildrenNumber;}
 
   /**
           * TODO:REMOVE
    * @return Returns the number of childs which were moved up.
    */
-  int childrenMovedUp() {return m_childrenMovedUp;}
+  int tqchildrenMovedUp() {return m_tqchildrenMovedUp;}
 
   /**
           * TODO:REMOVE
@@ -139,7 +139,7 @@ public:
     NodeTreeRemoved,
     //Moving a Node from one location to another. Implemented.
     NodeMoved,
-    //Moving a Node and its children from one location to another.
+    //Moving a Node and its tqchildren from one location to another.
     NodeAndChildsMoved
   };
 
@@ -148,7 +148,7 @@ private:
   TQValueList<int> m_location, m_finalLocation;
   Node *m_node;
   Tag *m_tag;
-  int m_childrenMovedUp;
+  int m_tqchildrenMovedUp;
   int m_neighboursMovedDown;
 };
 
@@ -248,7 +248,7 @@ private:
  * This class, basically a new undo/redo system, also helps KafkaDocument to synchronize the
  * kafka and quanta view.
  */
-class undoRedo : public QObject
+class undoRedo : public TQObject
 {
 public:
   /**
diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp
index 73e2a019..6eae1afc 100644
--- a/quanta/parts/kafka/wkafkapart.cpp
+++ b/quanta/parts/kafka/wkafkapart.cpp
@@ -61,7 +61,7 @@
 KafkaWidget *kafkaWidget;
 KafkaDocument *kafkaDoc;
 
-KafkaDocument::KafkaDocument(TQWidget *parent, TQWidget *widgetParent, const char *name)
+KafkaDocument::KafkaDocument(TQWidget *tqparent, TQWidget *widgetParent, const char *name)
 :domNodeProps(1021), _docLoaded(false)
 {
 // i18n reserve
@@ -88,7 +88,7 @@ TQString ab = i18n("Ident all");
 
 	kafkaDoc = this;
 
-	m_kafkaPart = new KafkaWidget(parent, widgetParent,this, name);
+	m_kafkaPart = new KafkaWidget(tqparent, widgetParent,this, name);
 	kafkaWidget = m_kafkaPart;
 	//m_kafkaPart->showDomTree();
 	m_currentDoc = 0L;
@@ -107,9 +107,9 @@ TQString ab = i18n("Ident all");
 		{
 			tmp = t.readLine();
 			if(tmp.left(2) == "//") continue;//comments
-			int begin = tmp.find("(") + 1;
+			int begin = tmp.tqfind("(") + 1;
 			if(begin == (-1 + 1)) continue;//"(" not found : invalid line
-			int length = tmp.find(")") - begin;
+			int length = tmp.tqfind(")") - begin;
 			decodedChars.insert(tmp.left(1), tmp.mid(begin, length));
 			encodedChars.insert(tmp.mid(begin, length), tmp.left(1));
 		}
@@ -428,7 +428,7 @@ kNodeAttrs* KafkaDocument::connectDomNodeToQuantaNode(DOM::Node domNode, Node *n
 	else
 	{
 		kdDebug(25001)<< "KafkaDocument::connectDomNodeToQuantaNode () - " <<
-			"No QTag found! Setting default parameters..." << endl;
+			"No TQTag found! Setting default parameters..." << endl;
 		props->setCHCursorFocus(kNodeAttrs::no);
 		props->setCCEnter(false);
 		props->setCBModified(false);
@@ -513,7 +513,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 	DOM::Node newNode, newNode2, attr, nextNode, parentNode, *ptDomNode;
 	bool removeLeftWhitespaces, removeRightWhitespaces;
 	TQString str, nodeValue;
-	Node *n, *parent;
+	Node *n, *tqparent;
 	int i;
 
 //     Don't create DOM::Nodes from Quanta empty nodes outside the body or inside other not allowed element, or KHTML
@@ -521,14 +521,14 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
     bool canInsertEmptyNode = false;
     if(node->tag->type == Tag::Empty)
     {
-        if(!m_currentDoc->defaultDTD()->name.contains("HTML", false))
+        if(!m_currentDoc->defaultDTD()->name.tqcontains("HTML", false))
             canInsertEmptyNode = true;
         else
             canInsertEmptyNode = kafkaCommon::hasParent(node, "body");
 
-        Node* parent_node = node->parent;
-        QTag* parent_node_description_tag = QuantaCommon::tagFromDTD(parent_node);
-        if(parent_node_description_tag && !parent_node_description_tag->isChild(node, false, true))
+        Node* tqparent_node = node->tqparent;
+        TQTag* tqparent_node_description_tag = QuantaCommon::tagFromDTD(tqparent_node);
+        if(tqparent_node_description_tag && !tqparent_node_description_tag->isChild(node, false, true))
             canInsertEmptyNode = false;
     }
 
@@ -540,7 +540,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 		//The basics DOM::Nodes HTML, HEAD and BODY are loaded anyway, but we must now
 		// link the real  HTML,... to their Nodes.
 		//A basic Common tree is !doctype<-html<-(head, body)
-		if(!node->parent)
+		if(!node->tqparent)
 		{//FIXME:html, head and body are HTML-specific tag, for others DTDs it might result to some pbs.
 			if(str == "html")
 			{
@@ -575,30 +575,30 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 				}
 			}
 		}
-		else if(str == "html" && (!node->parent || (node->parent && !node->parent->parent)))
+		else if(str == "html" && (!node->tqparent || (node->tqparent && !node->tqparent->tqparent)))
 		{
 			if(!html.isNull())//delete the empty Node
 				disconnectDomNodeFromQuantaNode(html);
 			newNode = html;
 			insertNode = false;
 			}
-		else if(str == "body" && ((node->parent && !node->parent->parent) || (node->parent &&
-			 node->parent->parent && !node->parent->parent->parent)))
+		else if(str == "body" && ((node->tqparent && !node->tqparent->tqparent) || (node->tqparent &&
+			 node->tqparent->tqparent && !node->tqparent->tqparent->tqparent)))
 		{
 			if(!body.isNull())
 				disconnectDomNodeFromQuantaNode(body);
 			newNode = body;
 			insertNode = false;
 		}
-		else if(str == "head" && ((node->parent && !node->parent->parent) || (node->parent &&
-			 node->parent->parent && !node->parent->parent->parent)))
+		else if(str == "head" && ((node->tqparent && !node->tqparent->tqparent) || (node->tqparent &&
+			 node->tqparent->tqparent && !node->tqparent->tqparent->tqparent)))
 		{
 			if(!head.isNull())
 				disconnectDomNodeFromQuantaNode(head);
 			newNode = head;
 			insertNode = false;
 		}
-	/**	else if(node->parent->tag->str == "html")*/
+	/**	else if(node->tqparent->tag->str == "html")*/
 		else
 		{
             if(node->tag->type == Tag::Text || node->tag->type == Tag::Empty)
@@ -631,16 +631,16 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 			//- It is the last child of a BLOCK
 			removeLeftWhitespaces = false;
 			n = node;
-			parent = node->parent;
-			while(parent && parent->SFirstChild() == n)
+			tqparent = node->tqparent;
+			while(tqparent && tqparent->SFirstChild() == n)
 			{
-				if(!kafkaCommon::isInline(parent->tag->name))
+				if(!kafkaCommon::isInline(tqparent->tag->name))
 				{
 					removeLeftWhitespaces = true;
 					break;
 				}
-				n = parent;
-				parent = parent->parent;
+				n = tqparent;
+				tqparent = tqparent->tqparent;
 			}
 			if(!removeLeftWhitespaces)
 			{
@@ -661,16 +661,16 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 
 			removeRightWhitespaces = false;
 			n = node;
-			parent = node->parent;
-			while(parent && parent->SLastChild() == n)
+			tqparent = node->tqparent;
+			while(tqparent && tqparent->SLastChild() == n)
 			{
-				if(!kafkaCommon::isInline(parent->tag->name))
+				if(!kafkaCommon::isInline(tqparent->tag->name))
 				{
 					removeRightWhitespaces = true;
 					break;
 				}
-				n = parent;
-				parent = parent->parent;
+				n = tqparent;
+				tqparent = tqparent->tqparent;
 			}
 
 			nodeValue = node->tag->tagStr();
@@ -714,11 +714,11 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 						break;
 				}
 			}
-			if(node->parent && node->parent->leafNode())
-				parentNode = *node->parent->leafNode();
-			else if(node->parent && !node->parent->leafNode())
+			if(node->tqparent && node->tqparent->leafNode())
+				parentNode = *node->tqparent->leafNode();
+			else if(node->tqparent && !node->tqparent->leafNode())
 			{
-				//the parent tag was invalid and khtml refuse to insert it
+				//the tqparent tag was invalid and khtml refuse to insert it
 				//so impossible to inser the current node
 				disconnectDomNodeFromQuantaNode(newNode);
 				if(node->rootNode())
@@ -734,7 +734,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 			node->setLeafNode(ptDomNode);
 			mainEnhancer->enhanceNode(node, parentNode, nextNode);
 
-            QTag* qTag = QuantaCommon::tagFromDTD(getCurrentDoc()->defaultDTD(),
+            TQTag* qTag = QuantaCommon::tagFromDTD(getCurrentDoc()->defaultDTD(),
                     parentNode.nodeName().string());
 
             if(qTag && qTag->isChild(node, false))
@@ -774,8 +774,8 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 	}
 	else
 	{
-		if(node->parent && node->parent->leafNode())
-			parentNode = *node->parent->leafNode();
+		if(node->tqparent && node->tqparent->leafNode())
+			parentNode = *node->tqparent->leafNode();
 		else
 			parentNode = body;
 		n = node;
@@ -807,8 +807,8 @@ void KafkaDocument::buildNodeFromKafkaNode(Node *node, DOM::Node domNode)
 	if(domNode.nodeType() == DOM::Node::TEXT_NODE)
 	{
     TQString text = domNode.nodeValue().string();
-    text.replace("<", "&lt;");
-    text.replace(">", "&gt;");
+    text.tqreplace("<", "&lt;");
+    text.tqreplace(">", "&gt;");
 		node->tag->setStr(text);
 	}
 	else
@@ -875,7 +875,7 @@ Node * KafkaDocument::buildNodeFromKafkaNode(DOM::Node domNode, Node *nodeParent
 
 TQString KafkaDocument::getDecodedChar(const TQString &encodedChar)
 {
-	TQMap<TQString, TQString>::Iterator it = encodedChars.find(encodedChar);
+	TQMap<TQString, TQString>::Iterator it = encodedChars.tqfind(encodedChar);
 	if(it == encodedChars.end())
         {
           //try this
@@ -950,7 +950,7 @@ TQString KafkaDocument::getEncodedChar(const TQString &decodedChar, const TQStri
 	else if(decodedChar[0].isSpace())
 		//FIXME:for an unknown reason, by default it return &iquest; instead of &nbsp;
 		return "&nbsp;";
-	TQMap<TQString, TQString>::Iterator it = decodedChars.find(decodedChar);
+	TQMap<TQString, TQString>::Iterator it = decodedChars.tqfind(decodedChar);
 	if(it == decodedChars.end())
 		return decodedChar;
 
@@ -1074,10 +1074,10 @@ TQString KafkaDocument::generateCodeFromNode(Node *node, int bLine, int bCol, in
 		openingNode = node->getOpeningNode();
 		if(openingNode && openingNode->tag->type == Tag::ScriptTag)
 		{
-                  if(openingNode->tag->name.contains("XML PI", false) ||
-                    openingNode->tag->name.contains("PHP", false))
+                  if(openingNode->tag->name.tqcontains("XML PI", false) ||
+                    openingNode->tag->name.tqcontains("PHP", false))
                     text = "?>";
-                  else if(openingNode->tag->name.contains("DTD", false))
+                  else if(openingNode->tag->name.tqcontains("DTD", false))
                     text = ">";
                   else
                     text = ">";
@@ -1102,26 +1102,26 @@ TQString KafkaDocument::generateCodeFromNode(Node *node, int bLine, int bCol, in
             /** Can't use KGlobal::charsets()->toEntity() :
              * It translate all chars into entities! */
           else if(!hasPreParent)
-            text = node->tag->tagStr().replace(TQRegExp("\\s+"), " ");
+            text = node->tag->tagStr().tqreplace(TQRegExp("\\s+"), " ");
           else
             text = node->tag->tagStr();
 	}
 	else if(node->tag->type == Tag::ScriptTag)
 	{
 		//WARNING : HTML SPECIFIC
-        if(node->tag->name.contains("style", false))
+        if(node->tag->name.tqcontains("style", false))
 		{
 			text = "<" + QuantaCommon::tagCase("style") + ">";
 		}
-		else if(node->tag->name.contains("DTD", false))
+		else if(node->tag->name.tqcontains("DTD", false))
 		{
 			text = "<!";
 		}
-		else if(node->tag->name.contains("XML PI", false))
+		else if(node->tag->name.tqcontains("XML PI", false))
 		{
 			text = "<?xml";
 		}
-        else if(node->tag->name.contains("PHP", false))
+        else if(node->tag->name.tqcontains("PHP", false))
         {
             text = "<?php";
         }
@@ -1697,13 +1697,13 @@ void KafkaDocument::translateNodeIntoQuantaCursorPosition(Node *node, int offset
   }
 }
 
-bool KafkaDocument::insertDomNode(DOM::Node node, DOM::Node parent,
+bool KafkaDocument::insertDomNode(DOM::Node node, DOM::Node tqparent,
 	DOM::Node nextSibling, DOM::Node rootNode)
 {
 	DOM::Node siblingNSpecial;
 
 	//First insert the node
-	if(!kafkaCommon::insertDomNode(node, parent, nextSibling, rootNode))
+	if(!kafkaCommon::insertDomNode(node, tqparent, nextSibling, rootNode))
 		return false;
 
 	//Then unEnhance and reEnhance the nearest non special nodes so that everything's fine.
@@ -1728,12 +1728,12 @@ bool KafkaDocument::insertDomNode(DOM::Node node, DOM::Node parent,
 
 bool KafkaDocument::removeDomNode(DOM::Node node)
 {
-	DOM::Node nextSiblingNSpecial, prevSiblingNSpecial, parent;
+	DOM::Node nextSiblingNSpecial, prevSiblingNSpecial, tqparent;
 
 	//First remove the node
 	prevSiblingNSpecial = getPrevSiblingNSpecial(node);
 	nextSiblingNSpecial = getNextSiblingNSpecial(node);
-	parent = node.parentNode();
+	tqparent = node.parentNode();
 	if(!kafkaCommon::removeDomNode(node))
 		return false;
 
@@ -1748,8 +1748,8 @@ bool KafkaDocument::removeDomNode(DOM::Node node)
 		mainEnhancer->postUnenhanceNode(nextSiblingNSpecial);
 		mainEnhancer->postEnhanceNode(nextSiblingNSpecial);
 	}
-	mainEnhancer->postUnenhanceNode(parent);
-	mainEnhancer->postEnhanceNode(parent);
+	mainEnhancer->postUnenhanceNode(tqparent);
+	mainEnhancer->postEnhanceNode(tqparent);
 
 	return true;
 }
@@ -1832,9 +1832,9 @@ void KafkaDocument::coutLinkTree(Node *, int)
 		dots.fill('*', indent);
 		output = dots;
 		if (node->tag->type != Tag::Text)
-			output += node->tag->name.replace('\n'," ");
+			output += node->tag->name.tqreplace('\n'," ");
 		else
-			output+= node->tag->tagStr().replace('\n'," ");
+			output+= node->tag->tagStr().tqreplace('\n'," ");
 		output += " (";
 		output += node->tag->type;
 		output += ") ";
@@ -1930,9 +1930,9 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
 	Node *node = 0L;
 	NodeModif *modif;
 	kNodeAttrs *props, *newProps;
-	DOM::Node newDomNode, parentDomNode, nextSiblingDomNode;
+	DOM::Node newDomNode, tqparentDomNode, nextSiblingDomNode;
 	DOM::Node *ptDomNode;
-	QTag *qTag;
+	TQTag *qTag;
 
 #ifdef LIGHT_DEBUG
 	TQTime t;
@@ -1985,7 +1985,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
 			//let's create the corresponding Text Node and the P tag only if necessary
 			modifs = new NodeModifsSet();
 			modif = new NodeModif();
-			parentDomNode = domNode.parentNode();
+			tqparentDomNode = domNode.parentNode();
 			nextSiblingDomNode = domNode.nextSibling();
 
 			if(!qTag->isChild("#text", false))
@@ -1993,7 +1993,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
 				newDomNode = kafkaCommon::createDomNode("p",
 					getNode(domNode.parentNode())->tag->dtd(), m_kafkaPart->document());
 				kafkaCommon::removeDomNode(domNode);
-				kafkaCommon::insertDomNode(newDomNode, parentDomNode, nextSiblingDomNode);
+				kafkaCommon::insertDomNode(newDomNode, tqparentDomNode, nextSiblingDomNode);
 				kafkaCommon::insertDomNode(domNode, newDomNode);
 
 				node = kafkaCommon::createNode("p", "", Tag::XmlTag, m_currentDoc);
@@ -2002,12 +2002,12 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
 				node->setRootNode(ptDomNode);
 				ptDomNode = new DOM::Node(newDomNode);
 				node->setLeafNode(ptDomNode);
-				node = kafkaCommon::insertNode(node, getNode(parentDomNode),
+				node = kafkaCommon::insertNode(node, getNode(tqparentDomNode),
 					getNode(nextSiblingDomNode), getNode(nextSiblingDomNode), modifs);
 				newProps->setNode(node);
 				modifs->addNodeModif(modif);
 
-				parentDomNode = newDomNode;
+				tqparentDomNode = newDomNode;
 				nextSiblingDomNode = DOM::Node();
 				modif = new NodeModif();
 			}
@@ -2019,7 +2019,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs
 			ptDomNode = new DOM::Node(domNode);
 			node->setLeafNode(ptDomNode);
 			//avoid the merging of Text Nodes
-			node = kafkaCommon::insertNode(node, getNode(parentDomNode),
+			node = kafkaCommon::insertNode(node, getNode(tqparentDomNode),
 				getNode(nextSiblingDomNode), modifs, false);
 			props->setNode(node);
 			modifs->addNodeModif(modif);
@@ -2080,13 +2080,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 
 	//If we are deleting a PHP Node which is embedded into a tag e.g. <a <? echo boo; ?> >
 	//We must regenerate the <a> tag string.
-	if(_node->tag->type == Tag::ScriptTag && _node->parent)
+	if(_node->tag->type == Tag::ScriptTag && _node->tqparent)
 	{
-		_node->parent->tag->beginPos(bLine, bCol);
-		_node->parent->tag->endPos(eLine, eCol);
+		_node->tqparent->tag->beginPos(bLine, bCol);
+		_node->tqparent->tag->endPos(eLine, eCol);
 		_node->tag->beginPos(bLine2, bCol2);
 		if(QuantaCommon::isBetween(bLine2, bCol2, bLine, bCol, eLine,eCol) == 0)
-			_node->parent->tag->setCleanStrBuilt(false);
+			_node->tqparent->tag->setCleanStrBuilt(false);
 	}
 
 	if(_node->prev)
@@ -2099,15 +2099,15 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 			modif = new NodeModif();
 			modif->setType(NodeModif::NodeRemoved);
 			modif->setLocation(kafkaCommon::getLocation(_node));
-			if(_node->parent && _node->parent->child == _node)
-				_node->parent->child = _node->next;
+			if(_node->tqparent && _node->tqparent->child == _node)
+				_node->tqparent->child = _node->next;
 			if(_node->prev)
 				_node->prev->next = _node->next;
 			if(_node->next)
 				_node->next->prev = _node->prev;
 			if(_node == baseNode)
 				baseNode = _node->next;
-			_node->parent = 0L;
+			_node->tqparent = 0L;
 			_node->prev = 0L;
 			_node->next = 0L;
 			_node->child = 0L;
@@ -2131,8 +2131,8 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 		hasClosingNode = false;
 	//_node->removeAll = false;
 
-	if(_node->parent && _node->parent->child == _node)
-		_node->parent->child = _node->next;
+	if(_node->tqparent && _node->tqparent->child == _node)
+		_node->tqparent->child = _node->next;
 	if(_node->next)
 		_node->next->prev = _node->prev;
 	if(_node->prev)
@@ -2155,15 +2155,15 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 	}
 	else if(_node->child)// && !deleteChilds
 	{
-    if(_node->parent && !_node->parent->child)
-			_node->parent->child = _node->child;
+    if(_node->tqparent && !_node->tqparent->child)
+			_node->tqparent->child = _node->child;
 		if(_node->prev)
 			_node->prev->next = _node->child;
 		_tmpNode = _node->child;
 		while(_tmpNode)
 		{
 			i++;
-			_tmpNode->parent = _node->parent;
+			_tmpNode->tqparent = _node->tqparent;
 			n = _tmpNode;
 			_tmpNode = _tmpNode->next;
 			if(!_tmpNode)
@@ -2181,7 +2181,7 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 		disconnectDomNodeFromQuantaNode(*_node->rootNode());
 	if(_node->leafNode())
 		disconnectDomNodeFromQuantaNode(*_node->leafNode());
-	_node->parent = 0L;
+	_node->tqparent = 0L;
 	_nodeNext = _node->next;
 	_node->next = 0L;
 	_node->prev = 0L;
@@ -2195,13 +2195,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 	if(hasClosingNode)
 	{
 		//delete the closing Node if present
-		if(_node->parent && _node->parent->child == _node)
-			_node->parent->child = _node->next;
+		if(_node->tqparent && _node->tqparent->child == _node)
+			_node->tqparent->child = _node->next;
 		if(_node->prev)
 			_node->prev->next = _node->next;
 		if(_node->next)
 			_node->next->prev = _node->prev;
-		_node->parent = 0L;
+		_node->tqparent = 0L;
 		_nodeNext = _node->next;
 		_node->next = 0L;
 		_node->prev = 0L;
@@ -2221,13 +2221,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 		modif = new NodeModif();
 		modif->setType(NodeModif::NodeRemoved);
 		modif->setLocation(kafkaCommon::getLocation(_node));
-		if(_node->parent && _node->parent->child == _node)
-			_node->parent->child = _node->next;
+		if(_node->tqparent && _node->tqparent->child == _node)
+			_node->tqparent->child = _node->next;
 		if(_node->prev)
 			_node->prev->next = _node->next;
 		if(_node->next)
 			_node->next->prev = _node->prev;
-		_node->parent = 0L;
+		_node->tqparent = 0L;
 		_nodeNext = _node->next;
 		_node->prev = 0L;
 		_node->next = 0L;
@@ -2251,13 +2251,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 
 void KafkaDocument::slotDomNodeIsAboutToBeMoved(DOM::Node domNode, DOM::Node newParent, DOM::Node before, NodeModifsSet* modifs)
 {
-	Node *node, *parent, *nextSibling, *closingNode;
+	Node *node, *tqparent, *nextSibling, *closingNode;
 
 	if(domNode.isNull())
 		return;
 
 	node = getNode(domNode);
-	parent = getNode(newParent);
+	tqparent = getNode(newParent);
 	nextSibling = getNode(before);
 
 	if(!node)
@@ -2265,10 +2265,10 @@ void KafkaDocument::slotDomNodeIsAboutToBeMoved(DOM::Node domNode, DOM::Node new
 
 	closingNode = node->getClosingNode();
 
-	kafkaCommon::moveNode(node, parent, nextSibling, modifs, false);
+	kafkaCommon::moveNode(node, tqparent, nextSibling, modifs, false);
 
 	if(closingNode)
-		kafkaCommon::moveNode(closingNode, parent, nextSibling, modifs, false);
+		kafkaCommon::moveNode(closingNode, tqparent, nextSibling, modifs, false);
 
 }
 
@@ -2328,7 +2328,7 @@ void KafkaDocument::slotCut(Node* startNode, int startOffset, Node* endNode, int
         drag_object->addDragObject(node_drag);
         drag_object->addDragObject(text_drag);
 
-        TQApplication::clipboard()->setData(drag_object);
+        TQApplication::tqclipboard()->setData(drag_object);
 #ifdef LIGHT_DEBUG
         kafkaCommon::coutTree(subtree_root, 3);
 #endif
@@ -2365,7 +2365,7 @@ void KafkaDocument::slotCopy(Node* startNode, int startOffset, Node* endNode, in
         drag_object->addDragObject(node_drag);
         drag_object->addDragObject(text_drag);
 
-        TQApplication::clipboard()->setData(drag_object);
+        TQApplication::tqclipboard()->setData(drag_object);
         // FIXME delete the subtree
 #ifdef LIGHT_DEBUG
         kafkaCommon::coutTree(subtree_root, 3);
@@ -2375,7 +2375,7 @@ void KafkaDocument::slotCopy(Node* startNode, int startOffset, Node* endNode, in
 
 void KafkaDocument::slotPaste()
 {
-    QClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     TQMimeSource* e = cb->data();
     Node* node = new Node(0);
 
diff --git a/quanta/parts/kafka/wkafkapart.h b/quanta/parts/kafka/wkafkapart.h
index 712dc2e2..3c0ca23c 100644
--- a/quanta/parts/kafka/wkafkapart.h
+++ b/quanta/parts/kafka/wkafkapart.h
@@ -47,15 +47,16 @@ class NodeModifsSet;
  * By Kafka Node, i mean DOM::Node (cf <dom/dom_node.h>)
  * It is a singleton class.
  */
-class KafkaDocument : public QObject
+class KafkaDocument : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
         /** Returns a reference to the KafkaDocument object */
-        static KafkaDocument* const ref(TQWidget *parent = 0L, TQWidget *widgetParent = 0L, const char *name = 0L)
+        static KafkaDocument* const ref(TQWidget *tqparent = 0L, TQWidget *widgetParent = 0L, const char *name = 0L)
         {
           static KafkaDocument *m_ref;
-          if (!m_ref) m_ref = new KafkaDocument(parent, widgetParent, name);
+          if (!m_ref) m_ref = new KafkaDocument(tqparent, widgetParent, name);
           return m_ref;
         }
 
@@ -160,7 +161,7 @@ public:
 	 * and thus make them its childs. Usefull when adding a Node on a selected range of Nodes.
 	 * It also create empty Nodes between Nodes.
 	 * @param domNode The Node returned is synchronized from this DOM::Node.
-	 * @param nodeParent The parent Node of the Node returned.
+	 * @param nodeParent The tqparent Node of the Node returned.
 	 * @param beginNode The new Node will be placed before or within _beginNode.
 	 * @param beginOffset NOT IMLEMENTED If set to 0 or -1, the new Node will be placed before _beginNode,
 	 * else _beginNode will be splitted at offset #beginOffset and the new Node will be placed
@@ -308,12 +309,12 @@ public:
 	 * Insert a DOM::Node in the DOM::Node tree. It takes care to handle the exceptions and
 	 * to postEnhance (cf htmlenhancer.h)
 	 * @param node The node to insert.
-	 * @param parent The new parent of node. If null, insert node at the top level.
+	 * @param tqparent The new tqparent of node. If null, insert node at the top level.
 	 * @param nextSibling The new next sibling of node. If null, append node at the end of the child list.
-	 * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no parent is provided.
+	 * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no tqparent is provided.
 	 * @return Returns true if the operation was successfull.
 	 */
-	bool insertDomNode(DOM::Node node, DOM::Node parent = DOM::Node(),
+	bool insertDomNode(DOM::Node node, DOM::Node tqparent = DOM::Node(),
 		DOM::Node nextSibling = DOM::Node(), DOM::Node rootNode = DOM::Node());
 
 
@@ -368,7 +369,7 @@ public:
 	/**
 	 * Prints in stdout the current Node tree + Node->DOM::Node->Node relationship.
 	 * @node The startNode
-	 * @indent The number of little dots per parent relationship.
+	 * @indent The number of little dots per tqparent relationship.
 	 */
 	void coutLinkTree(Node *node, int indent);
 
@@ -432,7 +433,7 @@ public slots:
 	/**
 	 * Called whenever a DOM::Node is moved.
 	 * @param domNode The DOM::Node to move.
-	 * @param newParent The new parent DOM::Node of domNode.
+	 * @param newParent The new tqparent DOM::Node of domNode.
 	 * @param before domNode will be inserted before before.
          * @param modifs The changes made are logged into modifs.
 	 */
@@ -459,7 +460,7 @@ private:
 	/**
 	 * Create a KafkaWidget.
 	 */
-	KafkaDocument(TQWidget *parent, TQWidget *widgetParent, const char *name);
+	KafkaDocument(TQWidget *tqparent, TQWidget *widgetParent, const char *name);
 
   TQMap<TQString, TQString> decodedChars;
 	TQMap<TQString, TQString> encodedChars;
diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp
index 47c1ca70..068bc9d3 100644
--- a/quanta/parts/preview/whtmlpart.cpp
+++ b/quanta/parts/preview/whtmlpart.cpp
@@ -33,11 +33,11 @@
 #include "whtmlpart.h"
 #include "resource.h"
 
-WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enableViewSource, 
-            TQObject *parent, const char *name, GUIProfile prof)
-  : KHTMLPart(parentWidget, widgetName, parent, name, prof), m_contextMenu(0)
+WHTMLPart::WHTMLPart(TQWidget *tqparentWidget, const char *widgetName, bool enableViewSource, 
+            TQObject *tqparent, const char *name, GUIProfile prof)
+  : KHTMLPart(tqparentWidget, widgetName, tqparent, name, prof), m_contextMenu(0)
 {
-  //kdDebug(24000) << "WHTMLPart: " << parentWidget << " " << widgetName << " " << parent << " " << name << this << endl;
+  //kdDebug(24000) << "WHTMLPart: " << tqparentWidget << " " << widgetName << " " << tqparent << " " << name << this << endl;
    hpos = 0;
    // get settings from konq.
    KConfig konqConfig("konquerorrc");
@@ -52,7 +52,7 @@ WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enable
    m_enableViewSource = enableViewSource;
    if (m_enableViewSource)
    {
-    m_contextMenu = new KPopupMenu(parentWidget);
+    m_contextMenu = new KPopupMenu(tqparentWidget);
     m_contextMenu->insertItem(i18n("View &Document Source"), this, TQT_SLOT(slotViewSource()));
     
     connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQT_SLOT(popupMenu(const TQString&, const TQPoint&)));
@@ -103,7 +103,7 @@ void WHTMLPart::forward()
     hpos++;
     openURL( KURL( history.at(hpos) ) );
 
-    emit updateStatus( backEnable() , forwardEnable() );
+    emit updatetqStatus( backEnable() , forwardEnable() );
   }
 }
 
@@ -115,7 +115,7 @@ void WHTMLPart::back()
     hpos--;
     openURL(KURL(history.at(hpos)));
 
-    emit updateStatus(backEnable(), forwardEnable());
+    emit updatetqStatus(backEnable(), forwardEnable());
   }
 }
 
@@ -133,7 +133,7 @@ void WHTMLPart::addToHistory(const TQString &url)
 
    hpos = history.count()-1;
 
-   emit updateStatus( backEnable() , forwardEnable() );
+   emit updatetqStatus( backEnable() , forwardEnable() );
 
 }
 
@@ -149,21 +149,21 @@ bool WHTMLPart::forwardEnable()
    return hpos < history.count()-1;
 }
 
-KParts::ReadOnlyPart *WHTMLPart::createPart( TQWidget * parentWidget, const char *widgetName, 
-                                            TQObject *parent, const char *name,
+KParts::ReadOnlyPart *WHTMLPart::createPart( TQWidget * tqparentWidget, const char *widgetName, 
+                                            TQObject *tqparent, const char *name,
                                             const TQString &, TQString &,
                                             TQStringList &, const TQStringList &)
 {
-  //kdDebug(24000) << "Create WHTMLPart: " << parentWidget << " " << widgetName << " " << parent << " " << name << endl;
-  return new WHTMLPart(parentWidget, widgetName, m_enableViewSource, parent, name);
+  //kdDebug(24000) << "Create WHTMLPart: " << tqparentWidget << " " << widgetName << " " << tqparent << " " << name << endl;
+  return new WHTMLPart(tqparentWidget, widgetName, m_enableViewSource, tqparent, name);
 }
 
 bool WHTMLPart::eventFilter(TQObject *watched, TQEvent *e)
 {
-  if (watched == view() && e->type() == TQEvent::FocusOut && (!m_contextMenu || !m_contextMenu->hasFocus()))
+  if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(view()) && e->type() == TQEvent::FocusOut && (!m_contextMenu || !m_contextMenu->hasFocus()))
     emit previewHasFocus(false);
   else
-  if (watched == view() && e->type() == TQEvent::FocusIn)
+  if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(view()) && e->type() == TQEvent::FocusIn)
     emit previewHasFocus(true);
   return false;
 }
diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h
index 63be955b..4133b045 100644
--- a/quanta/parts/preview/whtmlpart.h
+++ b/quanta/parts/preview/whtmlpart.h
@@ -29,9 +29,10 @@ class KPopupMenu;
 
 class WHTMLPart : public KHTMLPart  {
    Q_OBJECT
+  TQ_OBJECT
 public:
-  WHTMLPart(TQWidget *parentWidget = 0, const char *widgetname = 0, bool enableViewSource = false,
-            TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
+  WHTMLPart(TQWidget *tqparentWidget = 0, const char *widgetname = 0, bool enableViewSource = false,
+            TQObject *tqparent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
   virtual ~WHTMLPart();
 
   /** Specify the URL where the preview was started */
@@ -53,15 +54,15 @@ public slots:
   virtual bool eventFilter(TQObject *watched, TQEvent *e);
 
 signals:
-  void updateStatus( bool back, bool forward );
+  void updatetqStatus( bool back, bool forward );
   void previewHasFocus(bool focus);
   void showPreview(bool show);
   void openFile(const KURL&, const TQString&, bool);
 
 protected:
   virtual void urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args = KParts::URLArgs());
-  virtual KParts::ReadOnlyPart *createPart( TQWidget *parentWidget, const char *widgetName,
-                                            TQObject *parent, const char *name,
+  virtual KParts::ReadOnlyPart *createPart( TQWidget *tqparentWidget, const char *widgetName,
+                                            TQObject *tqparent, const char *name,
                                             const TQString &mimetype, TQString &serviceName,
                                             TQStringList &serviceTypes, const TQStringList &params);
 
diff --git a/quanta/plugins/pluginconfig.ui b/quanta/plugins/pluginconfig.ui
index a4cc6052..03f6de6d 100644
--- a/quanta/plugins/pluginconfig.ui
+++ b/quanta/plugins/pluginconfig.ui
@@ -11,7 +11,7 @@
 
 </comment>
 <author>(C) 2002 by Marc Britton &lt;consume@optushome.com.au&gt;,  (C) 2003 by Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PluginConfig</cstring>
     </property>
@@ -23,7 +23,7 @@
             <height>281</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>560</width>
             <height>280</height>
@@ -36,7 +36,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>validateCheckBox</cstring>
             </property>
@@ -57,14 +57,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="QGroupBox" row="0" column="0" rowspan="1" colspan="4">
+        <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -89,7 +89,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>TextLabel3_2</cstring>
                     </property>
@@ -97,7 +97,7 @@
                         <string>Name:</string>
                     </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>pluginName</cstring>
                     </property>
@@ -117,13 +117,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>
@@ -133,7 +133,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>TextLabel3</cstring>
                     </property>
@@ -141,7 +141,7 @@
                         <string>Location:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="3">
+                <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>location</cstring>
                     </property>
@@ -149,7 +149,7 @@
                         <string>The exact location of the plugin. If not set the global search paths setting is used.</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="4">
+                <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>pluginFileName</cstring>
                     </property>
@@ -157,7 +157,7 @@
                         <string>The plugin executable or library name (with extension).</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>TextLabel4_2</cstring>
                     </property>
@@ -165,7 +165,7 @@
                         <string>File name:</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1" rowspan="1" colspan="4">
+                <widget class="TQComboBox" row="1" column="1" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>outputWindow</cstring>
                     </property>
@@ -178,7 +178,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -186,11 +186,11 @@
                         <string>Output window:</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="4">
+                <widget class="TQPushButton" row="2" column="4">
                     <property name="name">
                         <cstring>locationButton</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>28</width>
                             <height>32767</height>
@@ -200,7 +200,7 @@
                         <string>...</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>readOnlyBox</cstring>
                     </property>
@@ -208,7 +208,7 @@
                         <string>&amp;Read only part</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -216,7 +216,7 @@
                         <string>Input:</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="4" column="2" rowspan="1" colspan="3">
+                <widget class="TQComboBox" row="4" column="2" rowspan="1" colspan="3">
                     <item>
                         <property name="text">
                             <string>None</string>
@@ -259,11 +259,11 @@
 <includes>
     <include location="global" impldecl="in implementation">kicondialog.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>pluginType_highlighted(const QString&amp;)</slot>
     <slot>slotPluginTypeHighlighted(const QString&amp;)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kicondialog.h</includehint>
 </includehints>
diff --git a/quanta/plugins/plugineditor.ui b/quanta/plugins/plugineditor.ui
index 104d9923..5188166c 100644
--- a/quanta/plugins/plugineditor.ui
+++ b/quanta/plugins/plugineditor.ui
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 </comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>pluginEditor</cstring>
     </property>
@@ -22,7 +22,7 @@
             <height>306</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>500</width>
             <height>224</height>
@@ -41,7 +41,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>TextLabel6</cstring>
             </property>
@@ -49,7 +49,7 @@
                 <string>Search paths:</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>GroupBox3</cstring>
             </property>
@@ -66,7 +66,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QListView" row="0" column="1" rowspan="5" colspan="1">
+                <widget class="TQListView" row="0" column="1" rowspan="5" colspan="1">
                     <column>
                         <property name="text">
                             <string>Name</string>
@@ -126,7 +126,7 @@
                         <cstring>pluginList</cstring>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="0">
+                <widget class="TQPushButton" row="0" column="0">
                     <property name="name">
                         <cstring>addButton</cstring>
                     </property>
@@ -137,7 +137,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="0">
+                <widget class="TQPushButton" row="1" column="0">
                     <property name="name">
                         <cstring>configureButton</cstring>
                     </property>
@@ -145,7 +145,7 @@
                         <string>Configure...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="0">
+                <widget class="TQPushButton" row="2" column="0">
                     <property name="name">
                         <cstring>removeButton</cstring>
                     </property>
@@ -163,14 +163,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>67</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton" row="4" column="0">
+                <widget class="TQPushButton" row="4" column="0">
                     <property name="name">
                         <cstring>refreshButton</cstring>
                     </property>
@@ -180,7 +180,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QPushButton" row="0" column="2">
+        <widget class="TQPushButton" row="0" column="2">
             <property name="name">
                 <cstring>addSearchPathButton</cstring>
             </property>
@@ -188,7 +188,7 @@
                 <string>Add...</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="0" column="1">
+        <widget class="TQLineEdit" row="0" column="1">
             <property name="name">
                 <cstring>searchPaths</cstring>
             </property>
@@ -204,5 +204,5 @@
     <tabstop>refreshButton</tabstop>
     <tabstop>pluginList</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp
index 628f38a7..bfed02c1 100644
--- a/quanta/plugins/quantaplugin.cpp
+++ b/quanta/plugins/quantaplugin.cpp
@@ -114,19 +114,19 @@ bool QuantaPlugin::load()
   TQString ow = outputWindow();
   m_targetWidget =  new TQWidget(quantaApp);
   if (m_readOnlyPart)
-      m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>(partInfo.baseName().latin1(), m_targetWidget, 0, m_targetWidget, 0 );
+      m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>(partInfo.baseName().latin1(), m_targetWidget, 0, TQT_TQOBJECT(m_targetWidget), 0 );
   else
-      m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>(partInfo.baseName().latin1(), m_targetWidget, 0, m_targetWidget, 0 );
+      m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>(partInfo.baseName().latin1(), m_targetWidget, 0, TQT_TQOBJECT(m_targetWidget), 0 );
   if(!m_part)
   {
-    KMessageBox::error(quantaApp, i18n("<qt>The <b>%1</b> plugin could not be loaded.<br>Possible reasons are:<br>    - <b>%2</b> is not installed;<br>    - the file <i>%3</i> is not installed or it is not reachable.").arg(m_name).arg(m_name).arg(m_fileName));
+    KMessageBox::error(quantaApp, i18n("<qt>The <b>%1</b> plugin could not be loaded.<br>Possible reasons are:<br>    - <b>%2</b> is not installed;<br>    - the file <i>%3</i> is not installed or it is not reachable.").tqarg(m_name).tqarg(m_name).tqarg(m_fileName));
     delete m_targetWidget;
     m_targetWidget = 0L;
     return false;
   }
   m_part->setName(m_name.ascii());  // for better debug output
   m_part->widget()->setName(m_name.ascii()); //needed to be able to dock the same plugin twice in separate toolviews
-  m_part->widget()->setFocusPolicy(TQWidget::ClickFocus);
+  m_part->widget()->setFocusPolicy(TQ_ClickFocus);
   quantaApp->slotNewPart(m_part, false);  // register the part in the partmanager
   return true;
 }
@@ -155,7 +155,7 @@ bool QuantaPlugin::run()
                 }
         case 3: { KURL url;
                   if ( Project::ref()->hasProject() &&
-                       (Project::ref()->contains(view->document()->url()) ||
+                       (Project::ref()->tqcontains(view->document()->url()) ||
                         view->document()->isUntitled())
                      )
                   {
diff --git a/quanta/plugins/quantaplugin.h b/quanta/plugins/quantaplugin.h
index e3cd1758..969268da 100644
--- a/quanta/plugins/quantaplugin.h
+++ b/quanta/plugins/quantaplugin.h
@@ -36,9 +36,10 @@ class KMdiToolViewAccessor;
 
 class QuantaView;
 
-class QuantaPlugin : public QObject
+class QuantaPlugin : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   QuantaPlugin();
   ~QuantaPlugin();
@@ -122,7 +123,7 @@ protected:
 private: // Private attributes
   TQString m_standardName;
   KMdiToolViewAccessor* m_pluginToolView;
-  TQWidget *m_targetWidget; //this will be the parent, used only to make the plugin widget hidden until addWidget is called
+  TQWidget *m_targetWidget; //this will be the tqparent, used only to make the plugin widget hidden until addWidget is called
 };
 
 #endif
diff --git a/quanta/plugins/quantapluginconfig.cpp b/quanta/plugins/quantapluginconfig.cpp
index 30fd6ee2..62f25553 100644
--- a/quanta/plugins/quantapluginconfig.cpp
+++ b/quanta/plugins/quantapluginconfig.cpp
@@ -77,7 +77,7 @@ void QuantaPluginConfig::accept()
 /** Gets the plugin location */
 void QuantaPluginConfig::selectLocation()
 {
-  TQString pluginLocation = KFileDialog::getExistingDirectory(TQString::null, this, i18n("Select Plugin Folder"));
+  TQString pluginLocation = KFileDialog::getExistingDirectory(TQString(), this, i18n("Select Plugin Folder"));
   if(!pluginLocation.isNull())
   {
     m_pluginConfigWidget->location->setText(pluginLocation);
diff --git a/quanta/plugins/quantapluginconfig.h b/quanta/plugins/quantapluginconfig.h
index 26cf53e5..9390b61e 100644
--- a/quanta/plugins/quantapluginconfig.h
+++ b/quanta/plugins/quantapluginconfig.h
@@ -30,6 +30,7 @@ class TQString;
 class QuantaPluginConfig : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   QuantaPluginConfig(TQWidget *, const char *);
   ~QuantaPluginConfig();
diff --git a/quanta/plugins/quantaplugineditor.cpp b/quanta/plugins/quantaplugineditor.cpp
index 42f6a237..db7f73ed 100644
--- a/quanta/plugins/quantaplugineditor.cpp
+++ b/quanta/plugins/quantaplugineditor.cpp
@@ -50,7 +50,7 @@ QuantaPluginEditor::QuantaPluginEditor(TQWidget *a_parent, const char *a_name)
   setMainWidget(m_pluginEditorWidget);
   m_pluginEditorWidget->pluginList->setSelectionMode(TQListView::Single);
   m_pluginEditorWidget->pluginList->setAllColumnsShowFocus(true);
-  m_pluginEditorWidget->pluginList->setColumnAlignment(2, Qt::AlignHCenter);
+  m_pluginEditorWidget->pluginList->setColumnAlignment(2, TQt::AlignHCenter);
 
   connect(this, TQT_SIGNAL(pluginsChanged()), TQT_SLOT(refreshPlugins()));
   connect(m_pluginEditorWidget->refreshButton, TQT_SIGNAL(clicked()), TQT_SLOT(refreshPlugins()));
@@ -100,7 +100,7 @@ void QuantaPluginEditor::addPlugin()
 void QuantaPluginEditor::addSearchPath()
 {
   // Get a dir and append it to the line edit
-  TQString appendDir = KFileDialog::getExistingDirectory(TQString::null, 0, i18n("Select Folder"));
+  TQString appendDir = KFileDialog::getExistingDirectory(TQString(), 0, i18n("Select Folder"));
   if(!appendDir.isNull())
   {
     m_pluginEditorWidget->searchPaths->setText(m_pluginEditorWidget->searchPaths->text()+appendDir+":");
@@ -115,10 +115,10 @@ void QuantaPluginEditor::configurePlugin()
   if(item)
     key = item->text(0);
 
-  if(!key.isNull() && m_plugins.find(key))
+  if(!key.isNull() && m_plugins.tqfind(key))
   {
     QuantaPluginConfig *configDlg = new QuantaPluginConfig(this, "pluginConfig");
-    QuantaPlugin *curPlugin = m_plugins.find(key);
+    QuantaPlugin *curPlugin = m_plugins.tqfind(key);
     PluginConfig *configWidget = static_cast<PluginConfig*>(configDlg->mainWidget());
 
     configWidget->outputWindow->setCurrentText(curPlugin->outputWindow());
@@ -186,7 +186,7 @@ void QuantaPluginEditor::removePlugin()
   TQListViewItem *currentItem = m_pluginEditorWidget->pluginList->currentItem();
   if (currentItem)
   {
-    QuantaPlugin *plugin = m_plugins.find(currentItem->text(0));
+    QuantaPlugin *plugin = m_plugins.tqfind(currentItem->text(0));
     if(plugin)
     {
       m_plugins.remove(plugin->pluginName());
@@ -212,7 +212,7 @@ void PluginEditorItem::paintCell(TQPainter *a_painter, const TQColorGroup &a_cg,
 {
 /*
   if(a_column == 2)
-    a_align = Qt::AlignCenter;
+    a_align = TQt::AlignCenter;
   FIXME : Why won't QT let us align cell contents?
 */
   TQListViewItem::paintCell(a_painter, a_cg, a_column, a_width, a_align);
diff --git a/quanta/plugins/quantaplugineditor.h b/quanta/plugins/quantaplugineditor.h
index 9f66e519..e26ad53f 100644
--- a/quanta/plugins/quantaplugineditor.h
+++ b/quanta/plugins/quantaplugineditor.h
@@ -42,6 +42,7 @@ class PluginEditor;
 class QuantaPluginEditor : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   QuantaPluginEditor(TQWidget *, const char *);
@@ -69,7 +70,7 @@ protected:
   PluginEditor *m_pluginEditorWidget;
 };
 
-class PluginEditorItem : public QListViewItem
+class PluginEditorItem : public TQListViewItem
 {
 public:
   PluginEditorItem(TQListView *);
diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp
index 098c7828..73ba5a48 100644
--- a/quanta/plugins/quantaplugininterface.cpp
+++ b/quanta/plugins/quantaplugininterface.cpp
@@ -38,12 +38,12 @@
 #include "resource.h"
 #include "quantacommon.h"
 
-QuantaPluginInterface::QuantaPluginInterface(TQWidget *parent)
+QuantaPluginInterface::QuantaPluginInterface(TQWidget *tqparent)
 {
-  m_parent = parent;
+  m_parent = tqparent;
    (void) new KAction( i18n( "Configure &Plugins..." ), 0, 0,
                         this, TQT_SLOT( slotPluginsEdit() ),
-                        ((KMainWindow*)parent)->actionCollection(), "configure_plugins" );
+                        ((KMainWindow*)tqparent)->actionCollection(), "configure_plugins" );
   m_pluginMenu = 0L;
   // m_plugins.setAutoDelete(true);
 }
@@ -71,7 +71,7 @@ void QuantaPluginInterface::readConfigFile(const TQString& configFile)
   // now that we have a list of the plugins, go through and get the details of them
   for(TQStringList::Iterator it = pList.begin();it != pList.end();++it)
   {
-    if (m_plugins.find(*it))
+    if (m_plugins.tqfind(*it))
         continue;
     config->setGroup(*it);
 
@@ -90,7 +90,7 @@ void QuantaPluginInterface::readConfigFile(const TQString& configFile)
       if (pluginType == "Command Line")
       {
         emit hideSplash();
-        KMessageBox::information(m_parent, i18n("<qt><b>%1</b> is a command line plugin. We have removed support for command-line plugins. However, the functionality has not been lost as script actions can still be used to run command-line tools. </qt>").arg(*it), i18n("Unsupported Plugin Type"), "CommandLinePluginWarning");
+        KMessageBox::information(m_parent, i18n("<qt><b>%1</b> is a command line plugin. We have removed support for command-line plugins. However, the functionality has not been lost as script actions can still be used to run command-line tools. </qt>").tqarg(*it), i18n("Unsupported Plugin Type"), "CommandLinePluginWarning");
         continue;
       }
 
@@ -176,7 +176,7 @@ bool QuantaPluginInterface::pluginAvailable(const TQString &a_name)
 {
   if (a_name.isEmpty())
     return false;
-  QuantaPlugin *availPlugin = m_plugins.find(a_name);
+  QuantaPlugin *availPlugin = m_plugins.tqfind(a_name);
   if(availPlugin && QuantaPlugin::validatePlugin(availPlugin))
     return true;
 
@@ -257,7 +257,7 @@ void QuantaPluginInterface::slotPluginsValidate()
      {
          invalidNames += "<br>" + invalidPlugins[i]->name();
      }
-     int answer = KMessageBox::questionYesNo(m_parent, i18n("<qt>The following plugins seems to be invalid:<b>%1</b>.<br><br>Do you want to edit the plugins?</qt>").arg(invalidNames), i18n("Invalid Plugins"), i18n("Edit Plugins"), i18n("Do Not Edit"));
+     int answer = KMessageBox::questionYesNo(m_parent, i18n("<qt>The following plugins seems to be invalid:<b>%1</b>.<br><br>Do you want to edit the plugins?</qt>").tqarg(invalidNames), i18n("Invalid Plugins"), i18n("Edit Plugins"), i18n("Do Not Edit"));
       if(answer == KMessageBox::Yes)
       {
         slotPluginsEdit();
diff --git a/quanta/plugins/quantaplugininterface.h b/quanta/plugins/quantaplugininterface.h
index 2749fbd0..6711e9e0 100644
--- a/quanta/plugins/quantaplugininterface.h
+++ b/quanta/plugins/quantaplugininterface.h
@@ -35,9 +35,10 @@ class QuantaPlugin;
 /**Provides an interface to the installed plugins
   *@author Marc Britton
   */
-class QuantaPluginInterface : public QObject
+class QuantaPluginInterface : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    *  since this class is a singleton you must use this function to access it
@@ -45,10 +46,10 @@ public:
    *  the parameters are only used at the first call to create the class
    *
    */
-  static QuantaPluginInterface* const ref(TQWidget *parent = 0L)
+  static QuantaPluginInterface* const ref(TQWidget *tqparent = 0L)
   {
     static QuantaPluginInterface *m_ref;
-    if (!m_ref) m_ref = new QuantaPluginInterface (parent);
+    if (!m_ref) m_ref = new QuantaPluginInterface (tqparent);
     return m_ref;
   }
 
@@ -76,7 +77,7 @@ private:
    *  If you need the class use QuantaPluginInterface::ref() for
    *  construction and reference
    */
-  QuantaPluginInterface(TQWidget *parent);
+  QuantaPluginInterface(TQWidget *tqparent);
 
 protected slots:
   /** slot for the menu: validate */
diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp
index 29d23964..226c4bff 100644
--- a/quanta/project/eventconfigurationdlg.cpp
+++ b/quanta/project/eventconfigurationdlg.cpp
@@ -29,8 +29,8 @@
 #include "eventeditordlg.h"
 #include "qpevents.h"
 
-EventConfigurationDlg::EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl)
-: EventConfigurationDlgS(parent,name,fl)
+EventConfigurationDlg::EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* tqparent, const char* name, WFlags fl)
+: EventConfigurationDlgS(tqparent,name,fl)
 {
   m_actionCollection = actionCollection;
 }
@@ -48,7 +48,7 @@ void EventConfigurationDlg::initEvents(EventActions *events)
     for (TQValueList<EventAction>::ConstIterator it2 = evList.constBegin(); it2 != evList.constEnd(); ++it2)
     {
       EventAction ev = *it2;
-      item = new TQListViewItem(eventsListView, QPEvents::ref()->fullEventName(it.key()), QPEvents::ref()->fullActionName(ev.action));
+      item = new TQListViewItem(eventsListView, TQPEvents::ref()->fullEventName(it.key()), TQPEvents::ref()->fullActionName(ev.action));
       int argcount = ev.arguments.count();
       if (argcount > 0)
           item->setText(2, ev.arguments[0]);
@@ -78,8 +78,8 @@ void EventConfigurationDlg::saveEvents(TQDomDocument dom)
        node = dom.createElement("event");
        eventsNode.appendChild(node);
        TQDomElement el = node.toElement();
-       el.setAttribute("name", QPEvents::ref()->eventName(item->text(0)));
-       el.setAttribute("action", QPEvents::ref()->actionName(item->text(1)));
+       el.setAttribute("name", TQPEvents::ref()->eventName(item->text(0)));
+       el.setAttribute("action", TQPEvents::ref()->actionName(item->text(1)));
        if (el.attribute("action") == "script" || el.attribute("action") == "action")
          el.setAttribute("type", "external");
        else
@@ -141,7 +141,7 @@ void EventConfigurationDlg::slotDeleteEvent()
 {
    TQListViewItem *item = eventsListView->currentItem();
    if (!item) return;
-   if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove the configuration of the <b>%1</b> event?</qt>").arg(item->text(0)), i18n("Delete Event Configuration"),KStdGuiItem::del()) == KMessageBox::Continue)
+   if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove the configuration of the <b>%1</b> event?</qt>").tqarg(item->text(0)), i18n("Delete Event Configuration"),KStdGuiItem::del()) == KMessageBox::Continue)
    {
       delete item;
    }
diff --git a/quanta/project/eventconfigurationdlg.h b/quanta/project/eventconfigurationdlg.h
index c1451c81..0d8a305b 100644
--- a/quanta/project/eventconfigurationdlg.h
+++ b/quanta/project/eventconfigurationdlg.h
@@ -27,9 +27,10 @@ typedef  TQMap<TQString, TQValueList<EventAction> > EventActions;
 class EventConfigurationDlg : public EventConfigurationDlgS
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
   ~EventConfigurationDlg();
   void initEvents(EventActions *events);
   void saveEvents(TQDomDocument dom);
diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui
index 329791b8..a9f8461d 100644
--- a/quanta/project/eventconfigurationdlgs.ui
+++ b/quanta/project/eventconfigurationdlgs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>EventConfigurationDlgS</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>EventConfigurationDlgS</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>enableEventsBox</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -64,7 +64,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>172</width>
                             <height>20</height>
@@ -152,7 +152,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>150</width>
                             <height>20</height>
@@ -211,12 +211,12 @@
     <tabstop>editButton</tabstop>
     <tabstop>deleteButton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>slotEditEvent()</slot>
     <slot>slotAddEvent()</slot>
     <slot>slotDeleteEvent()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp
index 2926f916..db5c8b93 100644
--- a/quanta/project/eventeditordlg.cpp
+++ b/quanta/project/eventeditordlg.cpp
@@ -35,12 +35,12 @@ extern TQString taskLeaderStr;
 extern TQString teamLeaderStr;
 extern TQString subprojectLeaderStr;
 
-EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl)
-: EventEditorDlgS(parent,name,fl)
+EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* tqparent, const char* name, WFlags fl)
+: EventEditorDlgS(tqparent,name,fl)
 {
   m_actionCollection = actionCollection;
-  eventCombo->insertStringList(QPEvents::ref()->eventNames());
-  actionCombo->insertStringList(QPEvents::ref()->actionNames());
+  eventCombo->insertStringList(TQPEvents::ref()->eventNames());
+  actionCombo->insertStringList(TQPEvents::ref()->actionNames());
   slotActionChanged(actionCombo->currentText());
 }
 
@@ -79,7 +79,7 @@ TQString EventEditorDlg::argument1()
    {
       TQString s = argument1Combo->currentText();
       TQString actionType = actionCombo->currentText();
-      if (actionType == QPEvents::ref()->fullActionName("email"))
+      if (actionType == TQPEvents::ref()->fullActionName("email"))
       {
           if (s ==  i18n(teamLeaderStr.utf8()))
               s = "teamleader";
@@ -96,7 +96,7 @@ TQString EventEditorDlg::argument1()
           }
           return s;
        } else
-       if (actionType == QPEvents::ref()->fullActionName("script"))
+       if (actionType == TQPEvents::ref()->fullActionName("script"))
        {
           TQString s = argument1Combo->currentText();
           for (TQMap<TQString, TQString>::ConstIterator it = m_scriptActions.constBegin(); it != m_scriptActions.constEnd(); ++it)
@@ -109,7 +109,7 @@ TQString EventEditorDlg::argument1()
           }
           return s;
        } else
-       if (actionType == QPEvents::ref()->fullActionName("action"))
+       if (actionType == TQPEvents::ref()->fullActionName("action"))
        {
           TQString s = argument1Combo->currentText();
           for (TQMap<TQString, TQString>::ConstIterator it = m_otherActions.constBegin(); it != m_otherActions.constEnd(); ++it)
@@ -126,7 +126,7 @@ TQString EventEditorDlg::argument1()
        return s;
    }
 
-   return TQString::null;
+   return TQString();
 }
 
 TQString EventEditorDlg::argument2()
@@ -134,7 +134,7 @@ TQString EventEditorDlg::argument2()
    if (argument2Combo->isEnabled())
    {
      TQString actionType = actionCombo->currentText();
-     if (actionType == QPEvents::ref()->fullActionName("log"))
+     if (actionType == TQPEvents::ref()->fullActionName("log"))
      {
         int id = argument2Combo->currentItem();
         if (id == 0)
@@ -142,7 +142,7 @@ TQString EventEditorDlg::argument2()
        else
             return "minimal";
      } else
-     if (actionType == QPEvents::ref()->fullActionName("script"))
+     if (actionType == TQPEvents::ref()->fullActionName("script"))
      {
         int id = argument2Combo->currentItem();
         if (id == 0)
@@ -152,7 +152,7 @@ TQString EventEditorDlg::argument2()
      }
      return argument2Combo->currentText();
    } else
-     return TQString::null;
+     return TQString();
 }
 
 TQString EventEditorDlg::argument3()
@@ -160,7 +160,7 @@ TQString EventEditorDlg::argument3()
    if (argument3Combo->isEnabled())
    {
      TQString actionType = actionCombo->currentText();
-     if (actionType == QPEvents::ref()->fullActionName("log"))
+     if (actionType == TQPEvents::ref()->fullActionName("log"))
      {
         int id = argument3Combo->currentItem();
         if (id == 0)
@@ -170,7 +170,7 @@ TQString EventEditorDlg::argument3()
      }
      return argument3Combo->currentText();
    } else
-     return TQString::null;
+     return TQString();
 }
 
 TQString EventEditorDlg::argument4()
@@ -179,13 +179,13 @@ TQString EventEditorDlg::argument4()
    {
      return argument4Combo->currentText();
    } else
-     return TQString::null;
+     return TQString();
 }
 
 void EventEditorDlg::setArguments(const TQStringList& arguments)
 {
    TQString actionType = actionCombo->currentText();
-   if (actionType == QPEvents::ref()->fullActionName("email"))
+   if (actionType == TQPEvents::ref()->fullActionName("email"))
    {
       TQString s = arguments[0];
       if (s == "teamleader")
@@ -218,10 +218,10 @@ void EventEditorDlg::setArguments(const TQStringList& arguments)
          argument1Combo->setCurrentItem(0);
       }
    } else
-   if (actionType == QPEvents::ref()->fullActionName("script"))
+   if (actionType == TQPEvents::ref()->fullActionName("script"))
    {
       TQString s = arguments[0];
-      if (m_scriptActions.contains(s))
+      if (m_scriptActions.tqcontains(s))
         s = m_scriptActions[s];
       if (argument1Combo->contains(s))
       {
@@ -246,10 +246,10 @@ void EventEditorDlg::setArguments(const TQStringList& arguments)
         argument2Combo->setCurrentItem(1);
       return; //setup for script arguments completed
    } else
-   if (actionType == QPEvents::ref()->fullActionName("action"))
+   if (actionType == TQPEvents::ref()->fullActionName("action"))
    {
       TQString s = arguments[0];
-      if (m_otherActions.contains(s))
+      if (m_otherActions.tqcontains(s))
         s = m_otherActions[s];
       if (argument1Combo->contains(s))
       {
@@ -268,7 +268,7 @@ void EventEditorDlg::setArguments(const TQStringList& arguments)
          argument1Combo->setCurrentItem(0);
       }
    } else
-   if (actionType == QPEvents::ref()->fullActionName("log"))
+   if (actionType == TQPEvents::ref()->fullActionName("log"))
    {
       argument1Combo->insertItem(arguments[0], 0);
       argument1Combo->setCurrentItem(0);
@@ -312,7 +312,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
    resetArgumentWidgets(argument2Label, argument2Combo);
    resetArgumentWidgets(argument3Label, argument3Combo);
    resetArgumentWidgets(argument4Label, argument4Combo);
-   if (name == QPEvents::ref()->fullActionName("email"))
+   if (name == TQPEvents::ref()->fullActionName("email"))
    {
        argument1Label->setEnabled(true);
        argument1Label->setText(i18n("Receiver:"));
@@ -331,7 +331,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
           argument1Combo->insertItem(i18n(taskLeaderStr.utf8()) + " - " + tasks[i]);
        }
    } else
-   if (name == QPEvents::ref()->fullActionName("log"))
+   if (name == TQPEvents::ref()->fullActionName("log"))
    {
        argument1Label->setEnabled(true);
        argument1Label->setText(i18n("Log file:"));
@@ -350,7 +350,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
        argument3Combo->insertItem(i18n("Create New Log"), 0);
        argument3Combo->insertItem(i18n("Append to Existing Log"), 1);
    } else
-   if (name == QPEvents::ref()->fullActionName("script"))
+   if (name == TQPEvents::ref()->fullActionName("script"))
    {
        argument1Label->setEnabled(true);
        argument1Label->setText(i18n("Action name:"));
@@ -363,7 +363,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
           action = dynamic_cast<TagAction*>(m_actionCollection->action(i));
           if (action && action->type() == "script")
           {
-             s = action->text().replace(r, "");
+             s = action->text().tqreplace(r, "");
              items.append(s);
              m_scriptActions[action->name()] = s;
           }
@@ -378,7 +378,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
        argument2Combo->insertItem(i18n("Yes"), 0);
        argument2Combo->insertItem(i18n("No"), 1);
    } else
-   if (name == QPEvents::ref()->fullActionName("action"))
+   if (name == TQPEvents::ref()->fullActionName("action"))
    {
        argument1Label->setEnabled(true);
        argument1Label->setText(i18n("Action name:"));
@@ -392,7 +392,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
           action = dynamic_cast<TagAction*>(a);
           if (!action || action->type() != "script")
           {
-             s = a->text().replace(r, "");
+             s = a->text().tqreplace(r, "");
              items.append(s);
              m_otherActions[a->name()] = s;
           }
diff --git a/quanta/project/eventeditordlg.h b/quanta/project/eventeditordlg.h
index 9f89a09c..73897b39 100644
--- a/quanta/project/eventeditordlg.h
+++ b/quanta/project/eventeditordlg.h
@@ -27,9 +27,10 @@ class KComboBox;
 class EventEditorDlg : public EventEditorDlgS
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  EventEditorDlg(KActionCollection *actionCollection, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
   ~EventEditorDlg();
   void setEvent(const TQString &name);
   void setAction(const TQString &name);
diff --git a/quanta/project/eventeditordlgs.ui b/quanta/project/eventeditordlgs.ui
index a19a35d1..ba10f39b 100644
--- a/quanta/project/eventeditordlgs.ui
+++ b/quanta/project/eventeditordlgs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>EventEditorDlgS</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>EventEditorDlgS</cstring>
     </property>
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>350</width>
             <height>0</height>
@@ -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>textLabel2</cstring>
             </property>
@@ -62,7 +62,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel3</cstring>
             </property>
@@ -91,7 +91,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>argument1Label</cstring>
             </property>
@@ -123,7 +123,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>argument2Label</cstring>
             </property>
@@ -155,7 +155,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>argument3Label</cstring>
             </property>
@@ -171,7 +171,7 @@
                 <string>Argument 3:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>argument4Label</cstring>
             </property>
@@ -229,8 +229,8 @@
         <slot>slotActionChanged(const QString&amp;)</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>slotActionChanged(const QString &amp;name)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/membereditdlg.cpp b/quanta/project/membereditdlg.cpp
index 1b27d354..047ff302 100644
--- a/quanta/project/membereditdlg.cpp
+++ b/quanta/project/membereditdlg.cpp
@@ -38,8 +38,8 @@ TQString teamLeaderStr = I18N_NOOP("Team Leader");
 TQString subprojectLeaderStr = I18N_NOOP("Subproject Leader");
 
 
-MemberEditDlg::MemberEditDlg(TQWidget *parent, const char *name)
- : MemberEditDlgS(parent, name)
+MemberEditDlg::MemberEditDlg(TQWidget *tqparent, const char *name)
+ : MemberEditDlgS(tqparent, name)
 {
    TQValueList<SubProject> *subprojects = Project::ref()->subprojects();
    for (TQValueList<SubProject>::ConstIterator it = subprojects->constBegin(); it != subprojects->constEnd(); ++it)
@@ -53,7 +53,7 @@ MemberEditDlg::MemberEditDlg(TQWidget *parent, const char *name)
   {
      nameCombo->insertItem(it.key());
   }
-  nameCombo->insertItem(TQString::null, 0);
+  nameCombo->insertItem(TQString(), 0);
 
   roleCombo->insertItem(i18n(teamLeaderStr.utf8()));
   roleCombo->insertItem(i18n(subprojectLeaderStr.utf8()));
@@ -123,7 +123,7 @@ void MemberEditDlg::slotMemberSelected()
 {
   TQString name = nameCombo->currentText();
   TQMap<TQString, TeamMember> members = Project::ref()->allMembers();
-  if (members.contains(name))
+  if (members.tqcontains(name))
   {
      emailEdit->setText(members[name].email);
   }
diff --git a/quanta/project/membereditdlg.h b/quanta/project/membereditdlg.h
index 3c6c94a8..c4173e91 100644
--- a/quanta/project/membereditdlg.h
+++ b/quanta/project/membereditdlg.h
@@ -25,8 +25,9 @@
 class MemberEditDlg : public MemberEditDlgS
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    MemberEditDlg(TQWidget *parent = 0, const char *name = 0);
+    MemberEditDlg(TQWidget *tqparent = 0, const char *name = 0);
     ~MemberEditDlg();
     void selectMember(const TQString &name);
 
diff --git a/quanta/project/membereditdlgs.ui b/quanta/project/membereditdlgs.ui
index 487e20bf..f8d22bbe 100644
--- a/quanta/project/membereditdlgs.ui
+++ b/quanta/project/membereditdlgs.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>MemberEditDlgS</class>
 <author>(C) 2005 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>MemberEditDlgS</cstring>
     </property>
@@ -33,7 +33,7 @@
                 <string>...</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -62,7 +62,7 @@
                 <cstring>taskEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>textLabel5</cstring>
             </property>
@@ -73,7 +73,7 @@
                 <cstring>taskEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>textLabel6</cstring>
             </property>
@@ -84,7 +84,7 @@
                 <cstring>subprojectCombo</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>textLabel4</cstring>
             </property>
@@ -95,7 +95,7 @@
                 <cstring>roleCombo</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel3</cstring>
             </property>
@@ -119,7 +119,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel3_2</cstring>
             </property>
@@ -175,13 +175,13 @@
     <tabstop>subprojectCombo</tabstop>
     <tabstop>editSubprojectsButton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>slotRoleSelected(const QString&amp; roleName)</slot>
     <slot>slotEditSubprojects()</slot>
     <slot>slotMemberSelected()</slot>
     <slot>slotSelectFromAddrBook()</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/quanta/project/project.cpp b/quanta/project/project.cpp
index fa4af964..d5988c69 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -68,15 +68,15 @@ extern TQString taskLeaderStr;
 extern TQString teamLeaderStr;
 extern TQString subprojectLeaderStr;
 
-Project::Project(KMainWindow *parent)
+Project::Project(KMainWindow *tqparent)
         : TQObject()
 {
   d = new ProjectPrivate(this);
   connect(d, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )));
-  d->m_mainWindow = parent;
+  d->m_mainWindow = tqparent;
   d->m_uploadDialog = 0L;
   keepPasswd = true;
-  d->initActions(parent->actionCollection());
+  d->initActions(tqparent->actionCollection());
 }
 
 Project::~Project()
@@ -109,7 +109,7 @@ KURL::List Project::files()
   return list;
 }
 
-void Project::insertFile(const KURL& nameURL, bool repaint )
+void Project::insertFile(const KURL& nameURL, bool tqrepaint )
 {
   if (d->excludeRx.exactMatch(nameURL.path()))
       return;
@@ -118,7 +118,7 @@ void Project::insertFile(const KURL& nameURL, bool repaint )
   if ( !d->baseURL.isParentOf(url) )
   {
     KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( d->baseURL.prettyURL(), d->m_mainWindow, "");
-    urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(nameURL.prettyURL(0, KURL::StripFileProtocol)));
+    urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(nameURL.prettyURL(0, KURL::StripFileProtocol)));
     urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly);
     urlRequesterDlg->exec();
     KURL destination = urlRequesterDlg->selectedURL();
@@ -143,26 +143,26 @@ void Project::insertFile(const KURL& nameURL, bool repaint )
   TQDomElement  el;
   while ( d->baseURL.isParentOf(url) )
   {
-    if ( !d->m_projectFiles.contains(url) )
+    if ( !d->m_projectFiles.tqcontains(url) )
     {
       el = d->dom.createElement("item");
-      el.setAttribute("url", QuantaCommon::qUrl( QExtFileInfo::toRelative(url, d->baseURL) ));
+      el.setAttribute("url", QuantaCommon::qUrl( TQExtFileInfo::toRelative(url, d->baseURL) ));
       d->dom.firstChild().firstChild().appendChild( el );
       KURL u = url.upURL();
-      ProjectURL *parentURL = d->m_projectFiles.find(u);
-      int uploadStatus = 1;
-      if (parentURL)
-        uploadStatus = parentURL->uploadStatus;
-      d->m_projectFiles.insert( new ProjectURL(url, "", uploadStatus, false, el) );
+      ProjectURL *tqparentURL = d->m_projectFiles.tqfind(u);
+      int uploadtqStatus = 1;
+      if (tqparentURL)
+        uploadtqStatus = tqparentURL->uploadtqStatus;
+      d->m_projectFiles.insert( new ProjectURL(url, "", uploadtqStatus, false, el) );
     }
     url.setPath(url.directory(false));
   }
-  emit eventHappened("after_project_add", url.url(), TQString::null);
+  emit eventHappened("after_project_add", url.url(), TQString());
   setModified();
-  if ( repaint )
+  if ( tqrepaint )
   {
     emit reloadTree( &(d->m_projectFiles), false, TQStringList());
-    emit newStatus();
+    emit newtqStatus();
   }
 }
 
@@ -213,7 +213,7 @@ void Project::loadLastProject(bool reload)
     {
       KURL tempURL = KURL().fromPathOrURL(tempPath);
       if (KIO::NetAccess::exists(tempURL, false, d->m_mainWindow) &&
-          KMessageBox::questionYesNo(d->m_mainWindow, i18n("<qt>Found a backup for project <b>%1</b>.<br> Do you want to open it?</qt>").arg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") )
+          KMessageBox::questionYesNo(d->m_mainWindow, i18n("<qt>Found a backup for project <b>%1</b>.<br> Do you want to open it?</qt>").tqarg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") )
           == KMessageBox::Yes)
       {
         d->m_tmpProjectFile = tempPath;
@@ -258,11 +258,11 @@ void Project::slotOpenProject(const KURL &url)
   kdDebug(24000) << "Open recent project: " << url <<endl;
   if ( !url.isEmpty() )
   {
-    if ( !QExtFileInfo::exists(url, true, d->m_mainWindow) )
+    if ( !TQExtFileInfo::exists(url, true, d->m_mainWindow) )
     {
       emit hideSplash();
       if (KMessageBox::questionYesNo(d->m_mainWindow,
-           i18n("<qt>The file <b>%1</b> does not exist.<br> Do you want to remove it from the list?</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString::null, KStdGuiItem::del(), i18n("Keep") )
+           i18n("<qt>The file <b>%1</b> does not exist.<br> Do you want to remove it from the list?</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep") )
            == KMessageBox::Yes)
       {
         d->m_projectRecent->removeURL(url);
@@ -271,7 +271,7 @@ void Project::slotOpenProject(const KURL &url)
     } else
     {
       d->loadProject ( url );
-      emit eventHappened("after_project_open", url.url(), TQString::null);
+      emit eventHappened("after_project_open", url.url(), TQString());
     }
   }
 }
@@ -297,7 +297,7 @@ void Project::slotAddDirectory(const KURL& p_dirURL, bool showDlg)
       if (showDlg)
       {
         KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( d->baseURL.prettyURL(), d->m_mainWindow, "");
-        urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol)));
+        urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol)));
         urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly);
         urlRequesterDlg->exec();
         destination = urlRequesterDlg->selectedURL();
@@ -364,7 +364,7 @@ void Project::slotRenamed(const KURL& oldURL, const KURL& newURL)
     ProjectURL * curUrl = it.current();
     if ( oldURL == *curUrl || (isFolder && oldURL.isParentOf(*curUrl)) )
     {
-      curUrl->setPath( curUrl->path().replace(oldURL.path(), newURL.path()) );
+      curUrl->setPath( curUrl->path().tqreplace(oldURL.path(), newURL.path()) );
       el = curUrl->domElement;
       el.setAttribute("url", d->m_projectFiles.toRelative(*curUrl).path());
 //      el.setAttribute("upload_time", "");
@@ -379,12 +379,12 @@ void Project::slotRenamed(const KURL& oldURL, const KURL& newURL)
   progressBar->setValue(0);
   progressBar->setTextEnabled(false);
 
-  emit statusMsg(TQString::null);
+  emit statusMsg(TQString());
   if (d->m_modified)
     setModified();  // there happens more than setting the flag !
 
   emit reloadTree(&(d->m_projectFiles), false, TQStringList());
-  emit newStatus();
+  emit newtqStatus();
 }
 
 
@@ -406,7 +406,7 @@ void Project::slotRemove(const KURL& urlToRemove)
     {
       d->m_projectFiles.removeFromListAndXML(url);
       d->m_modified = true;
-      emit eventHappened("after_project_remove", url.url(), TQString::null);
+      emit eventHappened("after_project_remove", url.url(), TQString());
       if (!isFolder)
         break;
     }
@@ -417,17 +417,17 @@ void Project::slotRemove(const KURL& urlToRemove)
   progressBar->setValue(0);
   progressBar->setTextEnabled(false);
 
-  emit statusMsg(TQString::null);
+  emit statusMsg(TQString());
 
   if (d->m_modified)
     setModified();  // there happens more than setting the flag !
   emit reloadTree( &(d->m_projectFiles), false, TQStringList() );
-  emit newStatus();
+  emit newtqStatus();
 
-  TQString urlPath = QExtFileInfo::toRelative(urlToRemove, d->baseURL).path();
+  TQString urlPath = TQExtFileInfo::toRelative(urlToRemove, d->baseURL).path();
   TQString nice = urlPath;
   nice = KStringHandler::lsqueeze(nice, 60);
-  if (KMessageBox::warningContinueCancel(d->m_mainWindow, i18n("<qt>Do you want to remove <br><b>%1</b><br> from the server(s) as well?</qt>").arg(nice), i18n("Remove From Server"), KStdGuiItem::remove(), "RemoveFromServer") == KMessageBox::Continue )
+  if (KMessageBox::warningContinueCancel(d->m_mainWindow, i18n("<qt>Do you want to remove <br><b>%1</b><br> from the server(s) as well?</qt>").tqarg(nice), i18n("Remove From Server"), KStdGuiItem::remove(), "RemoveFromServer") == KMessageBox::Continue )
   {
     TQDomNode profilesNode = d->m_sessionDom.firstChild().firstChild().namedItem("uploadprofiles");
     TQDomNodeList profileList = profilesNode.toElement().elementsByTagName("profile");
@@ -468,9 +468,9 @@ void Project::slotOptions()
   topLayout->addWidget(&optionsPage);
 
   optionsPage.linePrjName->setText( d->projectName );
-  url = QExtFileInfo::toRelative(d->templateURL, d->baseURL);
+  url = TQExtFileInfo::toRelative(d->templateURL, d->baseURL);
   optionsPage.linePrjTmpl->setText(QuantaCommon::qUrl(url));
-  url = QExtFileInfo::toRelative(d->toolbarURL, d->baseURL);
+  url = TQExtFileInfo::toRelative(d->toolbarURL, d->baseURL);
   optionsPage.linePrjToolbar->setText( QuantaCommon::qUrl(url) );
 
   optionsPage.lineAuthor->setText( d->author );
@@ -627,16 +627,16 @@ void Project::slotOptions()
 
     QuantaCommon::setUrl(d->templateURL, optionsPage.linePrjTmpl->text());
     d->templateURL.adjustPath(1);
-    d->templateURL = QExtFileInfo::toAbsolute(d->templateURL, d->baseURL);
-    if (!QExtFileInfo::createDir(d->templateURL, d->m_mainWindow))
+    d->templateURL = TQExtFileInfo::toAbsolute(d->templateURL, d->baseURL);
+    if (!TQExtFileInfo::createDir(d->templateURL, d->m_mainWindow))
     {
       QuantaCommon::dirCreationError(d->m_mainWindow, d->templateURL);
     }
 
     QuantaCommon::setUrl(d->toolbarURL, optionsPage.linePrjToolbar->text());
     d->toolbarURL.adjustPath(1);
-    d->toolbarURL = QExtFileInfo::toAbsolute(d->toolbarURL, d->baseURL);
-    if (!QExtFileInfo::createDir(d->toolbarURL, d->m_mainWindow))
+    d->toolbarURL = TQExtFileInfo::toAbsolute(d->toolbarURL, d->baseURL);
+    if (!TQExtFileInfo::createDir(d->toolbarURL, d->m_mainWindow))
     {
       QuantaCommon::dirCreationError(d->m_mainWindow, d->toolbarURL);
     }
@@ -658,14 +658,14 @@ void Project::slotOptions()
 
     el = projectNode.namedItem("author").toElement();
     if (!el.isNull())
-       el.parentNode().removeChild(el);
+       el.tqparentNode().removeChild(el);
     el =d->dom.createElement("author");
     projectNode.appendChild( el );
     el.appendChild(d->dom.createTextNode( d->author ) );
 
     el = projectNode.namedItem("email").toElement();
     if (!el.isNull())
-       el.parentNode().removeChild(el);
+       el.tqparentNode().removeChild(el);
     el =d->dom.createElement("email");
     projectNode.appendChild( el );
     el.appendChild(d->dom.createTextNode( d->email ) );
@@ -673,7 +673,7 @@ void Project::slotOptions()
     // Debugger
     el =projectNode.namedItem("debuggerclient").toElement();
     if (!el.isNull())
-       el.parentNode().removeChild(el);
+       el.tqparentNode().removeChild(el);
     el =d->dom.createElement("debuggerclient");
     projectNode.appendChild( el );
     el.appendChild(d->dom.createTextNode( d->debuggerClient ) );
@@ -684,7 +684,7 @@ void Project::slotOptions()
     excludeStr = optionsPage.lineExclude->text();
     el =projectNode.namedItem("exclude").toElement();
     if (!el.isNull())
-       el.parentNode().removeChild(el);
+       el.tqparentNode().removeChild(el);
     el =d->dom.createElement("exclude");
     if (d->m_excludeCvsignore)
       el.setAttribute("cvsignore", "true");
@@ -706,7 +706,7 @@ void Project::slotOptions()
     }
 
     el = projectNode.namedItem("templates").toElement();
-    url = QExtFileInfo::toRelative(d->templateURL, d->baseURL);
+    url = TQExtFileInfo::toRelative(d->templateURL, d->baseURL);
     if(el.isNull())
     {
       el =d->dom.createElement("templates");
@@ -718,7 +718,7 @@ void Project::slotOptions()
       el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
     }
 
-    url = QExtFileInfo::toRelative(d->toolbarURL, d->baseURL);
+    url = TQExtFileInfo::toRelative(d->toolbarURL, d->baseURL);
     el = projectNode.namedItem("toolbars").toElement();
     if(el.isNull())
     {
@@ -826,7 +826,7 @@ void Project::slotOptions()
     //subprojects without a leader
     for (uint i = 0; i < d->m_subprojects.count(); i++)
     {
-      if (!savedSubprojects.contains(d->m_subprojects[i].name))
+      if (!savedSubprojects.tqcontains(d->m_subprojects[i].name))
       {
           el = d->dom.createElement("subproject");
           el.setAttribute("name", d->m_subprojects[i].name);
@@ -874,7 +874,7 @@ void Project::slotUploadURL(const KURL& urlToUpload, const TQString& profileName
   if (!ViewManager::ref()->saveAll())
     return;
 
-  KURL url = QExtFileInfo::toRelative( urlToUpload, d->baseURL);
+  KURL url = TQExtFileInfo::toRelative( urlToUpload, d->baseURL);
   if (!d->m_uploadDialog)
   {
     d->m_uploadDialog = new ProjectUpload(url, profileName, false, quickUpload, markOnly, i18n("Upload project items...").ascii());
@@ -909,7 +909,7 @@ KURL Project::urlWithPrefix(const KURL& url)
 
   if (d->usePreviewPrefix)
   {
-    KURL tempUrl = QExtFileInfo::toRelative(url, d->baseURL );
+    KURL tempUrl = TQExtFileInfo::toRelative(url, d->baseURL );
     if ( !tempUrl.path().startsWith("/") )
     {
       returnUrl = d->previewPrefix;
@@ -921,16 +921,16 @@ KURL Project::urlWithPrefix(const KURL& url)
 
 
 /*Returns true if url is already in the project.*/
-bool Project::contains(const KURL& url)
+bool Project::tqcontains(const KURL& url)
 {
   if (d->m_projectFiles.isEmpty())
     d->m_projectFiles.readFromXML(d->dom, d->baseURL, d->templateURL, d->excludeRx);
-  return d->m_projectFiles.contains(url);
+  return d->m_projectFiles.tqcontains(url);
 }
 
 void Project::slotFileDescChanged(const KURL& url, const TQString& desc)
 {
-  ProjectURL *proUrl = d->m_projectFiles.find(url);
+  ProjectURL *proUrl = d->m_projectFiles.tqfind(url);
   if (! proUrl)
     return;
 
@@ -942,7 +942,7 @@ void Project::slotFileDescChanged(const KURL& url, const TQString& desc)
 
 void Project::slotUploadStatusChanged(const KURL& url, int status)
 {
-  if (! d->m_projectFiles.contains(url))
+  if (! d->m_projectFiles.tqcontains(url))
     return;
 
   TQDomElement el;
@@ -952,7 +952,7 @@ void Project::slotUploadStatusChanged(const KURL& url, int status)
   {
     if ( it.currentKey().startsWith(urlStr) || it.currentKey() + "/" == urlStr)
     {
-      it.current()->uploadStatus = status;
+      it.current()->uploadtqStatus = status;
       el = it.current()->domElement;
       el.setAttribute("uploadstatus", status);
     }
@@ -960,9 +960,9 @@ void Project::slotUploadStatusChanged(const KURL& url, int status)
   setModified();
 }
 
-void Project::slotChangeDocumentFolderStatus(const KURL &url, bool status)
+void Project::slotChangeDocumentFoldertqStatus(const KURL &url, bool status)
 {
-  ProjectURL *proUrl = d->m_projectFiles.find(url);
+  ProjectURL *proUrl = d->m_projectFiles.tqfind(url);
   if (! proUrl)
     return;
 
@@ -985,10 +985,10 @@ KURL Project::projectBaseURL()
     Document *w = ViewManager::ref()->activeDocument();
     if  ( !w || w->isUntitled() )
     {
-      result = QExtFileInfo::home();
+      result = TQExtFileInfo::home();
     } else
     {
-       result = QExtFileInfo::path(w->url());
+       result = TQExtFileInfo::path(w->url());
     }
   }
   return result;
@@ -1013,7 +1013,7 @@ void Project::savePassword(const TQString &entry, const TQString &passwd, bool s
 
 TQString Project::password(const TQString &entry)
 {
-   if (d->m_passwdList.contains(entry))
+   if (d->m_passwdList.tqcontains(entry))
      return d->m_passwdList[entry];
    else
    {
@@ -1187,7 +1187,7 @@ TeamMember Project::teamLeader()
 
 TeamMember Project::subprojectLeader(const TQString &name)
 {
-  if (d->m_subprojectLeaders.contains(name))
+  if (d->m_subprojectLeaders.tqcontains(name))
       return d->m_subprojectLeaders[name];
   else
       return TeamMember();
@@ -1195,7 +1195,7 @@ TeamMember Project::subprojectLeader(const TQString &name)
 
 TeamMember Project::taskLeader(const TQString &name)
 {
-  if (d->m_taskLeaders.contains(name))
+  if (d->m_taskLeaders.tqcontains(name))
     return d->m_taskLeaders[name];
   else
     return TeamMember();
@@ -1257,7 +1257,7 @@ bool Project::queryClose()
   bool canExit = true;
   if (hasProject())
   {
-    emit eventHappened("before_project_close", d->baseURL.url(), TQString::null);
+    emit eventHappened("before_project_close", d->baseURL.url(), TQString());
     d->config->setGroup("Projects");
     KURL url = d->projectURL.url();
     url.setPass("");
@@ -1270,7 +1270,7 @@ bool Project::queryClose()
     }
     if (canExit)
     {
-      emit eventHappened("after_project_close", d->baseURL.url(), TQString::null);
+      emit eventHappened("after_project_close", d->baseURL.url(), TQString());
   // empty dom tree
       d->dom.clear();
       d->m_sessionDom.clear();
@@ -1280,7 +1280,7 @@ bool Project::queryClose()
       reloadTree( &(d->m_projectFiles), true, TQStringList());
       d->adjustActions();
       d->m_projectRecent->setCurrentItem(-1);
-      newStatus();
+      newtqStatus();
 //      kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
     }
   }
@@ -1313,11 +1313,11 @@ void Project::slotShowProjectToolbar(bool show)
 
 void Project::loadBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
 {
-  if (!markIf || !hasProject() || !contains(url) || !d->m_persistentBookmarks)
+  if (!markIf || !hasProject() || !tqcontains(url) || !d->m_persistentBookmarks)
     return;
   TQDomNodeList nl = d->dom.elementsByTagName("item");
   TQDomElement el;
-  KURL u = QExtFileInfo::toRelative(url, d->baseURL);
+  KURL u = TQExtFileInfo::toRelative(url, d->baseURL);
   for ( uint i = 0; i < nl.count(); i++ )
   {
     el = nl.item(i).toElement();
@@ -1337,7 +1337,7 @@ void Project::loadBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
 
 void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
 {
-  if (!markIf || !hasProject() || !contains(url) || !d->m_persistentBookmarks)
+  if (!markIf || !hasProject() || !tqcontains(url) || !d->m_persistentBookmarks)
     return;
   TQStringList markList;
   TQPtrList<KTextEditor::Mark> marks = markIf->marks();
@@ -1345,11 +1345,11 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
   {
     KTextEditor::Mark *mark = marks.at(i);
     if (mark->type == KTextEditor::MarkInterface::Bookmark)
-          markList << TQString("%1").arg(mark->line);
+          markList << TQString("%1").tqarg(mark->line);
   }
   TQDomNodeList nl = d->dom.elementsByTagName("item");
   TQDomElement el;
-  KURL u = QExtFileInfo::toRelative(url, d->baseURL);
+  KURL u = TQExtFileInfo::toRelative(url, d->baseURL);
   for ( uint i = 0; i < nl.count(); i++ )
   {
     el = nl.item(i).toElement();
@@ -1363,11 +1363,11 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
 
 void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterface *viewCursorIf)
 {
-  if (!viewCursorIf || !hasProject() || !contains(url))
+  if (!viewCursorIf || !hasProject() || !tqcontains(url))
     return;
   TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item");
   TQDomElement el;
-  KURL u = QExtFileInfo::toRelative(url, d->baseURL);
+  KURL u = TQExtFileInfo::toRelative(url, d->baseURL);
   for ( uint i = 0; i < nl.count(); i++ )
   {
     el = nl.item(i).toElement();
@@ -1387,20 +1387,20 @@ void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterfa
     }
     KURL u2 = d->baseURL;
     QuantaCommon::setUrl(u2, el.attribute("url"));
-    if (!contains(u2))
+    if (!tqcontains(u2))
     {
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     }
   }
 }
 
 void Project::saveCursorPosition(const KURL &url, KTextEditor::ViewCursorInterface *viewCursorIf)
 {
-  if (!viewCursorIf || !hasProject() || !contains(url))
+  if (!viewCursorIf || !hasProject() || !tqcontains(url))
     return;
   TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item");
   TQDomElement el;
-  KURL u = QExtFileInfo::toRelative(url, d->baseURL);
+  KURL u = TQExtFileInfo::toRelative(url, d->baseURL);
   uint line, col;
   viewCursorIf->cursorPosition(&line, &col);
   bool found = false;
diff --git a/quanta/project/project.h b/quanta/project/project.h
index 95995036..6315c058 100644
--- a/quanta/project/project.h
+++ b/quanta/project/project.h
@@ -22,7 +22,7 @@
 
 #include "projecturl.h"
 
-class QDom;
+class TQDom;
 class ProjectPrivate;
 class ProjectList;
 namespace KTextEditor{
@@ -53,6 +53,7 @@ struct SubProject {
 
 class Project : public TQObject  {
    Q_OBJECT
+  TQ_OBJECT
    friend class ProjectPrivate;  // need this because I use the signals
 
 public:
@@ -63,10 +64,10 @@ public:
    *  the parameter is only used at the first call to create the class
    *
    */
-  static Project* const ref(KMainWindow *parent = 0L)
+  static Project* const ref(KMainWindow *tqparent = 0L)
   {
     static Project *m_ref;
-    if (!m_ref) m_ref = new Project(parent);
+    if (!m_ref) m_ref = new Project(tqparent);
     return m_ref;
   }
 
@@ -78,7 +79,7 @@ public:
   TQStringList fileNameList();
   KURL::List files();
 
-  void insertFile( const KURL& nameURL, bool repaint );
+  void insertFile( const KURL& nameURL, bool tqrepaint );
   void readConfig(KConfig *);
   /** loads the last project again if reload == true
       but checks in any case if there is a left over project from a crash
@@ -86,7 +87,7 @@ public:
   void loadLastProject(bool reload);
   /** Returns the relative url with the prefix inserted. */
   KURL urlWithPrefix(const KURL& url);
-  bool contains(const KURL &url);
+  bool tqcontains(const KURL &url);
   /** Read property of TQString defaultDTD. */
   const TQString& defaultDTD();
   const TQString& defaultEncoding();
@@ -173,7 +174,7 @@ public slots:
   void slotRescanPrjDir();
   void slotFileDescChanged(const KURL& url, const TQString& desc);
   void slotUploadStatusChanged(const KURL& url, int status);
-  void slotChangeDocumentFolderStatus(const KURL& url, bool status);
+  void slotChangeDocumentFoldertqStatus(const KURL& url, bool status);
 
   void slotReloadProjectDocs();
 
@@ -193,7 +194,7 @@ signals:
   void messages(const TQString& );
   void enableMessageWidget();
 
-  void newStatus();
+  void newtqStatus();
   void statusMsg(const TQString &);
   /** No descriptions */
   void newProjectLoaded(const TQString &, const KURL &, const KURL &);
@@ -203,7 +204,7 @@ signals:
   void getUserToolbarFiles(KURL::List *);
   void loadToolbarFile(const KURL &);
   /** ask for the tree status for saving in project */
-  void getTreeStatus(TQStringList *);
+  void getTreetqStatus(TQStringList *);
   void eventHappened(const TQString&, const TQString&, const TQString& );
 
 private:
@@ -211,7 +212,7 @@ private:
    *  If you need the class use Project::ref() for
    *  construction and reference
    */
-  Project(KMainWindow *parent);
+  Project(KMainWindow *tqparent);
 
   ProjectPrivate *d;
   bool m_projectToolbarVisible;
diff --git a/quanta/project/projectlist.cpp b/quanta/project/projectlist.cpp
index fabec2fd..db162ce2 100644
--- a/quanta/project/projectlist.cpp
+++ b/quanta/project/projectlist.cpp
@@ -69,19 +69,19 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
       }
     }
     path = url.path();
-    url = QExtFileInfo::toAbsolute(url, baseURL);
+    url = TQExtFileInfo::toAbsolute(url, baseURL);
     if ( el.nodeName() == "item" )
     {
-      if (excludeRx.exactMatch(path) || find(url.url(-1)))
+      if (excludeRx.exactMatch(path) || tqfind(url.url(-1)))
       {
-        el.parentNode().removeChild(el);
+        el.tqparentNode().removeChild(el);
         modified = true;
         i--;
       } else
       {
         bool docFolder = (el.attribute("documentFolder", "false") == "true");
-        int uploadStatus = el.attribute("uploadstatus", "-1").toInt();
-        if (uploadStatus == -1)
+        int uploadtqStatus = el.attribute("uploadstatus", "-1").toInt();
+        if (uploadtqStatus == -1)
           el.setAttribute("uploadstatus", 1);
         //remove non-existent local files
         if ( url.isLocalFile() )
@@ -89,7 +89,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
           TQFileInfo fi( url.path() );
           if ( !fi.exists() )
           {
-            el.parentNode().removeChild( el );
+            el.tqparentNode().removeChild( el );
             modified = true;
             i--;
           } else
@@ -106,7 +106,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
     }
     progressBar->advance(1);
   }
-  ProjectURL *proUrl = find(baseURL);
+  ProjectURL *proUrl = tqfind(baseURL);
   if (!proUrl)
   {
       el = dom.createElement("item");
@@ -126,10 +126,10 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
 
 bool ProjectList::removeFromListAndXML(const KURL &url)
 {
-  ProjectURL *p = find(url);
+  ProjectURL *p = tqfind(url);
   if (p) {
     TQDomElement el = p->domElement;
-    el.parentNode().removeChild(el);
+    el.tqparentNode().removeChild(el);
     remove(url.url(-1));
     return true;
   }
@@ -137,15 +137,15 @@ bool ProjectList::removeFromListAndXML(const KURL &url)
 }
 
 
-bool ProjectList::contains(const KURL &url) const
+bool ProjectList::tqcontains(const KURL &url) const
 {
-  return ProjectUrlList::find(url.url(-1));
+  return ProjectUrlList::tqfind(url.url(-1));
 }
 
 
-ProjectURL * ProjectList::find(const KURL &url) const
+ProjectURL * ProjectList::tqfind(const KURL &url) const
 {
-  return ProjectUrlList::find(url.url(-1));
+  return ProjectUrlList::tqfind(url.url(-1));
 }
 
 
@@ -157,7 +157,7 @@ void ProjectList::insert(ProjectURL *url)
 
 bool ProjectList::isFolder(const KURL &url) const
 {
-  ProjectURL *p = find(url);
+  ProjectURL *p = tqfind(url);
   return ( p && url.url(-1) != (*p).url() );
 }
 
@@ -168,9 +168,9 @@ void ProjectList::insert(const TQString & key, const ProjectURL * item)
 }
 
 
-ProjectURL * ProjectList::find ( const TQString & key ) const
+ProjectURL * ProjectList::tqfind ( const TQString & key ) const
 {
-  return ProjectUrlList::find(key);
+  return ProjectUrlList::tqfind(key);
 }
 
 
@@ -180,8 +180,8 @@ bool ProjectList::remove ( const TQString & key )
 }
 
 
-void ProjectList::replace(const TQString & key, const ProjectURL * item)
+void ProjectList::tqreplace(const TQString & key, const ProjectURL * item)
 {
-  ProjectUrlList::replace(key, item);
+  ProjectUrlList::tqreplace(key, item);
 }
 
diff --git a/quanta/project/projectlist.h b/quanta/project/projectlist.h
index 7106e142..baec78ec 100644
--- a/quanta/project/projectlist.h
+++ b/quanta/project/projectlist.h
@@ -56,7 +56,7 @@ public:
   */
   KURL toRelative(const KURL &url) const
   {
-    return QExtFileInfo::toRelative(url, m_baseURL, false);
+    return TQExtFileInfo::toRelative(url, m_baseURL, false);
   }
 
   /**
@@ -68,11 +68,11 @@ public:
 
   /**   @return true if url is in container
   */
-  bool contains(const KURL &url) const;
+  bool tqcontains(const KURL &url) const;
 
   /**   @return pointer to the entry or 0 if not found
   */
-  ProjectURL * find(const KURL &url) const;
+  ProjectURL * tqfind(const KURL &url) const;
 
   /**
         Attention: never delete the object you have given here because the
@@ -97,9 +97,9 @@ private:
 
   /**
        private because I want to control the key.
-       use find(const KURL &url) instead.
+       use tqfind(const KURL &url) instead.
   */
-  ProjectURL *find ( const TQString & key ) const;
+  ProjectURL *tqfind ( const TQString & key ) const;
 
   /**
        private because I want to control the key.
@@ -109,7 +109,7 @@ private:
   /**
        private because I want to control the key.
   */
-  void replace(const TQString & key, const ProjectURL * item);
+  void tqreplace(const TQString & key, const ProjectURL * item);
 };
 
 #endif // PROJECTFILES_H
diff --git a/quanta/project/projectnewfinal.cpp b/quanta/project/projectnewfinal.cpp
index b96e8b6f..033df99e 100644
--- a/quanta/project/projectnewfinal.cpp
+++ b/quanta/project/projectnewfinal.cpp
@@ -26,8 +26,8 @@
 #include "projectnewfinal.h"
 #include "projectnewfinal.moc"
 
-ProjectNewFinal::ProjectNewFinal(TQWidget *parent, const char *name )
-  : ProjectNewFinalS(parent,name)
+ProjectNewFinal::ProjectNewFinal(TQWidget *tqparent, const char *name )
+  : ProjectNewFinalS(tqparent,name)
 {
   imagelabel->setPixmap( UserIcon("wiznewprjfin") );
 }
@@ -37,6 +37,6 @@ ProjectNewFinal::~ProjectNewFinal(){
 
 void ProjectNewFinal::setMargin(int i)
 {
-  layout()->setMargin(i);
+  tqlayout()->setMargin(i);
 }
 
diff --git a/quanta/project/projectnewfinal.h b/quanta/project/projectnewfinal.h
index 16a40791..578aaa47 100644
--- a/quanta/project/projectnewfinal.h
+++ b/quanta/project/projectnewfinal.h
@@ -26,8 +26,9 @@
 
 class ProjectNewFinal : public ProjectNewFinalS  {
    Q_OBJECT
+  TQ_OBJECT
 public:
-  ProjectNewFinal(TQWidget *parent=0, const char *name=0);
+  ProjectNewFinal(TQWidget *tqparent=0, const char *name=0);
   ~ProjectNewFinal();
 
   void setMargin(int);
diff --git a/quanta/project/projectnewfinals.ui b/quanta/project/projectnewfinals.ui
index ffaac915..50cb98f4 100644
--- a/quanta/project/projectnewfinals.ui
+++ b/quanta/project/projectnewfinals.ui
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 </comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ProjectNewFinalS</cstring>
     </property>
@@ -29,27 +29,27 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>620</width>
             <height>410</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32000</width>
             <height>32000</height>
         </size>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
-    <property name="layoutSpacing" stdset="0">
+    <property name="tqlayoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1">
+        <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1">
             <property name="name">
                 <cstring>imagelabel</cstring>
             </property>
@@ -61,13 +61,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>115</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>115</width>
                     <height>480</height>
@@ -79,7 +79,7 @@
             <property name="scaledContents">
                 <bool>true</bool>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
@@ -95,22 +95,22 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <grid>
                 <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>TextLabel1</cstring>
                     </property>
@@ -121,12 +121,12 @@
                         <string>Prefix:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1">
+                <widget class="TQLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>lineAuthor</cstring>
                     </property>
                 </widget>
-                <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="5">
+                <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="5">
                     <property name="name">
                         <cstring>GroupBox4</cstring>
                     </property>
@@ -137,11 +137,11 @@
                         <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>TextLabel3_2_3</cstring>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>32767</height>
@@ -151,16 +151,16 @@
                                 <string>Default DTD:</string>
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="1" column="1">
+                        <widget class="TQComboBox" row="1" column="1">
                             <property name="name">
                                 <cstring>encodingCombo</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>TextLabel3_2_2_2</cstring>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>32767</height>
@@ -170,14 +170,14 @@
                                 <string>Default encoding:</string>
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="0" column="1">
+                        <widget class="TQComboBox" row="0" column="1">
                             <property name="name">
                                 <cstring>dtdCombo</cstring>
                             </property>
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="5">
+                <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="5">
                     <property name="name">
                         <cstring>insertLocalTemplates</cstring>
                     </property>
@@ -185,7 +185,7 @@
                         <string>Insert &amp;local templates</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="5">
+                <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="5">
                     <property name="name">
                         <cstring>insertGlobalTemplates</cstring>
                     </property>
@@ -193,7 +193,7 @@
                         <string>Insert &amp;global templates</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="5">
+                <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="5">
                     <property name="name">
                         <cstring>checkPrefix</cstring>
                     </property>
@@ -201,7 +201,7 @@
                         <string>Use preview prefi&amp;x</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel4</cstring>
                     </property>
@@ -209,7 +209,7 @@
                         <string>Author:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="4">
+                <widget class="TQLineEdit" row="0" column="4">
                     <property name="name">
                         <cstring>lineEmail</cstring>
                     </property>
@@ -227,7 +227,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -248,7 +248,7 @@
                         <enum>Horizontal</enum>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="4">
+                <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>linePrefix</cstring>
                     </property>
@@ -256,7 +256,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="3">
+                <widget class="TQLabel" row="0" column="3">
                     <property name="name">
                         <cstring>TextLabel5</cstring>
                     </property>
@@ -292,5 +292,5 @@
     <tabstop>insertGlobalTemplates</tabstop>
     <tabstop>insertLocalTemplates</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp
index 28c4b611..76a98a79 100644
--- a/quanta/project/projectnewgeneral.cpp
+++ b/quanta/project/projectnewgeneral.cpp
@@ -39,8 +39,8 @@
 #include "quantacommon.h"
 #include "qextfileinfo.h"
 
-ProjectNewGeneral::ProjectNewGeneral(TQWidget *parent, const char *name )
-  : ProjectNewGeneralS(parent,name)
+ProjectNewGeneral::ProjectNewGeneral(TQWidget *tqparent, const char *name )
+  : ProjectNewGeneralS(tqparent,name)
 {
   imagelabel->setPixmap( UserIcon("wiznewprjglb") );
   linePrjName->setFocus();
@@ -137,7 +137,7 @@ void ProjectNewGeneral::slotLinePrjFile( const TQString & )
     baseUrl = url;
     if (baseUrl.isLocalFile())
     {
-      s = QExtFileInfo::canonicalPath(baseUrl.path());
+      s = TQExtFileInfo::canonicalPath(baseUrl.path());
       if (!s.isEmpty())
         baseUrl.setPath(s);
     }
@@ -149,7 +149,7 @@ void ProjectNewGeneral::slotChangeNames( const TQString &text )
 {
   int i;
   TQString fname = text.lower();
-  while( (i=fname.find(" ")) >=0 ) fname.remove(i,1);
+  while( (i=fname.tqfind(" ")) >=0 ) fname.remove(i,1);
 
   linePrjFile->setText( fname+".webprj" );
 }
@@ -164,7 +164,7 @@ TQString ProjectNewGeneral::type()
 
 void ProjectNewGeneral::setMargin(int i)
 {
-  layout()->setMargin(i);
+  tqlayout()->setMargin(i);
 }
 
 void ProjectNewGeneral::slotButtonTmpl()
@@ -177,7 +177,7 @@ void ProjectNewGeneral::slotButtonTmpl()
      linePrjTmpl->setText(KURL::relativeURL(baseUrl, url));
    } else
    {
-     KMessageBox::sorry(this, i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
+     KMessageBox::sorry(this, i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
     }
 }
 
@@ -192,7 +192,7 @@ void ProjectNewGeneral::slotButtonToolbar()
    }
    {
       KMessageBox::sorry(0, i18n("<qt>The project toolbars must be stored under the main project folder: <br><br><b>%1</b></qt>")
-                                  .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
+                                  .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
    }
 }
 
@@ -218,28 +218,28 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e )
 {
   if (e->type() == TQEvent::FocusOut)
   {
-    if (watched == linePrjTmpl)
+    if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(linePrjTmpl))
     {
       KURL url = baseUrl;
       QuantaCommon::setUrl(url, linePrjTmpl->text());
-      url = QExtFileInfo::toAbsolute(url, baseUrl);
+      url = TQExtFileInfo::toAbsolute(url, baseUrl);
       if (!baseUrl.isParentOf(url))
       {
-        KMessageBox::sorry(this,i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
+        KMessageBox::sorry(this,i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
         linePrjTmpl->setFocus();
         emit enableNextButton(this, false);
       } else
         emit enableNextButton(this, true);
     } else
-    if (watched == linePrjToolbar)
+    if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(linePrjToolbar))
     {
       KURL url = baseUrl;
       QuantaCommon::setUrl(url, linePrjToolbar->text());
-      url = QExtFileInfo::toAbsolute(url, baseUrl);
+      url = TQExtFileInfo::toAbsolute(url, baseUrl);
       if (!baseUrl.isParentOf(url))
       {
         KMessageBox::sorry(0,i18n("<qt>The project toolbars must be stored under the main project folder: <br><br><b>%1</b></qt>")
-                                    .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
+                                    .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
         linePrjToolbar->setFocus();
         emit enableNextButton(this, false);
       } else
diff --git a/quanta/project/projectnewgeneral.h b/quanta/project/projectnewgeneral.h
index 6f39fde6..21c594f3 100644
--- a/quanta/project/projectnewgeneral.h
+++ b/quanta/project/projectnewgeneral.h
@@ -28,8 +28,9 @@ class KURL;
 
 class ProjectNewGeneral : public ProjectNewGeneralS  {
    Q_OBJECT
+  TQ_OBJECT
 public:
-  ProjectNewGeneral(TQWidget *parent=0, const char *name=0);
+  ProjectNewGeneral(TQWidget *tqparent=0, const char *name=0);
   ~ProjectNewGeneral();
 
   TQString type();
diff --git a/quanta/project/projectnewgenerals.ui b/quanta/project/projectnewgenerals.ui
index dfc0e55f..d64b0e92 100644
--- a/quanta/project/projectnewgenerals.ui
+++ b/quanta/project/projectnewgenerals.ui
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 </comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ProjectNewGeneralS</cstring>
     </property>
@@ -32,27 +32,27 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>620</width>
             <height>410</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32000</width>
             <height>32000</height>
         </size>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
-    <property name="layoutSpacing" stdset="0">
+    <property name="tqlayoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1">
+        <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1">
             <property name="name">
                 <cstring>imagelabel</cstring>
             </property>
@@ -64,13 +64,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>115</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>115</width>
                     <height>480</height>
@@ -82,7 +82,7 @@
             <property name="scaledContents">
                 <bool>true</bool>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
@@ -98,22 +98,22 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout12</cstring>
+                <cstring>tqlayout12</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <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>
@@ -124,12 +124,12 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLineEdit" row="1" column="2">
+                        <widget class="TQLineEdit" row="1" column="2">
                             <property name="name">
                                 <cstring>linePrjTmpl</cstring>
                             </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>TextLabel1_2_3</cstring>
                             </property>
@@ -137,17 +137,17 @@
                                 <string>Templates directory:</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="2" column="3">
+                        <widget class="TQPushButton" row="2" column="3">
                             <property name="name">
                                 <cstring>buttonToolbar</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>32</width>
                                     <height>32767</height>
@@ -157,12 +157,12 @@
                                 <string>...</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="2" column="2">
+                        <widget class="TQLineEdit" row="2" column="2">
                             <property name="name">
                                 <cstring>linePrjToolbar</cstring>
                             </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>TextLabel1_2_2_2</cstring>
                             </property>
@@ -170,17 +170,17 @@
                                 <string>Toolbars directory:</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="1" column="3">
+                        <widget class="TQPushButton" row="1" column="3">
                             <property name="name">
                                 <cstring>buttonTmpl</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>32</width>
                                     <height>32767</height>
@@ -190,7 +190,7 @@
                                 <string>...</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="3">
+                        <widget class="TQPushButton" row="0" column="3">
                             <property name="name">
                                 <cstring>buttonDir</cstring>
                             </property>
@@ -202,7 +202,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>32</width>
                                     <height>32767</height>
@@ -212,7 +212,7 @@
                                 <string>...</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>TextLabel2_3</cstring>
                             </property>
@@ -220,19 +220,19 @@
                                 <string>Main directory:</string>
                             </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>linePrjDir</cstring>
                             </property>
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLineEdit" row="0" column="3">
+                <widget class="TQLineEdit" row="0" column="3">
                     <property name="name">
                         <cstring>linePrjFile</cstring>
                     </property>
                 </widget>
-                <widget class="QButtonGroup" row="3" column="0" rowspan="1" colspan="4">
+                <widget class="TQButtonGroup" row="3" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>bGroupSources</cstring>
                     </property>
@@ -249,7 +249,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>radioLocal</cstring>
                             </property>
@@ -260,7 +260,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="1" column="0">
+                        <widget class="TQRadioButton" row="1" column="0">
                             <property name="name">
                                 <cstring>radioWeb</cstring>
                             </property>
@@ -270,18 +270,18 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLabel" row="0" column="2">
+                <widget class="TQLabel" row="0" column="2">
                     <property name="name">
                         <cstring>TextLabel3</cstring>
                     </property>
                     <property name="text">
                         <string>File:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -289,7 +289,7 @@
                         <string>Name:</string>
                     </property>
                 </widget>
-                <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="4">
+                <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="4">
                     <property name="name">
                         <cstring>GroupBox2</cstring>
                     </property>
@@ -300,31 +300,31 @@
                         <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_3</cstring>
                             </property>
                             <property name="text">
                                 <string>Protocol: </string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter</set>
                             </property>
                             <property name="hAlign" stdset="0">
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="4">
+                        <widget class="TQLabel" row="1" column="4">
                             <property name="name">
                                 <cstring>TextLabel3_3</cstring>
                             </property>
                             <property name="text">
                                 <string>Password:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="7">
+                        <widget class="TQLineEdit" row="1" column="7">
                             <property name="name">
                                 <cstring>linePort</cstring>
                             </property>
@@ -337,7 +337,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="0" column="2">
+                        <widget class="TQComboBox" row="0" column="2">
                             <item>
                                 <property name="text">
                                     <string>Local</string>
@@ -347,7 +347,7 @@
                                 <cstring>comboProtocol</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="5">
+                        <widget class="TQLineEdit" row="1" column="5">
                             <property name="name">
                                 <cstring>linePasswd</cstring>
                             </property>
@@ -359,7 +359,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>26</height>
@@ -374,34 +374,34 @@
                                 <enum>Password</enum>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="6">
+                        <widget class="TQLabel" row="1" column="6">
                             <property name="name">
                                 <cstring>TextLabel1_2_4</cstring>
                             </property>
                             <property name="text">
                                 <string>Port:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="0" column="4" rowspan="1" colspan="4">
+                        <widget class="TQLineEdit" row="0" column="4" rowspan="1" colspan="4">
                             <property name="name">
                                 <cstring>lineHost</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="3">
+                        <widget class="TQLabel" row="0" column="3">
                             <property name="name">
                                 <cstring>TextLabel4_2</cstring>
                             </property>
                             <property name="text">
                                 <string>Host:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>TextLabel2_2</cstring>
                             </property>
@@ -409,7 +409,7 @@
                                 <string>User:</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3">
+                        <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3">
                             <property name="name">
                                 <cstring>lineUser</cstring>
                             </property>
@@ -424,7 +424,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1">
+                <widget class="TQLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>linePrjName</cstring>
                     </property>
@@ -450,5 +450,5 @@
     <tabstop>radioLocal</tabstop>
     <tabstop>radioWeb</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp
index e2d99d30..1de12e9e 100644
--- a/quanta/project/projectnewlocal.cpp
+++ b/quanta/project/projectnewlocal.cpp
@@ -45,17 +45,17 @@
 #include "resource.h"
 #include "quantacommon.h"
 
-ProjectNewLocal::ProjectNewLocal(TQWidget *parent, const char *name )
-  : ProjectNewLocalS(parent,name)
+ProjectNewLocal::ProjectNewLocal(TQWidget *tqparent, const char *name )
+  : ProjectNewLocalS(tqparent,name)
 {
   imagelabel->setPixmap( UserIcon("wiznewprjloc") );
 
-//  listView->setColumnAlignment(1,Qt::AlignRight);
+//  listView->setColumnAlignment(1,TQt::AlignRight);
   listView->setColumnText(1, i18n("Add"));
   listView->removeColumn(2);
   listView->removeColumn(2);
 
-  mask->setText("*");
+  tqmask->setText("*");
 
   checkInsertWeb->setChecked( true );
 
@@ -75,7 +75,7 @@ void ProjectNewLocal::setBaseURL(const KURL& a_baseURL)
 {
   baseURL = a_baseURL;
   baseURL.adjustPath(1);
-  checkInsert->setText(i18n("Insert files from %1.").arg(baseURL.prettyURL(0, KURL::StripFileProtocol)));
+  checkInsert->setText(i18n("Insert files from %1.").tqarg(baseURL.prettyURL(0, KURL::StripFileProtocol)));
   listView->clear();
   fileList.clear();
   checkInsert->setChecked(false);
@@ -112,37 +112,37 @@ KURL::List ProjectNewLocal::projectFiles()
 {
   KURL::List list;
 
-  if (!QExtFileInfo::exists(baseURL, false, this) ||
+  if (!TQExtFileInfo::exists(baseURL, false, this) ||
       !baseURL.path().endsWith("/")  ||
       !checkInsert->isChecked() ) return list;
 
-  TQString fmask = "*";
+  TQString ftqmask = "*";
   if ( checkInsertWeb->isChecked() )
   {
     KMimeType::List list = KMimeType::allMimeTypes();
     KMimeType::List::iterator it;
     TQString name;
-    fmask = "";
+    ftqmask = "";
     for ( it = list.begin(); it != list.end(); ++it )
     {
       name = (*it)->name();
-      if (qConfig.markupMimeTypes.contains(name) ||
-          qConfig.scriptMimeTypes.contains(name) ||
-          qConfig.imageMimeTypes.contains(name))
+      if (qConfig.markupMimeTypes.tqcontains(name) ||
+          qConfig.scriptMimeTypes.tqcontains(name) ||
+          qConfig.imageMimeTypes.tqcontains(name))
       {
         TQStringList patterns = (*it)->patterns();
         for (uint i = 0 ; i < patterns.count(); i++)
         {
-          fmask = fmask+patterns[i]+" ";
+          ftqmask = ftqmask+patterns[i]+" ";
         }
       }
     }
   } else
   {
-    fmask = mask->text();
+    ftqmask = tqmask->text();
   }
 
-  list = QExtFileInfo::allFilesRelative(baseURL, fmask, this, false);
+  list = TQExtFileInfo::allFilesRelative(baseURL, ftqmask, this, false);
 
   return list;
 }
@@ -156,7 +156,7 @@ void ProjectNewLocal::slotSetFiles(bool)
     progressBar->setTextEnabled(true);
     for (uint i = 0; i < files.count(); i++)
     {
-       if ( !fileList.contains(files[i]))
+       if ( !fileList.tqcontains(files[i]))
        {
          fileList.append(files[i]);
          TQListViewItem *it = listView->addItem(files[i], KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL()));
@@ -180,7 +180,7 @@ void ProjectNewLocal::resizeEvent ( TQResizeEvent *t )
 /** No descriptions */
 void ProjectNewLocal::slotAddFiles()
 {
-  QExtFileInfo::createDir(baseURL, this);
+  TQExtFileInfo::createDir(baseURL, this);
   KURL::List list = KFileDialog::getOpenURLs(
     baseURL.url(),  i18n("*"), this, i18n("Insert Files in Project"));
 
@@ -188,7 +188,7 @@ void ProjectNewLocal::slotAddFiles()
   {
     KURL u = list.first();
 
-    u = QExtFileInfo::toRelative( u, baseURL, false );
+    u = TQExtFileInfo::toRelative( u, baseURL, false );
 
     if ( u.path().startsWith("..") || u.path().startsWith("/"))
     {
@@ -218,8 +218,8 @@ void ProjectNewLocal::slotAddFiles()
     progressBar->setTextEnabled(true);
     for (uint i = 0; i < list.count(); i++)
     {
-       list[i] = QExtFileInfo::toRelative(list[i], baseURL, false);
-       if (!fileList.contains(list[i]))
+       list[i] = TQExtFileInfo::toRelative(list[i], baseURL, false);
+       if (!fileList.tqcontains(list[i]))
        {
          fileList.append(list[i]);
          TQListViewItem *it = listView->addItem(list[i], KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL()));
@@ -238,7 +238,7 @@ void ProjectNewLocal::slotAddFolder()
 {
 //TODO/FIXME: This returns null if the selected directory is not on the local disk.
 //I think this is a KDE bug
-  QExtFileInfo::createDir(baseURL, this);
+  TQExtFileInfo::createDir(baseURL, this);
   KURL dirURL ;
   dirURL = KFileDialog::getExistingURL(
            baseURL.url(),  this, i18n("Insert Folder in Project"));
@@ -248,13 +248,13 @@ void ProjectNewLocal::slotAddFolder()
     dirURL.adjustPath(1);
 
     KURL sdir = dirURL;
-    sdir = QExtFileInfo::toRelative( sdir, baseURL, false);
+    sdir = TQExtFileInfo::toRelative( sdir, baseURL, false);
 
     if ( sdir.path().startsWith("..") || sdir.path().startsWith("/") )
     {
 
       KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( baseURL.prettyURL(), this, "");
-      urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol)));
+      urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol)));
       urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly);
       urlRequesterDlg->exec();
       KURL destination = urlRequesterDlg->selectedURL();
@@ -293,14 +293,14 @@ void ProjectNewLocal::slotInsertFolderAfterCopying(const KURL::List& a_urlList)
   {
     dirURL = *it;
    // dirURL.adjustPath(1);
-    KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*", this, false);
+    KURL::List files = TQExtFileInfo::allFilesRelative(dirURL, "*", this, false);
     progressBar->setTotalSteps(files.count() - 1);
     progressBar->setTextEnabled(true);
     KURL u;
     for (uint i = 0; i < files.count(); i++)
     {
       u = files[i];
-      if ( !fileList.contains(u) && u.path() != "." && u.path() != ".." )
+      if ( !fileList.tqcontains(u) && u.path() != "." && u.path() != ".." )
       {
         fileList.append(u);
         listView->addItem(u, KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL()));
@@ -328,8 +328,8 @@ void ProjectNewLocal::slotInsertFilesAfterCopying(const KURL::List& a_urlList)
   progressBar->setTextEnabled(true);
   for (it = a_urlList.begin(); it != a_urlList.end(); ++it)
   {
-    u = QExtFileInfo::toRelative(*it, baseURL, false);
-    if ( !fileList.contains(u))
+    u = TQExtFileInfo::toRelative(*it, baseURL, false);
+    if ( !fileList.tqcontains(u))
     {
       fileList.append(u);
       TQListViewItem *it = listView->addItem(u, KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL()));
diff --git a/quanta/project/projectnewlocal.h b/quanta/project/projectnewlocal.h
index 498b336d..b1a984c9 100644
--- a/quanta/project/projectnewlocal.h
+++ b/quanta/project/projectnewlocal.h
@@ -30,8 +30,9 @@ class CopyTo;
 
 class ProjectNewLocal : public ProjectNewLocalS  {
    Q_OBJECT
+  TQ_OBJECT
 public:
-  ProjectNewLocal(TQWidget *parent=0, const char *name=0);
+  ProjectNewLocal(TQWidget *tqparent=0, const char *name=0);
   ~ProjectNewLocal();
 
   KURL::List files();
diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui
index c752274f..7ebdc26f 100644
--- a/quanta/project/projectnewlocals.ui
+++ b/quanta/project/projectnewlocals.ui
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 </comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ProjectNewLocalS</cstring>
     </property>
@@ -29,27 +29,27 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>620</width>
             <height>410</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32000</width>
             <height>32000</height>
         </size>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
-    <property name="layoutSpacing" stdset="0">
+    <property name="tqlayoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1">
+        <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1">
             <property name="name">
                 <cstring>imagelabel</cstring>
             </property>
@@ -61,13 +61,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>115</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>115</width>
                     <height>480</height>
@@ -85,21 +85,21 @@
             <property name="scaledContents">
                 <bool>true</bool>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <grid>
                 <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>checkInsert</cstring>
                     </property>
@@ -107,7 +107,7 @@
                         <string>Insert files from</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>TextLabel8</cstring>
                     </property>
@@ -123,7 +123,7 @@
                         <string>Included files:</string>
                     </property>
                 </widget>
-                <widget class="QButtonGroup" row="1" column="0">
+                <widget class="TQButtonGroup" row="1" column="0">
                     <property name="name">
                         <cstring>ButtonGroup12</cstring>
                     </property>
@@ -151,23 +151,23 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QRadioButton" row="1" column="0">
+                        <widget class="TQRadioButton" row="1" column="0">
                             <property name="name">
                                 <cstring>checkInsertWithMask</cstring>
                             </property>
                             <property name="text">
-                                <string>Insert files with the following &amp;mask:</string>
+                                <string>Insert files with the following &amp;tqmask:</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="1">
+                        <widget class="TQLineEdit" row="1" column="1">
                             <property name="name">
-                                <cstring>mask</cstring>
+                                <cstring>tqmask</cstring>
                             </property>
                             <property name="enabled">
                                 <bool>false</bool>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
+                        <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>checkInsertWeb</cstring>
                             </property>
@@ -182,9 +182,9 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="1">
+        <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -203,9 +203,9 @@
                         </sizepolicy>
                     </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>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -221,14 +221,14 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>85</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>addFiles</cstring>
                             </property>
@@ -236,7 +236,7 @@
                                 <string>&amp;Add Files...</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>addFolder</cstring>
                             </property>
@@ -244,7 +244,7 @@
                                 <string>A&amp;dd Folder...</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>clearList</cstring>
                             </property>
@@ -262,7 +262,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>89</width>
                                     <height>20</height>
@@ -281,7 +281,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -319,7 +319,7 @@
     <connection>
         <sender>checkInsertWithMask</sender>
         <signal>toggled(bool)</signal>
-        <receiver>mask</receiver>
+        <receiver>tqmask</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
@@ -332,12 +332,12 @@
 <tabstops>
     <tabstop>checkInsert</tabstop>
     <tabstop>checkInsertWeb</tabstop>
-    <tabstop>mask</tabstop>
+    <tabstop>tqmask</tabstop>
     <tabstop>addFiles</tabstop>
     <tabstop>addFolder</tabstop>
     <tabstop>clearList</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>uploadtreeview.h</includehint>
 </includehints>
diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp
index a087497c..08391dbe 100644
--- a/quanta/project/projectnewweb.cpp
+++ b/quanta/project/projectnewweb.cpp
@@ -38,8 +38,8 @@
 #include "quantacommon.h"
 #include "uploadtreeview.h"
 
-ProjectNewWeb::ProjectNewWeb(TQWidget *parent, const char *name )
-  : ProjectNewWebS(parent,name)
+ProjectNewWeb::ProjectNewWeb(TQWidget *tqparent, const char *name )
+  : ProjectNewWebS(tqparent,name)
 {
   button->setEnabled(false);
   siteUrl->setFocus();
@@ -99,7 +99,7 @@ void ProjectNewWeb::slotStart()
   {
     emit enableMessagesWidget();
 
-    if (QExtFileInfo::createDir(baseURL, this))
+    if (TQExtFileInfo::createDir(baseURL, this))
     {
       if (baseURL.protocol() == "file")
       {
@@ -126,7 +126,7 @@ void ProjectNewWeb::slotStart()
         {
           start = true;
           button->setText( i18n("Stop") );
-          emit enableNextButton((TQWidget *)this->parent(),false);
+          emit enableNextButton((TQWidget *)this->tqparent(),false);
         } else
         {
           KMessageBox::error(this, i18n("There was an error while trying to run the \"wget\" application.\
@@ -138,14 +138,14 @@ void ProjectNewWeb::slotStart()
         KMessageBox::sorry(this,i18n("This feature is available only if the project lies on a local disk."));
         start = false;
         button->setText( i18n("Start") );
-        emit enableNextButton((TQWidget *)this->parent(),true);
+        emit enableNextButton((TQWidget *)this->tqparent(),true);
       }
    } else
    {
      QuantaCommon::dirCreationError(this, baseURL);
      start = false;
      button->setText( i18n("Start") );
-     emit enableNextButton((TQWidget *)this->parent(),true);
+     emit enableNextButton((TQWidget *)this->tqparent(),true);
    }
   } else {
 
@@ -155,7 +155,7 @@ void ProjectNewWeb::slotStart()
 
     start = false;
     button->setText( i18n("Start") );
-    emit enableNextButton((TQWidget *)this->parent(),true);
+    emit enableNextButton((TQWidget *)this->tqparent(),true);
   }
 }
 
@@ -166,7 +166,7 @@ void ProjectNewWeb::slotGetWgetExited(KProcess*)
   start = false;
     button->setText( i18n("Start") );
     emit messages(i18n("wget finished...\n"));
-  emit enableNextButton((TQWidget *)this->parent(),true);
+  emit enableNextButton((TQWidget *)this->tqparent(),true);
 }
 
 void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen)
@@ -178,7 +178,7 @@ void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen)
 
   int pos;
   TQString basePath = baseURL.path(1);
-  while ( (pos = output.find("saved")) != -1 )
+  while ( (pos = output.tqfind("saved")) != -1 )
   {
     if (KLed1->state() == KLed::Off)
     {
@@ -189,13 +189,13 @@ void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen)
       KLed2->setState(KLed::On);
       KLed1->setState(KLed::Off);
     }
-    int begName = output.findRev('`',pos);
+    int begName = output.tqfindRev('`',pos);
     if ( begName == -1 ) {
       output = output.remove(0,pos+1);
       continue;
     }
 
-    int endName = output.find('\'',begName);
+    int endName = output.tqfind('\'',begName);
     if ( endName == -1 || endName > pos ) {
       output = output.remove(0,pos+1);
       continue;
diff --git a/quanta/project/projectnewweb.h b/quanta/project/projectnewweb.h
index 28a395b4..4e9c7088 100644
--- a/quanta/project/projectnewweb.h
+++ b/quanta/project/projectnewweb.h
@@ -34,8 +34,9 @@ class KURL;
 
 class ProjectNewWeb : public ProjectNewWebS  {
    Q_OBJECT
+  TQ_OBJECT
 public:
-  ProjectNewWeb(TQWidget *parent=0, const char *name=0);
+  ProjectNewWeb(TQWidget *tqparent=0, const char *name=0);
   ~ProjectNewWeb();
 
 public slots:
diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui
index b0b726e4..97b7fc7f 100644
--- a/quanta/project/projectnewwebs.ui
+++ b/quanta/project/projectnewwebs.ui
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 </comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ProjectNewWebS</cstring>
     </property>
@@ -29,27 +29,27 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>620</width>
             <height>410</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32000</width>
             <height>32000</height>
         </size>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
-    <property name="layoutSpacing" stdset="0">
+    <property name="tqlayoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1">
+        <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1">
             <property name="name">
                 <cstring>imagelabel</cstring>
             </property>
@@ -61,13 +61,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>115</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>115</width>
                     <height>480</height>
@@ -79,15 +79,15 @@
             <property name="scaledContents">
                 <bool>true</bool>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignTop|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="1">
+        <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -103,7 +103,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>309</width>
                             <height>16</height>
@@ -126,7 +126,7 @@
                         <enum>Circular</enum>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="3">
+                <widget class="TQPushButton" row="1" column="3">
                     <property name="name">
                         <cstring>button</cstring>
                     </property>
@@ -176,15 +176,15 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <grid>
                 <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>TextLabel10</cstring>
                     </property>
@@ -202,14 +202,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>228</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <item>
                         <property name="text">
                             <string>HTTP</string>
@@ -224,12 +224,12 @@
                         <cstring>protocolCombo</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>siteUrl</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -237,12 +237,12 @@
                         <string>Protocol:</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">
+                <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>commandLine</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel9</cstring>
                     </property>
@@ -283,7 +283,7 @@
     <tabstop>commandLine</tabstop>
     <tabstop>button</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kled.h</includehint>
     <includehint>uploadtreeview.h</includehint>
diff --git a/quanta/project/projectoptions.ui b/quanta/project/projectoptions.ui
index 163f1d4c..a2879e94 100644
--- a/quanta/project/projectoptions.ui
+++ b/quanta/project/projectoptions.ui
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 </comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ProjectOptions</cstring>
     </property>
@@ -36,17 +36,17 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QPushButton" row="2" column="5">
+        <widget class="TQPushButton" row="2" column="5">
             <property name="name">
                 <cstring>buttonToolbar</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>32</width>
                     <height>32767</height>
@@ -56,17 +56,17 @@
                 <string>...</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="5">
+        <widget class="TQPushButton" row="1" column="5">
             <property name="name">
                 <cstring>buttonTmpl</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>32</width>
                     <height>32767</height>
@@ -76,7 +76,7 @@
                 <string>...</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="3" column="4" rowspan="1" colspan="2">
+        <widget class="TQLineEdit" row="3" column="4" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>lineEmail</cstring>
             </property>
@@ -88,7 +88,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>0</height>
@@ -98,7 +98,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="2">
+        <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>lineAuthor</cstring>
             </property>
@@ -111,7 +111,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="5">
+        <widget class="TQLineEdit" row="4" column="1" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>lineExclude</cstring>
             </property>
@@ -124,7 +124,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="4">
+        <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>linePrjToolbar</cstring>
             </property>
@@ -137,7 +137,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="4">
+        <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>linePrjTmpl</cstring>
             </property>
@@ -150,7 +150,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="5">
+        <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>linePrjName</cstring>
             </property>
@@ -162,7 +162,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>300</width>
                     <height>0</height>
@@ -172,7 +172,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -191,7 +191,7 @@
                 <cstring>linePrjName</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>
@@ -202,7 +202,7 @@
                 <cstring>linePrjTmpl</cstring>
             </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>
@@ -219,7 +219,7 @@
                 <cstring>linePrjToolbar</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>TextLabel4</cstring>
             </property>
@@ -238,7 +238,7 @@
                 <cstring>lineAuthor</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="3">
+        <widget class="TQLabel" row="3" column="3">
             <property name="name">
                 <cstring>TextLabel5</cstring>
             </property>
@@ -257,7 +257,7 @@
                 <cstring>lineEmail</cstring>
             </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>GroupBox5</cstring>
             </property>
@@ -276,7 +276,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>TextLabel1_2_3</cstring>
                     </property>
@@ -287,7 +287,7 @@
                         <cstring>dtdCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel1_3_2</cstring>
                     </property>
@@ -298,11 +298,11 @@
                         <cstring>viewCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel3_2_2_2</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
@@ -315,17 +315,17 @@
                         <cstring>encodingCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <property name="name">
                         <cstring>encodingCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <property name="name">
                         <cstring>viewCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="2" column="1">
+                <widget class="TQComboBox" row="2" column="1">
                     <property name="name">
                         <cstring>dtdCombo</cstring>
                     </property>
@@ -335,7 +335,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -346,7 +346,7 @@
                 <cstring>lineExclude</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="6">
+        <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="6">
             <property name="name">
                 <cstring>checkCvsignore</cstring>
             </property>
@@ -358,7 +358,7 @@
 &lt;b&gt;NOTE:&lt;/b&gt; This feature works only for local projects.</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="9" column="0" rowspan="1" colspan="6">
+        <widget class="TQGroupBox" row="9" column="0" rowspan="1" colspan="6">
             <property name="name">
                 <cstring>GroupBox5_debug</cstring>
             </property>
@@ -377,7 +377,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_2</cstring>
                     </property>
@@ -388,7 +388,7 @@
                         <cstring>comboDebuggerClient</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <property name="name">
                         <cstring>comboDebuggerClient</cstring>
                     </property>
@@ -404,7 +404,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="2">
+                <widget class="TQPushButton" row="0" column="2">
                     <property name="name">
                         <cstring>buttonDebuggerOptions</cstring>
                     </property>
@@ -420,7 +420,7 @@
                         <string>Optio&amp;ns</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>checkDebuggerPersistentBreakpoints</cstring>
                     </property>
@@ -428,7 +428,7 @@
                         <string>Remember &amp;breakpoints across sessions</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>checkDebuggerPersistentWatches</cstring>
                     </property>
@@ -441,7 +441,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QCheckBox" row="8" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>checkPersistentBookmarks</cstring>
             </property>
@@ -449,7 +449,7 @@
                 <string>Use persistent boo&amp;kmarks</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>checkPrefix</cstring>
             </property>
@@ -465,7 +465,7 @@
                 <string>&amp;Use preview prefix:</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="7" column="2" rowspan="1" colspan="4">
+        <widget class="TQLineEdit" row="7" column="2" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>linePrefix</cstring>
             </property>
@@ -531,10 +531,10 @@
 <includes>
     <include location="local" impldecl="in implementation">projectoptions.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>buttonTemplate_clicked()</slot>
     <slot>buttonToolbar_clicked()</slot>
     <slot>comboDebuggerClient_activated( int idx )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/projectoptions.ui.h b/quanta/project/projectoptions.ui.h
index b6fc2202..5ee550ee 100644
--- a/quanta/project/projectoptions.ui.h
+++ b/quanta/project/projectoptions.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/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index 86f4e221..871ae7bc 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -65,7 +65,7 @@
 ProjectPrivate::ProjectPrivate(Project *p)
           : TQObject(), config(0L), m_dirWatch(0L), tempFile(0L), sessionTempFile(0L)
 {
-  parent = p;
+  tqparent = p;
   m_projectFiles.setAutoDelete(true);
   m_showUploadTreeviews = true;
   m_eventsEnabled = true;
@@ -90,7 +90,7 @@ void ProjectPrivate::initActions(KActionCollection *ac)
                         this, TQT_SLOT( slotOpenProject() ),
                         ac, "project_open" );
   m_projectRecent =
-      KStdAction::openRecent(parent, TQT_SLOT(slotOpenProject(const KURL&)),
+      KStdAction::openRecent(tqparent, TQT_SLOT(slotOpenProject(const KURL&)),
                             ac, "project_open_recent");
   m_projectRecent->setText(i18n("Open Recent Project"));
   m_projectRecent->setIcon("project_open");
@@ -131,25 +131,25 @@ void ProjectPrivate::initActions(KActionCollection *ac)
                         ac, "project_insert_directory" );
 
   rescanPrjDirAction = new KAction( i18n( "&Rescan Project Folder..." ), "reload", 0,
-                        parent, TQT_SLOT( slotRescanPrjDir() ),
+                        tqparent, TQT_SLOT( slotRescanPrjDir() ),
                         ac, "project_rescan" );
 
   uploadProjectAction = new KAction( i18n( "&Upload Project..." ), "up", Key_F8,
-                        parent, TQT_SLOT( slotUpload() ),
+                        tqparent, TQT_SLOT( slotUpload() ),
                         ac, "project_upload" );
 
   projectOptionAction = new KAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7,
-                        parent, TQT_SLOT( slotOptions() ),
+                        tqparent, TQT_SLOT( slotOptions() ),
                         ac, "project_options" );
 
   saveAsProjectTemplateAction =
             new KAction( i18n( "Save as Project Template..." ), 0,
-                        m_mainWindow, TQT_SLOT( slotFileSaveAsProjectTemplate() ),
+                        TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveAsProjectTemplate() ),
                         ac, "save_project_template" );
 
   saveSelectionAsProjectTemplateAction =
                         new KAction( i18n( "Save Selection to Project Template File..." ), 0,
-                                    m_mainWindow, TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ),
+                                    TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ),
                                     ac, "save_selection_project_template" );
   adjustActions();
 }
@@ -157,7 +157,7 @@ void ProjectPrivate::initActions(KActionCollection *ac)
 
 void ProjectPrivate::adjustActions()
 {
-  bool projectExists = parent->hasProject();
+  bool projectExists = tqparent->hasProject();
   closeprjAction->setEnabled(projectExists);
   openPrjViewAction->setEnabled(projectExists);
   savePrjViewAction->setEnabled(projectExists);
@@ -173,7 +173,7 @@ void ProjectPrivate::adjustActions()
   saveSelectionAsProjectTemplateAction->setEnabled(projectExists);
 
   adjustViewActions();
-  parent->slotShowProjectToolbar(projectExists);
+  tqparent->slotShowProjectToolbar(projectExists);
 }
 
 
@@ -183,7 +183,7 @@ void ProjectPrivate::adjustViewActions()
   TQString oldItem = openPrjViewAction->currentText();
   openPrjViewAction->clear();
   openPrjViewAction->setItems(viewList);
-  int i = viewList.findIndex(oldItem);
+  int i = viewList.tqfindIndex(oldItem);
   if (i > -1)
     openPrjViewAction->setCurrentItem(i);
   deletePrjViewAction->clear();
@@ -211,7 +211,7 @@ void ProjectPrivate::init()
 {
   projectURL  = KURL();
   templateURL = KURL();
-  projectName = TQString::null;
+  projectName = TQString();
   m_modified = false;
   m_defaultDTD = qConfig.defaultDocType;
   excludeRx.setPattern(".*~$");
@@ -223,11 +223,11 @@ void ProjectPrivate::init()
   m_debuggerPersistentBreakpoints = false;
   m_debuggerPersistentWatches = false;
   m_excludeCvsignore = false;
-  currentProjectView = TQString::null;
+  currentProjectView = TQString();
   m_projectFiles.clear();
-  m_mailingList = TQString::null;
-  m_teamLeader.name = TQString::null;
-  m_teamLeader.email = TQString::null;
+  m_mailingList = TQString();
+  m_teamLeader.name = TQString();
+  m_teamLeader.email = TQString();
   m_taskLeaders.clear();
   m_subprojectLeaders.clear();
   m_subprojects.clear();
@@ -254,34 +254,34 @@ void ProjectPrivate::openCurrentView()
         TQDomElement el2 = itemNodes.item(j).cloneNode().toElement();
         KURL url = baseURL;
         QuantaCommon::setUrl(url,el2.attribute("url"));
-        url = QExtFileInfo::toAbsolute(url, baseURL);
+        url = TQExtFileInfo::toAbsolute(url, baseURL);
         if (el2.nodeName() == "viewitem")
         {
           urlsInView.append(url);
-          if (!ViewManager::ref()->isOpened(url) && QExtFileInfo::exists(url, true, m_mainWindow))
+          if (!ViewManager::ref()->isOpened(url) && TQExtFileInfo::exists(url, true, m_mainWindow))
             urlsToOpen.append(url);
         } else {
           if (el2.nodeName() == "viewtoolbar")
           {
-            parent->loadToolbarFile(url);
+            tqparent->loadToolbarFile(url);
           }
         }
       }
       // first we open what we want, might be that a wanted file is already open!
-      parent->openFiles(urlsToOpen, m_defaultEncoding);
+      tqparent->openFiles(urlsToOpen, m_defaultEncoding);
       // second we close what we don't want
       KURL::List openURLs = ViewManager::ref()->openedFiles(true); // get open urls
       KURL::List::Iterator it;
       for ( it = openURLs.begin(); it != openURLs.end(); ++it )
       {
-        if (urlsInView.findIndex( *it ) == -1)
-          parent->closeFile (*it);
+        if (urlsInView.tqfindIndex( *it ) == -1)
+          tqparent->closeFile (*it);
       }
       break;
     }
   }
   TQStringList viewList = projectViewList();
-  int i = viewList.findIndex(currentProjectView);
+  int i = viewList.tqfindIndex(currentProjectView);
   if (i > -1)
     openPrjViewAction->setCurrentItem(i);
   adjustViewActions();
@@ -299,7 +299,7 @@ void ProjectPrivate::insertFiles( KURL::List files )
 {
   TQDomElement  el;
   TQDomNodeList nl = dom.elementsByTagName("item");
-  parent->statusMsg( i18n("Adding files to the project...") );
+  tqparent->statusMsg( i18n("Adding files to the project...") );
   progressBar->setTotalSteps(2 * files.count() - 2);
   progressBar->setValue(0);
   progressBar->setTextEnabled(true);
@@ -307,7 +307,7 @@ void ProjectPrivate::insertFiles( KURL::List files )
   KURL::List::Iterator it;
   for ( it = files.begin(); it != files.end(); ++it )
   {
-    if (m_projectFiles.contains(*it))
+    if (m_projectFiles.tqcontains(*it))
     {
         it = files.erase(it);
         --it;
@@ -322,13 +322,13 @@ void ProjectPrivate::insertFiles( KURL::List files )
       url.setPath(url.directory(false));
       while ( baseURL.isParentOf(url) )
       {
-        if (!m_projectFiles.contains(url))
+        if (!m_projectFiles.tqcontains(url))
         {
           el = dom.createElement("item");
-          el.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL, false)));
+          el.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::toRelative(url, baseURL, false)));
           dom.firstChild().firstChild().appendChild(el);
           m_projectFiles.insert( new ProjectURL(url, "", 1, false, el) );
-          emit eventHappened("after_project_add", url.url(), TQString::null);
+          emit eventHappened("after_project_add", url.url(), TQString());
           m_modified = true;
         }
         url.setPath(url.directory(false));
@@ -337,10 +337,10 @@ void ProjectPrivate::insertFiles( KURL::List files )
       url = *it;
       if (!excludeRx.exactMatch(url.path()))
       {
-        el.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL, false)));
+        el.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::toRelative(url, baseURL, false)));
         dom.firstChild().firstChild().appendChild(el);
         m_projectFiles.insert( new ProjectURL(url, "", 1, false, el) );
-        emit eventHappened("after_project_add", url.url(), TQString::null);
+        emit eventHappened("after_project_add", url.url(), TQString());
         m_modified = true;
       }
     }
@@ -350,19 +350,19 @@ void ProjectPrivate::insertFiles( KURL::List files )
   progressBar->setValue(0);
   progressBar->setTextEnabled(false);
 
-  parent->reloadTree(&(m_projectFiles), false, TQStringList());
-  parent->newStatus();
-  parent->statusMsg(TQString::null);
+  tqparent->reloadTree(&(m_projectFiles), false, TQStringList());
+  tqparent->newtqStatus();
+  tqparent->statusMsg(TQString());
 }
 
 
 /** insert files from dir recursive */
-void ProjectPrivate::insertFiles(const KURL& pathURL, const TQString& mask )
+void ProjectPrivate::insertFiles(const KURL& pathURL, const TQString& tqmask )
 {
   KURL::List list;
 
   list.append(pathURL);
-  list += QExtFileInfo::allFiles(pathURL, mask, m_mainWindow);
+  list += TQExtFileInfo::allFiles(pathURL, tqmask, m_mainWindow);
   insertFiles(list);
 }
 
@@ -371,7 +371,7 @@ void ProjectPrivate::loadProjectXML()
 {
 //TODO: Optimize reading. For example iterate through all the nodes and handle them
 //according to the found node type
-  parent->statusMsg( i18n("Reading the project file...") );
+  tqparent->statusMsg( i18n("Reading the project file...") );
   TQDomNode    no;
   TQDomElement el;
   KURL url;
@@ -380,7 +380,7 @@ void ProjectPrivate::loadProjectXML()
 
   if ( projectNode.isNull() || projectName.isEmpty() )
   {
-    parent->hideSplash();
+    tqparent->hideSplash();
     KMessageBox::sorry(m_mainWindow, i18n("Invalid project file.") );
     adjustActions();
     return;
@@ -464,7 +464,7 @@ void ProjectPrivate::loadProjectXML()
   if (tmpString != QuantaCommon::qUrl(templateURL) )
   {
     el = no.toElement();
-    url = QExtFileInfo::toRelative(templateURL, baseURL);
+    url = TQExtFileInfo::toRelative(templateURL, baseURL);
     if(el.isNull())
     {
       el = dom.createElement("templates");
@@ -476,7 +476,7 @@ void ProjectPrivate::loadProjectXML()
       el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
     }
   }
-  templateURL = QExtFileInfo::toAbsolute(templateURL, baseURL);
+  templateURL = TQExtFileInfo::toAbsolute(templateURL, baseURL);
 
   no = projectNode.namedItem("toolbars");
   toolbarURL = baseURL;
@@ -492,7 +492,7 @@ void ProjectPrivate::loadProjectXML()
   if (tmpString != QuantaCommon::qUrl(toolbarURL))
   {
     el = no.toElement();
-    url = QExtFileInfo::toRelative(toolbarURL, baseURL);
+    url = TQExtFileInfo::toRelative(toolbarURL, baseURL);
     if(el.isNull())
     {
       el = dom.createElement("toolbars");
@@ -504,7 +504,7 @@ void ProjectPrivate::loadProjectXML()
       el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
     }
   }
-  toolbarURL = QExtFileInfo::toAbsolute(toolbarURL, baseURL);
+  toolbarURL = TQExtFileInfo::toAbsolute(toolbarURL, baseURL);
 
   no = projectNode.namedItem("exclude");
   m_excludeCvsignore = (no.toElement().attribute("cvsignore", "false") == "true");
@@ -524,9 +524,9 @@ void ProjectPrivate::loadProjectXML()
     } else
     if (!excludeStr.endsWith("*"))
       str = excludeStr + "/*|"+ excludeStr + "$";
-    str.replace(".","\\.");
-    str.replace("*",".*");
-    str.replace("?",".");
+    str.tqreplace(".","\\.");
+    str.tqreplace("*",".*");
+    str.tqreplace("?",".");
     regExpStr.append(str);
     if (i+1 < excludeList.count())
       regExpStr.append("|");
@@ -564,9 +564,9 @@ void ProjectPrivate::loadProjectXML()
               line = line + "/*|"+ line + "$";
             if (!line.startsWith("*"))
               line.prepend("^");
-            line.replace(".","\\.");
-            line.replace("*",".*");
-            line.replace("?",".");
+            line.tqreplace(".","\\.");
+            line.tqreplace("*",".*");
+            line.tqreplace("?",".");
             rxStr += line + "|";
         }
         regExpStr.prepend(rxStr);
@@ -595,7 +595,7 @@ void ProjectPrivate::loadProjectXML()
       if (s != "--not set--" && !s.isEmpty())
           ev.arguments << s;
     }
-    if (m_events->contains(el.attribute("name")))
+    if (m_events->tqcontains(el.attribute("name")))
     {
       (*m_events)[el.attribute("name")].append(ev);
     } else
@@ -696,10 +696,10 @@ void ProjectPrivate::loadProjectXML()
   }
 
 
-  parent->statusMsg(TQString::null);
-  parent->newProjectLoaded(projectName, baseURL, templateURL);
-  parent->reloadTree(&(m_projectFiles), true, treeStatusFromXML());
-  parent->newStatus();
+  tqparent->statusMsg(TQString());
+  tqparent->newProjectLoaded(projectName, baseURL, templateURL);
+  tqparent->reloadTree(&(m_projectFiles), true, treeStatusFromXML());
+  tqparent->newtqStatus();
   adjustActions();
 }
 
@@ -723,7 +723,7 @@ void ProjectPrivate::slotAcceptCreateProject()
   /*
     it is important to set the fields only if there is some input
     otherwise you set them to an empty string and the treeview will
-    not recognize it as parent url because:
+    not recognize it as tqparent url because:
                 TQString::Null != ""
   */
   if (!png->lineHost->text().isEmpty())
@@ -739,7 +739,7 @@ void ProjectPrivate::slotAcceptCreateProject()
   if (baseURL.protocol() == i18n("Local")) baseURL.setProtocol("file");
   baseURL.adjustPath(1);
   if (!baseURL.path().startsWith("/")) baseURL.setPath("/"+ baseURL.path());
-  if (!QExtFileInfo::createDir(baseURL, m_mainWindow))
+  if (!TQExtFileInfo::createDir(baseURL, m_mainWindow))
   {
     QuantaCommon::dirCreationError(m_mainWindow, baseURL);
     baseURL = oldBaseURL;
@@ -789,7 +789,7 @@ void ProjectPrivate::slotAcceptCreateProject()
 
       for ( KURL::List::Iterator it = list.begin(); it != list.end(); ++it )
       {
-        url = *it;//QExtFileInfo::toRelative(*it, baseURL );
+        url = *it;//TQExtFileInfo::toRelative(*it, baseURL );
         el = dom.createElement("item");
         el.setAttribute("url",QuantaCommon::qUrl(url));
         dom.firstChild().firstChild().appendChild( el );
@@ -806,7 +806,7 @@ void ProjectPrivate::slotAcceptCreateProject()
       {
         KURL url;
         QuantaCommon::setUrl(url, qConfig.globalDataDir + resourceDir + "templates/");
-        parent->slotAddDirectory(url, false);
+        tqparent->slotAddDirectory(url, false);
         QuantaCommon::setUrl(templateURL, "templates/");
         createTemplateDir = false;
       }
@@ -814,7 +814,7 @@ void ProjectPrivate::slotAcceptCreateProject()
       {
         KURL url;
         QuantaCommon::setUrl(url, locateLocal("data", resourceDir + "templates/"));
-        parent->slotAddDirectory(url, false);
+        tqparent->slotAddDirectory(url, false);
         QuantaCommon::setUrl(templateURL, "templates/");
         createTemplateDir = false;
       }
@@ -823,28 +823,28 @@ void ProjectPrivate::slotAcceptCreateProject()
     {
       QuantaCommon::setUrl(templateURL, png->linePrjTmpl->text());
       templateURL.adjustPath(1);
-      templateURL = QExtFileInfo::toAbsolute(templateURL, baseURL);
-      if (!QExtFileInfo::createDir(templateURL, m_mainWindow))
+      templateURL = TQExtFileInfo::toAbsolute(templateURL, baseURL);
+      if (!TQExtFileInfo::createDir(templateURL, m_mainWindow))
       {
         QuantaCommon::dirCreationError(m_mainWindow, templateURL);
       }
     }
     //the nodes are already created in loadProjectXML() called from createEmptyDom()
     el = dom.firstChild().firstChild().namedItem("templates").toElement();
-    url = QExtFileInfo::toRelative(templateURL, baseURL);
+    url = TQExtFileInfo::toRelative(templateURL, baseURL);
     el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
 
     //setup the toolbars directory
     toolbarURL = baseURL;
     QuantaCommon::setUrl(toolbarURL,png->linePrjToolbar->text());
     toolbarURL.adjustPath(1);
-    toolbarURL = QExtFileInfo::toAbsolute(toolbarURL, baseURL);
-    if (!QExtFileInfo::createDir(toolbarURL, m_mainWindow))
+    toolbarURL = TQExtFileInfo::toAbsolute(toolbarURL, baseURL);
+    if (!TQExtFileInfo::createDir(toolbarURL, m_mainWindow))
     {
       QuantaCommon::dirCreationError(m_mainWindow, toolbarURL);
     }
     el = dom.firstChild().firstChild().namedItem("toolbars").toElement();
-    url = QExtFileInfo::toRelative(toolbarURL, baseURL);
+    url = TQExtFileInfo::toRelative(toolbarURL, baseURL);
     el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
 
 #if KDE_IS_VERSION(3,4,89)
@@ -887,10 +887,10 @@ void ProjectPrivate::slotDeleteProjectView(const TQString &view)
     el = node.cloneNode().toElement();
     if (el.attribute("name") == view)
     {
-      node.parentNode().removeChild(node);
+      node.tqparentNode().removeChild(node);
       if (currentProjectView == view)
         currentProjectView = "";
-      parent->setModified();
+      tqparent->setModified();
       adjustViewActions();
       break;
     }
@@ -917,9 +917,9 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName)
     {
       if (!askForName ||
           KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>A project view named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>")
-                                            .arg(currentProjectView), TQString::null, i18n("Overwrite")) == KMessageBox::Continue)
+                                            .tqarg(currentProjectView), TQString(), i18n("Overwrite")) == KMessageBox::Continue)
       {
-        node.parentNode().removeChild(node);
+        node.tqparentNode().removeChild(node);
         break;
       } else
       {
@@ -936,27 +936,27 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName)
   for ( it = openURLs.begin(); it != openURLs.end(); ++it )
   {
     KURL url = (*it);
-    if (m_projectFiles.contains(url))
+    if (m_projectFiles.tqcontains(url))
     {
       item = dom.createElement("viewitem");
-      item.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL)) );
+      item.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::toRelative(url, baseURL)) );
       el.appendChild(item);
     }
   }
 
   KURL::List toolbarList;
-  parent->getUserToolbarFiles(&toolbarList);
+  tqparent->getUserToolbarFiles(&toolbarList);
   for (uint i =0 ; i < toolbarList.count(); i++)
   {
     item = dom.createElement("viewtoolbar");
     KURL url = toolbarList[i];
-    url = QExtFileInfo::toRelative(url, baseURL);
+    url = TQExtFileInfo::toRelative(url, baseURL);
     item.setAttribute("url", QuantaCommon::qUrl(url) );
     el.appendChild(item);
   }
 
   dom.firstChild().firstChild().appendChild( el );
-  parent->setModified();
+  tqparent->setModified();
   adjustViewActions();
 }
 
@@ -994,7 +994,7 @@ bool ProjectPrivate::createEmptyDom()
   KURL sessionURL = projectURL;
   TQString fileName = projectURL.fileName();
   if (fileName.endsWith(".webprj"))
-    fileName.replace(".webprj", ".session");
+    fileName.tqreplace(".webprj", ".session");
   else
     fileName += ".session";
   sessionURL.setFileName(fileName);
@@ -1008,7 +1008,7 @@ bool ProjectPrivate::createEmptyDom()
     tempFile->textStream()->setEncoding(TQTextStream::UnicodeUTF8);
     *(tempFile->textStream()) << str;
     tempFile->close();
-    result = QExtFileInfo::createDir(baseURL, m_mainWindow);
+    result = TQExtFileInfo::createDir(baseURL, m_mainWindow);
     if (result)
       result = KIO::NetAccess::upload(tempFile->name(), projectURL, m_mainWindow);
     if (result)
@@ -1055,8 +1055,8 @@ bool ProjectPrivate::createEmptyDom()
 
   if (!result)
   {
-    parent->hideSplash();
-    KMessageBox::sorry(m_mainWindow, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").arg(projectURL.prettyURL(0, KURL::StripFileProtocol)));
+    tqparent->hideSplash();
+    KMessageBox::sorry(m_mainWindow, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").tqarg(projectURL.prettyURL(0, KURL::StripFileProtocol)));
     delete tempFile;
     tempFile = 0L;
     delete sessionTempFile;
@@ -1095,12 +1095,12 @@ void ProjectPrivate::getStatusFromTree()
   for ( unsigned int i = 0; i < nl.count(); i++ )
   {
     el = nl.item(i).toElement();
-    el.parentNode().removeChild( el );
+    el.tqparentNode().removeChild( el );
     i--;
   }
   TQStringList folderList;
-  parent->getTreeStatus( &folderList );
-  // toplevel folder is always open in a project and QExtFileInfo::toRelative
+  tqparent->getTreetqStatus( &folderList );
+  // toplevel folder is always open in a project and TQExtFileInfo::toRelative
   // creates strange output -> we remove the toplevel folder
   if (folderList.count() > 0)
      folderList.remove(folderList.begin());
@@ -1110,7 +1110,7 @@ void ProjectPrivate::getStatusFromTree()
     m_sessionDom.firstChild().firstChild().appendChild(root);
     for (TQStringList::Iterator it = folderList.begin(); it != folderList.end(); ++it) {
       el = m_sessionDom.createElement("openfolder");
-      el.setAttribute("url", QuantaCommon::qUrl( QExtFileInfo::toRelative(KURL(*it), baseURL) ) );
+      el.setAttribute("url", QuantaCommon::qUrl( TQExtFileInfo::toRelative(KURL(*it), baseURL) ) );
       root.appendChild( el );
     }
   }
@@ -1122,7 +1122,7 @@ void ProjectPrivate::slotNewProject()
 {
   TQWizard *wiz = new TQWizard(m_mainWindow, "new", true);
   wiz->setCaption(i18n("New Project Wizard"));
-  wiz->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+  wiz->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 
   png = new ProjectNewGeneral(0L);
 
@@ -1159,9 +1159,9 @@ void ProjectPrivate::slotNewProject()
   connect(wiz, TQT_SIGNAL(helpClicked()), TQT_SLOT(slotNewProjectHelpClicked()));
 
   connect( pnw, TQT_SIGNAL(enableMessagesWidget()),
-          parent, TQT_SIGNAL(enableMessageWidget()));
+          tqparent, TQT_SIGNAL(enableMessageWidget()));
   connect( pnw, TQT_SIGNAL(messages(const TQString&)),
-          parent, TQT_SLOT  (slotGetMessages(const TQString&)));
+          tqparent, TQT_SLOT  (slotGetMessages(const TQString&)));
   connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)),
            wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool)));
   connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)),
@@ -1170,7 +1170,7 @@ void ProjectPrivate::slotNewProject()
   TQStringList lst = DTDs::ref()->nickNameList(true);
   pnf->dtdCombo->insertStringList(lst);
   TQString defaultDTDName = DTDs::ref()->getDTDNickNameFromName(qConfig.defaultDocType.lower());
-  int pos = lst.findIndex(defaultDTDName);
+  int pos = lst.tqfindIndex(defaultDTDName);
   if (pos >= 0)
     pnf->dtdCombo->setCurrentItem(pos);
 
@@ -1197,48 +1197,48 @@ void ProjectPrivate::slotNewProject()
   delete wiz;
 
   adjustActions();
-  parent->newStatus();
+  tqparent->newtqStatus();
 }
 
 /** close project and edited files */
 void ProjectPrivate::slotCloseProject()
 {
-  if (!parent->hasProject()) return;
+  if (!tqparent->hasProject()) return;
   connect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool)));
-  parent->closeFiles();
+  tqparent->closeFiles();
 }
 
 void ProjectPrivate::slotProceedWithCloseProject(bool success)
 {
   disconnect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool)));
   if (!success) return;
-  emit eventHappened("before_project_close", baseURL.url(), TQString::null);
+  emit eventHappened("before_project_close", baseURL.url(), TQString());
   if (!uploadProjectFile())
   {
     if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("Saving of project failed. Do you want to continue with closing (might cause data loss)?"), i18n("Project Saving Error"), KStdGuiItem::close()) == KMessageBox::Cancel)
       return;
   }
-  emit eventHappened("after_project_close", baseURL.url(), TQString::null);
+  emit eventHappened("after_project_close", baseURL.url(), TQString());
   // empty dom tree
   dom.clear();
   m_sessionDom.clear();
   m_events->clear();
   config->setGroup("Projects");
-  config->writePathEntry("Last Project", TQString::null);
+  config->writePathEntry("Last Project", TQString());
   init();
-  parent->newProjectLoaded(projectName, baseURL, templateURL);
-  parent->reloadTree( &(m_projectFiles), true, TQStringList());
+  tqparent->newProjectLoaded(projectName, baseURL, templateURL);
+  tqparent->reloadTree( &(m_projectFiles), true, TQStringList());
   adjustActions();
   m_projectRecent->setCurrentItem(-1);
-  parent->newStatus();
-  kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+  tqparent->newtqStatus();
+  kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
 }
 
 
 /** open project file */
 void ProjectPrivate::slotOpenProject()
 {
-  KURL url = KFileDialog::getOpenURL( TQString::null,
+  KURL url = KFileDialog::getOpenURL( TQString(),
                       "*.wpj *.webprj"+i18n("|Project Files\n*|All Files"), m_mainWindow,
                       i18n("Open Project"));
 
@@ -1252,7 +1252,7 @@ void ProjectPrivate::slotOpenProject()
 /* save project file */
 bool ProjectPrivate::saveProject()
 {
-  if ( !parent->hasProject() ) return false;
+  if ( !tqparent->hasProject() ) return false;
   bool result = true;
   // remove old opened files
   TQDomElement  el;
@@ -1263,7 +1263,7 @@ bool ProjectPrivate::saveProject()
     el = nl.item(i).toElement();
     if ( el.nodeName() == "openfile" )
     {
-      el.parentNode().removeChild( el );
+      el.tqparentNode().removeChild( el );
       i--;
     }
   }
@@ -1284,11 +1284,11 @@ bool ProjectPrivate::saveProject()
       f.close();
     }
     m_modified = false;
-    parent->statusMsg(i18n( "Wrote project file %1" ).arg(m_tmpProjectFile));
+    tqparent->statusMsg(i18n( "Wrote project file %1" ).tqarg(m_tmpProjectFile));
   } else
   {
-    parent->hideSplash();
-    KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for writing.</qt>").arg(m_tmpProjectFile));
+    tqparent->hideSplash();
+    KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for writing.</qt>").tqarg(m_tmpProjectFile));
     result = false;
   }
   return result;
@@ -1338,8 +1338,8 @@ void ProjectPrivate::loadProjectFromTemp(const KURL &url, const TQString &tempFi
     writeConfig();
   } else
   {
-    parent->hideSplash();
-    KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for reading.</qt>").arg(tempFile));
+    tqparent->hideSplash();
+    KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for reading.</qt>").tqarg(tempFile));
   }
 }
 
@@ -1350,14 +1350,14 @@ bool ProjectPrivate::loadProject(const KURL &url)
     return true;
   if (!url.isValid())
   {
-    parent->hideSplash();
-    KMessageBox::sorry(m_mainWindow, i18n("<qt>Malformed URL: <b>%1</b></qt>").arg(url.prettyURL()));
+    tqparent->hideSplash();
+    KMessageBox::sorry(m_mainWindow, i18n("<qt>Malformed URL: <b>%1</b></qt>").tqarg(url.prettyURL()));
     return false;
   }
   if ( projectAlreadyOpen(url.url()) )
   {
-    parent->hideSplash();
-    if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>The project<br><b>%1</b><br> seems to be used by another Quanta instance.<br>You may end up with data loss if you open the same project in two instances, modify and save them in both.<br><br>Do you want to proceed with open?</qt>").arg(url.prettyURL()), TQString::null, KStdGuiItem::open()) == KMessageBox::Cancel)
+    tqparent->hideSplash();
+    if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>The project<br><b>%1</b><br> seems to be used by another Quanta instance.<br>You may end up with data loss if you open the same project in two instances, modify and save them in both.<br><br>Do you want to proceed with open?</qt>").tqarg(url.prettyURL()), TQString(), KStdGuiItem::open()) == KMessageBox::Cancel)
       return false;
   }
   TQString projectTmpFile;
@@ -1367,14 +1367,14 @@ bool ProjectPrivate::loadProject(const KURL &url)
   if (KIO::NetAccess::exists(url, false, m_mainWindow) &&
       KIO::NetAccess::download(url, projectTmpFile, m_mainWindow))
   {
-    if (parent->hasProject())
+    if (tqparent->hasProject())
     {
       slotCloseProject();
     }
     KURL sessionURL = url;
     TQString fileName = url.fileName();
     if (fileName.endsWith(".webprj"))
-      fileName.replace(".webprj", ".session");
+      fileName.tqreplace(".webprj", ".session");
     else
       fileName += ".session";
     sessionURL.setFileName(fileName);
@@ -1415,8 +1415,8 @@ bool ProjectPrivate::loadProject(const KURL &url)
     loadProjectFromTemp(url, projectTmpFile, sessionTmpFile);
   } else
   {
-    parent->hideSplash();
-    KMessageBox::error(m_mainWindow, i18n("<qt>Cannot access the project file <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
+    tqparent->hideSplash();
+    KMessageBox::error(m_mainWindow, i18n("<qt>Cannot access the project file <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
     return false;
   }
   return true;
@@ -1432,7 +1432,7 @@ void ProjectPrivate::slotAddFiles()
   if ( !list.isEmpty() )
   {
     KURL firstURL = list.first();
-    firstURL = QExtFileInfo::toRelative( firstURL, baseURL );
+    firstURL = TQExtFileInfo::toRelative( firstURL, baseURL );
 
     if ( firstURL.path().startsWith("/") || firstURL.path().startsWith("."))
     {
@@ -1448,7 +1448,7 @@ void ProjectPrivate::slotAddFiles()
         CopyTo *dlg = new CopyTo( baseURL);
         connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)),
                     TQT_SLOT  (slotDeleteCopytoDlg(CopyTo*)));
-        connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), parent,
+        connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), tqparent,
                     TQT_SLOT  (slotInsertFilesAfterCopying(const KURL::List&)));
         list = dlg->copy( list, destination );
         return;
@@ -1470,7 +1470,7 @@ void ProjectPrivate::slotAddFiles()
       }
     }
 
-    parent->reloadTree( &(m_projectFiles), false, TQStringList());
+    tqparent->reloadTree( &(m_projectFiles), false, TQStringList());
   }
 }
 
@@ -1487,7 +1487,7 @@ void ProjectPrivate::slotAddDirectory()
   KURL url = KURL();
   url = KFileDialog::getExistingURL(baseURL.prettyURL(), m_mainWindow,
                   i18n("Insert Folder in Project"));
-  parent->slotAddDirectory(url);
+  tqparent->slotAddDirectory(url);
 }
 
 
@@ -1531,8 +1531,8 @@ void ProjectPrivate::slotDebuggerOptions()
       }
       else
       {
-        parent->hideSplash();
-        KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").arg(errCode).arg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error"));
+        tqparent->hideSplash();
+        KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error"));
       }
     }
   }
@@ -1556,7 +1556,7 @@ void ProjectPrivate::writeConfig()
   if (!projectURL.isEmpty())
   {
     TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects");
-    if (projectList.contains( projectURL.url() ) == 0)
+    if (projectList.tqcontains( projectURL.url() ) == 0)
     {
       projectList.append( projectURL.url() );
       config->writePathEntry("OpenProjects", projectList);
@@ -1581,7 +1581,7 @@ void ProjectPrivate::removeFromConfig(const TQString & urlStr)
   config->reparseConfiguration();
   config->setGroup("Projects");
   TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects");
-  int i = projectList.findIndex( urlStr );
+  int i = projectList.tqfindIndex( urlStr );
   if ( i > -1)
   {
     projectList.remove(projectList.at(i));
@@ -1606,7 +1606,7 @@ bool ProjectPrivate::projectAlreadyOpen(const TQString & urlStr)
   config->reparseConfiguration();
   config->setGroup("Projects");
   TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects");
-  return (projectList.contains(urlStr) != 0);
+  return (projectList.tqcontains(urlStr) != 0);
 }
 
 
@@ -1618,7 +1618,7 @@ bool ProjectPrivate::uploadProjectFile()
   KURL sessionURL = projectURL;
   TQString fileName = projectURL.fileName();
   if (fileName.endsWith(".webprj"))
-    fileName.replace(".webprj", ".session");
+    fileName.tqreplace(".webprj", ".session");
   else
     fileName += ".session";
   sessionURL.setFileName(fileName);
@@ -1632,14 +1632,14 @@ bool ProjectPrivate::uploadProjectFile()
     tempFile = 0L;
     delete sessionTempFile;
     sessionTempFile = 0L;
-    m_tmpProjectFile = TQString::null;
+    m_tmpProjectFile = TQString();
     return true;
   }
   if (KIO::NetAccess::upload(m_tmpProjectFile, projectURL, m_mainWindow) && KIO::NetAccess::upload(m_tmpSessionFile, sessionURL, m_mainWindow))
   {
     removeFromConfig(projectURL.url());    // remove the project from the list of open projects
     if (quantaApp)
-      parent->statusMsg(i18n( "Uploaded project file %1" ).arg( projectURL.prettyURL()));
+      tqparent->statusMsg(i18n( "Uploaded project file %1" ).tqarg( projectURL.prettyURL()));
     // delete all temp files we used
     // first the one from creating a new project
     delete tempFile;
@@ -1659,7 +1659,7 @@ bool ProjectPrivate::uploadProjectFile()
   {
     if (quantaApp)
     {
-      parent->statusMsg(TQString::null );
+      tqparent->statusMsg(TQString() );
       KMessageBox::error(m_mainWindow, KIO::NetAccess::lastErrorString());
     }
     return false;
diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h
index a0b37fa3..6c5adf12 100644
--- a/quanta/project/projectprivate.h
+++ b/quanta/project/projectprivate.h
@@ -48,15 +48,16 @@ struct EventAction;
 typedef TQMap<TQString, TQValueList<EventAction> > EventActions;
 
 class ProjectPrivate
-            : public QObject
+            : public TQObject
 {
    Q_OBJECT
+  TQ_OBJECT
 public:
   ProjectPrivate(Project *p);
 
   ~ProjectPrivate();
 
-  Project *parent;
+  Project *tqparent;
   /** Point to the .webprj file */
   KURL projectURL;
   TQString projectName;
@@ -147,7 +148,7 @@ upload.*/
   void insertFiles( KURL::List files );
 
   /** insert files from dir recursive */
-  void insertFiles(const KURL& pathURL, const TQString& mask );
+  void insertFiles(const KURL& pathURL, const TQString& tqmask );
 
   void loadProjectXML();
 
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index ce621c07..52f52908 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -63,7 +63,7 @@
 #include "resource.h"
 
 ProjectUpload::ProjectUpload(const KURL& url, const TQString& profileName, bool showOnlyProfiles, bool quickUpload, bool markOnly, const char* name)
-  :ProjectUploadS( 0L, name, false, Qt::WDestructiveClose)
+  :ProjectUploadS( 0L, name, false, TQt::WDestructiveClose)
 {
     m_quickUpload = quickUpload;
     m_profilesOnly = showOnlyProfiles;
@@ -73,7 +73,7 @@ ProjectUpload::ProjectUpload(const KURL& url, const TQString& profileName, bool
     startUrl = url;
     if (m_profilesOnly)
     {
-      clearWFlags(Qt::WDestructiveClose);
+      clearWFlags(TQt::WDestructiveClose);
       uploadFrame->hide();
       buttonCancel->hide();
       adjustSize();
@@ -172,13 +172,13 @@ void ProjectUpload::slotBuildTree()
  KURL u = m_project->projectBaseURL();
  if (!startUrl.isEmpty())
  {
-   u = QExtFileInfo::toAbsolute(startUrl, u);
+   u = TQExtFileInfo::toAbsolute(startUrl, u);
  }
  TQDict<KFileItem> projectDirFiles;
 
  if (startUrl.isEmpty() || strUrl.endsWith("/")) //upload a folder
  {
-   projectDirFiles = QExtFileInfo::allFilesDetailed(u, "*", this);
+   projectDirFiles = TQExtFileInfo::allFilesDetailed(u, "*", this);
  } else
  {
    projectDirFiles.insert(u.url(), new KFileItem(KFileItem::Unknown, KFileItem::Unknown, u, true));
@@ -197,9 +197,9 @@ void ProjectUpload::slotBuildTree()
    {
      QuantaCommon::setUrl(u, s);
      absUrl.setPath(m_project->projectBaseURL().path(1)+u.path(-1));
-/*     if (!QExtFileInfo::exists(absUrl))
+/*     if (!TQExtFileInfo::exists(absUrl))
        continue; */
-     KFileItem *p_item = projectDirFiles.find(absUrl.url());
+     KFileItem *p_item = projectDirFiles.tqfind(absUrl.url());
      if (!p_item)
        continue;
      KFileItem item(*p_item);
@@ -207,19 +207,19 @@ void ProjectUpload::slotBuildTree()
      if ( it != 0 )
      {
        int uploadedTime = -1;
-       if (m_uploadTimeList.contains(s))
+       if (m_uploadTimeList.tqcontains(s))
          uploadedTime = m_uploadTimeList[s];
        int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME);
        el.setAttribute("modified_time", modifiedTime);
-       int uploadStatus = el.attribute("uploadstatus", "1").toInt();
-       if (m_quickUpload || (forceUpload && uploadStatus == 0))
-        uploadStatus = 1;
-       if (m_quickUpload || (uploadedTime != modifiedTime && uploadStatus != 0))
+       int uploadtqStatus = el.attribute("uploadstatus", "1").toInt();
+       if (m_quickUpload || (forceUpload && uploadtqStatus == 0))
+        uploadtqStatus = 1;
+       if (m_quickUpload || (uploadedTime != modifiedTime && uploadtqStatus != 0))
        {
          modified.append( u );
          it->setSelected(true);
        }
-       if (uploadStatus == 2)
+       if (uploadtqStatus == 2)
          it->setConfirmUpload(true);
        totalProgress->setValue(i);
      }
@@ -235,7 +235,7 @@ void ProjectUpload::slotBuildTree()
  totalText->setText(i18n("Total:"));
  totalProgress->setTotalSteps(1);
  totalProgress->setValue(0);
- //hack to force repainting of the treeview
+ //hack to force tqrepainting of the treeview
  resize(width() + 1, height());
  resize(width() - 1, height());
  if (m_quickUpload)
@@ -338,7 +338,7 @@ void ProjectUpload::startUpload()
     for ( uint i = 0; i < nl.count(); i++ )
     {
       el = nl.item(i).toElement();
-      if ( selectedList.contains(el.attribute("url")))
+      if ( selectedList.tqcontains(el.attribute("url")))
       {
         m_uploadTimeList[el.attribute("url")] = el.attribute("modified_time").toInt();
       }
@@ -362,7 +362,7 @@ void ProjectUpload::startUpload()
         if (!ok)  return;
         for (it = needsConfirmation.begin(); it != needsConfirmation.end(); ++it)
         {
-            if (!confirmedList.contains(((UploadTreeFile*)(*it))->url().prettyURL(0, KURL::StripFileProtocol)))
+            if (!confirmedList.tqcontains(((UploadTreeFile*)(*it))->url().prettyURL(0, KURL::StripFileProtocol)))
               toUpload.remove(*it);
         }
 
@@ -375,14 +375,14 @@ void ProjectUpload::startUpload()
     buttonUpload->setEnabled(false);
     KURL u = *baseUrl;
     u.setPath(u.protocol() == "file" ? "/" : "");
-    if (QExtFileInfo::exists(u, false, this) || (u.protocol() == "webdav" && QExtFileInfo::exists(*baseUrl, false, this)))
+    if (TQExtFileInfo::exists(u, false, this) || (u.protocol() == "webdav" && TQExtFileInfo::exists(*baseUrl, false, this)))
     {
       upload();
       return;
     } else
     {
       if (KMessageBox::warningContinueCancel(this, i18n("<qt><b>%1</b> seems to be unaccessible.<br>Do you want to proceed with upload?</qt>")
-          .arg(u.prettyURL(0, KURL::StripFileProtocol)),TQString::null,KStdGuiItem::cont()) == KMessageBox::Continue)
+          .tqarg(u.prettyURL(0, KURL::StripFileProtocol)),TQString(),KStdGuiItem::cont()) == KMessageBox::Continue)
       {
         upload();
         return;
@@ -425,7 +425,7 @@ void ProjectUpload::upload()
   }
 
 
-  KURL from = QExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL());
+  KURL from = TQExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL());
   to = *baseUrl;
   to.addPath( currentURL.path() );
   if (to.fileName(false).isEmpty())
@@ -437,10 +437,10 @@ void ProjectUpload::upload()
     dir = to.upURL() ;
   }
 
-  if ( !madeDirs.contains(dir) )
+  if ( !madeDirs.tqcontains(dir) )
   {
     madeDirs.append( dir );
-    if (!QExtFileInfo::createDir(dir, this))
+    if (!TQExtFileInfo::createDir(dir, this))
     {
       QuantaCommon::dirCreationError(this, KURL( dir.prettyURL(0, KURL::StripFileProtocol) ));
       buttonUpload->setEnabled(true);
@@ -463,7 +463,7 @@ void ProjectUpload::upload()
     connect( job, TQT_SIGNAL( infoMessage( KIO::Job *,const TQString& ) ),
                 this, TQT_SLOT( uploadMessage( KIO::Job *,const TQString& ) ) );
 
-    labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName()));
+    labelCurFile->setText(i18n("Current: %1").tqarg(currentURL.fileName()));
     currentProgress->setProgress( 0 );
     return;
   } else  //it is a dir, so just go to the next item
@@ -517,7 +517,7 @@ void ProjectUpload::selectModified()
   {
     TQListViewItem *it = list->findItem( (*file).path() );
     it->setSelected(true);
-    it->repaint();
+    it->tqrepaint();
   }
   list->checkboxTree();
 }
@@ -564,7 +564,7 @@ void ProjectUpload::slotUploadNext()
      UploadTreeFile *itf = dynamic_cast<UploadTreeFile*>(it);
      if (itf)
       itf->setWhichPixmap( "check_clear" );
-     it->repaint();
+     it->tqrepaint();
     }
     toUpload.remove( it );
 
@@ -639,7 +639,7 @@ void ProjectUpload::slotRemoveProfile()
    } else
    {
       TQString profileName = comboProfile->currentText();
-      if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> upload profile?</qt>").arg(profileName),
+      if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> upload profile?</qt>").tqarg(profileName),
                                    i18n("Profile Removal"), KStdGuiItem::del()) == KMessageBox::Continue)
        {
           m_profilesNode.removeChild(m_currentProfileElement);
@@ -652,7 +652,7 @@ void ProjectUpload::slotRemoveProfile()
           slotNewProfileSelected(currentProfile);
           if (profileName == defaultProfile())
           {
-              KMessageBox::information(this, i18n("<qt>You have removed your default profile.<br>The new default profile will be <b>%1</b>.</qt>").arg(currentProfile), i18n("Profile Removal"));
+              KMessageBox::information(this, i18n("<qt>You have removed your default profile.<br>The new default profile will be <b>%1</b>.</qt>").tqarg(currentProfile), i18n("Profile Removal"));
               m_profilesNode.toElement().setAttribute("defaultProfile", currentProfile);
           }
           comboProfile->removeItem(idx);
@@ -800,10 +800,10 @@ void ProjectUpload::loadRemoteUploadInfo()
 
 void ProjectUpload::saveRemoteUploadInfo()
 {
-    TQDomNode parent = m_currentProfileElement.parentNode();
+    TQDomNode tqparent = m_currentProfileElement.tqparentNode();
     TQDomNode profileNode = m_currentProfileElement.cloneNode(false);
-    parent.removeChild(m_currentProfileElement);
-    parent.appendChild(profileNode);
+    tqparent.removeChild(m_currentProfileElement);
+    tqparent.appendChild(profileNode);
     TQMap<TQString, int>::ConstIterator it;
     for (it = m_uploadTimeList.constBegin(); it != m_uploadTimeList.constEnd(); ++it)
     {
diff --git a/quanta/project/projectupload.h b/quanta/project/projectupload.h
index d76d1767..ca136dce 100644
--- a/quanta/project/projectupload.h
+++ b/quanta/project/projectupload.h
@@ -38,13 +38,14 @@ class UploadProfileDlgS;
 class ProjectUpload : public ProjectUploadS
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   /** Initializes the dialog. If showOnlyProfiles is true, the dialog
   displays only the list of profiles, no real upload can be performed.
   If quickUpload is true, the upload starts immediately without checking
   for modifications or confirmation from the user. The url will be
   uploaded to the default profile */
-  ProjectUpload(const KURL& url, const TQString& profileName = TQString::null, bool showOnlyProfiles = false, bool quickUpload = false, bool markOnly = false, const char * name = 0);
+  ProjectUpload(const KURL& url, const TQString& profileName = TQString(), bool showOnlyProfiles = false, bool quickUpload = false, bool markOnly = false, const char * name = 0);
   ~ProjectUpload();
   TQString defaultProfile();
 
diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui
index 19a2328c..9c94e17f 100644
--- a/quanta/project/projectuploads.ui
+++ b/quanta/project/projectuploads.ui
@@ -10,7 +10,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2002-2004 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ProjectUploadS</cstring>
     </property>
@@ -30,7 +30,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -46,15 +46,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="0" 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>textLabel2</cstring>
                     </property>
@@ -88,7 +88,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -121,7 +121,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QPushButton" row="3" column="1">
+        <widget class="TQPushButton" row="3" column="1">
             <property name="name">
                 <cstring>buttonUpload</cstring>
             </property>
@@ -143,7 +143,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="3" column="2">
+        <widget class="TQPushButton" row="3" column="2">
             <property name="name">
                 <cstring>buttonCancel</cstring>
             </property>
@@ -172,14 +172,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="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>keepPasswords</cstring>
             </property>
@@ -187,7 +187,7 @@
                 <string>&amp;Keep passwords in memory</string>
             </property>
         </widget>
-        <widget class="QFrame" row="2" column="0" rowspan="1" colspan="3">
+        <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>uploadFrame</cstring>
             </property>
@@ -209,7 +209,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton" row="4" column="1">
+                <widget class="TQPushButton" row="4" column="1">
                     <property name="name">
                         <cstring>buttonInvert</cstring>
                     </property>
@@ -217,7 +217,7 @@
                         <string>&amp;Invert</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="3" column="1">
+                <widget class="TQPushButton" row="3" column="1">
                     <property name="name">
                         <cstring>buttonClear</cstring>
                     </property>
@@ -225,7 +225,7 @@
                         <string>&amp;None</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="6" column="1">
+                <widget class="TQPushButton" row="6" column="1">
                     <property name="name">
                         <cstring>buttonCollapse</cstring>
                     </property>
@@ -233,7 +233,7 @@
                         <string>C&amp;ollapse All</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="7" column="1">
+                <widget class="TQPushButton" row="7" column="1">
                     <property name="name">
                         <cstring>buttonUpdate</cstring>
                     </property>
@@ -244,7 +244,7 @@
                         <string>This will cause all files to appear already uploaded</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="1">
+                <widget class="TQPushButton" row="2" column="1">
                     <property name="name">
                         <cstring>buttonModified</cstring>
                     </property>
@@ -252,7 +252,7 @@
                         <string>&amp;Modified</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="5" column="1">
+                <widget class="TQPushButton" row="5" column="1">
                     <property name="name">
                         <cstring>buttonExpand</cstring>
                     </property>
@@ -273,7 +273,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -289,7 +289,7 @@
                         <string>Selection:</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="1">
+                <widget class="TQPushButton" row="1" column="1">
                     <property name="name">
                         <cstring>buttonAll</cstring>
                     </property>
@@ -305,7 +305,7 @@
                         <string>&amp;All</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="8" column="0">
+                <widget class="TQCheckBox" row="8" column="0">
                     <property name="name">
                         <cstring>markAsUploaded</cstring>
                     </property>
@@ -323,7 +323,7 @@
                         <cstring>currentProgress</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="9" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>labelCurFile</cstring>
                     </property>
@@ -338,11 +338,11 @@
                     <property name="text">
                         <string>Current: [none]</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
-                <widget class="QLabel" row="11" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>totalText</cstring>
                     </property>
@@ -476,7 +476,7 @@
 <includes>
     <include location="global" impldecl="in declaration">../treeviews/uploadtreeview.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>clearSelection()</slot>
     <slot>startUpload()</slot>
     <slot>selectAll()</slot>
@@ -489,8 +489,8 @@
     <slot>slotEditProfile()</slot>
     <slot>slotRemoveProfile()</slot>
     <slot>slotNewProfileSelected(const QString&amp;)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>uploadtreeview.h</includehint>
 </includehints>
diff --git a/quanta/project/projecturl.h b/quanta/project/projecturl.h
index cf3eae66..02232234 100644
--- a/quanta/project/projecturl.h
+++ b/quanta/project/projecturl.h
@@ -32,26 +32,26 @@ class ProjectURL : public KURL
 {
 public:
   TQString fileDesc;
-  int uploadStatus; ///< The upload state, see UploadStatus
+  int uploadtqStatus; ///< The upload state, see UploadtqStatus
   bool documentFolder;
   TQDomElement domElement;
 
   ProjectURL()
-    : KURL(), uploadStatus(1), documentFolder(false) {}
+    : KURL(), uploadtqStatus(1), documentFolder(false) {}
   
   ProjectURL(const KURL& url)
-    : KURL(url), uploadStatus(1), documentFolder(false) {}
+    : KURL(url), uploadtqStatus(1), documentFolder(false) {}
   
   ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder)
-    : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder) {}
+    : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder) {}
   
   ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder, TQDomElement el)
-    : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder), domElement(el) {}
+    : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder), domElement(el) {}
   
   virtual ~ProjectURL() {}
 
   /** The default state for a file when uploading */
-  enum UploadStatus
+  enum UploadtqStatus
   {
      NeverUpload = 0, ///< the files is not selected for upload, even if it was modified
      AlwaysUpload, ///< the file is automatically selected for upload if it was modified
diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp
index 1c467c7d..b24b123f 100644
--- a/quanta/project/rescanprj.cpp
+++ b/quanta/project/rescanprj.cpp
@@ -40,8 +40,8 @@
 
 
 RescanPrj::RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, const TQRegExp &p_excludeRx,
-                       TQWidget *parent, const char *name, bool modal )
-  : RescanPrjDir(parent,name,modal)
+                       TQWidget *tqparent, const char *name, bool modal )
+  : RescanPrjDir(tqparent,name,modal)
 {
   setCaption(name);
 
@@ -87,7 +87,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list)
 {
   KURL url = static_cast<KIO::ListJob *>(job)->url();
   url.adjustPath(-1);
-  // avoid creating these QStrings again and again
+  // avoid creating these TQStrings again and again
   static const TQString& dot = KGlobal::staticQString(".");
   static const TQString& dotdot = KGlobal::staticQString("..");
 
@@ -115,7 +115,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list)
       else       
         u.setPath(linkDest);
       u.adjustPath(+1);
-      KURL u2 = QExtFileInfo::toRelative(u, baseURL);
+      KURL u2 = TQExtFileInfo::toRelative(u, baseURL);
       bool found = false;
       for (uint i = 0; i < urlList.count(); i++)
        if (urlList[i].url == u2)
@@ -123,7 +123,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list)
          found = true;
          break;
        }
-      if (!prjFileList.contains(u) && !found)
+      if (!prjFileList.tqcontains(u) && !found)
       {
         linkItems.append(new KFileItem(item));
       } else
@@ -137,7 +137,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list)
       itemURL = item.url();
       if (item.isDir())
         itemURL.adjustPath(+1);
-      ProjectURL *proUrl = prjFileList.find(itemURL);
+      ProjectURL *proUrl = prjFileList.tqfind(itemURL);
       if (!proUrl)
       {
         urlEntry.url = prjFileList.toRelative(itemURL);
@@ -162,7 +162,7 @@ void RescanPrj::resizeEvent ( TQResizeEvent *t )
 {
   RescanPrjDir::resizeEvent(t);
 //  listView->setColumnWidth(0,listView->width()-listView->columnWidth(1)-20);
-//  MainLayout->setGeometry(childrenRect());
+//  MainLayout->setGeometry(tqchildrenRect());
 }
 
 void RescanPrj::slotSelect()
@@ -214,7 +214,7 @@ KURL::List RescanPrj::files()
      }
 
      if (!u.isEmpty())
-       r.append( QExtFileInfo::toAbsolute(u, baseURL) );
+       r.append( TQExtFileInfo::toAbsolute(u, baseURL) );
    }
   }
   return r;
@@ -227,7 +227,7 @@ void RescanPrj::slotListDone(KIO::Job *)
   if (m_listJobCount == 0)
   {
     progressText->setText(i18n("Building tree:"));
-    progressText->repaint();
+    progressText->tqrepaint();
     progress->setTotalSteps(urlList.count());
     progress->setValue(0);
     URLListEntry urlEntry;
diff --git a/quanta/project/rescanprj.h b/quanta/project/rescanprj.h
index e1e61f04..39a03bb0 100644
--- a/quanta/project/rescanprj.h
+++ b/quanta/project/rescanprj.h
@@ -34,9 +34,10 @@ struct URLListEntry{
 
 class RescanPrj : public RescanPrjDir  {
    Q_OBJECT
+  TQ_OBJECT
 public:
   RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, const TQRegExp &p_excludeRx,
-             TQWidget *parent=0, const char *name=0, bool modal = true);
+             TQWidget *tqparent=0, const char *name=0, bool modal = true);
   ~RescanPrj();
 
 public slots:
diff --git a/quanta/project/rescanprjdir.ui b/quanta/project/rescanprjdir.ui
index d4fdf556..8cdafab6 100644
--- a/quanta/project/rescanprjdir.ui
+++ b/quanta/project/rescanprjdir.ui
@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 </comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>RescanPrjDir</cstring>
     </property>
@@ -29,7 +29,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>620</width>
             <height>540</height>
@@ -50,7 +50,7 @@
                 <cstring>progress</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="11" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>progressText</cstring>
             </property>
@@ -71,7 +71,7 @@
                 </sizepolicy>
             </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>TextLabel2</cstring>
             </property>
@@ -83,13 +83,13 @@
             <property name="name">
                 <cstring>Line2</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>4</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>4</height>
@@ -105,7 +105,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QPushButton" row="9" column="1">
+        <widget class="TQPushButton" row="9" column="1">
             <property name="name">
                 <cstring>buttonCancel</cstring>
             </property>
@@ -116,7 +116,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="8" column="1">
+        <widget class="TQPushButton" row="8" column="1">
             <property name="name">
                 <cstring>buttonOk</cstring>
             </property>
@@ -130,7 +130,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="6" column="1">
+        <widget class="TQPushButton" row="6" column="1">
             <property name="name">
                 <cstring>buttonCollapse</cstring>
             </property>
@@ -148,14 +148,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>144</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="2" column="1">
+        <widget class="TQPushButton" row="2" column="1">
             <property name="name">
                 <cstring>buttonSelect</cstring>
             </property>
@@ -163,7 +163,7 @@
                 <string>&amp;All</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="3" column="1">
+        <widget class="TQPushButton" row="3" column="1">
             <property name="name">
                 <cstring>buttonDeselect</cstring>
             </property>
@@ -171,7 +171,7 @@
                 <string>&amp;None</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="5" column="1">
+        <widget class="TQPushButton" row="5" column="1">
             <property name="name">
                 <cstring>buttonExpand</cstring>
             </property>
@@ -179,7 +179,7 @@
                 <string>E&amp;xpand All</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="10" column="1">
+        <widget class="TQPushButton" row="10" column="1">
             <property name="name">
                 <cstring>buttonHelp</cstring>
             </property>
@@ -190,7 +190,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QPushButton" row="4" column="1">
+        <widget class="TQPushButton" row="4" column="1">
             <property name="name">
                 <cstring>buttonInvert</cstring>
             </property>
@@ -247,7 +247,7 @@
     <tabstop>buttonCancel</tabstop>
     <tabstop>buttonHelp</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kprogress.h</includehint>
     <includehint>uploadtreeview.h</includehint>
diff --git a/quanta/project/subprojecteditdlgs.ui b/quanta/project/subprojecteditdlgs.ui
index 422bf2b8..ac9470ed 100644
--- a/quanta/project/subprojecteditdlgs.ui
+++ b/quanta/project/subprojecteditdlgs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>SubprojectEditDlgS</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SubprojectEditDlgS</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>textLabel9</cstring>
             </property>
@@ -40,7 +40,7 @@
                 <cstring>nameEdit</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel10</cstring>
             </property>
@@ -51,7 +51,7 @@
                 <cstring>locationEdit</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>createNew</cstring>
             </property>
@@ -69,5 +69,5 @@
     <tabstop>locationEdit</tabstop>
     <tabstop>createNew</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/teammembersdlg.cpp b/quanta/project/teammembersdlg.cpp
index ea3e415c..f2fe6ad2 100644
--- a/quanta/project/teammembersdlg.cpp
+++ b/quanta/project/teammembersdlg.cpp
@@ -42,8 +42,8 @@ extern TQString taskLeaderStr;
 extern TQString teamLeaderStr;
 extern TQString subprojectLeaderStr;
 
-TeamMembersDlg::TeamMembersDlg(TQWidget *parent, const char *name)
- : TeamMembersDlgS(parent, name)
+TeamMembersDlg::TeamMembersDlg(TQWidget *tqparent, const char *name)
+ : TeamMembersDlgS(tqparent, name)
 {
   m_yourself = "";
 }
@@ -186,13 +186,13 @@ void TeamMembersDlg::slotDeleteMember()
 
   if (deleteYourself)
   {
-    if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove yourself (<b>%1</b>) from the project team?<br>If you do so, you should select another member as yourself.</qt>").arg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue)
+    if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove yourself (<b>%1</b>) from the project team?<br>If you do so, you should select another member as yourself.</qt>").tqarg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue)
     {
       delete item;
       setYourself("");
     }
   } else
-  if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove <b>%1</b> from the project team?</qt>").arg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue)
+  if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove <b>%1</b> from the project team?</qt>").tqarg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue)
   {
     delete item;
   }
@@ -213,7 +213,7 @@ bool TeamMembersDlg::checkDuplicates(TQListViewItem *item, const TQString &name,
               (role == i18n(subprojectLeaderStr.utf8()) && it.current()->text(SUBPROJECT_COL) == subProject)
              ) )
         {
-            if (KMessageBox::warningYesNo(this, i18n("<qt>The <b>%1</b> role is already assigned to <b>%2</b>. Do you want to reassign it to the current member?</qt>").arg(role).arg(it.current()->text(NAME_COL)), TQString::null, i18n("Reassign"), i18n("Do Not Reassign")) == KMessageBox::Yes)
+            if (KMessageBox::warningYesNo(this, i18n("<qt>The <b>%1</b> role is already assigned to <b>%2</b>. Do you want to reassign it to the current member?</qt>").tqarg(role).tqarg(it.current()->text(NAME_COL)), TQString(), i18n("Reassign"), i18n("Do Not Reassign")) == KMessageBox::Yes)
             {
               it.current()->setText(ROLE_COL, i18n(simpleMemberStr.utf8()));
               return true;
@@ -223,7 +223,7 @@ bool TeamMembersDlg::checkDuplicates(TQListViewItem *item, const TQString &name,
         } else
         if (nick.lower() == nickName.lower() && it.current() != item && (it.current()->text(EMAIL_COL) != email || it.current()->text(NAME_COL) != name))
         {
-          KMessageBox::error(this, i18n("<qt>The <b>%1</b> nickname is already assigned to <b>%2 &lt;%3&gt;</b>.</qt>").arg(nickName).arg(it.current()->text(NAME_COL)).arg(it.current()->text(EMAIL_COL)));
+          KMessageBox::error(this, i18n("<qt>The <b>%1</b> nickname is already assigned to <b>%2 &lt;%3&gt;</b>.</qt>").tqarg(nickName).tqarg(it.current()->text(NAME_COL)).tqarg(it.current()->text(EMAIL_COL)));
           return false;
         } 
         ++it;
diff --git a/quanta/project/teammembersdlg.h b/quanta/project/teammembersdlg.h
index 045c0a7c..2884fb1c 100644
--- a/quanta/project/teammembersdlg.h
+++ b/quanta/project/teammembersdlg.h
@@ -25,8 +25,9 @@
 class TeamMembersDlg : public TeamMembersDlgS
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    TeamMembersDlg(TQWidget *parent = 0, const char *name = 0);
+    TeamMembersDlg(TQWidget *tqparent = 0, const char *name = 0);
 
     ~TeamMembersDlg();
     void setYourself(const TQString &name);
diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui
index eb2689dc..0949cf88 100644
--- a/quanta/project/teammembersdlgs.ui
+++ b/quanta/project/teammembersdlgs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>TeamMembersDlgS</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>TeamMembersDlgS</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>textLabel1</cstring>
             </property>
@@ -32,7 +32,7 @@
                 <cstring>mailingListEdit</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>
@@ -40,7 +40,7 @@
                 <string>You are:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="1">
+        <widget class="TQLabel" row="1" column="1">
             <property name="name">
                 <cstring>yourselfLabel</cstring>
             </property>
@@ -52,11 +52,11 @@
             <property name="text">
                 <string>Please select your identity from the member list.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter</set>
             </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>
@@ -172,7 +172,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>100</width>
                             <height>20</height>
@@ -231,13 +231,13 @@
     <tabstop>deleteMemberButton</tabstop>
     <tabstop>setToYourselfButton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>slotAddMember()</slot>
     <slot>slotEditMember()</slot>
     <slot>slotDeleteMember()</slot>
     <slot>slotSetToYourself()</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/quanta/project/uploadprofiledlgs.ui b/quanta/project/uploadprofiledlgs.ui
index 851a133c..9d36a26e 100644
--- a/quanta/project/uploadprofiledlgs.ui
+++ b/quanta/project/uploadprofiledlgs.ui
@@ -10,7 +10,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2004 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>UploadProfileDlgS</cstring>
     </property>
@@ -29,12 +29,12 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="10">
+        <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="10">
             <property name="name">
                 <cstring>linePath</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel4</cstring>
             </property>
@@ -45,7 +45,7 @@
                 <cstring>lineHost</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -56,7 +56,7 @@
                 <cstring>lineUser</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>TextLabel2_2</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <cstring>linePath</cstring>
             </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>
@@ -78,7 +78,7 @@
                 <cstring>lineProfileName</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="5">
+        <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>defaultProfile</cstring>
             </property>
@@ -86,7 +86,7 @@
                 <string>Use as &amp;default profile</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">
+        <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>lineUser</cstring>
             </property>
@@ -99,7 +99,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="3">
+        <widget class="TQLabel" row="2" column="3">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -122,7 +122,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>90</width>
                     <height>0</height>
@@ -144,7 +144,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>90</width>
                     <height>0</height>
@@ -167,14 +167,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>445</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3">
+        <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>lineHost</cstring>
             </property>
@@ -187,12 +187,12 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QComboBox" row="1" column="5" rowspan="1" colspan="3">
+        <widget class="TQComboBox" row="1" column="5" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>comboProtocol</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="10">
+        <widget class="TQLineEdit" row="1" column="10">
             <property name="name">
                 <cstring>port</cstring>
             </property>
@@ -205,7 +205,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="8" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="1" column="8" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>TextLabel1_2</cstring>
             </property>
@@ -216,7 +216,7 @@
                 <cstring>port</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="2" column="6" rowspan="1" colspan="5">
+        <widget class="TQCheckBox" row="2" column="6" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>keepPasswd</cstring>
             </property>
@@ -256,14 +256,14 @@ is obscured, saving the password in any file is a security risk. Use this option
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="4">
+        <widget class="TQLabel" row="1" column="4">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
             <property name="text">
                 <string>&amp;Protocol:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
@@ -306,5 +306,5 @@ is obscured, saving the password in any file is a security risk. Use this option
     <tabstop>okButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/uploadprofiles.cpp b/quanta/project/uploadprofiles.cpp
index cb54c27f..779903ab 100644
--- a/quanta/project/uploadprofiles.cpp
+++ b/quanta/project/uploadprofiles.cpp
@@ -55,12 +55,12 @@ void UploadProfiles::readFromXML(const TQDomDocument &dom)
 
 bool UploadProfiles::removeFromMapAndXML(const TQString &name)
 {
-  UploadProfiles::Iterator it = find(name);
+  UploadProfiles::Iterator it = tqfind(name);
   if ( it == end() )
     return false;
   // ok now remove
   TQDomElement el = (*it).domElement;
-  el.parentNode().removeChild(el);
+  el.tqparentNode().removeChild(el);
   erase(name);
   return true;
 }
diff --git a/quanta/project/uploadprofiles.h b/quanta/project/uploadprofiles.h
index db83e125..07011e2e 100644
--- a/quanta/project/uploadprofiles.h
+++ b/quanta/project/uploadprofiles.h
@@ -94,7 +94,7 @@ private:
   TQWidget * createTreeview(const UploadProfile &profile);
 
   /**
-      creates a KURL from a QDomElement
+      creates a KURL from a TQDomElement
   
       @param e a TQDomElement where the path is saved
       
diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui
index 745e0ba4..bd5ce2e4 100644
--- a/quanta/project/uploadprofilespage.ui
+++ b/quanta/project/uploadprofilespage.ui
@@ -11,7 +11,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2004 by Andras Mantia</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>UploadProfilesPage</cstring>
     </property>
@@ -30,15 +30,15 @@
         <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>layout2</cstring>
+                <cstring>tqlayout2</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>pLabel</cstring>
                     </property>
@@ -62,7 +62,7 @@
                         <string>Edit Profiles</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>profileLabel</cstring>
                     </property>
@@ -78,7 +78,7 @@
                         <string>x</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>checkShowUploadTreeviews</cstring>
                     </property>
@@ -98,7 +98,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -118,8 +118,8 @@
 <includes>
     <include location="local" impldecl="in implementation">uploadprofilespage.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>buttonEditProfiles_clicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/project/uploadprofilespage.ui.h b/quanta/project/uploadprofilespage.ui.h
index cb7aad06..054a3622 100644
--- a/quanta/project/uploadprofilespage.ui.h
+++ b/quanta/project/uploadprofilespage.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/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi
index 4dd81e39..a7cd94c0 100644
--- a/quanta/quanta_uml.xmi
+++ b/quanta/quanta_uml.xmi
@@ -13,12 +13,12 @@
   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="74" abstract="0" documentation="This should contain a &quot;view&quot; of the document. This is not clearly implemented. The class contains a set of tabs, and each tab can hold one Document object. I think the tab (and such the MDI) handling should go to the QuantaApp class and here only the document view related things should be. Just as the Document/View model requests." name="QuantaView" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="86" type="" abstract="0" documentation="" name="QuantaView" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="87" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="87" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="88" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="89" type="void" abstract="0" documentation="" name="addWrite" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="90" value="" type="Document *" abstract="0" documentation="" name="w" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="91" value="" type="QString" abstract="0" documentation="" name="label" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="91" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="label" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="92" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="93" type="virtual void" abstract="0" documentation="" name="dragEnterEvent" static="0" scope="202" >
@@ -31,8 +31,8 @@
     <UML:Operation stereotype="" package="" xmi.id="98" type="void" abstract="0" documentation="" name="initActions" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="99" type="void" abstract="0" documentation="" name="initMenu" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="100" type="void" abstract="0" documentation="" name="insertNewTag" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="101" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="102" value="" type="QString" abstract="0" documentation="" name="attr" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="101" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="102" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attr" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="103" value="" type="bool" abstract="0" documentation="" name="insertInLine" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="104" type="void" abstract="0" documentation="" name="insertTag" static="0" scope="200" >
@@ -49,11 +49,11 @@
     <UML:Attribute stereotype="" package="" xmi.id="76" value="" type="bool" abstract="0" documentation="" name="beginOfScriptOutput" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="77" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="78" value="" type="QuantaDoc *" abstract="0" documentation="" name="doc" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="79" value="" type="QString" abstract="0" documentation="" name="dontShowSavePreview" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="79" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dontShowSavePreview" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="80" value="" type="Document *" abstract="0" documentation="" name="oldWrite" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="81" value="" type="QString" abstract="0" documentation="" name="scriptErrorDest" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="82" value="" type="QString" abstract="0" documentation="" name="scriptOutputDest" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="83" value="" type="QString" abstract="0" documentation="" name="space" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="81" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptErrorDest" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="82" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptOutputDest" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="83" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="space" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="84" value="" type="QTabWidget *" abstract="0" documentation="" name="toolbarTab" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="85" value="" type="QTabWidget *" abstract="0" documentation="" name="writeTab" static="0" scope="200" />
    </UML:Class>
@@ -62,12 +62,12 @@
     <UML:Operation stereotype="" package="" xmi.id="206" type="QDomDocument *" abstract="0" documentation="" name="actions" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="207" type="bool" abstract="0" documentation="Returns true if the current DTD does not have any toolbars, or if all of the toolbars are removed or if the &quot;Shov DTD Toolbar&quot; is unchecked." name="allToolbarsHidden" static="0" scope="202" />
     <UML:Operation stereotype="" package="" xmi.id="208" type="QWidget *" abstract="0" documentation="" name="createContainer" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="209" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="209" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="210" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="211" value="" type="const QDomElement &amp;" abstract="0" documentation="" name="element" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="212" value="" type="int &amp;" abstract="0" documentation="" name="id" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="213" type="QString" abstract="0" documentation="Returns the project default encoding if a project is loaded, otherwise it returns the global default encoding." name="defaultEncoding" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="213" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="Returns the project default encoding if a project is loaded, otherwise it returns the global default encoding." name="defaultEncoding" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="214" type="virtual void" abstract="0" documentation="Sets the focus to the editor window and checkes for changes in the edited file when the application gets back the focus." name="focusInEvent" static="0" scope="202" >
      <UML:Parameter stereotype="" package="" xmi.id="215" value="" type="QFocusEvent *" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
@@ -85,16 +85,16 @@
     <UML:Operation stereotype="" package="" xmi.id="227" type="void" abstract="0" documentation="" name="initTagDict" static="0" scope="202" />
     <UML:Operation stereotype="" package="" xmi.id="228" type="void" abstract="0" documentation="" name="initView" static="0" scope="202" />
     <UML:Operation stereotype="" package="" xmi.id="229" type="void" abstract="0" documentation="" name="loadInitialProject" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="230" value="" type="QString" abstract="0" documentation="" name="url" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="230" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="url" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="231" type="void" abstract="0" documentation="" name="loadToolbarForDTD" static="0" scope="202" >
      <UML:Parameter stereotype="" package="" xmi.id="232" value="" type="const QString &amp;" abstract="0" documentation="" name="dtdName" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="233" type="QString" abstract="0" documentation="" name="newFileType" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="233" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="newFileType" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="234" type="KDockWidget *" abstract="0" documentation="" name="outputDockWidget" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="235" type="QPopupMenu *" abstract="0" documentation="" name="pluginMenu" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="236" type="void" abstract="0" documentation="" name="processDTD" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="237" value="" type="QString" abstract="0" documentation="" name="documentType" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="237" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="documentType" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="238" type="KURL" abstract="0" documentation="" name="projectBaseURL" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="239" type="virtual bool" abstract="0" documentation="" name="queryClose" static="0" scope="202" />
@@ -103,13 +103,13 @@
      <UML:Parameter stereotype="" package="" xmi.id="242" value="" type="QString &amp;" abstract="0" documentation="" name="dirName" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="243" type="uint" abstract="0" documentation="" name="readTagFile" static="0" scope="202" >
-     <UML:Parameter stereotype="" package="" xmi.id="244" value="" type="QString" abstract="0" documentation="" name="fileName" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="245" value="" type="DTDStruct *" abstract="0" documentation="" name="parentDTD" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="244" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fileName" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="245" value="" type="DTDStruct *" abstract="0" documentation="" name="tqparentDTD" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="246" value="" type="QTagList *" abstract="0" documentation="" name="tagList" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="247" type="void" abstract="0" documentation="" name="removeContainer" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="248" value="" type="QWidget *" abstract="0" documentation="" name="container" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="249" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="249" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="250" value="" type="QDomElement &amp;" abstract="0" documentation="" name="element" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="251" value="" type="int" abstract="0" documentation="" name="id" static="0" scope="200" />
     </UML:Operation>
@@ -148,11 +148,11 @@
     <UML:Attribute stereotype="" package="" xmi.id="116" value="" type="QWidgetStack *" abstract="0" documentation="" name="bottomWidgetStack" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="117" value="" type="KAction *" abstract="0" documentation="" name="closeprjAction" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="118" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="119" value="" type="QString" abstract="0" documentation="" name="currentToolbarDTD" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="119" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="currentToolbarDTD" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="120" value="" type="DocTreeView *" abstract="0" documentation="" name="dTab" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="121" value="" type="PHP3Debugger *" abstract="0" documentation="" name="dbg3" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="122" value="" type="PHP4Debugger *" abstract="0" documentation="" name="dbg4" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="123" value="" type="QString" abstract="0" documentation="" name="debuggerStyle" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="123" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="debuggerStyle" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="124" value="" type="QuantaDoc *" abstract="0" documentation="" name="doc" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="125" value="" type="KDockWidget *" abstract="0" documentation="" name="dtabdock" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="126" value="" type="KAction *" abstract="0" documentation="" name="editRedo" static="0" scope="201" />
@@ -206,8 +206,8 @@
     <UML:Attribute stereotype="" package="" xmi.id="174" value="" type="KAction *" abstract="0" documentation="" name="saveSelectionAsLocalTemplateAction" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="175" value="" type="KAction *" abstract="0" documentation="" name="saveSelectionAsProjectTemplateAction" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="176" value="" type="KAction *" abstract="0" documentation="" name="saveprjAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="177" value="" type="QString" abstract="0" documentation="" name="scriptBeginRxStr" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="178" value="" type="QString" abstract="0" documentation="" name="scriptEndRxStr" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="177" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptBeginRxStr" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="178" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptEndRxStr" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="179" value="" type="KSelectAction *" abstract="0" documentation="" name="setEndOfLine" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="180" value="" type="KToggleAction *" abstract="0" documentation="" name="showDTDToolbar" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="181" value="" type="KToggleAction *" abstract="0" documentation="" name="showDTabAction" static="0" scope="201" />
@@ -238,7 +238,7 @@
    <UML:Class stereotype="" package="" xmi.id="274" abstract="0" documentation="The document handling class. This is somewhat weird, as the Document class should handle all the document related things. The job is distrivute now between this the QuantaView and the QuantaApp class. This must be clearly seperated...
 See the operations in order to get a picture what's here." name="QuantaDoc" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="276" type="" abstract="0" documentation="" name="QuantaDoc" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="277" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="277" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="278" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="279" type="void" abstract="0" documentation="" name="changeFileTabName" static="0" scope="200" >
@@ -257,7 +257,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="289" type="void" abstract="0" documentation="" name="nextDocument" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="290" type="void" abstract="0" documentation="" name="openDocument" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="291" value="" type="const KURL &amp;" abstract="0" documentation="" name="" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="292" value="" type="QString" abstract="0" documentation="" name="encoding" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="292" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="encoding" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="293" type="void" abstract="0" documentation="" name="prevDocument" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="294" type="void" abstract="0" documentation="" name="readConfig" static="0" scope="200" >
@@ -282,7 +282,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="307" abstract="0" documentation="Common static functions used everywhere in the code. " name="QuantaCommon" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="308" type="" abstract="0" documentation="" name="QuantaCommon" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="309" type="QString" abstract="0" documentation="" name="attrCase" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="309" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attrCase" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="310" value="" type="const QString" abstract="0" documentation="" name="attr" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="311" type="bool" abstract="0" documentation="" name="checkExactMimeType" static="0" scope="200" >
@@ -304,13 +304,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="323" value="" type="QWidget *" abstract="0" documentation="" name="widget" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="324" value="" type="const KURL &amp;" abstract="0" documentation="" name="url" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="325" type="QString" abstract="0" documentation="" name="getDTDNameFromNickName" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="326" value="" type="QString" abstract="0" documentation="" name="nickName" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="325" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getDTDNameFromNickName" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="326" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="nickName" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="327" type="QString" abstract="0" documentation="" name="getDTDNickNameFromName" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="328" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="327" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getDTDNickNameFromName" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="328" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="329" type="QString" abstract="0" documentation="" name="i18n2normal" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="329" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="i18n2normal" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="330" value="" type="const QString &amp;" abstract="0" documentation="" name="a_str" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="331" type="int" abstract="0" documentation="" name="isBetween" static="0" scope="200" >
@@ -322,51 +322,51 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="337" value="" type="int" abstract="0" documentation="" name="eCol" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="338" type="bool" abstract="0" documentation="" name="isKnownTag" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="339" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="340" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="339" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="340" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="341" type="bool" abstract="0" documentation="" name="isOptionalTag" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="342" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="343" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="342" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="343" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="344" type="bool" abstract="0" documentation="" name="isSingleTag" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="345" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="346" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="345" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="346" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="347" type="QString" abstract="0" documentation="" name="makeRxCompatible" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="347" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="makeRxCompatible" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="348" value="" type="const QString" abstract="0" documentation="" name="s" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="349" type="KStandardDirs *" abstract="0" documentation="" name="pluginDirs" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="350" value="" type="const char *" abstract="0" documentation="" name="type" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="351" type="QString" abstract="0" documentation="" name="qUrl" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="351" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="qUrl" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="352" value="" type="const KURL &amp;" abstract="0" documentation="" name="url" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="353" type="void" abstract="0" documentation="" name="setUrl" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="354" value="" type="KURL &amp;" abstract="0" documentation="" name="url" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="355" value="" type="QString" abstract="0" documentation="" name="urlString" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="355" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="urlString" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="356" type="QStringList *" abstract="0" documentation="" name="tagAttributeValues" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="357" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="358" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="359" value="" type="QString" abstract="0" documentation="" name="attribute" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="357" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="358" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="359" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attribute" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="360" type="AttributeList *" abstract="0" documentation="" name="tagAttributes" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="361" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="362" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="361" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="362" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="363" type="QString" abstract="0" documentation="" name="tagCase" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="363" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagCase" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="364" value="" type="const QString" abstract="0" documentation="" name="tag" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="365" type="QTag *" abstract="0" documentation="" name="tagFromDTD" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="366" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="367" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="367" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="368" type="QTag *" abstract="0" documentation="" name="tagFromDTD" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="369" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="370" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="369" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="370" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="371" type="QString" abstract="0" documentation="" name="xmlFromAttributes" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="371" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="xmlFromAttributes" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="372" value="" type="AttributeList *" abstract="0" documentation="" name="attributes" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="373" type="" abstract="0" documentation="" name="~QuantaCommon" static="0" scope="200" />
@@ -390,7 +390,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="390" type="KURL" abstract="0" documentation="" name="path" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="391" value="" type="const KURL &amp;" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="392" type="QString" abstract="0" documentation="" name="shortName" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="392" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="shortName" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="393" value="" type="const QString &amp;" abstract="0" documentation="" name="fname" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="394" type="KURL" abstract="0" documentation="" name="toAbsolute" static="0" scope="200" >
@@ -403,7 +403,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="400" type="" abstract="0" documentation="" name="~QExtFileInfo" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="375" value="" type="bool" abstract="0" documentation="" name="bJobOK" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="376" value="" type="QString" abstract="0" documentation="" name="lastErrorMsg" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="376" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="lastErrorMsg" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="377" value="" type="QPtrList" abstract="0" documentation="" name="lstFilters" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="378" value="" type="QTimer *" abstract="0" documentation="" name="timer" static="0" scope="201" />
    </UML:Class>
@@ -420,7 +420,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="428" value="" type="KTextEditor :: Document *" abstract="0" documentation="" name="doc" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="429" value="" type="Project *" abstract="0" documentation="" name="project" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="430" value="" type="QuantaPluginInterface *" abstract="0" documentation="" name="" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="431" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="431" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="432" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="433" value="" type="WFlags" abstract="0" documentation="" name="f" static="0" scope="200" />
     </UML:Operation>
@@ -428,7 +428,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="435" value="" type="Tag *" abstract="0" documentation="" name="tag" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="436" value="" type="QDict &lt; QString > *" abstract="0" documentation="" name="dict" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="437" type="void" abstract="0" documentation="" name="checkDirtyStatus" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="437" type="void" abstract="0" documentation="" name="checkDirtytqStatus" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="438" type="int" abstract="0" documentation="" name="checkOverwrite" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="439" value="" type="KURL" abstract="0" documentation="" name="u" static="0" scope="200" />
     </UML:Operation>
@@ -445,7 +445,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="449" type="bool" abstract="0" documentation="" name="evenQuotes" static="0" scope="202" >
      <UML:Parameter stereotype="" package="" xmi.id="450" value="" type="const QString &amp;" abstract="0" documentation="" name="text" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="451" type="QString" abstract="0" documentation="" name="find" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="451" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tqfind" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="452" value="" type="const QRegExp &amp;" abstract="0" documentation="" name="rx" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="453" value="" type="int" abstract="0" documentation="" name="sLine" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="454" value="" type="int" abstract="0" documentation="" name="sCol" static="0" scope="200" />
@@ -454,10 +454,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="457" value="" type="int &amp;" abstract="0" documentation="" name="feLine" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="458" value="" type="int &amp;" abstract="0" documentation="" name="feCol" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="459" type="QString" abstract="0" documentation="" name="findDTDName" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="459" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="findDTDName" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="460" value="" type="Tag * *" abstract="0" documentation="" name="tag" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="461" type="QString" abstract="0" documentation="" name="findRev" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="461" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tqfindRev" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="462" value="" type="const QRegExp &amp;" abstract="0" documentation="" name="rx" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="463" value="" type="int" abstract="0" documentation="" name="sLine" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="464" value="" type="int" abstract="0" documentation="" name="sCol" static="0" scope="200" />
@@ -466,7 +466,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="467" value="" type="int &amp;" abstract="0" documentation="" name="feLine" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="468" value="" type="int &amp;" abstract="0" documentation="" name="feCol" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="469" type="QString" abstract="0" documentation="" name="findWordRev" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="469" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="findWordRev" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="470" value="" type="const QString &amp;" abstract="0" documentation="" name="textToSearch" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="471" type="Tag *" abstract="0" documentation="" name="findXMLTag" static="0" scope="200" >
@@ -477,24 +477,24 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="476" type="QValueList *" abstract="0" documentation="" name="getAttributeCompletions" static="0" scope="202" >
      <UML:Parameter stereotype="" package="" xmi.id="477" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="478" value="" type="QString" abstract="0" documentation="" name="tagName" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="479" value="" type="QString" abstract="0" documentation="" name="startsWith" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="478" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagName" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="479" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="startsWith" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="480" type="QValueList *" abstract="0" documentation="" name="getAttributeValueCompletions" static="0" scope="202" >
      <UML:Parameter stereotype="" package="" xmi.id="481" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="482" value="" type="QString" abstract="0" documentation="" name="tagName" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="483" value="" type="QString" abstract="0" documentation="" name="attribute" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="484" value="" type="QString" abstract="0" documentation="" name="startsWith" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="482" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagName" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="483" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attribute" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="484" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="startsWith" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="485" type="QValueList *" abstract="0" documentation="" name="getCharacterCompletions" static="0" scope="202" />
-    <UML:Operation stereotype="" package="" xmi.id="486" type="QString" abstract="0" documentation="" name="getDTDIdentifier" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="487" type="QPoint" abstract="0" documentation="" name="getGlobalCursorPos" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="486" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getDTDIdentifier" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="487" type=TQPOINT_OBJECT_NAME_STRING abstract="0" documentation="" name="getGlobalCursorPos" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="488" type="QValueList *" abstract="0" documentation="" name="getTagCompletions" static="0" scope="202" >
      <UML:Parameter stereotype="" package="" xmi.id="489" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="490" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="491" value="" type="int" abstract="0" documentation="" name="col" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="492" type="QString" abstract="0" documentation="" name="getTagNameAt" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="492" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getTagNameAt" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="493" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="494" value="" type="int" abstract="0" documentation="" name="col" static="0" scope="200" />
     </UML:Operation>
@@ -507,22 +507,22 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="500" value="" type="const KURL &amp;" abstract="0" documentation="" name="url" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="501" type="void" abstract="0" documentation="" name="insertTag" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="502" value="" type="QString" abstract="0" documentation="" name="s1" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="503" value="" type="QString" abstract="0" documentation="" name="s2" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="502" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="s1" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="503" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="s2" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="504" type="void" abstract="0" documentation="" name="insertText" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="505" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="505" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="506" value="" type="bool" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="507" type="bool" abstract="0" documentation="" name="isModified" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="508" type="bool" abstract="0" documentation="" name="isUntitled" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="509" type="void" abstract="0" documentation="" name="parseVariables" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="510" type="QString" abstract="0" documentation="" name="parsingDTD" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="510" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="parsingDTD" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="511" type="void" abstract="0" documentation="" name="readConfig" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="512" value="" type="KConfig *" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="513" type="void" abstract="0" documentation="" name="replaceSelected" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="514" value="" type="QString" abstract="0" documentation="" name="s" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="514" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="s" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="515" type="void" abstract="0" documentation="" name="resizeEvent" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="516" value="" type="QResizeEvent *" abstract="0" documentation="" name="e" static="0" scope="200" />
@@ -547,9 +547,9 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="532" value="" type="int" abstract="0" documentation="" name="y2" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="533" type="void" abstract="0" documentation="" name="setDTDIdentifier" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="534" value="" type="QString" abstract="0" documentation="" name="id" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="534" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="id" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="535" type="void" abstract="0" documentation="" name="setDirtyStatus" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="535" type="void" abstract="0" documentation="" name="setDirtytqStatus" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="536" value="" type="bool" abstract="0" documentation="" name="status" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="537" type="void" abstract="0" documentation="" name="setModified" static="0" scope="200" >
@@ -559,13 +559,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="540" value="" type="const QString &amp;" abstract="0" documentation="" name="dtdName" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="541" type="void" abstract="0" documentation="" name="setUntitledUrl" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="542" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="542" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="543" type="void" abstract="0" documentation="" name="showCodeCompletions" static="0" scope="202" >
      <UML:Parameter stereotype="" package="" xmi.id="544" value="" type="QValueList &lt; KTextEditor :: CompletionEntry > *" abstract="0" documentation="" name="completions" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="545" type="QString" abstract="0" documentation="" name="tempFileName" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="546" type="QString" abstract="0" documentation="" name="text" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="545" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tempFileName" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="546" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="547" value="" type="int" abstract="0" documentation="" name="bLine" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="548" value="" type="int" abstract="0" documentation="" name="bCol" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="549" value="" type="int" abstract="0" documentation="" name="eLine" static="0" scope="200" />
@@ -590,21 +590,21 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Attribute stereotype="" package="" xmi.id="408" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="409" value="" type="bool" abstract="0" documentation="" name="busy" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="410" value="" type="bool" abstract="0" documentation="" name="completionInProgress" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="411" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="412" value="" type="QStringList" abstract="0" documentation="" name="includeList" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="411" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="412" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="includeList" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="413" value="" type="bool" abstract="0" documentation="" name="m_dirty" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="414" value="" type="QString" abstract="0" documentation="" name="m_parsingDTD" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="414" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_parsingDTD" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="415" value="" type="QuantaPluginInterface *" abstract="0" documentation="" name="m_pluginInterface" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="416" value="" type="Project *" abstract="0" documentation="" name="m_project" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="417" value="" type="QString" abstract="0" documentation="" name="m_tempFileName" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="417" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_tempFileName" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="418" value="" type="bool" abstract="0" documentation="" name="oldstat" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="419" value="" type="int" abstract="0" documentation="" name="spellMoved" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="420" value="" type="QValueList *" abstract="0" documentation="" name="spellPos" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="421" value="" type="QString" abstract="0" documentation="" name="spellText" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="421" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="spellText" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="422" value="" type="KTempFile *" abstract="0" documentation="" name="tempFile" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="423" value="" type="QString" abstract="0" documentation="" name="untitledUrl" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="423" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="untitledUrl" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="424" value="" type="QTagList" abstract="0" documentation="" name="userTagList" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="425" value="" type="QStringList" abstract="0" documentation="" name="variableList" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="425" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="variableList" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="564" abstract="0" documentation="" name="KQApplication" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="565" type="" abstract="0" documentation="" name="KQApplication" static="0" scope="200" />
@@ -621,14 +621,14 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="574" abstract="0" documentation="" name="Node" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="583" type="" abstract="0" documentation="" name="Node" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="584" value="" type="Node *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="584" value="" type="Node *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="585" type="" abstract="0" documentation="" name="~Node" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="575" value="" type="Node *" abstract="0" documentation="" name="child" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="576" value="" type="QListViewItem *" abstract="0" documentation="" name="listItem" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="577" value="" type="Node *" abstract="0" documentation="" name="next" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="578" value="" type="bool" abstract="0" documentation="" name="opened" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="579" value="" type="Node *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="579" value="" type="Node *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="580" value="" type="Node *" abstract="0" documentation="" name="prev" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="581" value="" type="bool" abstract="0" documentation="" name="removeAll" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="582" value="" type="Tag *" abstract="0" documentation="" name="tag" static="0" scope="200" />
@@ -641,11 +641,11 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="605" type="" abstract="0" documentation="" name="Tag" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="606" value="" type="const Tag &amp;" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="607" type="QString" abstract="0" documentation="" name="attribute" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="607" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attribute" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="608" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="609" type="int" abstract="0" documentation="" name="attributeIndex" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="610" value="" type="QString" abstract="0" documentation="" name="attr" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="610" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attr" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="611" type="int" abstract="0" documentation="" name="attributeIndexAtPos" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="612" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" />
@@ -656,10 +656,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="616" value="" type="int &amp;" abstract="0" documentation="" name="line" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="617" value="" type="int &amp;" abstract="0" documentation="" name="col" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="618" type="QString" abstract="0" documentation="" name="attributeValue" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="619" value="" type="QString" abstract="0" documentation="" name="attr" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="618" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attributeValue" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="619" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attr" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="620" type="QString" abstract="0" documentation="" name="attributeValue" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="620" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attributeValue" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="621" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="622" type="void" abstract="0" documentation="" name="attributeValuePos" static="0" scope="200" >
@@ -686,7 +686,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="638" value="" type="Document *" abstract="0" documentation="" name="p_write" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="639" type="void" abstract="0" documentation="" name="parseAttr" static="0" scope="202" >
-     <UML:Parameter stereotype="" package="" xmi.id="640" value="" type="QString" abstract="0" documentation="" name="text" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="640" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="641" value="" type="int &amp;" abstract="0" documentation="" name="line" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="642" value="" type="int &amp;" abstract="0" documentation="" name="col" static="0" scope="200" />
     </UML:Operation>
@@ -702,7 +702,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="650" type="void" abstract="0" documentation="" name="setWrite" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="651" value="" type="Document *" abstract="0" documentation="" name="p_write" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="652" type="QString" abstract="0" documentation="" name="tagStr" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="652" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagStr" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="653" type="int" abstract="0" documentation="" name="valueIndexAtPos" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="654" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="655" value="" type="int" abstract="0" documentation="" name="col" static="0" scope="200" />
@@ -713,16 +713,16 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Attribute stereotype="" package="" xmi.id="588" value="" type="TagAttr []" abstract="0" documentation="" name="attrs" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="589" value="" type="int" abstract="0" documentation="" name="beginCol" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="590" value="" type="int" abstract="0" documentation="" name="beginLine" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="591" value="" type="QString" abstract="0" documentation="" name="cleanStr" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="591" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="cleanStr" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="592" value="" type="bool" abstract="0" documentation="" name="closingMissing" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="593" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="594" value="" type="int" abstract="0" documentation="" name="endCol" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="595" value="" type="int" abstract="0" documentation="" name="endLine" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="596" value="" type="QString" abstract="0" documentation="" name="m_tagStr" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="596" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_tagStr" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="597" value="" type="Document *" abstract="0" documentation="" name="m_write" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="598" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="598" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="599" value="" type="bool" abstract="0" documentation="" name="single" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="600" value="" type="QString" abstract="0" documentation="" name="structBeginStr" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="600" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="structBeginStr" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="601" value="" type="int" abstract="0" documentation="" name="type" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="658" abstract="0" documentation="" name="QTag" static="0" scope="200" >
@@ -744,10 +744,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="680" type="int" abstract="0" documentation="" name="attributeCount" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="681" type="AttributeList *" abstract="0" documentation="" name="attributes" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="682" type="QString" abstract="0" documentation="" name="fileName" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="682" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fileName" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="683" type="bool" abstract="0" documentation="" name="isOptional" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="684" type="bool" abstract="0" documentation="" name="isSingle" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="685" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="685" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="686" type="void" abstract="0" documentation="" name="setFileName" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="687" value="" type="QString &amp;" abstract="0" documentation="" name="fileName" static="0" scope="200" />
     </UML:Operation>
@@ -762,15 +762,15 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="694" type="" abstract="0" documentation="" name="~QTag" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="659" value="" type="AttributeList" abstract="0" documentation="" name="attrs" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="660" value="" type="QStringList" abstract="0" documentation="" name="commonGroups" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="661" value="" type="QString" abstract="0" documentation="" name="m_fileName" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="660" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="commonGroups" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="661" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_fileName" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="662" value="" type="bool" abstract="0" documentation="" name="optional" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="663" value="" type="DTDStruct *" abstract="0" documentation="" name="parentDTD" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="664" value="" type="QString" abstract="0" documentation="" name="returnType" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="663" value="" type="DTDStruct *" abstract="0" documentation="" name="tqparentDTD" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="664" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="returnType" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="665" value="" type="bool" abstract="0" documentation="" name="single" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="666" value="" type="QStringList" abstract="0" documentation="" name="stoppingTags" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="667" value="" type="QString" abstract="0" documentation="" name="tagName" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="668" value="" type="QString" abstract="0" documentation="" name="type" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="666" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="stoppingTags" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="667" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagName" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="668" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="type" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="695" abstract="0" documentation="" name="Parser" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="704" type="" abstract="0" documentation="" name="Parser" static="0" scope="200" />
@@ -803,9 +803,9 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="724" type="" abstract="0" documentation="" name="~Parser" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="696" value="" type="QValueList" abstract="0" documentation="" name="dtdList" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="697" value="" type="DTDStruct *" abstract="0" documentation="" name="m_dtd" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="698" value="" type="QString" abstract="0" documentation="" name="m_dtdName" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="698" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_dtdName" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="699" value="" type="Node *" abstract="0" documentation="" name="m_node" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="700" value="" type="QString" abstract="0" documentation="" name="m_text" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="700" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_text" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="701" value="" type="int" abstract="0" documentation="" name="maxLines" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="702" value="" type="int" abstract="0" documentation="" name="oldMaxLines" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="703" value="" type="Document *" abstract="0" documentation="" name="write" static="0" scope="201" />
@@ -814,7 +814,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="728" type="" abstract="0" documentation="" name="QuantaCmdPlugin" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="729" type="virtual bool" abstract="0" documentation="" name="isLoaded" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="730" type="virtual bool" abstract="0" documentation="" name="load" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="731" type="QString" abstract="0" documentation="" name="makeQString" static="0" scope="202" >
+    <UML:Operation stereotype="" package="" xmi.id="731" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="makeQString" static="0" scope="202" >
      <UML:Parameter stereotype="" package="" xmi.id="732" value="" type="const char *" abstract="0" documentation="" name="" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="733" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
@@ -843,7 +843,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="751" value="" type="const char *" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="752" type="QDict" abstract="0" documentation="" name="plugins" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="753" type="QStringList" abstract="0" documentation="" name="searchPathList" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="753" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="searchPathList" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="754" type="void" abstract="0" documentation="" name="setSearchPaths" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="755" value="" type="const QStringList &amp;" abstract="0" documentation="" name="paths" static="0" scope="200" />
     </UML:Operation>
@@ -866,7 +866,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    <UML:Class stereotype="" package="" xmi.id="767" abstract="0" documentation="This class handles the spellchecking. It should work with all KTextEditor's, not only Kate.
    This is not a real plugin. The code is based on SpellPlugin for Kate." name="SpellChecker" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="771" type="" abstract="0" documentation="" name="SpellChecker" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="772" value="" type="QObject *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="772" value="" type="QObject *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="773" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="774" type="void" abstract="0" documentation="" name="locatePosition" static="0" scope="202" >
@@ -958,20 +958,20 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="852" type="" abstract="0" documentation="" name="~QuantaPlugin" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="794" value="" type="KToggleAction *" abstract="0" documentation="" name="m_action" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="795" value="" type="QString" abstract="0" documentation="" name="m_arguments" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="796" value="" type="QString" abstract="0" documentation="" name="m_fileName" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="797" value="" type="QString" abstract="0" documentation="" name="m_icon" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="795" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_arguments" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="796" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_fileName" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="797" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_icon" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="798" value="" type="bool" abstract="0" documentation="" name="m_isRunning" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="799" value="" type="QString" abstract="0" documentation="" name="m_location" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="800" value="" type="QString" abstract="0" documentation="" name="m_name" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="801" value="" type="QString" abstract="0" documentation="" name="m_outputWindow" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="799" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_location" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="800" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_name" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="801" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_outputWindow" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="802" value="" type="bool" abstract="0" documentation="" name="m_standard" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="803" value="" type="QString" abstract="0" documentation="" name="m_standardName" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="804" value="" type="QString" abstract="0" documentation="" name="m_type" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="803" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_standardName" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="804" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_type" static="0" scope="202" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="853" abstract="0" documentation="Provides an interface to the installed plugins. " name="QuantaPluginInterface" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="856" type="" abstract="0" documentation="" name="QuantaPluginInterface" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="857" type="QStringList" abstract="0" documentation="" name="outputWindows" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="857" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="outputWindows" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="858" value="" type="const QString &amp;" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="859" type="virtual QuantaPlugin *" abstract="0" documentation="" name="plugin" static="0" scope="200" >
@@ -981,27 +981,27 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="862" value="" type="const QString &amp;" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="863" type="virtual QStringList" abstract="0" documentation="" name="pluginNames" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="864" type="QStringList" abstract="0" documentation="" name="pluginTypes" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="864" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="pluginTypes" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="865" type="QDict" abstract="0" documentation="" name="plugins" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="866" type="virtual void" abstract="0" documentation="" name="readConfig" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="867" type="virtual QStringList" abstract="0" documentation="" name="searchPaths" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="868" type="virtual void" abstract="0" documentation="" name="setPluginNames" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="869" value="" type="QStringList" abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="869" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="870" type="void" abstract="0" documentation="" name="setPlugins" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="871" value="" type="QDict &lt; QuantaPlugin >" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="872" type="virtual void" abstract="0" documentation="" name="setSearchPaths" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="873" value="" type="QStringList" abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="873" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="874" type="virtual void" abstract="0" documentation="" name="writeConfig" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="875" type="" abstract="0" documentation="" name="~QuantaPluginInterface" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="854" value="" type="QStringList" abstract="0" documentation="" name="m_pluginNames" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="854" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="m_pluginNames" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="855" value="" type="QDict" abstract="0" documentation="" name="m_plugins" static="0" scope="202" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="876" abstract="0" documentation="" name="Project" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="907" type="" abstract="0" documentation="" name="Project" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="908" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="908" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="909" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="910" type="bool" abstract="0" documentation="" name="createEmptyDom" static="0" scope="200" />
@@ -1010,14 +1010,14 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="913" type="bool" abstract="0" documentation="" name="hasProject" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="914" type="void" abstract="0" documentation="" name="insertFile" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="915" value="" type="const KURL &amp;" abstract="0" documentation="" name="nameURL" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="916" value="" type="bool" abstract="0" documentation="" name="repaint" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="916" value="" type="bool" abstract="0" documentation="" name="tqrepaint" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="917" type="void" abstract="0" documentation="" name="insertFiles" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="918" value="" type="KURL :: List" abstract="0" documentation="" name="files" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="919" type="void" abstract="0" documentation="" name="insertFiles" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="920" value="" type="const KURL &amp;" abstract="0" documentation="" name="pathURL" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="921" value="" type="const QString &amp;" abstract="0" documentation="" name="mask" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="921" value="" type="const QString &amp;" abstract="0" documentation="" name="tqmask" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="922" type="bool" abstract="0" documentation="" name="isModified" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="923" type="void" abstract="0" documentation="" name="loadProjectXML" static="0" scope="200" />
@@ -1039,28 +1039,28 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="935" value="" type="KConfig *" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="936" type="" abstract="0" documentation="" name="~Project" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="877" value="" type="QString" abstract="0" documentation="" name="author" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="877" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="author" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="878" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="879" value="" type="QBuffer" abstract="0" documentation="" name="buff" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="880" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="881" value="" type="QString" abstract="0" documentation="" name="currentProjectView" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="881" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="currentProjectView" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="882" value="" type="QDomDocument" abstract="0" documentation="" name="dom" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="883" value="" type="QString" abstract="0" documentation="" name="email" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="883" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="email" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="884" value="" type="bool" abstract="0" documentation="" name="keepPasswd" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="885" value="" type="QString" abstract="0" documentation="" name="m_defaultDTD" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="886" value="" type="QString" abstract="0" documentation="" name="m_defaultEncoding" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="887" value="" type="QString" abstract="0" documentation="" name="m_newFileType" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="885" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_defaultDTD" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="886" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_defaultEncoding" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="887" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_newFileType" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="888" value="" type="bool" abstract="0" documentation="" name="modified" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="889" value="" type="KURL" abstract="0" documentation="" name="newURL" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="890" value="" type="KURL" abstract="0" documentation="" name="oldURL" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="891" value="" type="bool" abstract="0" documentation="" name="olfwprj" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="892" value="" type="QString" abstract="0" documentation="" name="passwd" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="892" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="passwd" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="893" value="" type="ProjectNewFinal *" abstract="0" documentation="" name="pnf" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="894" value="" type="ProjectNewGeneral *" abstract="0" documentation="" name="png" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="895" value="" type="ProjectNewLocal *" abstract="0" documentation="" name="pnl" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="896" value="" type="ProjectNewWeb *" abstract="0" documentation="" name="pnw" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="897" value="" type="KURL" abstract="0" documentation="" name="previewPrefix" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="898" value="" type="QString" abstract="0" documentation="" name="projectName" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="898" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="projectName" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="899" value="" type="KRecentFilesAction *" abstract="0" documentation="" name="projectRecent" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="900" value="" type="KURL" abstract="0" documentation="" name="projectURL" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="901" value="" type="KURL" abstract="0" documentation="" name="remoteDir" static="0" scope="200" />
@@ -1072,28 +1072,28 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="937" abstract="0" documentation="" name="FilesListView" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="940" type="" abstract="0" documentation="" name="FilesListView" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="941" value="" type="QString" abstract="0" documentation="" name="dir" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="942" value="" type="QStringList" abstract="0" documentation="" name="topList" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="943" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="941" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dir" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="942" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="topList" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="943" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="944" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="945" type="virtual QString" abstract="0" documentation="" name="currentFileName" static="0" scope="202" />
     <UML:Operation stereotype="" package="" xmi.id="946" type="void" abstract="0" documentation="" name="loadDir" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="947" value="" type="QString" abstract="0" documentation="" name="path" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="947" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="path" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="948" type="virtual void" abstract="0" documentation="" name="slotReload" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="949" type="" abstract="0" documentation="" name="~FilesListView" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="938" value="" type="QString" abstract="0" documentation="" name="dir" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="939" value="" type="QStringList" abstract="0" documentation="" name="dirList" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="938" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dir" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="939" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="dirList" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="950" abstract="0" documentation="An extended KListViewItem for folders." name="FilesTreeFolder" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="955" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="956" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="957" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="956" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="957" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="958" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="959" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="960" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="960" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="961" value="" type="const QString &amp;" abstract="0" documentation="" name="p_name" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="962" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
     </UML:Operation>
@@ -1117,24 +1117,24 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="976" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="977" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="978" type="QString" abstract="0" documentation="" name="text" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="978" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="979" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="980" type="virtual " abstract="0" documentation="" name="~FilesTreeFolder" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="951" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="952" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="parentFolder" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="953" value="" type="FilesTreeView *" abstract="0" documentation="" name="parentView" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="951" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="952" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="tqparentFolder" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="953" value="" type="FilesTreeView *" abstract="0" documentation="" name="tqparentView" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="954" value="" type="KURL" abstract="0" documentation="" name="url" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="981" abstract="0" documentation="An extended KLIstViewItem for files." name="FilesTreeFile" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="984" type="" abstract="0" documentation="" name="FilesTreeFile" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="985" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="986" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="985" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="986" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="987" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="988" type="" abstract="0" documentation="" name="FilesTreeFile" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="989" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="990" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="989" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="990" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="991" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="992" type="void" abstract="0" documentation="" name="setDirIcon" static="0" scope="200" />
@@ -1151,59 +1151,59 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="999" abstract="0" documentation="" name="DocItem" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1002" type="" abstract="0" documentation="" name="DocItem" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1003" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1004" value="" type="QString" abstract="0" documentation="" name="_name" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1005" value="" type="QString" abstract="0" documentation="" name="_url" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1003" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1004" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1005" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_url" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1006" type="" abstract="0" documentation="" name="DocItem" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1007" value="" type="QListViewItem *" abstract="0" documentation="" name="parent" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1008" value="" type="QString" abstract="0" documentation="" name="_name" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1009" value="" type="QString" abstract="0" documentation="" name="_url" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1007" value="" type="QListViewItem *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1008" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1009" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_url" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="1010" type="QString" abstract="0" documentation="" name="text" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="1010" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1011" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1012" type="" abstract="0" documentation="" name="~DocItem" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="1000" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="1001" value="" type="QString" abstract="0" documentation="" name="url" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="1000" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="1001" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="url" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1013" abstract="0" documentation="" name="DocFolder" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1017" type="" abstract="0" documentation="" name="DocFolder" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1018" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1019" value="" type="QString" abstract="0" documentation="" name="_name" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1018" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1019" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1020" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1021" value="" type="QString" abstract="0" documentation="" name="basePath" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1021" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="basePath" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1022" type="" abstract="0" documentation="" name="DocFolder" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1023" value="" type="QListViewItem *" abstract="0" documentation="" name="parent" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1024" value="" type="QString" abstract="0" documentation="" name="_name" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1023" value="" type="QListViewItem *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1024" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1025" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1026" value="" type="QString" abstract="0" documentation="" name="basePath" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1026" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="basePath" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1027" type="void" abstract="0" documentation="" name="setOpen" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1028" value="" type="bool" abstract="0" documentation="" name="o" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1029" type="void" abstract="0" documentation="" name="setup" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="1030" type="QString" abstract="0" documentation="" name="text" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="1030" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1031" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1032" type="" abstract="0" documentation="" name="~DocFolder" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="1014" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="1014" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="1015" value="" type="bool" abstract="0" documentation="" name="topLevel" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="1016" value="" type="QString" abstract="0" documentation="" name="url" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="1016" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="url" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1033" abstract="0" documentation="" name="UploadTreeFolder" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1036" type="" abstract="0" documentation="" name="UploadTreeFolder" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1037" value="" type="const KURL &amp;" abstract="0" documentation="" name="a_url" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1038" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1038" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1039" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1040" type="" abstract="0" documentation="" name="UploadTreeFolder" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1041" value="" type="const KURL &amp;" abstract="0" documentation="" name="a_url" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1042" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1042" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1043" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="1044" type="QString" abstract="0" documentation="" name="fullName" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="1044" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fullName" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1045" type="virtual QString" abstract="0" documentation="" name="key" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1046" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1047" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" />
@@ -1212,26 +1212,26 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="1049" value="" type="bool" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1050" type="void" abstract="0" documentation="" name="setWhichPixmap" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1051" value="" type="QString" abstract="0" documentation="" name="pixmap" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1051" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="pixmap" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1052" type="void" abstract="0" documentation="" name="setup" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1053" type="KURL" abstract="0" documentation="" name="url" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1054" type="virtual " abstract="0" documentation="" name="~UploadTreeFolder" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="1034" value="" type="KURL" abstract="0" documentation="" name="m_url" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="1035" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="parentFolder" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="1035" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="tqparentFolder" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1055" abstract="0" documentation="Item for project folders." name="ProjectTreeFolder" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1059" type="" abstract="0" documentation="" name="ProjectTreeFolder" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1060" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1061" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1060" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1061" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1062" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1063" type="" abstract="0" documentation="" name="ProjectTreeFolder" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1064" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1064" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1065" value="" type="const QString &amp;" abstract="0" documentation="" name="name" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1066" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="1067" type="bool" abstract="0" documentation="" name="contains" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="1067" type="bool" abstract="0" documentation="" name="tqcontains" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1068" value="" type="const KURL &amp;" abstract="0" documentation="" name="url" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1069" type="void" abstract="0" documentation="" name="insertItem" static="0" scope="200" >
@@ -1251,38 +1251,38 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="1080" type="void" abstract="0" documentation="" name="setup" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1081" type="" abstract="0" documentation="" name="~ProjectTreeFolder" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="1056" value="" type="QPtrList" abstract="0" documentation="" name="filesTreeList" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="1057" value="" type="ProjectTreeView *" abstract="0" documentation="" name="parentView" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="1058" value="" type="QString" abstract="0" documentation="" name="path" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="1057" value="" type="ProjectTreeView *" abstract="0" documentation="" name="tqparentView" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="1058" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="path" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1082" abstract="0" documentation="Item for project files. It's different from a standard file as the project files are basically XML tag elements." name="ProjectTreeFile" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1084" type="" abstract="0" documentation="" name="ProjectTreeFile" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1085" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1086" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1085" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1086" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1087" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_url" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1088" type="" abstract="0" documentation="" name="~ProjectTreeFile" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="1083" value="" type="QString" abstract="0" documentation="" name="fname" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="1083" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fname" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1089" abstract="0" documentation="" name="DocTreeView" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1091" type="" abstract="0" documentation="" name="DocTreeView" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1092" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1092" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1093" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1094" type="QString *" abstract="0" documentation="" name="contextHelp" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1095" value="" type="QString" abstract="0" documentation="" name="keyword" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1095" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="keyword" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1096" type="" abstract="0" documentation="" name="~DocTreeView" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="1090" value="" type="QDict *" abstract="0" documentation="" name="contextHelpDict" static="0" scope="201" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1097" abstract="0" documentation="A tree view used to display a set of files/directories explicitly added to it. It is used in several dialogs, e.g in Project Upload dialog, Rescan Project dialog, add files/folders to project dialogs." name="UploadTreeView" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1098" type="" abstract="0" documentation="" name="UploadTreeView" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1099" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1099" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1100" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1101" type="UploadTreeFile *" abstract="0" documentation="" name="addItem" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1102" value="" type="const KURL &amp;" abstract="0" documentation="" name="a_url" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1103" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1104" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1103" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1104" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1105" type="int" abstract="0" documentation="" name="checkboxTree" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1106" value="" type="QListViewItem *" abstract="0" documentation="" name="it" static="0" scope="200" />
@@ -1308,7 +1308,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1120" type="UploadTreeFolder *" abstract="0" documentation="" name="printTree" static="0" scope="202" >
      <UML:Parameter stereotype="" package="" xmi.id="1121" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1122" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1122" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1123" type="virtual void" abstract="0" documentation="" name="selectAll" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1124" value="" type="bool" abstract="0" documentation="" name="select" static="0" scope="200" />
@@ -1319,7 +1319,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="1144" type="" abstract="0" documentation="" name="StructTreeView" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1145" value="" type="Parser *" abstract="0" documentation="" name="parser" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1146" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1147" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1147" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1148" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1149" type="void" abstract="0" documentation="" name="buildTree" static="0" scope="202" >
@@ -1347,7 +1347,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1166" type="" abstract="0" documentation="" name="~StructTreeView" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="1127" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="1128" value="" type="QStringList" abstract="0" documentation="" name="dtdList" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="1128" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdList" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="1129" value="" type="QPopupMenu *" abstract="0" documentation="" name="dtdMenu" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="1130" value="" type="bool" abstract="0" documentation="" name="followCursorFlag" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="1131" value="" type="int" abstract="0" documentation="" name="followCursorId" static="0" scope="201" />
@@ -1366,23 +1366,23 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1167" abstract="0" documentation="" name="UploadTreeFile" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1170" type="" abstract="0" documentation="" name="UploadTreeFile" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1171" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1171" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1172" value="" type="const KURL &amp;" abstract="0" documentation="" name="a_url" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1173" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1174" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1173" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1174" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1175" type="" abstract="0" documentation="" name="UploadTreeFile" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1176" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1176" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1177" value="" type="const KURL &amp;" abstract="0" documentation="" name="a_url" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1178" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1179" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1178" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1179" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1180" type="virtual QString" abstract="0" documentation="" name="key" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1181" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1182" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1183" type="void" abstract="0" documentation="" name="setWhichPixmap" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1184" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1184" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1185" type="KURL" abstract="0" documentation="" name="url" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1186" type="" abstract="0" documentation="" name="~UploadTreeFile" static="0" scope="200" />
@@ -1392,7 +1392,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    <UML:Class stereotype="" package="" xmi.id="1187" abstract="0" documentation="TreeView for templates. As the templates are standard directories, it inherits from FilesTreeView." name="TemplatesTreeView" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1195" type="" abstract="0" documentation="" name="TemplatesTreeView" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1196" value="" type="const KURL &amp;" abstract="0" documentation="" name="projectBaseURL" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1197" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1197" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1198" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1199" type="void" abstract="0" documentation="" name="contentsDropEvent" static="0" scope="202" >
@@ -1400,14 +1400,14 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1201" type="virtual QDragObject *" abstract="0" documentation="" name="dragObject" static="0" scope="202" />
     <UML:Operation stereotype="" package="" xmi.id="1202" type="void" abstract="0" documentation="" name="readDirInfo" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1203" value="" type="QString" abstract="0" documentation="" name="startDir" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1203" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="startDir" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1204" type="virtual void" abstract="0" documentation="" name="slotInsertTag" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1205" type="virtual void" abstract="0" documentation="" name="slotProperties" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1206" type="virtual void" abstract="0" documentation="" name="slotPropertiesApplied" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1207" type="virtual void" abstract="0" documentation="" name="slotReload" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1208" type="void" abstract="0" documentation="" name="writeDirInfo" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1209" value="" type="QString" abstract="0" documentation="" name="dirInfoFile" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1209" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dirInfoFile" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1210" type="" abstract="0" documentation="" name="~TemplatesTreeView" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="1188" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="201" />
@@ -1420,17 +1420,17 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1211" abstract="0" documentation="KListViewItem specific for the structure tree." name="StructTreeTag" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1213" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1214" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1214" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1215" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1216" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1217" value="" type="StructTreeTag *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1217" value="" type="StructTreeTag *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1218" value="" type="Node *" abstract="0" documentation="" name="a_node" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1219" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1220" value="" type="QListViewItem *" abstract="0" documentation="" name="after" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1221" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1222" value="" type="StructTreeTag *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1222" value="" type="StructTreeTag *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1223" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1224" type="" abstract="0" documentation="" name="~StructTreeTag" static="0" scope="200" />
@@ -1438,7 +1438,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1225" abstract="0" documentation="A project specific KListView." name="ProjectTreeView" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1231" type="" abstract="0" documentation="" name="ProjectTreeView" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1232" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1232" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1233" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1234" type="virtual KURL" abstract="0" documentation="" name="currentURL" static="0" scope="202" />
@@ -1454,16 +1454,16 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Attribute stereotype="" package="" xmi.id="1227" value="" type="int" abstract="0" documentation="" name="openInQuantaId" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="1228" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="projectDir" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="1229" value="" type="QPopupMenu *" abstract="0" documentation="" name="projectMenu" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="1230" value="" type="QString" abstract="0" documentation="" name="projectName" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="1230" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="projectName" static="0" scope="201" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1241" abstract="0" documentation="Extended FileManage to handle remote and local directory structures in a tree." name="FilesTreeView" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1242" type="" abstract="0" documentation="" name="FilesTreeView" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1243" value="" type="KURL :: List" abstract="0" documentation="" name="topList" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1244" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1244" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1245" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1246" type="" abstract="0" documentation="" name="FilesTreeView" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1247" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1247" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1248" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1249" type="void" abstract="0" documentation="" name="addFileInfoPage" static="0" scope="202" >
@@ -1494,7 +1494,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    <UML:Class stereotype="" package="" xmi.id="1267" abstract="0" documentation="A treeview which has some common file managing methods. It inherits from KListView." name="FileManage" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1272" type="" abstract="0" documentation="" name="FileManage" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1273" type="" abstract="0" documentation="" name="FileManage" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1274" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1274" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1275" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1276" type="virtual KURL" abstract="0" documentation="" name="currentURL" static="0" scope="202" />
@@ -1537,7 +1537,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="1326" type="" abstract="0" documentation="" name="ProjectUpload" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1327" value="" type="Project *" abstract="0" documentation="" name="p" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1328" value="" type="const KURL &amp;" abstract="0" documentation="" name="url" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1329" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1329" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1330" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1331" value="" type="bool" abstract="0" documentation="" name="modal" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1332" value="" type="WFlags" abstract="0" documentation="" name="fl" static="0" scope="200" />
@@ -1561,7 +1561,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1340" abstract="0" documentation="Create a new project from kio accessible files and folders." name="ProjectNewLocal" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1342" type="" abstract="0" documentation="" name="ProjectNewLocal" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1343" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1343" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1344" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1345" type="virtual void" abstract="0" documentation="" name="resizeEvent" static="0" scope="200" >
@@ -1574,7 +1574,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="1351" type="" abstract="0" documentation="" name="RescanPrj" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1352" value="" type="KURL :: List" abstract="0" documentation="" name="p_prjFileList" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1353" value="" type="const KURL &amp;" abstract="0" documentation="" name="p_baseURL" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1354" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1354" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1355" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1356" value="" type="bool" abstract="0" documentation="" name="modal" static="0" scope="200" />
     </UML:Operation>
@@ -1587,7 +1587,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1360" abstract="0" documentation="" name="ProjectNewFinal" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1361" type="" abstract="0" documentation="" name="ProjectNewFinal" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1362" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1362" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1363" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1364" type="void" abstract="0" documentation="" name="setMargin" static="0" scope="200" >
@@ -1597,7 +1597,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1367" abstract="0" documentation="Create a new project with the help of wget." name="ProjectNewWeb" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1372" type="" abstract="0" documentation="" name="ProjectNewWeb" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1373" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1373" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1374" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1375" type="virtual void" abstract="0" documentation="" name="resizeEvent" static="0" scope="200" >
@@ -1605,19 +1605,19 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1377" type="" abstract="0" documentation="" name="~ProjectNewWeb" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="1368" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="1369" value="" type="QStringList" abstract="0" documentation="" name="filesList" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="1369" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="filesList" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="1370" value="" type="KProcess *" abstract="0" documentation="" name="proc" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="1371" value="" type="bool" abstract="0" documentation="" name="start" static="0" scope="201" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1378" abstract="0" documentation="" name="ProjectNewGeneral" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1379" type="" abstract="0" documentation="" name="ProjectNewGeneral" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1380" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1380" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1381" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1382" type="void" abstract="0" documentation="" name="setMargin" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1383" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="1384" type="QString" abstract="0" documentation="" name="type" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="1384" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="type" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1385" type="" abstract="0" documentation="" name="~ProjectNewGeneral" static="0" scope="200" />
    </UML:Class>
    <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1378" roleb="307" multia="" multib="" package="" xmi.id="1386" abstract="0" documentation="" name="" static="0" scope="200" namea="" />
@@ -1626,21 +1626,21 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1318" roleb="307" multia="" multib="" package="" xmi.id="1389" abstract="0" documentation="" name="" static="0" scope="200" namea="" />
    <UML:Class stereotype="" package="" xmi.id="1390" abstract="0" documentation="" name="CSSSelectorEditor" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1391" type="" abstract="0" documentation="" name="CSSSelectorEditor" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1392" value="" type="QString" abstract="0" documentation="" name="code" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1392" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="code" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1393" value="" type="bool" abstract="0" documentation="" name="editSelector" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1394" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1394" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1395" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="1396" type="QString" abstract="0" documentation="" name="code" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="1396" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="code" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1397" type="void" abstract="0" documentation="" name="splitValueTRBL" static="0" scope="202" >
-     <UML:Parameter stereotype="" package="" xmi.id="1398" value="" type="QString" abstract="0" documentation="" name="value" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1398" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="value" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1399" value="" type="QString &amp;" abstract="0" documentation="" name="" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1400" value="" type="QString &amp;" abstract="0" documentation="" name="" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1401" value="" type="QString &amp;" abstract="0" documentation="" name="" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1402" value="" type="QString &amp;" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1403" type="void" abstract="0" documentation="" name="widgetFromCode" static="0" scope="202" >
-     <UML:Parameter stereotype="" package="" xmi.id="1404" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1404" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1405" type="" abstract="0" documentation="" name="~CSSSelectorEditor" static="0" scope="200" />
    </UML:Class>
@@ -1648,7 +1648,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    <UML:Class stereotype="" package="" xmi.id="1407" abstract="0" documentation="" name="TagDialog" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1415" type="" abstract="0" documentation="" name="TagDialog" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1416" value="" type="QTag *" abstract="0" documentation="" name="dtdTag" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1417" value="" type="QString" abstract="0" documentation="" name="attrs" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1417" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attrs" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1418" value="" type="KURL" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1419" type="" abstract="0" documentation="" name="TagDialog" static="0" scope="200" >
@@ -1657,10 +1657,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="1422" value="" type="KURL" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1423" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="1424" type="QString" abstract="0" documentation="" name="getAttribute" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1425" value="" type="QString" abstract="0" documentation="" name="attr" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="1424" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getAttribute" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1425" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attr" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="1426" type="QString" abstract="0" documentation="" name="getAttributeString" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="1426" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getAttributeString" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1427" type="QDict *" abstract="0" documentation="" name="getAttributes" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1428" type="void" abstract="0" documentation="" name="init" static="0" scope="202" >
      <UML:Parameter stereotype="" package="" xmi.id="1429" value="" type="QTag *" abstract="0" documentation="" name="dtdTag" static="0" scope="200" />
@@ -1675,7 +1675,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="1436" value="" type="bool" abstract="0" documentation="" name="insertInLine" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1437" type="void" abstract="0" documentation="" name="parseAttributes" static="0" scope="202" >
-     <UML:Parameter stereotype="" package="" xmi.id="1438" value="" type="QString" abstract="0" documentation="" name="attrs" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1438" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attrs" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1439" type="void" abstract="0" documentation="" name="parseTag" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1440" type="" abstract="0" documentation="" name="~TagDialog" static="0" scope="200" />
@@ -1690,7 +1690,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1407" roleb="307" multia="" multib="" package="" xmi.id="1441" abstract="0" documentation="" name="" static="0" scope="200" namea="" />
    <UML:Class stereotype="" package="" xmi.id="1442" abstract="0" documentation="" name="TagImgDlg" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1465" type="" abstract="0" documentation="" name="TagImgDlg" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1466" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1466" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1467" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1468" type="void" abstract="0" documentation="" name="initDialog" static="0" scope="200" />
@@ -1721,7 +1721,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    <UML:Class stereotype="" package="" xmi.id="1470" abstract="0" documentation="" name="TagQuickTable" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1472" type="" abstract="0" documentation="" name="TagQuickTable" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1473" value="" type="Document *" abstract="0" documentation="" name="write" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1474" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1474" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1475" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1476" type="" abstract="0" documentation="" name="~TagQuickTable" static="0" scope="200" />
@@ -1755,8 +1755,8 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Attribute stereotype="" package="" xmi.id="1481" value="" type="bool" abstract="0" documentation="" name="firstOutput" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="1482" value="" type="QuantaView *" abstract="0" documentation="" name="m_view" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="1483" value="" type="KProcess *" abstract="0" documentation="" name="proc" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="1484" value="" type="QString" abstract="0" documentation="" name="scriptErrorDest" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="1485" value="" type="QString" abstract="0" documentation="" name="scriptOutputDest" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="1484" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptErrorDest" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="1485" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptOutputDest" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="1486" value="" type="QDomElement" abstract="0" documentation="" name="tag" static="0" scope="201" />
    </UML:Class>
    <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1479" roleb="307" multia="" multib="" package="" xmi.id="1504" abstract="0" documentation="" name="" static="0" scope="200" namea="" />
@@ -1769,7 +1769,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    <UML:Class stereotype="" package="" xmi.id="1512" abstract="0" documentation="" name="CopyTo" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1515" type="" abstract="0" documentation="" name="CopyTo" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1516" value="" type="const KURL &amp;" abstract="0" documentation="" name="dirURL" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1517" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1517" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1518" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1519" type="KURL" abstract="0" documentation="" name="copy" static="0" scope="200" >
@@ -1790,7 +1790,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    <UML:Class stereotype="" package="" xmi.id="1530" abstract="0" documentation="" name="TagQuickStart" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1532" type="" abstract="0" documentation="" name="TagQuickStart" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1533" value="" type="const KURL &amp;" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1534" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1534" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1535" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1536" type="" abstract="0" documentation="" name="~TagQuickStart" static="0" scope="200" />
@@ -1798,12 +1798,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="1537" abstract="0" documentation="" name="FileCombo" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1542" type="" abstract="0" documentation="" name="FileCombo" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1543" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1543" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1544" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1545" type="" abstract="0" documentation="" name="FileCombo" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1546" value="" type="const KURL &amp;" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="1547" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1547" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1548" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1549" type="void" abstract="0" documentation="" name="setBaseURL" static="0" scope="200" >
@@ -1813,9 +1813,9 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="1552" value="" type="bool" abstract="0" documentation="" name="absolutePath" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1553" type="void" abstract="0" documentation="" name="setText" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1554" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="1554" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="1555" type="QString" abstract="0" documentation="" name="text" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="1555" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1556" type="" abstract="0" documentation="" name="~FileCombo" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="1538" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="1539" value="" type="QPushButton *" abstract="0" documentation="" name="button" static="0" scope="202" />
@@ -2506,7 +2506,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
       <listitem open="0" type="814" id="408" label="baseURL" />
       <listitem open="0" type="814" id="409" label="busy" />
       <listitem open="0" type="815" id="434" label="changeTag" />
-      <listitem open="0" type="815" id="437" label="checkDirtyStatus" />
+      <listitem open="0" type="815" id="437" label="checkDirtytqStatus" />
       <listitem open="0" type="815" id="438" label="checkOverwrite" />
       <listitem open="0" type="815" id="440" label="clearTempFile" />
       <listitem open="0" type="815" id="441" label="closeTempFile" />
@@ -2519,9 +2519,9 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
       <listitem open="0" type="815" id="448" label="dirty" />
       <listitem open="0" type="814" id="411" label="dtdName" />
       <listitem open="0" type="815" id="449" label="evenQuotes" />
-      <listitem open="0" type="815" id="451" label="find" />
+      <listitem open="0" type="815" id="451" label="tqfind" />
       <listitem open="0" type="815" id="459" label="findDTDName" />
-      <listitem open="0" type="815" id="461" label="findRev" />
+      <listitem open="0" type="815" id="461" label="tqfindRev" />
       <listitem open="0" type="815" id="469" label="findWordRev" />
       <listitem open="0" type="815" id="471" label="findXMLTag" />
       <listitem open="0" type="815" id="476" label="getAttributeCompletions" />
@@ -2555,7 +2555,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
       <listitem open="0" type="815" id="524" label="scriptCodeCompletion" />
       <listitem open="0" type="815" id="528" label="selectText" />
       <listitem open="0" type="815" id="533" label="setDTDIdentifier" />
-      <listitem open="0" type="815" id="535" label="setDirtyStatus" />
+      <listitem open="0" type="815" id="535" label="setDirtytqStatus" />
       <listitem open="0" type="815" id="537" label="setModified" />
       <listitem open="0" type="815" id="539" label="setParsingDTD" />
       <listitem open="0" type="815" id="541" label="setUntitledUrl" />
@@ -2637,8 +2637,8 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
       <listitem open="0" type="815" id="968" label="init" />
       <listitem open="0" type="815" id="969" label="key" />
       <listitem open="0" type="814" id="951" label="name" />
-      <listitem open="0" type="814" id="952" label="parentFolder" />
-      <listitem open="0" type="814" id="953" label="parentView" />
+      <listitem open="0" type="814" id="952" label="tqparentFolder" />
+      <listitem open="0" type="814" id="953" label="tqparentView" />
       <listitem open="0" type="815" id="972" label="setOpen" />
       <listitem open="0" type="815" id="974" label="setup" />
       <listitem open="0" type="815" id="975" label="sortChildItems" />
@@ -2689,7 +2689,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
       <listitem open="0" type="814" id="576" label="listItem" />
       <listitem open="0" type="814" id="577" label="next" />
       <listitem open="0" type="814" id="578" label="opened" />
-      <listitem open="0" type="814" id="579" label="parent" />
+      <listitem open="0" type="814" id="579" label="tqparent" />
       <listitem open="0" type="814" id="580" label="prev" />
       <listitem open="0" type="814" id="581" label="removeAll" />
       <listitem open="0" type="814" id="582" label="tag" />
@@ -2803,11 +2803,11 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <listitem open="0" type="813" id="1055" label="ProjectTreeFolder" >
       <listitem open="0" type="815" id="1063" label="ProjectTreeFolder" />
       <listitem open="0" type="815" id="1059" label="ProjectTreeFolder" />
-      <listitem open="0" type="815" id="1067" label="contains" />
+      <listitem open="0" type="815" id="1067" label="tqcontains" />
       <listitem open="0" type="814" id="1056" label="filesTreeList" />
       <listitem open="0" type="815" id="1069" label="insertItem" />
       <listitem open="0" type="815" id="1072" label="paintCell" />
-      <listitem open="0" type="814" id="1057" label="parentView" />
+      <listitem open="0" type="814" id="1057" label="tqparentView" />
       <listitem open="0" type="814" id="1058" label="path" />
       <listitem open="0" type="815" id="1078" label="setOpen" />
       <listitem open="0" type="815" id="1080" label="setup" />
@@ -2875,7 +2875,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
       <listitem open="0" type="814" id="661" label="m_fileName" />
       <listitem open="0" type="815" id="685" label="name" />
       <listitem open="0" type="814" id="662" label="optional" />
-      <listitem open="0" type="814" id="663" label="parentDTD" />
+      <listitem open="0" type="814" id="663" label="tqparentDTD" />
       <listitem open="0" type="814" id="664" label="returnType" />
       <listitem open="0" type="815" id="686" label="setFileName" />
       <listitem open="0" type="815" id="688" label="setName" />
@@ -3395,7 +3395,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
       <listitem open="0" type="815" id="1044" label="fullName" />
       <listitem open="0" type="815" id="1045" label="key" />
       <listitem open="0" type="814" id="1034" label="m_url" />
-      <listitem open="0" type="814" id="1035" label="parentFolder" />
+      <listitem open="0" type="814" id="1035" label="tqparentFolder" />
       <listitem open="0" type="815" id="1048" label="setOpen" />
       <listitem open="0" type="815" id="1050" label="setWhichPixmap" />
       <listitem open="0" type="815" id="1052" label="setup" />
diff --git a/quanta/scripts/TemplateMagic.pl b/quanta/scripts/TemplateMagic.pl
index 40b3b2d1..261cd791 100644
--- a/quanta/scripts/TemplateMagic.pl
+++ b/quanta/scripts/TemplateMagic.pl
@@ -217,7 +217,7 @@ print OFH <<E
           </property>
       </widget>
   </widget>
-  <layoutdefaults spacing="6" margin="11"/>
+  <tqlayoutdefaults spacing="6" margin="11"/>
   </UI>
 
 E
@@ -228,7 +228,7 @@ sub createUI() {
 =pod
 Structure for label widget: height is 20
 
-    <widget class="QLabel">
+    <widget class=TQLABEL_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>TextLabel2_2</cstring>
         </property>
@@ -292,7 +292,7 @@ Structure for a text widget: height is 30
   for $k (0..$#OrderedVars) {
     $Layouts{$OrderedVars[$k][0]}{y}=$y_loc;
     print OFH <<E
-    <widget class="QLabel">
+    <widget class=TQLABEL_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>LBL_$OrderedVars[$k][0]</cstring>
         </property>
diff --git a/quanta/scripts/checkxml.kmdr b/quanta/scripts/checkxml.kmdr
index 4e83a9f6..27853adf 100755
--- a/quanta/scripts/checkxml.kmdr
+++ b/quanta/scripts/checkxml.kmdr
@@ -34,7 +34,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>Layout26</cstring>
             </property>
@@ -48,7 +48,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="1" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
                     <property name="name">
                         <cstring>Layout7</cstring>
                     </property>
@@ -72,7 +72,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -162,7 +162,7 @@ checkXML index.docbook 2&gt;&amp;1</string>
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
+                        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0" rowspan="1" colspan="3">
                             <property name="name">
                                 <cstring>Layout10</cstring>
                             </property>
@@ -207,7 +207,7 @@ checkXML index.docbook 2&gt;&amp;1</string>
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>30</width>
                                             <height>0</height>
@@ -216,7 +216,7 @@ checkXML index.docbook 2&gt;&amp;1</string>
                                 </spacer>
                             </hbox>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0">
                             <property name="name">
                                 <cstring>TextLabel3</cstring>
                             </property>
@@ -237,7 +237,7 @@ checkXML index.docbook 2&gt;&amp;1</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>89</width>
                                     <height>0</height>
@@ -282,5 +282,5 @@ checkXML index.docbook 2&gt;&amp;1</string>
     <tabstop>ExecButton2</tabstop>
     <tabstop>CloseButton1</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/docbook_table.kmdr b/quanta/scripts/docbook_table.kmdr
index 69778134..b8f30a4e 100755
--- a/quanta/scripts/docbook_table.kmdr
+++ b/quanta/scripts/docbook_table.kmdr
@@ -27,7 +27,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>TextLabel1_2</cstring>
             </property>
@@ -40,7 +40,7 @@
             <property name="text">
                 <string>DocBook Table</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -80,7 +80,7 @@ echo '&lt;/table&gt;'
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="3" column="0">
+                <widget class=TQLABEL_OBJECT_NAME_STRING row="3" column="0">
                     <property name="name">
                         <cstring>TextLabel4</cstring>
                     </property>
@@ -108,7 +108,7 @@ echo '&lt;/table&gt;'
                         </stringlist>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2">
+                <widget class=TQLABEL_OBJECT_NAME_STRING row="4" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>TextLabel5</cstring>
                     </property>
@@ -116,7 +116,7 @@ echo '&lt;/table&gt;'
                         <string>Description:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -147,7 +147,7 @@ done
                         </stringlist>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
+                <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -246,5 +246,5 @@ echo '   &lt;/thead&gt;';</string>
     <tabstop>CloseButton1</tabstop>
     <tabstop>CloseButton1_2</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/dwt.kmdr b/quanta/scripts/dwt.kmdr
index 1fab1576..94eb7fbf 100755
--- a/quanta/scripts/dwt.kmdr
+++ b/quanta/scripts/dwt.kmdr
@@ -52,7 +52,7 @@
             <property name="name">
                 <cstring>tabMain</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -69,7 +69,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
                         <property name="name">
                             <cstring>lblProject</cstring>
                         </property>
@@ -98,7 +98,7 @@
                             </stringlist>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="2" column="0">
                         <property name="name">
                             <cstring>lblScript</cstring>
                         </property>
@@ -126,7 +126,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>0</width>
                                 <height>80</height>
@@ -135,7 +135,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -152,7 +152,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
                         <property name="name">
                             <cstring>txtHelp</cstring>
                         </property>
@@ -162,7 +162,7 @@
                         <property name="textFormat">
                             <enum>AutoText</enum>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>WordBreak|AlignTop|AlignLeft</set>
                         </property>
                     </widget>
@@ -179,7 +179,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>225</width>
                     <height>0</height>
@@ -188,5 +188,5 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/dwt.pl b/quanta/scripts/dwt.pl
index af823663..03a126ac 100644
--- a/quanta/scripts/dwt.pl
+++ b/quanta/scripts/dwt.pl
@@ -228,13 +228,13 @@ sub RemoveHtmlTags() {
     $p1=$p1+6;
     $templatesource=substr($templatesource,$p1);
   } else {
-    print "WARNING: Could not find <head> tag in template $templatename";
+    print "WARNING: Could not tqfind <head> tag in template $templatename";
   }
   $p1=index($templatesource,"</body>"); 
   if ($p1>=0) {
     $templatesource=substr($templatesource,0,$p1);
   } else {
-    print "WARNING: Could not find </body> tag in template $templatename";
+    print "WARNING: Could not tqfind </body> tag in template $templatename";
   }
   return $templatesource;
 }
@@ -252,13 +252,13 @@ sub AddHtmlTags() {
     $p1=$p1+6;
     $hstart=substr($source,0,$p1);
   } else {
-    print "WARNING: Could not find <head> tag in $filename";
+    print "WARNING: Could not tqfind <head> tag in $filename";
   }
   $p1=index($source,"</body>"); 
   if ($p1>=0) {
     $hend=substr($source,$p1);
   } else {
-    print "WARNING: Could not find </body> tag in $filename";
+    print "WARNING: Could not tqfind </body> tag in $filename";
   }
   return "$hstart$templatesource$hend"; 
 }
diff --git a/quanta/scripts/gubed_install.kmdr b/quanta/scripts/gubed_install.kmdr
index c362fabf..c0bdbf01 100755
--- a/quanta/scripts/gubed_install.kmdr
+++ b/quanta/scripts/gubed_install.kmdr
@@ -54,7 +54,7 @@
         <property name="sizeType">
             <enum>Expanding</enum>
         </property>
-        <property name="sizeHint">
+        <property name="tqsizeHint">
             <size>
                 <width>332</width>
                 <height>0</height>
@@ -79,7 +79,7 @@
         <property name="sizeType">
             <enum>Expanding</enum>
         </property>
-        <property name="sizeHint">
+        <property name="tqsizeHint">
             <size>
                 <width>0</width>
                 <height>175</height>
@@ -94,7 +94,7 @@
             </rect>
         </property>
     </spacer>
-    <widget class="QLayoutWidget">
+    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
         <property name="name">
             <cstring>Layout5</cstring>
         </property>
@@ -116,7 +116,7 @@
             <property name="spacing">
                 <number>6</number>
             </property>
-            <widget class="QLabel" row="1" column="0">
+            <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0">
                 <property name="name">
                     <cstring>TextLabel2</cstring>
                 </property>
@@ -124,7 +124,7 @@
                     <string>Target directory:</string>
                 </property>
             </widget>
-            <widget class="QLabel" row="0" column="0">
+            <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
                 <property name="name">
                     <cstring>TextLabel1</cstring>
                 </property>
@@ -276,12 +276,12 @@ fi
 echo "Cleaning up..."
 rm /tmp/gubed-install-log
 cd /tmp/gubed-install
-find . | xargs rm -f &gt; /dev/null
+tqfind . | xargs rm -f &gt; /dev/null
 cd /tmp/gubed-install
 cd $dirName
 rm -f "docs/Theory of operation" &gt; /dev/null
 cd /tmp/gubed-install
-find . | xargs rmdir -p &gt; /dev/null
+tqfind . | xargs rmdir -p &gt; /dev/null
 rmdir /tmp/gubed-install &gt; /dev/null
 </string>
             </stringlist>
@@ -291,5 +291,5 @@ rmdir /tmp/gubed-install &gt; /dev/null
         </property>
     </widget>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/htmlquickstart.kmdr b/quanta/scripts/htmlquickstart.kmdr
index a182dcd4..66dd808b 100755
--- a/quanta/scripts/htmlquickstart.kmdr
+++ b/quanta/scripts/htmlquickstart.kmdr
@@ -30,14 +30,14 @@
         <stringlist>
             <string></string>
             <string>@execBegin
-quanta=`dcop quanta-@parentPid`
+quanta=`dcop quanta-@tqparentPid`
 if [ -z "$quanta" ]; then
     quanta=`dcop quanta`
     if [ ! -z "$quanta" ]; then
        quantadcop=quanta
     fi
 else
-    quantadcop=quanta-@parentPid
+    quantadcop=quanta-@tqparentPid
 fi
 
 if [ ! -z "$quantadcop" ]; then
@@ -61,7 +61,7 @@ fi
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4">
+        <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -75,7 +75,7 @@ fi
             <property name="text">
                 <string>Quanta Plus Kommander Quick Start</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -89,7 +89,7 @@ fi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>33</width>
                     <height>0</height>
@@ -108,7 +108,7 @@ fi
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -161,14 +161,14 @@ echo '@CBPHPFooter'
 echo '&lt;/body&gt;'
 echo '&lt;/html&gt;'
 
-quanta=`dcop quanta-@parentPid`
+quanta=`dcop quanta-@tqparentPid`
 if [ -z "$quanta" ]; then
     quanta=`dcop quanta`
     if [ ! -z "$quanta" ]; then
        quantadcop=quanta
     fi
 else
-    quantadcop=quanta-@parentPid
+    quantadcop=quanta-@tqparentPid
 fi
 
 if [ ! -z "$quantadcop" ]; then
@@ -186,7 +186,7 @@ fi</string>
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1_2</cstring>
                     </property>
@@ -815,7 +815,7 @@ echo "\"$TAGEND"</string>
                                 </stringlist>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
                             <property name="name">
                                 <cstring>TextLabel2</cstring>
                             </property>
@@ -983,5 +983,5 @@ echo "$PADDING&lt;/script&gt;"</string>
     <tabstop>CloseButton1</tabstop>
     <tabstop>CloseButton1_2</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/listwizard.kmdr b/quanta/scripts/listwizard.kmdr
index 818a1b92..edd5ec00 100755
--- a/quanta/scripts/listwizard.kmdr
+++ b/quanta/scripts/listwizard.kmdr
@@ -34,7 +34,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0">
             <property name="name">
                 <cstring>Layout12</cstring>
             </property>
@@ -58,7 +58,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>296</width>
                             <height>0</height>
@@ -150,7 +150,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
                     <property name="name">
                         <cstring>Layout7</cstring>
                     </property>
@@ -183,7 +183,7 @@
                                 <string>Select or enter in this spin box the number of list entries or steps that should be created by the wizard. After using the wizard, you can add (or remove) more entries or steps manually.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
                             <property name="name">
                                 <cstring>TextLabel2</cstring>
                             </property>
@@ -198,7 +198,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1_2_2</cstring>
             </property>
@@ -217,7 +217,7 @@ Select the list type:
 &lt;/ul&gt;
 &lt;/qt&gt;</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignJustify|AlignTop</set>
             </property>
         </widget>
@@ -437,5 +437,5 @@ Here is one example of a variablelist:
     <tabstop>CloseButton1_2</tabstop>
     <tabstop>ItemizedOption</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/meinproc.kmdr b/quanta/scripts/meinproc.kmdr
index c931e426..d0c90a6a 100755
--- a/quanta/scripts/meinproc.kmdr
+++ b/quanta/scripts/meinproc.kmdr
@@ -95,7 +95,7 @@ fi</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>292</width>
                     <height>0</height>
@@ -124,7 +124,7 @@ fi</string>
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
                     <property name="name">
                         <cstring>Layout10</cstring>
                     </property>
@@ -172,7 +172,7 @@ fi</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -181,7 +181,7 @@ fi</string>
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
                     <property name="name">
                         <cstring>Layout4</cstring>
                     </property>
@@ -195,7 +195,7 @@ fi</string>
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING>
                             <property name="name">
                                 <cstring>TextLabel3</cstring>
                             </property>
@@ -216,7 +216,7 @@ fi</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -280,5 +280,5 @@ fi</string>
     <tabstop>ExecButton2</tabstop>
     <tabstop>CloseButton1</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/picturewizard.kmdr b/quanta/scripts/picturewizard.kmdr
index 95d488f1..414e0476 100755
--- a/quanta/scripts/picturewizard.kmdr
+++ b/quanta/scripts/picturewizard.kmdr
@@ -34,7 +34,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0">
             <property name="name">
                 <cstring>Layout12</cstring>
             </property>
@@ -58,7 +58,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>342</width>
                             <height>0</height>
@@ -125,7 +125,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1_2_2</cstring>
             </property>
@@ -143,7 +143,7 @@ Select the type of markup appropriated to wrap your image:
 &lt;/ul&gt;
 &lt;/qt&gt;</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignJustify|AlignTop</set>
             </property>
         </widget>
@@ -286,7 +286,7 @@ echo '&lt;/inlinemediaobject&gt;'</string>
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
@@ -498,7 +498,7 @@ echo '&lt;/inlinemediaobject&gt;'</string>
                                 <string>Enter the description of the image here. For instance, a screenshot of a configuration dialog should be described as "Configuration dialog.". This text will be used as caption text if the box below is checked.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING row="2" column="0">
                             <property name="name">
                                 <cstring>TextLabel2_2_2</cstring>
                             </property>
@@ -509,7 +509,7 @@ echo '&lt;/inlinemediaobject&gt;'</string>
                                 <string>Select the image format here.  The image format is usually reflects the file extension of your image file (.png corresponds to PNG in the drop down, .jpg corresponds to JPG, etc.).</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0">
                             <property name="name">
                                 <cstring>TextLabel2_2</cstring>
                             </property>
@@ -536,7 +536,7 @@ echo '&lt;/inlinemediaobject&gt;'</string>
                                 <string>Enter the file name of the image here, including the extension (.png, .jpg, etc.). Enter only the file name, not the location (path) of the image file. The image files should be located in the same folder as the DocBook sources.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
                             <property name="name">
                                 <cstring>TextLabel2</cstring>
                             </property>
@@ -583,5 +583,5 @@ echo '&lt;/inlinemediaobject&gt;'</string>
     <tabstop>CloseButton1_2</tabstop>
     <tabstop>MediaOption</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/scriptinfo.kmdr b/quanta/scripts/scriptinfo.kmdr
index c225a132..f84682e7 100755
--- a/quanta/scripts/scriptinfo.kmdr
+++ b/quanta/scripts/scriptinfo.kmdr
@@ -29,7 +29,7 @@
             <property name="name">
                 <cstring>TabWidget1</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -46,7 +46,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>TextLabel1_3</cstring>
                         </property>
@@ -61,7 +61,7 @@
                             <string>Please fill in all fields</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0">
                         <property name="name">
                             <cstring>TextLabel1</cstring>
                         </property>
@@ -90,7 +90,7 @@
                             <string>Enter the script name with the extension</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="8" column="0">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="8" column="0">
                         <property name="name">
                             <cstring>TextLabel5</cstring>
                         </property>
@@ -127,7 +127,7 @@
                             <string>The location of your up-to-date file on the web</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="0">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="3" column="0">
                         <property name="name">
                             <cstring>TextLabel2</cstring>
                         </property>
@@ -135,7 +135,7 @@
                             <string>Script author:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="7" column="0">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="7" column="0">
                         <property name="name">
                             <cstring>TextLabel4</cstring>
                         </property>
@@ -200,7 +200,7 @@
                             <string>If other include in about</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="2" column="0">
                         <property name="name">
                             <cstring>TextLabel1_4</cstring>
                         </property>
@@ -208,7 +208,7 @@
                             <string>Editor/Executor:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="4" column="0">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="4" column="0">
                         <property name="name">
                             <cstring>TextLabel3</cstring>
                         </property>
@@ -216,7 +216,7 @@
                             <string>Author email:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="5" column="0">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="5" column="0">
                         <property name="name">
                             <cstring>TextLabel1_2</cstring>
                         </property>
@@ -224,7 +224,7 @@
                             <string>Web address:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="6" column="0">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="6" column="0">
                         <property name="name">
                             <cstring>TextLabel2_2</cstring>
                         </property>
@@ -344,7 +344,7 @@
                             <string>Optional: External program executor</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="9" column="0">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="9" column="0">
                         <property name="name">
                             <cstring>TextLabel6</cstring>
                         </property>
@@ -397,7 +397,7 @@ $options&lt;name&gt;@Name&lt;/name&gt;
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -450,5 +450,5 @@ $options&lt;name&gt;@Name&lt;/name&gt;
     <tabstop>TabWidget1</tabstop>
     <tabstop>TextEdit3</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/tablewizard.kmdr b/quanta/scripts/tablewizard.kmdr
index 6f78c3c8..b3fb3ddb 100755
--- a/quanta/scripts/tablewizard.kmdr
+++ b/quanta/scripts/tablewizard.kmdr
@@ -27,7 +27,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0">
             <property name="name">
                 <cstring>Layout10</cstring>
             </property>
@@ -108,7 +108,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>141</width>
                             <height>0</height>
@@ -142,7 +142,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
                     <property name="name">
                         <cstring>Layout12</cstring>
                     </property>
@@ -156,7 +156,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>ColumnLabel</cstring>
                             </property>
@@ -167,7 +167,7 @@
                                 <string>Select or enter in this spin box the number of columns that should be created by the wizard.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING row="2" column="0">
                             <property name="name">
                                 <cstring>TableIdLabel</cstring>
                             </property>
@@ -243,7 +243,7 @@ done;
                                 <string>Select or enter in this spin box the number of rows that should be created by the wizard. After using the wizard, you can add (or remove) more rows. To add more rows,  add the same number of &lt;entry&gt; tags per &lt;row&gt; tag as in the rest of the table.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>LinesLabel</cstring>
                             </property>
@@ -254,7 +254,7 @@ done;
                                 <string>Select or enter in this spin box the number of rows that should be created by the wizard. After using the wizard, you can add (or remove) more rows. To add more rows,  add the same number of &lt;entry&gt; tags per &lt;row&gt; tag as in the rest of the table.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING row="3" column="0">
                             <property name="name">
                                 <cstring>TableTitleLabel5</cstring>
                             </property>
@@ -391,7 +391,7 @@ echo '&lt;/informaltable&gt;'</string>
                 </widget>
             </grid>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>TableTypeLabel</cstring>
             </property>
@@ -408,7 +408,7 @@ Select the table type:
 &lt;/ul&gt;
 &lt;/qt&gt;</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignJustify|AlignTop</set>
             </property>
         </widget>
@@ -445,5 +445,5 @@ Select the table type:
     <tabstop>OKButton</tabstop>
     <tabstop>CloseButton1_2</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/tidy.kmdr b/quanta/scripts/tidy.kmdr
index 4682470d..c01e75b7 100755
--- a/quanta/scripts/tidy.kmdr
+++ b/quanta/scripts/tidy.kmdr
@@ -29,7 +29,7 @@
             <property name="name">
                 <cstring>TabWidget1</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -63,7 +63,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0">
                                 <property name="name">
                                     <cstring>TextLabel4</cstring>
                                 </property>
@@ -108,7 +108,7 @@ instances of Quanta running.</string>
                             </stringlist>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0">
                         <property name="name">
                             <cstring>TextLabel1</cstring>
                         </property>
@@ -258,7 +258,7 @@ instances of Quanta running.</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -275,7 +275,7 @@ instances of Quanta running.</string>
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QLayoutWidget" row="0" column="0">
+                    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
                         <property name="name">
                             <cstring>Layout1</cstring>
                         </property>
@@ -379,7 +379,7 @@ instances of Quanta running.</string>
                                     </stringlist>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
                                 <property name="name">
                                     <cstring>TextLabel1_2</cstring>
                                 </property>
@@ -443,7 +443,7 @@ instances of Quanta running.</string>
                                     </stringlist>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2</cstring>
                                 </property>
@@ -515,7 +515,7 @@ instances of Quanta running.</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -791,7 +791,7 @@ instances of Quanta running.</string>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class=TQWIDGET_OBJECT_NAME_STRING>
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -914,7 +914,7 @@ escape-cdata			Boolean    	y/n, yes/no, t/f, true/false, 1/0
 language			String     	-
 ncr				Boolean    	y/n, yes/no, t/f, true/false, 1/0
 output-bom			AutoBool   	auto, y/n, yes/no, t/f, true/false, 1/0
-replace-color			Boolean    	y/n, yes/no, t/f, true/false, 1/0
+tqreplace-color			Boolean    	y/n, yes/no, t/f, true/false, 1/0
 css-prefix			Name       	CSS1 selector
 new-inline-tags			Tag names  	tagX, tagY, ...
 new-blocklevel-tags		Tag names  	tagX, tagY, ...
@@ -985,7 +985,7 @@ fi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>100</width>
                     <height>0</height>
@@ -1002,7 +1002,7 @@ fi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>80</width>
                     <height>0</height>
@@ -1019,7 +1019,7 @@ fi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>125</width>
                     <height>0</height>
@@ -1074,5 +1074,5 @@ fi
         <slot>setWidgetText(const QString&amp;)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/xmlval.kmdr b/quanta/scripts/xmlval.kmdr
index ea8b5078..ec4ae69d 100755
--- a/quanta/scripts/xmlval.kmdr
+++ b/quanta/scripts/xmlval.kmdr
@@ -70,7 +70,7 @@ CMDLINE="$VALSTR $FILE"</string>
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
                     <property name="name">
                         <cstring>Layout10</cstring>
                     </property>
@@ -121,7 +121,7 @@ fi</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -130,7 +130,7 @@ fi</string>
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
                     <property name="name">
                         <cstring>Layout4</cstring>
                     </property>
@@ -144,7 +144,7 @@ fi</string>
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING>
                             <property name="name">
                                 <cstring>TextLabel3</cstring>
                             </property>
@@ -165,7 +165,7 @@ fi</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -187,7 +187,7 @@ fi</string>
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget" row="3" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
@@ -201,7 +201,7 @@ fi</string>
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING>
                             <property name="name">
                                 <cstring>TextLabel4</cstring>
                             </property>
@@ -219,7 +219,7 @@ fi</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -296,7 +296,7 @@ esac</string>
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget" row="2" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0">
                     <property name="name">
                         <cstring>Layout11</cstring>
                     </property>
@@ -343,7 +343,7 @@ fi
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -352,7 +352,7 @@ fi
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget" row="4" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="4" column="0">
                     <property name="name">
                         <cstring>Layout6</cstring>
                     </property>
@@ -366,7 +366,7 @@ fi
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class=TQLABEL_OBJECT_NAME_STRING>
                             <property name="name">
                                 <cstring>TextLabel5</cstring>
                             </property>
@@ -384,7 +384,7 @@ fi
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -448,7 +448,7 @@ xmllint $CMDLINE 2&gt;&amp;1
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>228</width>
                     <height>0</height>
@@ -495,5 +495,5 @@ xmllint $CMDLINE 2&gt;&amp;1
         <slot>setDisabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/scripts/xsltproc.kmdr b/quanta/scripts/xsltproc.kmdr
index 0341f681..ffaceebe 100755
--- a/quanta/scripts/xsltproc.kmdr
+++ b/quanta/scripts/xsltproc.kmdr
@@ -27,7 +27,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
             <property name="name">
                 <cstring>Layout5</cstring>
             </property>
@@ -51,7 +51,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -121,7 +121,7 @@ CMDLINE="-o $HOME/$OPFILE $STYLESHEET $FILE"</string>
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
                     <property name="name">
                         <cstring>Layout17</cstring>
                     </property>
@@ -159,7 +159,7 @@ fi</string>
                                 </stringlist>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
                             <property name="name">
                                 <cstring>Layout15</cstring>
                             </property>
@@ -173,7 +173,7 @@ fi</string>
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class=TQLABEL_OBJECT_NAME_STRING>
                                     <property name="name">
                                         <cstring>TextLabel1</cstring>
                                     </property>
@@ -199,7 +199,7 @@ fi</string>
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
                             <property name="name">
                                 <cstring>Layout14</cstring>
                             </property>
@@ -213,7 +213,7 @@ fi</string>
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class=TQLABEL_OBJECT_NAME_STRING>
                                     <property name="name">
                                         <cstring>TextLabel2</cstring>
                                     </property>
@@ -233,7 +233,7 @@ fi</string>
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
                             <property name="name">
                                 <cstring>Layout13</cstring>
                             </property>
@@ -247,7 +247,7 @@ fi</string>
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class=TQLABEL_OBJECT_NAME_STRING>
                                     <property name="name">
                                         <cstring>TextLabel1_2</cstring>
                                     </property>
@@ -290,5 +290,5 @@ fi</string>
         <slot>setDisabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/src/dcopquanta.cpp b/quanta/src/dcopquanta.cpp
index 149240d6..8dde34bc 100644
--- a/quanta/src/dcopquanta.cpp
+++ b/quanta/src/dcopquanta.cpp
@@ -40,11 +40,11 @@ TQStringList DCOPQuanta::selectors(const TQString& tag)
     if (key.startsWith("Selectors|"))
     {
       TQString selectorName = key.mid(10);
-      int index = selectorName.find(':');
+      int index = selectorName.tqfind(':');
       if (index != -1)
         selectorName = selectorName.mid(0, index);
       TQString tmpStr;
-      index = selectorName.find(rx);
+      index = selectorName.tqfind(rx);
       if (index != -1)
       {
         tmpStr = selectorName.left(index).lower();
@@ -54,8 +54,8 @@ TQStringList DCOPQuanta::selectors(const TQString& tag)
       }
       if (tmpStr.isEmpty() || tag.lower() == tmpStr || tmpStr == "*")
       {
-        tmpStr = selectorName.mid(index + 1).replace('.',' ');
-        if (!tmpStr.isEmpty() && !selectorList.contains(tmpStr))
+        tmpStr = selectorName.mid(index + 1).tqreplace('.',' ');
+        if (!tmpStr.isEmpty() && !selectorList.tqcontains(tmpStr))
           selectorList << tmpStr;
       }
      }
@@ -93,11 +93,11 @@ TQStringList DCOPQuanta::groupElements(const TQString& group)
     if (key.startsWith(group + "|"))
     {
       TQString name = key.mid(10);
-      int index = name.find(':');
+      int index = name.tqfind(':');
       if (index != -1)
         name = name.mid(0, index);
       TQString tmpStr;
-      index = name.find("|");
+      index = name.tqfind("|");
       if (index != -1)
       {
         tmpStr = name.left(index).lower();
diff --git a/quanta/src/dcopsettings.cpp b/quanta/src/dcopsettings.cpp
index 504eca84..c640b956 100644
--- a/quanta/src/dcopsettings.cpp
+++ b/quanta/src/dcopsettings.cpp
@@ -28,9 +28,9 @@ DCOPSettings::DCOPSettings() : DCOPObject("SettingsIf")
 TQString DCOPSettings::encoding()
 {
   TQString encoding = quantaApp->defaultEncoding();
-  encoding.replace("iso ", "iso-"); //it's said that "iso-8859-x" is the valid format
-  encoding.replace("utf", "utf-"); //it's said that "utf-x" is the valid format
-  encoding.replace("cp ", "windows-");
+  encoding.tqreplace("iso ", "iso-"); //it's said that "iso-8859-x" is the valid format
+  encoding.tqreplace("utf", "utf-"); //it's said that "utf-x" is the valid format
+  encoding.tqreplace("cp ", "windows-");
   return encoding;
 }
 
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index f42986ab..70fce267 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -93,8 +93,8 @@
 extern GroupElementMapList globalGroupMap;
 
 Document::Document(KTextEditor::Document *doc,
-                   TQWidget *parent, const char *name, WFlags f )
-  : TQWidget(parent, name, f)
+                   TQWidget *tqparent, const char *name, WFlags f )
+  : TQWidget(tqparent, name, f)
 {
   m_dirty   = false;
   busy    = false;
@@ -102,7 +102,7 @@ Document::Document(KTextEditor::Document *doc,
   m_md5sum = "";
   m_doc = doc;
   m_view = 0L; //needed, because createView() calls processEvents() and the "this" may be deleted before m_view gets a value => crash on delete m_view;
-  m_view = m_doc->createView(parent, 0L);
+  m_view = m_doc->createView(tqparent, 0L);
   completionInProgress = false;
   argHintVisible = false;
   completionRequested = false;
@@ -142,11 +142,11 @@ Document::Document(KTextEditor::Document *doc,
   //conflicting shortcuts, so change them
   a = m_view->actionCollection()->action("view_border");
   if (a)
-    a->setShortcut(Qt::SHIFT + Qt::Key_F9);
+    a->setShortcut(TQt::SHIFT + TQt::Key_F9);
 
   a = m_view->actionCollection()->action("view_folding_markers");
   if (a)
-    a->setShortcut(Qt::SHIFT + Qt::Key_F11);
+    a->setShortcut(TQt::SHIFT + TQt::Key_F11);
 
   KActionMenu *bookmarkAction = dynamic_cast<KActionMenu*>(m_view->actionCollection()->action( "bookmarks" ));
   if (bookmarkAction)
@@ -190,15 +190,15 @@ Document::Document(KTextEditor::Document *doc,
   }
 
   tempFile = 0;
-  m_tempFileName = TQString::null;
+  m_tempFileName = TQString();
   dtdName = Project::ref()->defaultDTD();
   reparseEnabled = true;
-  repaintEnabled = true;
+  tqrepaintEnabled = true;
   delayedTextChangedEnabled = true;
   docUndoRedo = new undoRedo(this);
 
   //path of the backup copy file of the document
-  m_backupPathValue = TQString::null;
+  m_backupPathValue = TQString();
 
   connect( m_doc,  TQT_SIGNAL(charactersInteractivelyInserted (int ,int ,const TQString&)),
            this,  TQT_SLOT(slotCharactersInserted(int ,int ,const TQString&)) );
@@ -409,7 +409,7 @@ void Document::insertFile(const KURL& url)
   {
     if (!KIO::NetAccess::download(url, fileName, this))
     {
-      KMessageBox::error(this, i18n("<qt>Cannot download <b>%1</b>.</qt>").arg( url.prettyURL(0, KURL::StripFileProtocol)));
+      KMessageBox::error(this, i18n("<qt>Cannot download <b>%1</b>.</qt>").tqarg( url.prettyURL(0, KURL::StripFileProtocol)));
       return;
     }
   }
@@ -421,7 +421,7 @@ void Document::insertFile(const KURL& url)
     insertText(stream.read());
     file.close();
   } else
-    KMessageBox::error(this, i18n("<qt>Cannot open <b>%1</b> for reading.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
+    KMessageBox::error(this, i18n("<qt>Cannot open <b>%1</b> for reading.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
 }
 
 /** Inserts text at the current cursor position */
@@ -461,8 +461,8 @@ void Document::insertText(const TQString &a_text, bool adjustCursor, bool repars
     }
     if (insideQuotes && closeQuotationFound)
     {
-      text.replace("\\\"", "\"");
-      text.replace("\"", "\\\"");
+      text.tqreplace("\\\"", "\"");
+      text.tqreplace("\"", "\\\"");
     }
   }
 
@@ -552,7 +552,7 @@ void Document::insertText(const TQString &a_text, bool adjustCursor, bool repars
   }
 }
 
-bool Document::insertChildTags(QTag *tag, QTag *lastTag)
+bool Document::insertChildTags(TQTag *tag, TQTag *lastTag)
 {
   bool childInserted = false;
   if (!tag || tag == lastTag) //avoid infinite recursion
@@ -565,9 +565,9 @@ bool Document::insertChildTags(QTag *tag, QTag *lastTag)
     if (it.data())
     {
       childInserted = true;
-      QTag *childTag = QuantaCommon::tagFromDTD(tag->parentDTD, it.key());
+      TQTag *childTag = QuantaCommon::tagFromDTD(tag->tqparentDTD, it.key());
       TQString tagStr =QuantaCommon::tagCase(it.key());
-      if ( tag->parentDTD->singleTagStyle == "xml" &&
+      if ( tag->tqparentDTD->singleTagStyle == "xml" &&
            ( childTag->isSingle() ||
             (childTag->isOptional() && !qConfig.closeOptionalTags)) )
       {
@@ -648,7 +648,7 @@ void Document::closeTempFile()
  if (TQFileInfo(m_tempFileName).exists())
      TQFile::remove(m_tempFileName);
 
- m_tempFileName = TQString::null;
+ m_tempFileName = TQString();
 }
 
 TQString Document::tempFileName()
@@ -669,8 +669,8 @@ TQString Document::getTagNameAt(int line, int col )
  while (line >= 0)
  {
     QuantaCommon::removeCommentsAndQuotes(textLine, completionDTD);
-    int pos = textLine.findRev("<");
-    int pos2 = textLine.findRev(">");
+    int pos = textLine.tqfindRev("<");
+    int pos2 = textLine.tqfindRev(">");
     if (pos != -1 && pos2 < pos)
     {
       textLine.remove(0, pos + 1);
@@ -680,7 +680,7 @@ TQString Document::getTagNameAt(int line, int col )
             textLine[pos] != '>')
             pos++;
       name = textLine.left(pos).stripWhiteSpace();
-      pos = name.find(":");
+      pos = name.tqfind(":");
       if (pos != -1)
         name = name.mid(pos + 1);
       break;
@@ -732,7 +732,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion )
     viewCursorIf->setCursorPositionReal(line,col-1);
     if (dtd)
     {
-      QTag *tag = QuantaCommon::tagFromDTD(dtd,completion.userdata);
+      TQTag *tag = QuantaCommon::tagFromDTD(dtd,completion.userdata);
       if (tag)
       {
         m_lastCompletionList = getAttributeValueCompletions(tag->name(), completion.text);
@@ -778,7 +778,7 @@ void Document::slotFilterCompletion( KTextEditor::CompletionEntry *completion ,T
 {
   kdDebug(24000) << *string << endl;
   kdDebug(24000) << completion->userdata << endl;
-  int pos = completion->userdata.find("|");
+  int pos = completion->userdata.tqfind("|");
   TQString s = completion->userdata.left(pos);
   completion->userdata.remove(0,pos+1);
   string->remove(0, s.length());
@@ -791,7 +791,7 @@ void Document::slotFilterCompletion( KTextEditor::CompletionEntry *completion ,T
     viewCursorIf->cursorPositionReal(&line, &col);
     TQString s2 = editIf->textLine(line).left(col);
     kdDebug(24000) << s2 << endl;
-    int pos = s2.findRev('&');
+    int pos = s2.tqfindRev('&');
     if (pos != -1)
     {
       s2 = s2.mid(pos + 1);
@@ -820,7 +820,7 @@ void Document::slotFilterCompletion( KTextEditor::CompletionEntry *completion ,T
     s = *string;
     string->remove(0, string->length());
     TQString s2 = TQString("public \""+DTDs::ref()->getDTDNameFromNickName(s)+"\"");
-    const DTDStruct *dtd = DTDs::ref()->find(DTDs::ref()->getDTDNameFromNickName(s));
+    const DTDStruct *dtd = DTDs::ref()->tqfind(DTDs::ref()->getDTDNameFromNickName(s));
     if (dtd && !dtd->url.isEmpty())
     {
       s2 += " \""+dtd->url+"\"";
@@ -858,7 +858,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri
       {
         m_replaceLine = line;
         m_replaceCol = column;
-        m_replaceStr = QuantaCommon::encodedChar(string[0].unicode());
+        m_replaceStr = QuantaCommon::encodedChar(string[0].tqunicode());
         TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar()));
         return;
       }
@@ -866,7 +866,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri
   }
   if (qConfig.replaceAccented)
   {
-    uint c = string[0].unicode();
+    uint c = string[0].tqunicode();
     if (c > 191)
     {
       m_replaceLine = line;
@@ -936,13 +936,13 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri
 */
 bool Document::xmlAutoCompletion(int line, int column, const TQString & string)
 {
-  QTag *tag;
+  TQTag *tag;
   TQString tagName;
   bool handled = false;
   tagName = getTagNameAt(line, column);
   tag = QuantaCommon::tagFromDTD(completionDTD, tagName);
   if (!tag && !tagName.isEmpty())
-     tag = userTagList.find(tagName.lower());
+     tag = userTagList.tqfind(tagName.lower());
 
   TQString s = editIf->textLine(line).left(column + 1);
   bool namespacecompletion = false;
@@ -978,13 +978,13 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string)
     if (string == "/" && s.endsWith("</") && tagName.isEmpty())
     {
       Node *node = parser->nodeAt(line, column, false);
-      if (node && node->parent )
+      if (node && node->tqparent )
       {
-        node = node->parent;
+        node = node->tqparent;
         if (node->tag->type == Tag::XmlTag && (!node->next || !QuantaCommon::closesTag(node->tag, node->next->tag)))
         {
             TQString name = node->tag->name;
-            name = name.left(name.find(" | "));
+            name = name.left(name.tqfind(" | "));
             if (!node->tag->nameSpace.isEmpty())
               name.prepend(node->tag->nameSpace + ":");
             editIf->insertText(line, column + 1, name + ">");
@@ -1000,7 +1000,7 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string)
     if ( string == ">" && tagName[0] != '/' && !tagName.endsWith("/") &&
          !s.endsWith("/>") && tag)
     {
-      if ( tag->parentDTD->singleTagStyle == "xml" &&
+      if ( tag->tqparentDTD->singleTagStyle == "xml" &&
            (tag->isSingle() || (!qConfig.closeOptionalTags && tag->isOptional()))
          )
       {
@@ -1052,10 +1052,10 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string)
           {
             //we need to find the attribute name
             TQString textLine = editIf->textLine(line).left(column-1);
-            TQString attribute = textLine.mid(textLine.findRev(' ')+1);
-            if (attribute == "style" && completionDTD->insideDTDs.contains("css"))
+            TQString attribute = textLine.mid(textLine.tqfindRev(' ')+1);
+            if (attribute == "style" && completionDTD->insideDTDs.tqcontains("css"))
             {
-              completionDTD = DTDs::ref()->find("text/css");
+              completionDTD = DTDs::ref()->tqfind("text/css");
               completionRequested = true;
               return scriptAutoCompletion(line, column + 1, string);
             }
@@ -1068,20 +1068,20 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string)
     //check if we are inside a style attribute, and use css autocompletion if we are
     TQString textLine = editIf->textLine(line);
     textLine = textLine.left(column);
-    int pos = textLine.findRev('"');
+    int pos = textLine.tqfindRev('"');
     if (pos != -1)
     {
-      pos = textLine.findRev(' ', pos);
+      pos = textLine.tqfindRev(' ', pos);
       if (pos != -1)
       {
         textLine = textLine.mid(pos + 1);
-        pos = textLine.find('=');
+        pos = textLine.tqfind('=');
         if (pos != -1)
         {
           TQString attribute = textLine.left(pos);
-          if (attribute == "style" && completionDTD->insideDTDs.contains("css"))
+          if (attribute == "style" && completionDTD->insideDTDs.tqcontains("css"))
           {
-            completionDTD = DTDs::ref()->find("text/css");
+            completionDTD = DTDs::ref()->tqfind("text/css");
             completionRequested = true;
             return scriptAutoCompletion(line, column + 1, string);
           }
@@ -1089,7 +1089,7 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string)
       }
     }
     TQString s = editIf->textLine(line).left(column + 1);
-    pos = s.findRev('&');
+    pos = s.tqfindRev('&');
     if (pos != -1)
     {
       //complete character codes
@@ -1125,7 +1125,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n
       GroupElementList elementList = it.data();
       for (uint i = 0; i < elementList.count(); i++)
       {
-        if (elementList[i]->parentNode == 0L || elementList[i]->global)
+        if (elementList[i]->tqparentNode == 0L || elementList[i]->global)
         {
           completion.text = it.key().section('|', -1).stripWhiteSpace();
           completions->append(completion);
@@ -1133,11 +1133,11 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n
         } else
         {
           Node *n = node;
-          while (n && n != elementList[i]->parentNode)
+          while (n && n != elementList[i]->tqparentNode)
           {
-            n = n->parent;
+            n = n->tqparent;
           }
-          if (n == elementList[i]->parentNode)
+          if (n == elementList[i]->tqparentNode)
           {
             completion.text = it.key().section('|', -1).stripWhiteSpace();
             completions->append(completion);
@@ -1169,18 +1169,18 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n
 
 bool Document::isDerivatedFrom(const TQString& className, const TQString &baseClass)
 {
-  if (className.isEmpty() || !completionDTD->classInheritance.contains(className))
+  if (className.isEmpty() || !completionDTD->classInheritance.tqcontains(className))
     return false;
 
-  TQString parentClass = completionDTD->classInheritance[className];
+  TQString tqparentClass = completionDTD->classInheritance[className];
   int result = 0;
   do {
-    if (parentClass == baseClass)
+    if (tqparentClass == baseClass)
       result = 1; //className extends baseClass
     else
     {
-      if (completionDTD->classInheritance.contains(parentClass))
-        parentClass = completionDTD->classInheritance[parentClass];
+      if (completionDTD->classInheritance.tqcontains(tqparentClass))
+        tqparentClass = completionDTD->classInheritance[tqparentClass];
       else
         result = -1;//nothing was found in the inheritance list
     }
@@ -1205,12 +1205,12 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
   }
   Node *node = parser->nodeAt(line, col);
   if (node && node->tag->type != Tag::XmlTag)
-      node = node->parent;
+      node = node->tqparent;
   if (node && node->tag->type != Tag::XmlTag)
       node = 0L;
-  QTag *parentQTag= 0L;
-  if (node && node->parent)
-      parentQTag = QuantaCommon::tagFromDTD(node->parent);
+  TQTag *tqparentTQTag= 0L;
+  if (node && node->tqparent)
+      tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
   TQString textLine = editIf->textLine(line).left(col);
   TQString word = findWordRev(textLine, completionDTD).upper();
   TQString classStr = "";
@@ -1229,7 +1229,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
         objStr = r->cap(1);
         if (objStr == "this")
         {
-          TQString parentGroupStr = "";
+          TQString tqparentGroupStr = "";
           bool classFound = false;
           parser->synchParseInDetail(); 
           Node *n = parser->nodeAt(line, col);
@@ -1244,11 +1244,11 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
             while (it != n->m_groupElements.end())
             {
               GroupElement *e = *it;
-              if (parentGroupStr.isEmpty() && e->group->appendToTags)
+              if (tqparentGroupStr.isEmpty() && e->group->appendToTags)
               {
-                parentGroupStr = e->group->parentGroup;
+                tqparentGroupStr = e->group->tqparentGroup;
               }
-              if (!parentGroupStr.isEmpty() && e->group->name == parentGroupStr)
+              if (!tqparentGroupStr.isEmpty() && e->group->name == tqparentGroupStr)
               {
                 classStr = e->tag->name;
                 classFound = true;
@@ -1260,7 +1260,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
               it = n->m_groupElements.erase(it);
             }
             delete gParser;
-            n = n->parent;
+            n = n->tqparent;
           }
         } else
         {
@@ -1290,20 +1290,20 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
   //A TQMap to hold the completion type (function/string/class/etc)
   TQMap<TQString, TQString> type;
   TQString tagName;
-  TQDictIterator<QTag> it(*(completionDTD->tagsList));
+  TQDictIterator<TQTag> it(*(completionDTD->tagsList));
   int i = 0;
   for( ; it.current(); ++it )
   {
-    QTag *tag = it.current();
+    TQTag *tag = it.current();
     if ((tag->type != "entity") && (tag->className == classStr ||
         isDerivatedFrom(classStr, tag->className)))
     {
       tagName = tag->name();
       if (!tagName.isEmpty() && tagName.upper().startsWith(word))
       {
-        if (!parentQTag || (parentQTag && parentQTag->isChild(tagName)))
+        if (!tqparentTQTag || (tqparentTQTag && tqparentTQTag->isChild(tagName)))
         {
-          tagName = tag->name() + TQString("%1").arg(i, 10);
+          tagName = tag->name() + TQString("%1").tqarg(i, 10);
           tagNameList += tagName;
           comments.insert(tagName, tag->comment);
           i++;
@@ -1312,14 +1312,14 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
     }
   }
 
-  TQDictIterator<QTag> it2(userTagList);
+  TQDictIterator<TQTag> it2(userTagList);
   for( ; it2.current(); ++it2 )
   {
-    QTag *tag = it2.current();
+    TQTag *tag = it2.current();
     if ((tag->className == classStr ||
          isDerivatedFrom(classStr, tag->className)) && tag->name().upper().startsWith(word))
     {
-      tagName = tag->name() + TQString("%1").arg(i, 10);
+      tagName = tag->name() + TQString("%1").tqarg(i, 10);
       tagNameList += tagName;
       comments.insert(tagName, tag->comment);
       
@@ -1366,7 +1366,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
       // Here we actually append the completion type
       completion.type = type[tagNameList[i]];
       // And here is out sorting...
-      if(completion.type.contains("variable"))
+      if(completion.type.tqcontains("variable"))
       {
         // Insert after the last variable
         variableIt++;
@@ -1374,7 +1374,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
       }
       else
       {
-        if(completion.type.contains("script"))
+        if(completion.type.tqcontains("script"))
         {
           //Scripts can go at the end of the list
           completions->append(completion);
@@ -1404,10 +1404,10 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeCompletions(con
 {
   TQValueList<KTextEditor::CompletionEntry> *completions = new TQValueList<KTextEditor::CompletionEntry>();
   KTextEditor::CompletionEntry completion;
-  QTag *tag = QuantaCommon::tagFromDTD(completionDTD, tagName);
+  TQTag *tag = QuantaCommon::tagFromDTD(completionDTD, tagName);
   if (!tag)
   {
-    tag = userTagList.find(tagName.lower());
+    tag = userTagList.tqfind(tagName.lower());
   }
   TQString startsWith = a_startsWith.upper();
   if (tag)
@@ -1438,7 +1438,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeCompletions(con
               //list common attributes for this tag
               for (TQStringList::Iterator it = tag->commonGroups.begin(); it != tag->commonGroups.end(); ++it)
               {
-                AttributeList *attrs = tag->parentDTD->commonAttrs->find(*it);
+                AttributeList *attrs = tag->tqparentDTD->commonAttrs->tqfind(*it);
                 for (uint j = 0; j < attrs->count(); j++)
                 {
                   TQString name = attrs->at(j)->name;
@@ -1452,7 +1452,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeCompletions(con
                 }
               }
 
-              if (tag->name().contains("!doctype",false)) //special case, list all the known document types
+              if (tag->name().tqcontains("!doctype",false)) //special case, list all the known document types
               {
                 TQStringList nickNames = DTDs::ref()->nickNameList(true);
                 for ( TQStringList::Iterator it = nickNames.begin(); it != nickNames.end(); ++it )
@@ -1538,7 +1538,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeValueCompletion
   }
   if (deleteValues)
     delete values;
-  int andSignPos = startsWith.find('&');
+  int andSignPos = startsWith.tqfind('&');
   if (andSignPos != -1)
   {
     TQValueList<KTextEditor::CompletionEntry> *charCompletions = getCharacterCompletions(startsWith.mid(andSignPos + 1));
@@ -1557,7 +1557,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getCharacterCompletions(con
   TQMap<TQString, KTextEditor::CompletionEntry> completionMap;
 
   //first search for entities defined in the document
-  const DTDStruct *dtdDTD = DTDs::ref()->find("dtd");
+  const DTDStruct *dtdDTD = DTDs::ref()->tqfind("dtd");
   if (dtdDTD)
   {
     StructTreeGroup group;
@@ -1588,10 +1588,10 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getCharacterCompletions(con
   KTextEditor::CompletionEntry completion;
   completion.type = "charCompletion";
   //add the entities from the tag files
-  TQDictIterator<QTag> it(*(completionDTD->tagsList));
+  TQDictIterator<TQTag> it(*(completionDTD->tagsList));
   for( ; it.current(); ++it )
   {
-    QTag *tag = it.current();
+    TQTag *tag = it.current();
     if (tag->type == "entity")
     {
       TQString tagName = tag->name(true);
@@ -1616,10 +1616,10 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getCharacterCompletions(con
   for ( TQStringList::Iterator it = charList.begin(); it != charList.end(); ++it )
   {
     completion.text = *it;
-    int begin = completion.text.find("(&") + 2;
+    int begin = completion.text.tqfind("(&") + 2;
     if (begin == 1)
         continue;
-    int length = completion.text.find(";)") - begin + 1;
+    int length = completion.text.tqfind(";)") - begin + 1;
     TQString s = completion.text.mid(begin, length - 1);
     completion.text = s + " : " + completion.text.left(begin -2) + " - " + completion.text.mid(begin + length + 1);
     if (s.startsWith(startsWith))
@@ -1661,9 +1661,9 @@ const DTDStruct* Document::currentDTD(bool fallback)
 /** Get a pointer to the default DTD (document, or app). */
 const DTDStruct* Document::defaultDTD() const
 {
-  const DTDStruct* dtd = DTDs::ref()->find(dtdName);
-  if (!dtd) dtd = DTDs::ref()->find(Project::ref()->defaultDTD());
-  if (!dtd) dtd = DTDs::ref()->find(qConfig.defaultDocType); //this will always exists
+  const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName);
+  if (!dtd) dtd = DTDs::ref()->tqfind(Project::ref()->defaultDTD());
+  if (!dtd) dtd = DTDs::ref()->tqfind(qConfig.defaultDocType); //this will always exists
 
   return dtd;
 }
@@ -1682,17 +1682,17 @@ TQString Document::findDTDName(Tag **tag)
  {
    text = editIf->textLine(i);
    //search for !DOCTYPE tags
-   pos = text.find("!doctype",0,false);
+   pos = text.tqfind("!doctype",0,false);
    if (pos != -1) //parse the found !DOCTYPE tag
    {
      int bl, bc, el, ec;
      line = i;
      bl = line;
-     startPos = text.findRev('<',pos);
+     startPos = text.tqfindRev('<',pos);
      while (startPos == -1 && line >=0)
      {
        text = editIf->textLine(line);
-       startPos = text.findRev('<');
+       startPos = text.tqfindRev('<');
        bl = line;
        line--;
      }
@@ -1704,12 +1704,12 @@ TQString Document::findDTDName(Tag **tag)
      bc = startPos;
      line = i;
      text = editIf->textLine(i);
-     startPos = text.find('>',pos);
+     startPos = text.tqfind('>',pos);
      el = line;
      while (startPos == -1 && line < endLine)
      {
        text = editIf->textLine(line);
-       startPos = text.find('>');
+       startPos = text.tqfind('>');
        el = line;
        line++;
      }
@@ -1724,17 +1724,17 @@ TQString Document::findDTDName(Tag **tag)
      text = this->text(bl, bc, el, ec);
      (*tag)->parse(text, this);
      (*tag)->type = Tag::XmlTag;
-     text.replace("\\\"", "\"");
-     pos = text.find("public",0,false);
+     text.tqreplace("\\\"", "\"");
+     pos = text.tqfind("public",0,false);
      if (pos == -1) //if no PUBLIC info, use the word after !DOCTYPE as the doc.type
      {
        foundText = (*tag)->attribute(0);
      } else
      {             //use the quoted string after PUBLIC as doc. type
-       pos = text.find("\"", pos+1);
+       pos = text.tqfind("\"", pos+1);
        if (pos !=-1)
        {
-         int endPos = text.find("\"",pos+1);
+         int endPos = text.tqfind("\"",pos+1);
          foundText = text.mid(pos+1, endPos-pos-1);
        }
      }
@@ -1759,8 +1759,8 @@ bool Document::scriptAutoCompletion(int line, int column, const TQString& insert
  if (node->prev)
    node = node->prev;
  else
- if (node->parent)
-   node = node->parent;
+ if (node->tqparent)
+   node = node->tqparent;
 
  int bl, bc;
  node->tag->beginPos(bl, bc);
@@ -1794,11 +1794,11 @@ bool Document::scriptAutoCompletion(int line, int column, const TQString& insert
  {
    TQString textLine = s.left(i);
    TQString word = findWordRev(textLine, completionDTD);
-   TQValueList<QTag *> tags;
+   TQValueList<TQTag *> tags;
    if (!word.isEmpty())
    {
-      tags.append(userTagList.find(word.lower()));
-      TQDictIterator<QTag> it(*(completionDTD->tagsList));
+      tags.append(userTagList.tqfind(word.lower()));
+      TQDictIterator<TQTag> it(*(completionDTD->tagsList));
       for( ; it.current(); ++it )
       {
         if (it.currentKey() == word)
@@ -1806,9 +1806,9 @@ bool Document::scriptAutoCompletion(int line, int column, const TQString& insert
       }
    }
    TQStringList argList;
-   for (TQValueList<QTag*>::ConstIterator it = tags.constBegin(); it != tags.constEnd(); ++it)
+   for (TQValueList<TQTag*>::ConstIterator it = tags.constBegin(); it != tags.constEnd(); ++it)
    {
-     QTag *tag = *it;
+     TQTag *tag = *it;
      if (!tag)
        continue;
      TQString arguments;
@@ -1907,7 +1907,7 @@ TQString Document::text(const AreaStruct &area) const
   return text(area.bLine, area.bCol, area.eLine, area.eCol);
 }
 
-TQString Document::find(const TQRegExp& regExp, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol)
+TQString Document::tqfind(const TQRegExp& regExp, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol)
 {
 
  TQRegExp rx = regExp;
@@ -1937,11 +1937,11 @@ TQString Document::find(const TQRegExp& regExp, int sLine, int sCol, int& fbLine
  {
    foundText = rx.cap();
    TQString s = textToSearch.left(pos);
-   int linesUntilFound = s.contains("\n");
+   int linesUntilFound = s.tqcontains("\n");
    fbLine = sLine + linesUntilFound;
-   fbCol = s.length()-s.findRev("\n")-1;
-   int linesInFound = foundText.contains("\n");
-   feCol = foundText.length()-foundText.findRev("\n")-2;
+   fbCol = s.length()-s.tqfindRev("\n")-1;
+   int linesInFound = foundText.tqcontains("\n");
+   feCol = foundText.length()-foundText.tqfindRev("\n")-2;
    feLine = fbLine + linesInFound;
    if (linesUntilFound == 0)
    {
@@ -1965,7 +1965,7 @@ TQString Document::find(const TQRegExp& regExp, int sLine, int sCol, int& fbLine
  return foundText;
 }
 
-TQString Document::findRev(const TQRegExp& regExp, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol)
+TQString Document::tqfindRev(const TQRegExp& regExp, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol)
 {
  TQRegExp rx = regExp;
  TQString foundText = "";
@@ -1993,8 +1993,8 @@ TQString Document::findRev(const TQRegExp& regExp, int sLine, int sCol, int& fbL
    foundText = rx.cap();
    fbLine = line;
    fbCol = pos;
-   int linesInFound = foundText.contains("\n");
-   feCol = foundText.length()-foundText.findRev("\n")-2;
+   int linesInFound = foundText.tqcontains("\n");
+   feCol = foundText.length()-foundText.tqfindRev("\n")-2;
    feLine = fbLine + linesInFound;
    if (linesInFound == 0)
    {
@@ -2047,7 +2047,7 @@ void Document::handleCodeCompletion()
     {
       completionDTD = defaultDTD();
       TQString s = text(line, 0, line, col).stripWhiteSpace();
-      if (s.findRev("<") != -1)
+      if (s.tqfindRev("<") != -1)
       {
         //showCodeCompletions(getTagCompletions(line, col + 1));
 
@@ -2079,8 +2079,8 @@ void Document::codeCompletionHintRequested()
   if (completionDTD->family == Script)
   {
 //    TQString textLine = editIf->textLine(line).left(col);
-//    int pos = textLine.findRev("(");
-//    int pos2 = textLine.findRev(")");
+//    int pos = textLine.tqfindRev("(");
+//    int pos2 = textLine.tqfindRev(")");
     //if (pos > pos2 )
     hintRequested = true;
     scriptAutoCompletion(line, col - 1, "");
@@ -2093,8 +2093,8 @@ TQString Document::currentWord()
   uint line, col;
   viewCursorIf->cursorPositionReal(&line, &col);
   TQString textLine = editIf->textLine(line);
-  int startPos = textLine.findRev(TQRegExp("\\W"), col);
-  int endPos = textLine.find(TQRegExp("\\W"), col);
+  int startPos = textLine.tqfindRev(TQRegExp("\\W"), col);
+  int endPos = textLine.tqfind(TQRegExp("\\W"), col);
   if (startPos == -1)
      startPos = 0;
   else
@@ -2114,7 +2114,7 @@ TQString Document::findWordRev(const TQString& textToSearch, const DTDStruct *dt
   int pos;
   bool end = false;
   do{
-    pos = t.findRev(TQRegExp("\\W"), startPos);
+    pos = t.tqfindRev(TQRegExp("\\W"), startPos);
     if (t[pos] == '_' ||
         (dtd && dtd->minusAllowedInWord && t[pos] == '-'))
     {
@@ -2155,9 +2155,9 @@ bool Document::xmlCodeCompletion(int line, int col)
       if (index != -1)      //inside a value
       {
         s = tag->attribute(index);
-        if (s == "style" && completionDTD->insideDTDs.contains("css"))
+        if (s == "style" && completionDTD->insideDTDs.tqcontains("css"))
         {
-          completionDTD = DTDs::ref()->find("text/css");
+          completionDTD = DTDs::ref()->tqfind("text/css");
           return scriptAutoCompletion(line, col, "");
         } else
         {
@@ -2190,7 +2190,7 @@ bool Document::xmlCodeCompletion(int line, int col)
   if (!handled)
   {
     TQString s = editIf->textLine(line).left(col);
-    int pos = s.findRev('&');
+    int pos = s.tqfindRev('&');
     if (pos != -1)
     {
       s = s.mid(pos + 1);
@@ -2212,7 +2212,7 @@ void Document::slotCompletionAborted()
 }
 
 /** Ask for user confirmation if the file was changed outside. */
-void Document::checkDirtyStatus()
+void Document::checkDirtytqStatus()
 {
   TQString fileName;
   if (url().isLocalFile())
@@ -2236,7 +2236,7 @@ void Document::checkDirtyStatus()
           const char* c = "";
           KMD5 context(c);
           context.reset();
-          context.update(f);
+          context.update(*TQT_TQIODEVICE(&f));
           m_md5sum = context.hexDigest();
           f.close();
         }
@@ -2252,7 +2252,7 @@ void Document::checkDirtyStatus()
           const char* c = "";
           KMD5 context(c);
           context.reset();
-          context.update(f);
+          context.update(*TQT_TQIODEVICE(&f));
           md5sum = context.hexDigest();
           kdDebug(24000) << "MD5 sum of current doc: " << m_md5sum << endl;
           kdDebug(24000) << "MD5 sum of doc on disc : " << md5sum << endl;
@@ -2323,7 +2323,7 @@ bool Document::saveAs(const KURL& url)
         const char* c = "";
         KMD5 context(c);
         context.reset();
-        context.update(f);
+        context.update(*TQT_TQIODEVICE(&f));
         m_md5sum = context.hexDigest();
         f.close();
       }
@@ -2338,7 +2338,7 @@ void Document::enableGroupsForDTEP(const TQString& dtepName, bool enable)
     m_groupsForDTEPs = m_DTEPList;
   if (enable)
   {
-    if (m_groupsForDTEPs.contains(dtepName) == 0)
+    if (m_groupsForDTEPs.tqcontains(dtepName) == 0)
       m_groupsForDTEPs.append(dtepName);
   } else
   {
@@ -2354,7 +2354,7 @@ void Document::resetGroupsForDTEPList()
 /** Returns true if the number of " (excluding \") inside text is even. */
 bool Document::evenQuotes(const TQString &text)
 {
- int num = text.contains(TQRegExp("[^\\\\]\""));
+ int num = text.tqcontains(TQRegExp("[^\\\\]\""));
 
  return (num /2 *2 == num);
 }
@@ -2521,7 +2521,7 @@ TQStringList* Document::tagAttributeValues(const TQString& dtdName, const TQStri
 {
   TQStringList *values = 0L;
   deleteResult = true;
-  const DTDStruct* dtd = DTDs::ref()->find(dtdName);
+  const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName);
   if (dtd)
   {
     TQString searchForAttr = (dtd->caseSensitive) ? attribute : attribute.upper();
@@ -2546,7 +2546,7 @@ TQStringList* Document::tagAttributeValues(const TQString& dtdName, const TQStri
               for (uint i = 0; i < values->count(); i++)
               {
                 u = (*values)[i];
-                u = QExtFileInfo::toRelative(u, base);
+                u = TQExtFileInfo::toRelative(u, base);
                 (*values)[i] = u.path();
               }
               values->remove(values->at(0));
@@ -2576,9 +2576,9 @@ bool Document::hasChanged()
   return b;
 }
 
-void Document::setChanged(bool newStatus)
+void Document::setChanged(bool newtqStatus)
 {
-  changed = newStatus;
+  changed = newtqStatus;
 }
 
 void Document::paste()
@@ -2614,7 +2614,7 @@ TQStringList Document::tagAreas(const TQString& tag, bool includeCoordinates, bo
         TQString s = text(bl, bc, el, ec);
         if (includeCoordinates)
         {
-          s.prepend(TQString("%1,%2,%3,%4\n").arg(bl).arg(bc).arg(el).arg(ec));
+          s.prepend(TQString("%1,%2,%3,%4\n").tqarg(bl).tqarg(bc).tqarg(el).tqarg(ec));
         }
         result += s;
         if (skipFoundContent)
@@ -2632,7 +2632,7 @@ TQStringList Document::tagAreas(const TQString& tag, bool includeCoordinates, bo
 
 void Document::activateRepaintView(bool activation)
 {
-  repaintEnabled = activation;
+  tqrepaintEnabled = activation;
   m_view->setUpdatesEnabled(activation);
 }
 
@@ -2691,7 +2691,7 @@ void Document::createBackup(KConfig* config)
     config->setGroup("General Options");
     TQStringList backedupFilesEntryList = QuantaCommon::readPathListEntry(config, "List of backedup files"); //the files that were backedup
     TQStringList autosavedFilesEntryList = QuantaCommon::readPathListEntry(config, "List of autosaved files"); //the list of actual backup files inside $KDEHOME/share/apps/quanta/backups
-    if (!autosavedFilesEntryList.contains(backupPathValueURL)) //not yet backed up, add an entry for this file
+    if (!autosavedFilesEntryList.tqcontains(backupPathValueURL)) //not yet backed up, add an entry for this file
     {
       autosavedFilesEntryList.append(backupPathValueURL);
       config->writePathEntry("List of autosaved files", autosavedFilesEntryList);
@@ -2875,10 +2875,10 @@ void Document::open(const KURL &url, const TQString &encoding)
     connect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted()));
     connect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&)));
     if (!openURL(url))
-      slotOpeningFailed(TQString::null);
+      slotOpeningFailed(TQString());
     if (!url.isLocalFile())
     {
-      QExtFileInfo internalFileInfo;
+      TQExtFileInfo internalFileInfo;
       internalFileInfo.enter_loop();
     }
 }
@@ -2889,7 +2889,7 @@ void Document::slotOpeningCompleted()
   if (!u.isLocalFile())
   {
     m_modifTime = TQDateTime();
-    qApp->exit_loop();
+    tqApp->exit_loop();
   }
   else
   {
@@ -2910,7 +2910,7 @@ void Document::slotOpeningFailed(const TQString &errorMessage)
   m_md5sum = "";
   Q_UNUSED(errorMessage); //TODO: append the error message to our own error message
   if (!url().isLocalFile())
-    qApp->exit_loop();
+    tqApp->exit_loop();
   disconnect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted()));
   disconnect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&)));
   emit openingFailed(url());
@@ -2943,11 +2943,11 @@ void Document::processDTD(const TQString& documentType)
         }
       }
 
-      if (!DTDs::ref()->find(foundName))
+      if (!DTDs::ref()->tqfind(foundName))
       {
         //try to find the closest matching DTD
         TQString s = foundName.lower();
-        uint spaceNum = s.contains(' ');
+        uint spaceNum = s.tqcontains(' ');
         TQStringList dtdList = DTDs::ref()->nameList();
         TQStringList lastDtdList;
         for (uint i = 0; i <= spaceNum && !dtdList.empty(); i++)
@@ -3006,7 +3006,7 @@ void Document::processDTD(const TQString& documentType)
         {
           qConfig.showDTDSelectDialog = !dtdWidget->useClosestMatching->isChecked();
           setDTDIdentifier(DTDs::ref()->getDTDNameFromNickName(dtdWidget->dtdCombo->currentText()));
-          const DTDStruct *dtd = DTDs::ref()->find(dtdName);
+          const DTDStruct *dtd = DTDs::ref()->tqfind(dtdName);
           if (dtdWidget->convertDTD->isChecked() && dtd->family == Xml)
           {
             int bLine, bCol, eLine, eCol;
@@ -3024,12 +3024,12 @@ void Document::processDTD(const TQString& documentType)
      TQString dtdId = DTDs::ref()->DTDforURL(u)->name;
 //     if (dtdId == "empty")
      {
-       const DTDStruct * dtd = DTDs::ref()->find(projectDTD);
+       const DTDStruct * dtd = DTDs::ref()->tqfind(projectDTD);
        if (DTDs::canHandle(dtd, u))
         dtdId = projectDTD;
        else
        {
-         dtd = DTDs::ref()->find(qConfig.defaultDocType);
+         dtd = DTDs::ref()->tqfind(qConfig.defaultDocType);
          if (DTDs::canHandle(dtd, u))
            dtdId = qConfig.defaultDocType;
        }
@@ -3043,7 +3043,7 @@ void Document::processDTD(const TQString& documentType)
 
   if (!isUntitled())
   {
-    quantaApp->messageOutput()->showMessage(i18n("\"%1\" is used for \"%2\".\n").arg(DTDs::ref()->getDTDNickNameFromName(dtdName)).arg(url().prettyURL(0, KURL::StripFileProtocol)));
+    quantaApp->messageOutput()->showMessage(i18n("\"%1\" is used for \"%2\".\n").tqarg(DTDs::ref()->getDTDNickNameFromName(dtdName)).tqarg(url().prettyURL(0, KURL::StripFileProtocol)));
   }
   quantaApp->slotLoadToolbarForDTD(dtdName);
   StructTreeView::ref()->useOpenLevelSetting = true;
@@ -3056,10 +3056,10 @@ void Document::slotFileDirty(const TQString& fileName)
 {
   if ( url().path() == fileName && !dirty() )
   {
-    setDirtyStatus(true);
+    setDirtytqStatus(true);
     if (this == ViewManager::ref()->activeDocument())
     {
-      checkDirtyStatus();
+      checkDirtytqStatus();
     }
   }
 }
@@ -3083,7 +3083,7 @@ void Document::resetDTEPs()
 
 void Document::addDTEP(const TQString &dtepName)
 {
-  if (m_DTEPList.contains(dtepName) == 0)
+  if (m_DTEPList.tqcontains(dtepName) == 0)
   {
     m_DTEPList.append(dtepName);
   }
@@ -3099,11 +3099,11 @@ TQStringList Document::groupsForDTEPs()
 
 TQString Document::annotationText(uint line)
 {
-  TQMap<uint, QPair<TQString, TQString> >::Iterator it = m_annotations.find(line);
+  TQMap<uint, TQPair<TQString, TQString> >::Iterator it = m_annotations.tqfind(line);
   if (it != m_annotations.end())
     return it.data().first;
   else
-   return TQString::null;
+   return TQString();
 }
 
 void Document::setAnnotationText(uint line, const TQString& text)
@@ -3115,7 +3115,7 @@ void Document::setAnnotationText(uint line, const TQString& text)
       markIf->removeMark(line, KTextEditor::MarkInterface::markType08);
   } else
   {
-    m_annotations.insert(line, qMakePair(text, TQString("")));
+    m_annotations.insert(line, tqMakePair(text, TQString("")));
     if (markIf)
       markIf->setMark(line, KTextEditor::MarkInterface::markType08);
     uint line, column;
@@ -3147,11 +3147,11 @@ void Document::setAnnotationText(uint line, const TQString& text)
     s.prepend(commentBegin + " ");
     s.append(" " + commentEnd + "\n");
     insertText(s, true, true);
-    emit showAnnotation(line, "", qMakePair(text, TQString("")));
+    emit showAnnotation(line, "", tqMakePair(text, TQString("")));
   }
 }
 
-void Document::addAnnotation(uint line, const QPair<TQString, TQString>& annotation)
+void Document::addAnnotation(uint line, const TQPair<TQString, TQString>& annotation)
 {
   m_annotations.insert(line, annotation);
   if (markIf)
@@ -3181,7 +3181,7 @@ bool Document::openURL(const KURL& url)
       const char* c = "";
       KMD5 context(c);
       context.reset();
-      context.update(f);
+      context.update(*TQT_TQIODEVICE(&f));
       m_md5sum = context.hexDigest();
       f.close();
     }
diff --git a/quanta/src/document.h b/quanta/src/document.h
index b812ddb9..975b9f31 100644
--- a/quanta/src/document.h
+++ b/quanta/src/document.h
@@ -66,12 +66,13 @@ namespace KTextEditor
   class Mark;
 }
 
-class Document : public QWidget{
+class Document : public TQWidget{
    Q_OBJECT
+  TQ_OBJECT
 
 public:
   Document(KTextEditor::Document *doc,
-           TQWidget *parent = 0, const char *name = 0, WFlags f=0);
+           TQWidget *tqparent = 0, const char *name = 0, WFlags f=0);
   ~Document();
 
   KURL url();
@@ -85,7 +86,7 @@ public:
   void replaceSelected(const TQString &s);
 
   /** insert tag in document  */
-  void insertTag(const TQString &s1, const TQString &s2 = TQString::null);
+  void insertTag(const TQString &s1, const TQString &s2 = TQString());
   /** Change the current tag's attributes with those from dict */
   void changeTag(Tag *tag, TQDict<TQString> *dict );
   /**Change the attr value of the called attrName to attrValue*/
@@ -99,11 +100,11 @@ public:
   void insertText(const TQString &text, bool adjustCursor = true, bool reparse = true);
   /** Recursively insert the mandatory childs of tag. Returns true if a child was
   inserted.*/
-  bool insertChildTags(QTag *tag, QTag* lastTag = 0L);
+  bool insertChildTags(TQTag *tag, TQTag* lastTag = 0L);
 
   TQPoint getGlobalCursorPos();
-  TQString find(const TQRegExp& rx, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol);
-  TQString findRev(const TQRegExp& rx, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol);
+  TQString tqfind(const TQRegExp& rx, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol);
+  TQString tqfindRev(const TQRegExp& rx, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol);
   /** Get the view of the document */
   KTextEditor::View* view();
   /** Get the KTextEditor::Document of the document */
@@ -118,7 +119,7 @@ public:
   void createTempFile();
   /** Closes and removes the temporary file. */
   void closeTempFile();
-  /** Returns the name of the temporary file, TQString::null if no temporary file exists. */
+  /** Returns the name of the temporary file, TQString() if no temporary file exists. */
   TQString tempFileName();
 
   /** Returns the DTD identifier for the document */
@@ -142,9 +143,9 @@ work correctly. */
   void codeCompletionHintRequested();
   /** Returns the dirty status. */
   bool dirty() const {return m_dirty;};
-  void setDirtyStatus(bool status) {m_dirty = status;};
+  void setDirtytqStatus(bool status) {m_dirty = status;};
   /** Ask for user confirmation if the file was changed outside. */
-  void checkDirtyStatus();
+  void checkDirtytqStatus();
   /** Save the document and reset the dirty status. */
   void save();
   /** Save the document under a new name and calculate the new md5sum. */
@@ -158,7 +159,7 @@ work correctly. */
   /** Returns the changed status since the last query. Resets changed.*/
   bool hasChanged();
   /** Sets the changed status.*/
-  void setChanged(bool newStatus);
+  void setChanged(bool newtqStatus);
   /** Paste the contents of clipboard into the document */
   void paste();
 
@@ -169,9 +170,9 @@ work correctly. */
   /** returns all the areas that are between tag and it's closing pair */
   TQStringList tagAreas(const TQString &tag, bool includeCoordinates, bool skipFoundContent);
 
-  /** disable/enable the repaint of the Kate view */
+  /** disable/enable the tqrepaint of the Kate view */
   void activateRepaintView(bool activation);
-  bool RepaintViewActivated() {return repaintEnabled;}
+  bool RepaintViewActivated() {return tqrepaintEnabled;}
 
   void setErrorMark(int line);
   void clearErrorMarks();
@@ -187,7 +188,7 @@ work correctly. */
    */
   bool openURL(const KURL& url);
   /** Reads the DTD info from the file, tries to find the correct DTD and builds the tag/attribute list from the DTD file. */
-  void processDTD(const TQString& documentType = TQString::null);
+  void processDTD(const TQString& documentType = TQString());
 
   /** Resets the list of DTEPs found in the document */
   void resetDTEPs();
@@ -211,7 +212,7 @@ work correctly. */
   KTextEditor::MarkInterface* markIf;
 
   /** Hold the list of user tags (real or not, like functions) that are in the document*/
-  QTagList userTagList;
+  TQTagList userTagList;
   /** The undo/redo stack */
   undoRedo *docUndoRedo;
 
@@ -228,8 +229,8 @@ work correctly. */
   static TQString hashFilePath(const TQString& p);
   TQString annotationText(uint line);
   void setAnnotationText(uint line, const TQString& text);
-  TQMap<uint, QPair<TQString, TQString> > annotations() {return m_annotations;}
-  void addAnnotation(uint line, const QPair<TQString, TQString>& annotation);
+  TQMap<uint, TQPair<TQString, TQString> > annotations() {return m_annotations;}
+  void addAnnotation(uint line, const TQPair<TQString, TQString>& annotation);
   void clearAnnotations();
 
 public slots:
@@ -259,7 +260,7 @@ signals:
 
   void breakpointMarked(Document*, int);
   void breakpointUnmarked(Document*, int);
-  void showAnnotation(uint, const TQString&, const QPair<TQString, TQString>&);
+  void showAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&);
 
 private slots:
   void slotReplaceChar();
@@ -280,7 +281,7 @@ private:
 
 
 
-  TQMap<uint, QPair<TQString, TQString> > m_annotations;
+  TQMap<uint, TQPair<TQString, TQString> > m_annotations;
   TQString untitledUrl;
   int m_replaceLine;
   int m_replaceCol;
@@ -306,7 +307,7 @@ private:
   bool argHintVisible;
   bool hintRequested;
   bool reparseEnabled;
-  bool repaintEnabled;
+  bool tqrepaintEnabled;
   bool delayedTextChangedEnabled;
   /** True if the document is dirty (has been modified outside). */
   bool m_dirty;
@@ -326,11 +327,11 @@ private:
   /** Get list of possibile tag name completions */
   TQValueList<KTextEditor::CompletionEntry>* getTagCompletions(int line, int col);
   /** Get list of possibile tag attribute completions */
-  TQValueList<KTextEditor::CompletionEntry>* getAttributeCompletions(const TQString& tagName,const TQString& startsWith=TQString::null);
+  TQValueList<KTextEditor::CompletionEntry>* getAttributeCompletions(const TQString& tagName,const TQString& startsWith=TQString());
   /** Get list of possibile tag attribute value completions */
-  TQValueList<KTextEditor::CompletionEntry>* getAttributeValueCompletions(const TQString& tagName, const TQString& attribute, const TQString& startsWith=TQString::null);
+  TQValueList<KTextEditor::CompletionEntry>* getAttributeValueCompletions(const TQString& tagName, const TQString& attribute, const TQString& startsWith=TQString());
   /** Get list of possibile completions in normal text input (nt creating a tag) */
-  TQValueList<KTextEditor::CompletionEntry>* getCharacterCompletions(const TQString& starstWith=TQString::null);
+  TQValueList<KTextEditor::CompletionEntry>* getCharacterCompletions(const TQString& starstWith=TQString());
   /** Invoke code completion dialog for XML like tags according to the position (line, col), using DTD dtd. */
   bool xmlCodeCompletion(int line, int col);
   /** Returns list of values for attribute. If deleteResult is true after the call,
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index cc25516f..e1c5a742 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -56,12 +56,12 @@ const TQString m_rcFilename("description.rc");
   This constructor reads the dictionary of known dtd's, the attributes and tags will be loaded
   on the first access to one dtd.
 */
-DTDs::DTDs(TQObject *parent)
-  :TQObject(parent)
+DTDs::DTDs(TQObject *tqparent)
+  :TQObject(tqparent)
 {
-  connect(this, TQT_SIGNAL(hideSplash()), parent, TQT_SLOT(slotHideSplash()));
-  connect(this, TQT_SIGNAL(enableIdleTimer(bool)), parent, TQT_SLOT(slotEnableIdleTimer(bool)));
-  connect(this, TQT_SIGNAL(loadToolbarForDTD(const TQString&)), parent, TQT_SLOT(slotLoadToolbarForDTD(const TQString&)));
+  connect(this, TQT_SIGNAL(hideSplash()), tqparent, TQT_SLOT(slotHideSplash()));
+  connect(this, TQT_SIGNAL(enableIdleTimer(bool)), tqparent, TQT_SLOT(slotEnableIdleTimer(bool)));
+  connect(this, TQT_SIGNAL(loadToolbarForDTD(const TQString&)), tqparent, TQT_SLOT(slotLoadToolbarForDTD(const TQString&)));
 //  kdDebug(24000) << "dtds::dtds" << endl;
   m_dict = new TQDict<DTDStruct>(119, false); //optimized for max 119 DTD. This should be enough.
   m_dict->setAutoDelete(true);
@@ -120,9 +120,9 @@ DTDs::DTDs(TQObject *parent)
     DTDStruct * dtd = it.current();
     for (uint i = 0; i < dtd->insideDTDs.count(); i++)
     {
-      const DTDStruct *insideDTD = m_dict->find(dtd->insideDTDs[i]);  // search but don't load
+      const DTDStruct *insideDTD = m_dict->tqfind(dtd->insideDTDs[i]);  // search but don't load
       if (!insideDTD)
-          insideDTD = m_dict->find(getDTDNameFromNickName(dtd->insideDTDs[i]));   // search but don't load
+          insideDTD = m_dict->tqfind(getDTDNameFromNickName(dtd->insideDTDs[i]));   // search but don't load
       if (insideDTD && !insideDTD->toplevel)
           dtd->mimeTypes += insideDTD->mimeTypes;
     }
@@ -168,7 +168,7 @@ bool DTDs::readTagDir(const TQString &dirName, bool loadAll)
   KConfig *dtdConfig = new KConfig(tmpStr, true);
   dtdConfig->setGroup("General");
   TQString dtdName = dtdConfig->readEntry("Name", "Unknown");
-  if (m_dict->find(dtdName.lower()))
+  if (m_dict->tqfind(dtdName.lower()))
   {
     delete dtdConfig;
     kdDebug(24000) << "dtds::readTagDir from " << dirName
@@ -205,8 +205,8 @@ bool DTDs::readTagDir(const TQString &dirName, bool loadAll)
   for (uint i = 0; i < tmpStrList.count(); i++)
   {
     tmpStr = tmpStrList[i].stripWhiteSpace();
-    int pos = tmpStr.find('(');
-    dtd->definitionTags[tmpStr.left(pos).stripWhiteSpace()] = tmpStr.mid(pos+1, tmpStr.findRev(')')-pos-1).stripWhiteSpace();
+    int pos = tmpStr.tqfind('(');
+    dtd->definitionTags[tmpStr.left(pos).stripWhiteSpace()] = tmpStr.mid(pos+1, tmpStr.tqfindRev(')')-pos-1).stripWhiteSpace();
   }
   //Which DTD can be present in this one?
   dtd->insideDTDs = dtdConfig->readListEntry("MayContain");
@@ -239,7 +239,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
 
   if (!TQFile::exists(dtd->fileName)) return false;
 
-  kapp->setOverrideCursor( TQCursor(Qt::WaitCursor) );
+  kapp->setOverrideCursor( TQCursor(TQt::WaitCursor) );
 
   KConfig *dtdConfig = new KConfig(dtd->fileName, true);
 
@@ -264,7 +264,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
   dtd->defaultExtension = dtdConfig->readEntry("DefaultExtension");
   dtd->caseSensitive = caseSensitive;
   int numOfTags = 0;
-  QTagList *tagList = new QTagList(119, false); //max 119 tag in a DTD
+  TQTagList *tagList = new TQTagList(119, false); //max 119 tag in a DTD
   tagList->setAutoDelete(true);
   //read all the tag files
   KURL dirURL(dtd->fileName);
@@ -272,10 +272,10 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
   TQString dirName = dirURL.path(1);
   if (TQFile::exists(dirName + "common.tag"))
     readTagFile(dirName + "common.tag", dtd, 0L);
-  //bool idleTimerStatus = quantaApp->slotEnableIdleTimer(false);
+  //bool idleTimertqStatus = quantaApp->slotEnableIdleTimer(false);
   emit enableIdleTimer(false);
-  KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*.tag", 0L);
-  //quantaApp->slotEnableIdleTimer(idleTimerStatus);
+  KURL::List files = TQExtFileInfo::allFilesRelative(dirURL, "*.tag", 0L);
+  //quantaApp->slotEnableIdleTimer(idleTimertqStatus);
   emit enableIdleTimer(true);
   TQString tmpStr;
   KURL::List::ConstIterator end_f = files.constEnd();
@@ -313,16 +313,16 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
   TQStrList attrList;
   for (uint i = 0 ; i < extraTagsList.count(); i++)
   {
-    QTag *tag = new QTag();
+    TQTag *tag = new TQTag();
     tag->setName(TQString(extraTagsList.at(i)).stripWhiteSpace());
 
     tmpStr = (dtd->caseSensitive) ? tag->name() : tag->name().upper();
-    if (tagList->find(tmpStr)) //the tag is already defined in a .tag file
+    if (tagList->tqfind(tmpStr)) //the tag is already defined in a .tag file
     {
       delete tag;
       continue; //skip this tag
     }
-    tag->parentDTD = dtd;
+    tag->tqparentDTD = dtd;
     //read the possible stopping tags
     TQStrList stoppingTags;
     dtdConfig->readListEntry(tag->name() + "_stoppingtags",stoppingTags);
@@ -422,8 +422,8 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
   for (uint i = 0; i < tmpStrList.count(); i++)
   {
     tmpStr = tmpStrList[i].stripWhiteSpace();
-    int pos = tmpStr.find('(');
-    dtd->specialTags[tmpStr.left(pos).stripWhiteSpace()] = tmpStr.mid(pos+1, tmpStr.findRev(')')-pos-1).stripWhiteSpace();
+    int pos = tmpStr.tqfind('(');
+    dtd->specialTags[tmpStr.left(pos).stripWhiteSpace()] = tmpStr.mid(pos+1, tmpStr.tqfindRev(')')-pos-1).stripWhiteSpace();
   }
 
   //static const TQString quotationStr = "\\\\\"|\\\\'";
@@ -533,7 +533,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
       TQString tagStr;
       for (uint index = 1; index <= structGroupsCount; index++)
       {
-        dtdConfig->setGroup(TQString("StructGroup_%1").arg(index));
+        dtdConfig->setGroup(TQString("StructGroup_%1").tqarg(index));
         //new code
         group.name = dtdConfig->readEntry("Name").stripWhiteSpace();
         group.noName = dtdConfig->readEntry("No_Name").stripWhiteSpace();
@@ -547,7 +547,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
         group.hasDefinitionRx = !group.definitionRx.pattern().isEmpty();
         group.isMinimalDefinitionRx = dtdConfig->readBoolEntry("DefinitionRx_Minimal", false);
         group.appendToTags = dtdConfig->readBoolEntry("AppendToTags", false);
-        group.parentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
+        group.tqparentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
         tagStr = dtdConfig->readEntry("TagType", "Text").stripWhiteSpace();
         if (tagStr == "XmlTag")
             group.tagType = Tag::XmlTag;
@@ -583,19 +583,19 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
       TQString tagName;
       for (uint index = 1; index <= structGroupsCount; index++)
       {
-        dtdConfig->setGroup(TQString("StructGroup_%1").arg(index));
+        dtdConfig->setGroup(TQString("StructGroup_%1").tqarg(index));
         group.name = dtdConfig->readEntry("Name").stripWhiteSpace();
         group.noName = dtdConfig->readEntry("No_Name").stripWhiteSpace();
         group.icon = dtdConfig->readEntry("Icon").stripWhiteSpace();
         group.appendToTags = dtdConfig->readBoolEntry("AppendToTags", false);
-        group.parentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
+        group.tqparentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
         TQString tagStr = dtdConfig->readEntry("Tag").stripWhiteSpace();
         if (!tagStr.isEmpty())
         {
           attrRx.search(tagStr);
           tmpStr = attrRx.cap();
           tmpStrList = TQStringList::split(',', tmpStr.mid(1, tmpStr.length()-2));
-          tagName = tagStr.left(tagStr.find('(')).lower();
+          tagName = tagStr.left(tagStr.tqfind('(')).lower();
           group.attributes.clear();
           for (uint i = 0; i < tmpStrList.count(); i++)
             group.attributes += tmpStrList[i].stripWhiteSpace();
@@ -620,15 +620,15 @@ void DTDs::resolveInherited (DTDStruct *dtd)
   //Resolve the inheritence
   if (!dtd->inheritsTagsFrom.isEmpty())
   {
-    DTDStruct *parent = (DTDStruct *) find(dtd->inheritsTagsFrom);  // this loads the dtd, if not present in memory
-    TQDictIterator<QTag> tag_it(*(parent->tagsList));
+    DTDStruct *tqparent = (DTDStruct *) tqfind(dtd->inheritsTagsFrom);  // this loads the dtd, if not present in memory
+    TQDictIterator<TQTag> tag_it(*(tqparent->tagsList));
     for ( ; tag_it.current(); ++tag_it)
     {
-      QTag *tag = tag_it.current();
+      TQTag *tag = tag_it.current();
       TQString searchForTag = (dtd->caseSensitive) ? tag->name() : tag->name().upper();
-      if (!dtd->tagsList->find(searchForTag))
+      if (!dtd->tagsList->tqfind(searchForTag))
       {
-        QTag *newTag = new QTag(*tag);
+        TQTag *newTag = new TQTag(*tag);
         dtd->tagsList->insert(searchForTag, newTag);
       }
     }
@@ -642,9 +642,9 @@ void DTDs::resolveInherited (DTDStruct *dtd)
       specialAreaStartRxStr += "|";
   for (uint i = 0; i < dtd->insideDTDs.count(); i++)
   {
-    const DTDStruct *insideDTD = m_dict->find(dtd->insideDTDs[i]);  // search but don't load
+    const DTDStruct *insideDTD = m_dict->tqfind(dtd->insideDTDs[i]);  // search but don't load
     if (!insideDTD)
-        insideDTD = m_dict->find(getDTDNameFromNickName(dtd->insideDTDs[i]));   // search but don't load
+        insideDTD = m_dict->tqfind(getDTDNameFromNickName(dtd->insideDTDs[i]));   // search but don't load
     if (insideDTD)
     {
       for (mapIt = insideDTD->definitionAreas.begin(); mapIt != insideDTD->definitionAreas.end(); ++mapIt)
@@ -667,7 +667,7 @@ void DTDs::resolveInherited (DTDStruct *dtd)
 
 
 /** Reads the tags for the tag files. Returns the number of read tags. */
-uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, QTagList *tagList)
+uint DTDs::readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagList *tagList)
 {
 //  kdDebug(24000) << "dtds::readTagFile:" << fileName << endl;
  TQFile f(fileName);
@@ -678,14 +678,14 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, QTagList
    bool result = f.open( IO_ReadOnly );
    if (! result)
      kdError() << "dtds::readTagFile unable to open:" << fileName
-                                << " Status: " << f.status() << endl;
+                                << " tqStatus: " << f.status() << endl;
  }
  TQString errorMsg;
  int errorLine, errorCol;
  if (!m_doc->setContent( &f, &errorMsg, &errorLine, &errorCol ))
  {
    emit hideSplash();
-   KMessageBox::error(0L, i18n("<qt>The DTD tag file %1 is not valid.<br> The error message is: <i>%2 in line %3, column %4.</i></qt>").arg(fileName).arg(errorMsg).arg(errorLine).arg(errorCol),
+   KMessageBox::error(0L, i18n("<qt>The DTD tag file %1 is not valid.<br> The error message is: <i>%2 in line %3, column %4.</i></qt>").tqarg(fileName).tqarg(errorMsg).tqarg(errorLine).tqarg(errorCol),
    i18n("Invalid Tag File"));
    kdWarning() << fileName << ": " << errorMsg << ": " << errorLine << "," << errorCol << endl;
  }
@@ -702,13 +702,13 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, QTagList
       TQString extends = e.attribute("extends");
       TQString name = e.attribute("name");
       if (!name.isEmpty() && !extends.isEmpty())
-        parentDTD->classInheritance[name] = extends;
+        tqparentDTD->classInheritance[name] = extends;
       continue;
     }
-    QTag *tag = new QTag();
+    TQTag *tag = new TQTag();
     tag->setName(e.attribute("name"));
     tag->setFileName(fileName);
-    tag->parentDTD = parentDTD;
+    tag->tqparentDTD = tqparentDTD;
     bool common = false;
     setAttributes(&n, tag, common);
     if (common)
@@ -720,15 +720,15 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, QTagList
       commonAttrList->setAutoDelete(true);
       *commonAttrList = *attrs;
       //delete tag;
-      parentDTD->commonAttrs->insert(groupName, commonAttrList);
+      tqparentDTD->commonAttrs->insert(groupName, commonAttrList);
     } else
     {
-      if (parentDTD->caseSensitive)
+      if (tqparentDTD->caseSensitive)
       {
-        tagList->replace(tag->name(), tag);  //append the tag to the list for this DTD
+        tagList->tqreplace(tag->name(), tag);  //append the tag to the list for this DTD
       } else
       {
-        tagList->replace(tag->name().upper(), tag);
+        tagList->tqreplace(tag->name().upper(), tag);
       }
     }
  }
@@ -739,7 +739,7 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, QTagList
 /**
  Parse the dom document and retrieve the tag attributes
 */
-void DTDs::setAttributes(TQDomNode *dom, QTag* tag, bool &common)
+void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
 {
  common = false;
  Attribute *attr;
@@ -750,9 +750,9 @@ void DTDs::setAttributes(TQDomNode *dom, QTag* tag, bool &common)
  tmpStr = el.attribute("common");
  if ((tmpStr != "1" && tmpStr != "yes")) //in case of common tags, we are not interested in these options
  {
-    if (tag->parentDTD->commonAttrs)
+    if (tag->tqparentDTD->commonAttrs)
     {
-      TQDictIterator<AttributeList> it(*(tag->parentDTD->commonAttrs));
+      TQDictIterator<AttributeList> it(*(tag->tqparentDTD->commonAttrs));
       for( ; it.current(); ++it )
       {
         TQString lookForAttr = "has" + TQString(it.currentKey()).stripWhiteSpace();
@@ -794,7 +794,7 @@ void DTDs::setAttributes(TQDomNode *dom, QTag* tag, bool &common)
  for ( TQDomNode n = dom->firstChild(); !n.isNull(); n = n.nextSibling() )
  {
    tmpStr = n.nodeName();
-   if (tmpStr == "children")
+   if (tmpStr == "tqchildren")
    {
      TQDomElement el = n.toElement();
      TQDomElement item = el.firstChild().toElement();
@@ -804,7 +804,7 @@ void DTDs::setAttributes(TQDomNode *dom, QTag* tag, bool &common)
         if (tmpStr == "child")
         {
             TQString childTag = item.attribute("name");
-            if (!tag->parentDTD->caseSensitive)
+            if (!tag->tqparentDTD->caseSensitive)
                 childTag = childTag.upper();
             tag->childTags.insert(childTag, item.attribute("usage") == "required");
         }
@@ -820,7 +820,7 @@ void DTDs::setAttributes(TQDomNode *dom, QTag* tag, bool &common)
        if (item.tagName() == "stoppingtag")
        {
          TQString stopTag = item.attribute("name");
-         if (!tag->parentDTD->caseSensitive)
+         if (!tag->tqparentDTD->caseSensitive)
             stopTag = stopTag.upper();
          tag->stoppingTags.append(stopTag);
        }
@@ -837,7 +837,7 @@ void DTDs::setAttributes(TQDomNode *dom, QTag* tag, bool &common)
      attr->method = el.attribute("method");
      attr->arguments = el.attribute("arguments");
 
-     attr->type = el.attribute("type",tag->parentDTD->defaultAttrType);
+     attr->type = el.attribute("type",tag->tqparentDTD->defaultAttrType);
      attr->defaultValue = el.attribute("defaultValue");
      attr->status = el.attribute("status");
 
@@ -912,9 +912,9 @@ void DTDs::slotLoadDTD()
       dtdcfg.setGroup("General");
       TQString dtdName = dtdcfg.readEntry("Name");
       TQString nickName = dtdcfg.readEntry("NickName", dtdName);
-      DTDStruct * dtd = m_dict->find(dtdName) ;
+      DTDStruct * dtd = m_dict->tqfind(dtdName) ;
       if (dtd &&
-          KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").arg(nickName), TQString::null, i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No)
+          KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").tqarg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No)
       {
         return;
       }
@@ -924,7 +924,7 @@ void DTDs::slotLoadDTD()
           TQString family = dtdcfg.readEntry("Family", "1");
           Document *w = ViewManager::ref()->activeDocument();
           if (family == "1" && w &&
-              KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").arg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes)
+              KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").tqarg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes)
           {
             w->setDTDIdentifier(dtdName);
             emit loadToolbarForDTD(w->getDTDIdentifier());
@@ -944,20 +944,20 @@ void DTDs::slotLoadDTEP(const TQString &_dirName, bool askForAutoload)
   dtdcfg.setGroup("General");
   TQString dtdName = dtdcfg.readEntry("Name");
   TQString nickName = dtdcfg.readEntry("NickName", dtdName);
-  DTDStruct * dtd = m_dict->find(dtdName) ;
+  DTDStruct * dtd = m_dict->tqfind(dtdName) ;
   if ( dtd &&
-      KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").arg(nickName), TQString::null, i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No)
+      KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").tqarg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No)
   {
     return;
   }
   removeDTD(dtd);
   if (!readTagDir(dirName))
   {
-    KMessageBox::error(0L, i18n("<qt>Cannot read the DTEP from <b>%1</b>. Check that the folder contains a valid DTEP (<i>description.rc and *.tag files</i>).</qt>").arg(dirName), i18n("Error Loading DTEP"));
+    KMessageBox::error(0L, i18n("<qt>Cannot read the DTEP from <b>%1</b>. Check that the folder contains a valid DTEP (<i>description.rc and *.tag files</i>).</qt>").tqarg(dirName), i18n("Error Loading DTEP"));
   } else
   {
     TQString family = dtdcfg.readEntry("Family", "1");
-    if (askForAutoload && KMessageBox::questionYesNo(0L, i18n("<qt>Autoload the <b>%1</b> DTD in the future?</qt>").arg(nickName), TQString::null, i18n("Load"), i18n("Do Not Load")) == KMessageBox::Yes)
+    if (askForAutoload && KMessageBox::questionYesNo(0L, i18n("<qt>Autoload the <b>%1</b> DTD in the future?</qt>").tqarg(nickName), TQString(), i18n("Load"), i18n("Do Not Load")) == KMessageBox::Yes)
     {
       KURL src;
       src.setPath(dirName);
@@ -968,7 +968,7 @@ void DTDs::slotLoadDTEP(const TQString &_dirName, bool askForAutoload)
     }
     Document *w = ViewManager::ref()->activeDocument();
     if (family == "1" && w &&
-        KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").arg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes)
+        KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").tqarg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes)
     {
       w->setDTDIdentifier(dtdName);
       emit loadToolbarForDTD(w->getDTDIdentifier());
@@ -987,12 +987,12 @@ void DTDs::slotLoadEntities()
   if (w)
   {
     TQString nickName = DTDs::ref()->getDTDNickNameFromName(w->getDTDIdentifier());
-    entitiesWidget.targetDTEPCombo->setCurrentItem(lst.findIndex(nickName));
+    entitiesWidget.targetDTEPCombo->setCurrentItem(lst.tqfindIndex(nickName));
   }
   dlg.setMainWidget(&entitiesWidget);
   if (dlg.exec())
   {
-    DTDStruct * dtd = m_dict->find(getDTDNameFromNickName(entitiesWidget.targetDTEPCombo->currentText()));
+    DTDStruct * dtd = m_dict->tqfind(getDTDNameFromNickName(entitiesWidget.targetDTEPCombo->currentText()));
     DTDParser dtdParser(KURL::fromPathOrURL(entitiesWidget.sourceDTDRequester->url()), KGlobal::dirs()->saveLocation("data") + resourceDir + "dtep");
     TQString dtdDir = TQFileInfo(dtd->fileName).dirPath();
     if (dtdParser.parse(dtdDir, true))
@@ -1077,7 +1077,7 @@ const DTDStruct * DTDs::DTDforURL(const KURL &url)
     }
   }
   if (foundList.isEmpty())
-    return find("empty");
+    return tqfind("empty");
   else
   {
     TQString path = url.path();
@@ -1093,7 +1093,7 @@ const DTDStruct * DTDs::DTDforURL(const KURL &url)
 bool DTDs::canHandle(const DTDStruct *dtd, const KURL &url)
 {
   TQString mimetype = KMimeType::findByURL(url)->name();
-  if (dtd->mimeTypes.contains(mimetype))
+  if (dtd->mimeTypes.tqcontains(mimetype))
     return true;
   if (url.path().endsWith('.' + dtd->defaultExtension))
     return true;
diff --git a/quanta/src/dtds.h b/quanta/src/dtds.h
index 120157a8..ae7c28f1 100644
--- a/quanta/src/dtds.h
+++ b/quanta/src/dtds.h
@@ -34,7 +34,7 @@
 
 class TQDomNode;
 class TQDomDocument;
-class QTag;
+class TQTag;
 class TQString;
 class TQStringList;
 class KConfig;
@@ -44,11 +44,12 @@ struct DTDStruct;
 /** @short This class manages the DTD's for Quanta.
  *
  *  The constructor only loads the necessary information from the description.rc file.
- *  The rest is later loaded on demand of the find() function.
+ *  The rest is later loaded on demand of the tqfind() function.
  */
-class DTDs : public QObject
+class DTDs : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -56,10 +57,10 @@ public:
    *  since this class is a singleton you must use this function to access it
    *  @return the class pointer
    */
-  static DTDs* ref(TQObject *parent = 0L)
+  static DTDs* ref(TQObject *tqparent = 0L)
   {
     static DTDs *m_ref;
-    if (!m_ref) m_ref = new DTDs(parent);
+    if (!m_ref) m_ref = new DTDs(tqparent);
     return m_ref;
   }
 
@@ -72,10 +73,10 @@ public:
    * @param dtdName name of the dtd, will be converted to lowercase inside
    * @return the found dtd structure
    */
-  const DTDStruct * find (const TQString &dtdName)
+  const DTDStruct * tqfind (const TQString &dtdName)
   {
-//    kdDebug(24000) << "dtds::find " << dtdName << endl;
-    DTDStruct *dtd = m_dict->find(dtdName.lower()) ;
+//    kdDebug(24000) << "dtds::tqfind " << dtdName << endl;
+    DTDStruct *dtd = m_dict->tqfind(dtdName.lower()) ;
     if (dtd && ! dtd->loaded ) readTagDir2(dtd);
     return dtd;
   }
@@ -92,7 +93,7 @@ public:
    */
   TQString getDTDNickNameFromName(const TQString& name)
   {
-    DTDStruct *dtd = m_dict->find(name);
+    DTDStruct *dtd = m_dict->tqfind(name);
     if ( dtd )
       return dtd->nickName;
     else
@@ -178,7 +179,7 @@ private:
    *  If you need the class use DTDs::ref() for
    *  construction and reference
    */
-  DTDs(TQObject *parent);
+  DTDs(TQObject *tqparent);
 
 
   /** Reads the tag files and the description.rc from tagDir in order to
@@ -208,19 +209,19 @@ private:
   /** Reads the tags from the tag files.
    *
    * @param fileName path of the tag file
-   * @param parentDTD the DTD where the tags belog to
+   * @param tqparentDTD the DTD where the tags belog to
    * @param tagList the list where the tags are inserted
    * @return the number of read tags.
    */
-  uint readTagFile(const TQString& fileName, DTDStruct* parentDTD, QTagList *tagList);
+  uint readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagList *tagList);
 
   /** Parses the dom document and retrieve the tag attributes
   *
   * @param dom the DOM node containing the tag definition
-  * @param tag the QTag object that will be initialized by using the information in dom
+  * @param tag the TQTag object that will be initialized by using the information in dom
   * @param common will be true, if the tag is a just a list of common group attributes
   */
-  void setAttributes(TQDomNode *dom, QTag* tag, bool &common);
+  void setAttributes(TQDomNode *dom, TQTag* tag, bool &common);
   /** removes dtd from dictonary and deletes all components
    *
    * @param dtd the dtd to delete
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index 32e1044c..1f1f0401 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -1,5 +1,5 @@
 /*
-    KQApplication.cpp
+    KTQApplication.cpp
 
     KNode, the KDE newsreader
     Copyright (c) 1999-2001 the KNode authors.
@@ -59,7 +59,7 @@ KSplash::~KSplash()
 }
 
 
-KQApplication::KQApplication()
+KTQApplication::KTQApplication()
  : KApplication()
 {
    args = KCmdLineArgs::parsedArgs();
@@ -80,12 +80,12 @@ KQApplication::KQApplication()
      KConfig *config = kapp->config();
      config->setGroup("General Options");
      int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode);
-     TQString layout = config->readEntry("Window layout", "Default");
-     if (layout == "Default" || args->isSet("resetlayout"))
+     TQString tqlayout = config->readEntry("Window tqlayout", "Default");
+     if (tqlayout == "Default" || args->isSet("resettqlayout"))
      {
          mdiMode = KMdi::IDEAlMode;
          config->writeEntry("MDI mode", KMdi::IDEAlMode);
-         config->writeEntry("Window layout", "Default");
+         config->writeEntry("Window tqlayout", "Default");
      }
      quantaApp = new QuantaApp(mdiMode);
      config->setGroup("General Options");
@@ -101,16 +101,16 @@ KQApplication::KQApplication()
    }
 }
 
-void KQApplication::slotInit()
+void KTQApplication::slotInit()
 {
-  KQApplicationPrivate::init();
+  KTQApplicationPrivate::init();
 }
 
-KQApplication::~KQApplication()
+KTQApplication::~KTQApplication()
 {
 }
 
-void KQApplication::slotSplashTimeout()
+void KTQApplication::slotSplashTimeout()
 {
   delete splash;
   delete sp;
@@ -118,19 +118,19 @@ void KQApplication::slotSplashTimeout()
   sp = 0L;
 }
 
-KQUniqueApplication::KQUniqueApplication()
+KTQUniqueApplication::KTQUniqueApplication()
  : KUniqueApplication()
 {
   KGlobal::dirs()->addPrefix(PREFIX);
   dcopClient()->registerAs("quanta", false);
 }
 
-KQUniqueApplication::~KQUniqueApplication()
+KTQUniqueApplication::~KTQUniqueApplication()
 {
 }
 
 
-int KQUniqueApplication::newInstance()
+int KTQUniqueApplication::newInstance()
 {
   args = KCmdLineArgs::parsedArgs();
   if (mainWidget())
@@ -151,11 +151,11 @@ int KQUniqueApplication::newInstance()
     KConfig *config = kapp->config();
     config->setGroup("General Options");
     int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode);
-    TQString layout = config->readEntry("Window layout", "Default");
-    if (layout == "Default" || args->isSet("resetlayout"))
+    TQString tqlayout = config->readEntry("Window tqlayout", "Default");
+    if (tqlayout == "Default" || args->isSet("resettqlayout"))
     {
         mdiMode = KMdi::IDEAlMode;
-        config->writeEntry("Window layout", "Default");
+        config->writeEntry("Window tqlayout", "Default");
         config->writeEntry("MDI mode", KMdi::IDEAlMode);
     }
     quantaApp = new QuantaApp(mdiMode);
@@ -174,12 +174,12 @@ int KQUniqueApplication::newInstance()
   return 0;
 }
 
-void KQUniqueApplication::slotInit()
+void KTQUniqueApplication::slotInit()
 {
-  KQApplicationPrivate::init();
+  KTQApplicationPrivate::init();
 }
 
-void KQUniqueApplication::slotSplashTimeout()
+void KTQUniqueApplication::slotSplashTimeout()
 {
   delete splash;
   delete sp;
@@ -188,7 +188,7 @@ void KQUniqueApplication::slotSplashTimeout()
 }
 
 
-void KQApplicationPrivate::init()
+void KTQApplicationPrivate::init()
 {
   if (quantaApp->quantaStarted)
   {
@@ -203,7 +203,7 @@ void KQApplicationPrivate::init()
     {
       TQString arg = args->url(i).url();
 
-      if(arg.findRev(TQRegExp(".+\\.webprj")) != -1)
+      if(arg.tqfindRev(TQRegExp(".+\\.webprj")) != -1)
         initialProject = arg;
       else
         initialFiles += arg;
diff --git a/quanta/src/kqapp.h b/quanta/src/kqapp.h
index 1ecda501..ea4b9b7d 100644
--- a/quanta/src/kqapp.h
+++ b/quanta/src/kqapp.h
@@ -16,8 +16,8 @@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, US
 */
 
-#ifndef KQAPPLICATION_H
-#define KQAPPLICATION_H
+#ifndef KTQAPPLICATION_H
+#define KTQAPPLICATION_H
 
 #include <tqframe.h>
 #include <kuniqueapplication.h>
@@ -25,20 +25,21 @@
 class KCmdLineArgs;
 class KSplashScreen;
 
-class KSplash : public QFrame
+class KSplash : public TQFrame
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     KSplash();
     ~KSplash();
 };
 
-class KQApplicationPrivate
+class KTQApplicationPrivate
 {
   public:
-    KQApplicationPrivate():splash(0L), sp(0L) {};
-    ~KQApplicationPrivate() {};
+    KTQApplicationPrivate():splash(0L), sp(0L) {};
+    ~KTQApplicationPrivate() {};
 
   protected:
     void init();
@@ -48,25 +49,27 @@ class KQApplicationPrivate
     KSplashScreen *sp;
 };
 
-class KQApplication : public KApplication, KQApplicationPrivate
+class KTQApplication : public KApplication, KTQApplicationPrivate
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KQApplication();
-    ~KQApplication();
+    KTQApplication();
+    ~KTQApplication();
   public slots:
     void slotInit();
     void slotSplashTimeout();
 };
 
-class KQUniqueApplication : public KUniqueApplication, KQApplicationPrivate
+class KTQUniqueApplication : public KUniqueApplication, KTQApplicationPrivate
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    KQUniqueApplication();
-    ~KQUniqueApplication();
+    KTQUniqueApplication();
+    ~KTQUniqueApplication();
 
     /** Create new instance of Quanta. Make the existing
         main window active if Quanta is already running */
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index 527c9956..7c2fe22a 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -56,7 +56,7 @@ static KCmdLineOptions options[] =
   { "+[File]", I18N_NOOP("File to open"), 0 },
   { "unique", I18N_NOOP("Whether we start as a one-instance application"), 0 },
   { "nologo", I18N_NOOP("Do not show the nice logo during startup"), 0 },
-  { "resetlayout", I18N_NOOP("Reset the layout of the user interface to the default"), 0},
+  { "resettqlayout", I18N_NOOP("Reset the tqlayout of the user interface to the default"), 0},
   KCmdLineLastOption
   // INSERT YOUR COMMANDLINE OPTIONS HERE
 };
@@ -208,9 +208,9 @@ int main(int argc, char *argv[])
           DCOPRef("quanta", QUANTA_PACKAGE).call("newInstance()");
           exit(0);
       }
-  app = new KQUniqueApplication;
+  app = new KTQUniqueApplication;
   } else {
-  app = new KQApplication;
+  app = new KTQApplication;
   }
 
   return app->exec();
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 16795ec9..ada60632 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -196,7 +196,7 @@ extern int NN;
 const TQString resourceDir = TQString(QUANTA_PACKAGE) + "/";
 
 // from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
-static void silenceQToolBar(QtMsgType, const char *){}
+static void silenceTQToolBar(TQtMsgType, const char *){}
 
 QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( 0, "Quanta", (KMdi::MdiMode) mdiMode)
 
@@ -206,13 +206,13 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm(
   m_quantaInit = new QuantaInit(this);
   dcopSettings = new DCOPSettings;
   dcopQuanta = new DCOPQuanta;
-  DTDs::ref(this);
+  DTDs::ref(TQT_TQOBJECT(this));
   quantaStarted = true;
   tempFileList.setAutoDelete(true);
   m_toolbarList.setAutoDelete(true);
   userToolbarsCount = 0;
   baseNode = 0L;
-  currentToolbarDTD = TQString::null;
+  currentToolbarDTD = TQString();
   m_config=kapp->config();
   idleTimer = new TQTimer(this);
   connect(idleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotIdleTimerExpired()));
@@ -232,7 +232,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm(
   qConfig.enableDTDToolbar = true;
 
   // connect up signals from KXXsldbgPart
-  connectDCOPSignal(0, 0, "debuggerPositionChangedQString,int)", "newDebuggerPosition(TQString,int)", false );
+  connectDCOPSignal(0, 0, "debuggerPositionChangedTQString,int)", "newDebuggerPosition(TQString,int)", false );
   connectDCOPSignal(0, 0, "editorPositionChanged(TQString,int,int)", "newCursorPosition(TQString,int,int)", false );
   connectDCOPSignal(0, 0, "openFile(TQString,int,int)", "openFile(TQString,int,int)", false);
 
@@ -258,7 +258,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm(
   m_parserEnabled = true;
   cursorLine = 0;
   cursorCol = 0;
-  emit eventHappened("quanta_start", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString::null);
+  emit eventHappened("quanta_start", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate), TQString());
   setAcceptDrops(true);
   tabWidget()->installEventFilter(this);
 }
@@ -320,7 +320,7 @@ QuantaApp::~QuantaApp()
  tmpDir = tmpDirs[0];
  for (uint i = 0; i < tmpDirs.count(); i++)
  {
-   if (tmpDirs[i].contains("kde-"))
+   if (tmpDirs[i].tqcontains("kde-"))
       tmpDir = tmpDirs[i];
  }
  TQString infoCss = tmpDir;
@@ -373,9 +373,9 @@ void QuantaApp::slotFileOpen(const KURL::List &urls, const TQString& encoding)
   m_parserEnabled = false;
   for (KURL::List::ConstIterator i = urls.begin(); i != urls.end(); ++i)
   {
-    if (!QExtFileInfo::exists(*i, true, this))
+    if (!TQExtFileInfo::exists(*i, true, this))
     {
-      KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").arg((*i).prettyURL(0, KURL::StripFileProtocol)));
+      KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg((*i).prettyURL(0, KURL::StripFileProtocol)));
 
     } else
     {
@@ -409,10 +409,10 @@ void QuantaApp::slotFileOpen(const KURL &url, const TQString& encoding, bool rea
 
 void QuantaApp::slotFileOpenRecent(const KURL &url)
 {
-  if (!QExtFileInfo::exists(url, true, this))
+  if (!TQExtFileInfo::exists(url, true, this))
   {
     if (KMessageBox::questionYesNo(this,
-        i18n("The file %1 does not exist.\n Do you want to remove it from the list?").arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString::null, KStdGuiItem::del(), i18n("Keep"))
+        i18n("The file %1 does not exist.\n Do you want to remove it from the list?").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep"))
         == KMessageBox::Yes)
     {
       fileRecent->removeURL(url);
@@ -433,7 +433,7 @@ void QuantaApp::slotFileSave()
   Document *w = view->document();
   if (w)
   {
-    w->checkDirtyStatus();
+    w->checkDirtytqStatus();
     if (w->isUntitled())
       slotFileSaveAs();
     else
@@ -457,7 +457,7 @@ bool QuantaApp::slotFileSaveAs(QuantaView *viewToSave)
   if (w)
   {
     KURL oldURL = w->url();
-    w->checkDirtyStatus();
+    w->checkDirtytqStatus();
     if (!w->isUntitled() && oldURL.isLocalFile())
     {
       fileWatcher->removeFile(oldURL.path());
@@ -522,8 +522,8 @@ bool QuantaApp::slotFileSaveAs(QuantaView *viewToSave)
     if (QuantaCommon::checkOverwrite(saveUrl, this) && view->saveDocument(saveUrl))
     {
       oldURL = saveUrl;
-      if (Project::ref()->hasProject() && !Project::ref()->contains(saveUrl) &&
-          KMessageBox::Yes == KMessageBox::questionYesNo(0,i18n("<qt>Do you want to add the<br><b>%1</b><br>file to project?</qt>").arg(saveUrl.prettyURL(0, KURL::StripFileProtocol)), TQString::null, KStdGuiItem::add(), i18n("Do Not Add"))
+      if (Project::ref()->hasProject() && !Project::ref()->tqcontains(saveUrl) &&
+          KMessageBox::Yes == KMessageBox::questionYesNo(0,i18n("<qt>Do you want to add the<br><b>%1</b><br>file to project?</qt>").tqarg(saveUrl.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::add(), i18n("Do Not Add"))
         )
       {
         if (saveUrl.isLocalFile())
@@ -557,7 +557,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly)
   KURL url;
   int query;
   KURL projectTemplateURL;
-  w->checkDirtyStatus();
+  w->checkDirtytqStatus();
   TQString localTemplateDir = locateLocal("data", resourceDir + "templates/");
 
   do {
@@ -565,10 +565,10 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly)
 
     if (projectTemplate)
     {
-      url = KFileDialog::getSaveURL(Project::ref()->templateURL().url(), TQString::null, this);
+      url = KFileDialog::getSaveURL(Project::ref()->templateURL().url(), TQString(), this);
     } else
     {
-      url = KFileDialog::getSaveURL(locateLocal("data", resourceDir + "templates/"), TQString::null, this);
+      url = KFileDialog::getSaveURL(locateLocal("data", resourceDir + "templates/"), TQString(), this);
     }
 
     if (url.isEmpty()) return;
@@ -584,7 +584,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly)
     {
       if (projectTemplate)
           localTemplateDir = projectTemplateURL.path(1);
-      KMessageBox::sorry(this,i18n("You must save the templates in the following folder: \n\n%1").arg(localTemplateDir));
+      KMessageBox::sorry(this,i18n("You must save the templates in the following folder: \n\n%1").tqarg(localTemplateDir));
       query = KMessageBox::No;
     }
   } while (query != KMessageBox::Yes);
@@ -602,8 +602,8 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly)
     stream << content;
     tempFile->file()->flush();
     tempFile->close();
-    if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url, -1, true, false,  this))
-      KMessageBox::error(this, i18n("<qt>There was an error while creating the template file.<br>Check that you have write access to <i>%1</i>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error"));
+    if (!TQExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url, -1, true, false,  this))
+      KMessageBox::error(this, i18n("<qt>There was an error while creating the template file.<br>Check that you have write access to <i>%1</i>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error"));
     delete tempFile;
   } else
   {
@@ -684,7 +684,7 @@ void QuantaApp::slotFileCloseAll()
   part->write(" ");
   part->end();
 
-  slotNewStatus();
+  slotNewtqStatus();
 }
 
 void QuantaApp::slotFileQuit()
@@ -703,19 +703,19 @@ void QuantaApp::slotEditFindInFiles()
 
 void QuantaApp::slotHelpTip()
 {
-   KTipDialog::showTip(this, TQString::null, true);
+   KTipDialog::showTip(this, TQString(), true);
 }
 
 void QuantaApp::slotStatusMsg(const TQString &msg)
 {
   statusbarTimer->stop();
   statusBar()->changeItem(" " + KStringHandler::cPixelSqueeze(msg, statusBar()->fontMetrics(), progressBar->x() - 20), IDS_STATUS);
-  statusBar()->repaint();
-  kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+  statusBar()->tqrepaint();
+  kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
   statusbarTimer->start(10000, true);
 }
 
-/** repaint preview */
+/** tqrepaint preview */
 void QuantaApp::slotRepaintPreview()
 {
   Document *w = ViewManager::ref()->activeDocument();
@@ -761,7 +761,7 @@ void QuantaApp::slotRepaintPreview()
       TQString noFramesText = w->text(0,0, bl, bc - 1);
       noFramesText += noframearea[0];
       noFramesText += w->text(el, ec + 1, w->editIf->numLines() - 1, w->editIf->lineLength(w->editIf->numLines() - 1));
-      noFramesText.replace(TQRegExp("</?noframes[^>]*>", false), "");
+      noFramesText.tqreplace(TQRegExp("</?noframes[^>]*>", false), "");
       //kdDebug(24000) << "NOFRAMES: " << noFramesText << endl;
       if (w->isUntitled())
         m_htmlPart->begin(Project::ref()->projectBaseURL(), xOffset, yOffset);
@@ -809,7 +809,7 @@ void QuantaApp::slotRepaintPreview()
       tmpFile->textStream()->setCodec(TQTextCodec::codecForName(encoding.ascii()));
       *(tmpFile->textStream()) << w->editIf->text();
       tmpFile->close();
-      if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFileName), previewURL, -1, true)) {
+      if (!TQExtFileInfo::copy(KURL::fromPathOrURL(tempFileName), previewURL, -1, true)) {
         m_htmlPart->setPreviewedURL(KURL());    //  copy failed, force the preview of the original
       };
       delete tmpFile;
@@ -864,7 +864,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo)
       baseURL = w->url();
       baseURL.setFileName("");
     }
-    KURL relURL = QExtFileInfo::toRelative(url, baseURL);
+    KURL relURL = TQExtFileInfo::toRelative(url, baseURL);
     TQString urlStr = relURL.url();
     if (relURL.protocol() == baseURL.protocol())
         urlStr = relURL.path();
@@ -876,7 +876,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo)
     } else
     {
       TQString mimetype = KMimeType::findByURL(url)->name();
-      if (mimetype.contains("image"))
+      if (mimetype.tqcontains("image"))
       {
         TQString imgFileName;
         KIO::NetAccess::download(url, imgFileName, this);
@@ -915,7 +915,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo)
   }
 }
 
-void QuantaApp::slotNewStatus()
+void QuantaApp::slotNewtqStatus()
 {
   fileRecent->setEnabled(true);
   actionCollection()->action("project_open_recent")->setEnabled(true);
@@ -965,7 +965,7 @@ void QuantaApp::slotOptionsConfigureKeys()
   for( TQPtrListIterator<KXMLGUIClient> it( clients );
        it.current(); ++it )
   {
-     if (toolbarGuiClients.contains(*it) <= 0) //no need to insert the collections of the toolbars as they are present in the main actionCollection
+     if (toolbarGuiClients.tqcontains(*it) <= 0) //no need to insert the collections of the toolbars as they are present in the main actionCollection
         dlg.insert((*it)->actionCollection());
   }
   if (dlg.configure() == KKeyDialog::Accepted)
@@ -1026,7 +1026,7 @@ void QuantaApp::slotOptionsConfigureKeys()
           el.setAttribute("shortcut", action->shortcut().toString());
           el = node.toElement();
           node = node.nextSibling();
-          el.parentNode().removeChild(el);
+          el.tqparentNode().removeChild(el);
         } else
         {
           node = node.nextSibling();
@@ -1161,7 +1161,7 @@ void QuantaApp::slotOptions()
               KDialogBase::Ok, this, "tabdialog");
 
   // Tag Style options
-  TQVBox *page=kd->addVBoxPage(i18n("Tag Style"), TQString::null, BarIcon("kwrite", KIcon::SizeMedium));
+  TQVBox *page=kd->addVBoxPage(i18n("Tag Style"), TQString(), BarIcon("kwrite", KIcon::SizeMedium));
   StyleOptionsS *styleOptionsS = new StyleOptionsS( (TQWidget *)page);
 
   styleOptionsS->tagCase->setCurrentItem( qConfig.tagCase);
@@ -1175,7 +1175,7 @@ void QuantaApp::slotOptions()
 
   // Environment options
   //TODO FileMasks name is not good anymore
-  page=kd->addVBoxPage(i18n("Environment"), TQString::null, UserIcon("files", KIcon::SizeMedium ) );
+  page=kd->addVBoxPage(i18n("Environment"), TQString(), UserIcon("files", KIcon::SizeMedium ) );
   FileMasks *fileMasks = new FileMasks((TQWidget *)page);
 
   fileMasks->lineMarkup->setText( qConfig.markupMimeTypes );
@@ -1215,7 +1215,7 @@ void QuantaApp::slotOptions()
   fileMasks->defaultDTDCombo->setCurrentItem(pos);
 
   // Preview options
-  page=kd->addVBoxPage(i18n("User Interface"), TQString::null, BarIcon("view_choose", KIcon::SizeMedium ) );
+  page=kd->addVBoxPage(i18n("User Interface"), TQString(), BarIcon("view_choose", KIcon::SizeMedium ) );
   PreviewOptions *uiOptions = new PreviewOptions( (TQWidget *)page );
 
   uiOptions->setPosition(qConfig.previewPosition);
@@ -1238,10 +1238,10 @@ void QuantaApp::slotOptions()
     uiOptions->warnEventActions->setChecked(true);
   }
   //kafka options
-  page = kd->addVBoxPage(i18n("VPL View"), TQString::null, UserIcon("vpl_text", KIcon::SizeMedium));
+  page = kd->addVBoxPage(i18n("VPL View"), TQString(), UserIcon("vpl_text", KIcon::SizeMedium));
   KafkaSyncOptions *kafkaOptions = new KafkaSyncOptions( m_config, (TQWidget *)page );
 
-  page=kd->addVBoxPage(i18n("Parser"), TQString::null, BarIcon("kcmsystem", KIcon::SizeMedium ) );
+  page=kd->addVBoxPage(i18n("Parser"), TQString(), BarIcon("kcmsystem", KIcon::SizeMedium ) );
   ParserOptions *parserOptions = new ParserOptions( m_config, (TQWidget *)page );
 
   parserOptions->refreshFrequency->setValue(qConfig.refreshFrequency);
@@ -1250,7 +1250,7 @@ void QuantaApp::slotOptions()
   parserOptions->showClosingTags->setChecked(qConfig.showClosingTags);
   parserOptions->spinExpand->setValue(qConfig.expandLevel);
 
-  page = kd->addVBoxPage(i18n("Abbreviations"), TQString::null, BarIcon("fontsizeup", KIcon::SizeMedium));
+  page = kd->addVBoxPage(i18n("Abbreviations"), TQString(), BarIcon("fontsizeup", KIcon::SizeMedium));
   AbbreviationDlg *abbreviationOptions = new AbbreviationDlg((TQWidget*)(page));
 
   bool reloadTrees = false;
@@ -1348,7 +1348,7 @@ void QuantaApp::slotOptions()
     if (previewSettingsChanged)
       slotShowPreviewWidget(true);
     qConfig.docPosition = uiOptions->docPosition();
-    qConfig.windowLayout = uiOptions->layout();
+    qConfig.windowLayout = uiOptions->tqlayout();
 
     m_htmlPart->closeURL();
     m_htmlPart->begin( Project::ref()->projectBaseURL());
@@ -1356,7 +1356,7 @@ void QuantaApp::slotOptions()
     m_htmlPart->end();
 
     reparse(true);
-    slotNewStatus();
+    slotNewtqStatus();
   }
 
   m_config->sync();
@@ -1379,7 +1379,7 @@ void QuantaApp::slotShowPreviewWidget(bool show)
     {
       delete m_previewToolView;
       m_previewToolView = 0L;
-      view->addCustomWidget(m_htmlPart->view(), TQString::null);
+      view->addCustomWidget(m_htmlPart->view(), TQString());
     } else
     {
       if (!m_previewToolView)
@@ -1402,7 +1402,7 @@ void QuantaApp::slotShowPreviewWidget(bool show)
     m_htmlPart->view()->hide();
     if (qConfig.previewPosition == "Editor")
     {
-        view->addCustomWidget(0L, TQString::null);
+        view->addCustomWidget(0L, TQString());
         delete m_previewToolView;
         m_previewToolView = 0L;
     } else
@@ -1437,7 +1437,7 @@ void QuantaApp::slotShowPreviewWidget(bool show)
   }
 }
 
-void QuantaApp::slotChangePreviewStatus()
+void QuantaApp::slotChangePreviewtqStatus()
 {
     if (qConfig.previewPosition == "Editor")
     {
@@ -1446,7 +1446,7 @@ void QuantaApp::slotChangePreviewStatus()
     if (m_previewToolView && m_htmlPart->view()->isVisible())
     {
       //hiding the preview when it's in a toolview means that the current tab has changed,
-      //so we just repaint the content and restore the document on the disc.
+      //so we just tqrepaint the content and restore the document on the disc.
         m_previewVisible = true;
         if (m_previewedDocument)
         {
@@ -1511,7 +1511,7 @@ void QuantaApp::newCursorPosition(const TQString &file, int lineNumber, int colu
   startIdleTimer();
  // updateTreeViews();
   TQString linenumber;
-  linenumber = i18n("Line: %1 Col: %2").arg(lineNumber).arg(columnNumber);
+  linenumber = i18n("Line: %1 Col: %2").tqarg(lineNumber).tqarg(columnNumber);
   statusBar()->changeItem(linenumber, IDS_STATUS_CLM);
   statusBar()->changeItem(i18n(" R/O "),IDS_INS_OVR);
   statusBar()->changeItem("",IDS_MODIFIED);
@@ -1525,7 +1525,7 @@ void QuantaApp::newDebuggerPosition(const TQString &file, int lineNumber)
 void QuantaApp::openFile(const TQString &file, int lineNumber, int columnNumber)
 {
   gotoFileAndLine(file, lineNumber, columnNumber);
-  slotNewStatus();
+  slotNewtqStatus();
 }
 
 void QuantaApp::slotNewLineColumn()
@@ -1539,7 +1539,7 @@ void QuantaApp::slotNewLineColumn()
   Document *w = ViewManager::ref()->activeDocument();
   if (w)
     w->viewCursorIf->cursorPosition(&cursorLine, &cursorCol);
-  linenumber = i18n("Line: %1 Col: %2").arg(cursorLine+1).arg(cursorCol+1);
+  linenumber = i18n("Line: %1 Col: %2").tqarg(cursorLine+1).tqarg(cursorCol+1);
   statusBar()->changeItem(linenumber, IDS_STATUS_CLM);
 }
 
@@ -1781,7 +1781,7 @@ void QuantaApp::slotShowAnnotationView()
   makeDockVisible(dynamic_cast<KDockWidget*>(m_annotationOutputView->wrapperWidget()));
 }
 
-TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id )
+TQWidget* QuantaApp::createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id )
 {
 
   TQString tabname = element.attribute( "i18ntabname", "" );
@@ -1790,12 +1790,12 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl
   if ( element.tagName().lower() == "toolbar" && !tabname.isEmpty())
   {
 //avoid TQToolBar warning in the log
-    QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
+    TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar );
     ToolbarTabWidget *toolbarTab = ToolbarTabWidget::ref();
     TQWidget *w = new TQWidget(toolbarTab, TQString("ToolbarHoldingWidget" + element.attribute("name")).ascii());
     QuantaToolBar *tb = new QuantaToolBar(w, element.attribute("name").ascii(), true, true);
     tb->loadState(element);
-    tb->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
+    tb->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
 
   //kdDebug(24000) << "tb->iconSize() " << tb->iconSize() << endl;
    if (toolbarTab->iconText() == KToolBar::IconTextBottom)
@@ -1813,7 +1813,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl
    kdDebug(24000) << "toolbarTab->tabHeight() " << toolbarTab->tabHeight() << endl;
 */
     toolbarTab->insertTab(tb, tabname, idStr);
-    qInstallMsgHandler( oldHandler );
+    tqInstallMsgHandler( oldHandler );
 
     connect(tb, TQT_SIGNAL(removeAction(const TQString&, const TQString&)),
                 TQT_SLOT(slotRemoveAction(const TQString&, const TQString&)));
@@ -1822,18 +1822,18 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl
     return tb;
   }
 
-  return KMainWindow::createContainer( parent, index, element, id );
+  return KMainWindow::createContainer( tqparent, index, element, id );
 
 }
 
-void QuantaApp::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id )
+void QuantaApp::removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id )
 {
   if (dynamic_cast<QuantaToolBar*>(container))
   {
     ToolbarTabWidget::ref()->removePage(container);
   }
   else
-    KMainWindow::removeContainer( container, parent, element, id );
+    KMainWindow::removeContainer( container, tqparent, element, id );
 }
 
 void QuantaApp::slotBack()
@@ -1911,14 +1911,14 @@ void QuantaApp::slotContextMenuAboutToShow()
                 name = tagStr.mid(pos, group.definitionRx.matchedLength());
                 node->tag->beginPos(bl, bc);
                 TQString tmpStr = tagStr.left(pos);
-                int newLines = tmpStr.contains('\n');
+                int newLines = tmpStr.tqcontains('\n');
                 bl += newLines;
-                int l = tmpStr.findRev('\n'); //the last EOL
+                int l = tmpStr.tqfindRev('\n'); //the last EOL
                 bc = (l == -1) ? bc+pos : pos - l - 1;
-                newLines = name.contains('\n');
+                newLines = name.tqcontains('\n');
                 l = name.length();
                 el = bl + newLines;
-                ec = (newLines > 0) ? l - name.findRev('\n') : bc + l - 1;
+                ec = (newLines > 0) ? l - name.tqfindRev('\n') : bc + l - 1;
                 pos += l;
                 int p = group.definitionRx.search(cleanName);
                 if (p != -1)
@@ -1942,7 +1942,7 @@ void QuantaApp::slotContextMenuAboutToShow()
         }
       } else
       {
-        TQMap<TQString, XMLStructGroup>::ConstIterator it = node->tag->dtd()->xmlStructTreeGroups.find(node->tag->name.lower());
+        TQMap<TQString, XMLStructGroup>::ConstIterator it = node->tag->dtd()->xmlStructTreeGroups.tqfind(node->tag->name.lower());
 
         if (it != node->tag->dtd()->xmlStructTreeGroups.constEnd())
         {
@@ -1964,11 +1964,11 @@ void QuantaApp::slotContextMenuAboutToShow()
     {
       if (!name.isEmpty())
       {
-        KURL baseUrl = QExtFileInfo::path(w->url());
+        KURL baseUrl = TQExtFileInfo::path(w->url());
         urlUnderCursor = baseUrl;
         QuantaCommon::setUrl(urlUnderCursor, name.stripWhiteSpace());
-        urlUnderCursor = QExtFileInfo::toAbsolute(urlUnderCursor, baseUrl);
-        action->setText(i18n("Open File: %1").arg(KStringHandler::lsqueeze(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol), 80)));
+        urlUnderCursor = TQExtFileInfo::toAbsolute(urlUnderCursor, baseUrl);
+        action->setText(i18n("Open File: %1").tqarg(KStringHandler::lsqueeze(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol), 80)));
         action->setEnabled(true);
       } else
       {
@@ -1979,7 +1979,7 @@ void QuantaApp::slotContextMenuAboutToShow()
     action = actionCollection()->action("upload_file");
     if (action)
     {
-      action->setEnabled(Project::ref()->contains(w->url()));
+      action->setEnabled(Project::ref()->tqcontains(w->url()));
     }
 
     // If we have a debugger session active...
@@ -1997,16 +1997,16 @@ void QuantaApp::slotContextMenuAboutToShow()
       {
         // Otherwise, find the word under the cursor
         word =  w->editIf->textLine(w->viewCursorIf->cursorLine());
-        startpos = word.findRev(TQRegExp("$|[^a-zA-Z0-9_]"), w->viewCursorIf->cursorColumn());
+        startpos = word.tqfindRev(TQRegExp("$|[^a-zA-Z0-9_]"), w->viewCursorIf->cursorColumn());
 
         word.remove(0, startpos);
         if(word.left(1) != "$")
           word.remove(0, 1);
 
-        word = word.left(word.find(TQRegExp("[^a-zA-Z0-9_]"), 1));
+        word = word.left(word.tqfind(TQRegExp("[^a-zA-Z0-9_]"), 1));
       }
       // If we have a linebreak, take everything before the break
-      startpos = word.find("\n");
+      startpos = word.tqfind("\n");
       if(startpos > 0)
         word = word.left(startpos);
 
@@ -2027,7 +2027,7 @@ void QuantaApp::slotContextMenuAboutToShow()
       action = actionCollection()->action("debug_addwatch");
       if(action)
       {
-        action->setText(i18n("Add Watch: '%1'").arg(word));
+        action->setText(i18n("Add Watch: '%1'").tqarg(word));
         action->setEnabled(!word.isEmpty());
 
         if(!action->isPlugged(popup))
@@ -2038,7 +2038,7 @@ void QuantaApp::slotContextMenuAboutToShow()
       action = actionCollection()->action("debug_variable_set");
       if(action)
       {
-        action->setText(i18n("Set Value of '%1'").arg(word));
+        action->setText(i18n("Set Value of '%1'").tqarg(word));
         action->setEnabled(!word.isEmpty());
 
         if(!action->isPlugged(popup))
@@ -2049,7 +2049,7 @@ void QuantaApp::slotContextMenuAboutToShow()
       action = actionCollection()->action("debug_conditional_break");
       if(action)
       {
-        action->setText(i18n("Break When '%1'...").arg(word));
+        action->setText(i18n("Break When '%1'...").tqarg(word));
         action->setEnabled(!word.isEmpty());
 
         if(!action->isPlugged(popup))
@@ -2074,7 +2074,7 @@ void QuantaApp::slotContextMenuAboutToShow()
 
 void QuantaApp::slotOpenFileUnderCursor()
 {
-  if (QExtFileInfo::exists(urlUnderCursor, true, this))
+  if (TQExtFileInfo::exists(urlUnderCursor, true, this))
   {
     if (QuantaCommon::checkMimeGroup(urlUnderCursor, "text" ))
     {
@@ -2087,7 +2087,7 @@ void QuantaApp::slotOpenFileUnderCursor()
     }
   } else
   {
-    KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").arg(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol)));
+    KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol)));
 
   }
 }
@@ -2166,8 +2166,8 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url)
        {
          if ((nodeList.item(i).cloneNode().toElement().attribute("name").lower() ) == name.lower())
          {
-           newName = origName + TQString(" (%1)").arg(count);
-           i18nName = i18n(origName.utf8()) + TQString(" (%1)").arg(count);
+           newName = origName + TQString(" (%1)").tqarg(count);
+           i18nName = i18n(origName.utf8()) + TQString(" (%1)").tqarg(count);
            nameModified = true;
            count++;
            found = true;
@@ -2195,12 +2195,12 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url)
    TQString s = i18nName.lower();
    TQString toolbarId = s;
    TQRegExp rx("\\s|\\.");
-   toolbarId.replace(rx, "_");
+   toolbarId.tqreplace(rx, "_");
    int n = 1;
-   while (m_toolbarList.find(toolbarId) != 0L)
+   while (m_toolbarList.tqfind(toolbarId) != 0L)
    {
-     toolbarId = s + TQString("%1").arg(n);
-     toolbarId.replace(rx, "_");
+     toolbarId = s + TQString("%1").tqarg(n);
+     toolbarId.tqreplace(rx, "_");
      n++;
    }
 
@@ -2250,7 +2250,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url)
 
     //Compatility code (read the action shortcuts from quantaui.rc)
     //TODO: Remove after upgrade from 3.1 is not supported
-      if (oldShortcuts.contains(actionName))
+      if (oldShortcuts.tqcontains(actionName))
       {
         tagAction->setModified(true);
         tagAction->data().setAttribute("shortcut", oldShortcuts[actionName]);
@@ -2438,7 +2438,7 @@ KURL QuantaApp::saveToolbarToFile(const TQString& toolbarName, const KURL& destF
   TQString error;
   int el, ec;
   if (!dom->setContent(s, &error, &el, &ec))
-      kdError(24000) << TQString("Error %1 at (%2, %3)").arg(error).arg(el).arg(ec)<<endl;
+      kdError(24000) << TQString("Error %1 at (%2, %3)").tqarg(error).tqarg(el).tqarg(ec)<<endl;
   p_toolbar->dom = dom;
 
   TQTextStream bufferStr(&buffer);
@@ -2458,10 +2458,10 @@ KURL QuantaApp::saveToolbarToFile(const TQString& toolbarName, const KURL& destF
   if (!tar.writeFile(TQFileInfo(tarFile.path()).baseName()+".actions", "user", "group", buffer2.buffer().size(), buffer2.buffer().data()))
       return KURL();
   tar.close();
-  if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), tarFile, -1, true, false, this))
+  if (!TQExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), tarFile, -1, true, false, this))
   {
     KMessageBox::error(this, i18n("<qt>An error happened while saving the <b>%1</b> toolbar.<br>"
-        "Check that you have write permissions for<br><b>%2</b>.<br><br>This might happen if you tried save to save a global toolbar as a simple user. Use <i>Save As</i> or <i>Toolbars->Save Toolbars->Save as Local Toolbar</i> in this case. </qt>").arg(p_toolbar->name).arg(tarFile.prettyURL(0, KURL::StripFileProtocol)), i18n("Toolbar Saving Error"));
+        "Check that you have write permissions for<br><b>%2</b>.<br><br>This might happen if you tried save to save a global toolbar as a simple user. Use <i>Save As</i> or <i>Toolbars->Save Toolbars->Save as Local Toolbar</i> in this case. </qt>").tqarg(p_toolbar->name).tqarg(tarFile.prettyURL(0, KURL::StripFileProtocol)), i18n("Toolbar Saving Error"));
     tarFile = KURL();
     delete p_toolbar->dom;
     p_toolbar->dom = oldDom;
@@ -2554,7 +2554,7 @@ bool QuantaApp::saveToolbar(bool localToolbar, const TQString& toolbarToSave, co
         if (!localToolbar)
             localToolbarsDir = projectToolbarsURL.prettyURL();
         KMessageBox::sorry(0,i18n("<qt>You must save the toolbars to the following folder: <br><br><b>%1</b></qt>")
-                                  .arg(localToolbarsDir));
+                                  .tqarg(localToolbarsDir));
         query = KMessageBox::No;
       }
     } while (query != KMessageBox::Yes);
@@ -2591,16 +2591,16 @@ void QuantaApp::slotSaveProjectToolbar()
 void QuantaApp::slotAddToolbar()
 {
  bool ok;
- TQString name = KInputDialog::getText(i18n("New Toolbar"), i18n("Enter toolbar name:"), i18n("User_%1").arg(userToolbarsCount), &ok, this);
+ TQString name = KInputDialog::getText(i18n("New Toolbar"), i18n("Enter toolbar name:"), i18n("User_%1").tqarg(userToolbarsCount), &ok, this);
  if (ok)
  {
   userToolbarsCount++;
 
   TQString toolbarId = name;
   int n = 1;
-  while (m_toolbarList.find(toolbarId) != 0L)
+  while (m_toolbarList.tqfind(toolbarId) != 0L)
   {
-    toolbarId = name + TQString("%1").arg(n);
+    toolbarId = name + TQString("%1").tqarg(n);
     n++;
   }
   toolbarId = toolbarId.lower();
@@ -2609,7 +2609,7 @@ void QuantaApp::slotAddToolbar()
   tempFile->setAutoDelete(true);
   tempFile->textStream()->setEncoding(TQTextStream::UnicodeUTF8);
   * (tempFile->textStream()) << TQString("<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n<kpartgui name=\"quanta\" version=\"2\">\n<ToolBar name=\"%1\" tabname=\"%2\" i18ntabname=\"%3\" id=\"%4\">\n<text>%5</text>\n</ToolBar>\n</kpartgui>\n")
-      .arg(name.lower()).arg(name).arg(name).arg(toolbarId).arg(name);
+      .tqarg(name.lower()).tqarg(name).tqarg(name).tqarg(toolbarId).tqarg(name);
   tempFile->close();
 
   ToolbarXMLGUI * toolbarGUI = new ToolbarXMLGUI(tempFile->name());
@@ -2700,7 +2700,7 @@ TQString QuantaApp::createToolbarTarball()
   i18n( "Please select a toolbar:" ), lst, current, false, &ok, this );
 
   if (!ok)
-    return TQString::null;
+    return TQString();
 
   TQString toolbarName = res;
   for (uint i = 0; i < lst.count(); i++)
@@ -2759,7 +2759,7 @@ void QuantaApp::slotSendToolbar()
       return;
     }
 
-    kapp->invokeMailer(toStr, TQString::null, TQString::null, subjectStr, message, TQString::null, toolbarFile);
+    kapp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), toolbarFile);
   }
   delete mailDlg;
 }
@@ -2767,7 +2767,7 @@ void QuantaApp::slotSendToolbar()
 void QuantaApp::slotDownloadToolbar()
 {
   if (!m_newToolbarStuff)
-    m_newToolbarStuff = new QNewToolbarStuff("quanta/toolbar", this);
+    m_newToolbarStuff = new TQNewToolbarStuff("quanta/toolbar", this);
   m_newToolbarStuff->downloadResource();
 }
 
@@ -2777,7 +2777,7 @@ void QuantaApp::slotUploadToolbar()
   if (tempFileName.isNull())
     return;
   if (!m_newToolbarStuff)
-    m_newToolbarStuff = new QNewToolbarStuff("quanta/toolbar", this);
+    m_newToolbarStuff = new TQNewToolbarStuff("quanta/toolbar", this);
 //  tempDirList.append(m_newToolbarStuff->uploadResource(tempFileName));
   m_newToolbarStuff->uploadResource(tempFileName);
 }
@@ -2846,7 +2846,7 @@ void QuantaApp::slotRenameToolbar(const TQString& name)
       {
         if (tb->id(i) == name)
         {
-          tb->setTabLabel(tb->page(i)->parentWidget(), i18n(p_toolbar->name.utf8()));
+          tb->setTabLabel(tb->page(i)->tqparentWidget(), i18n(p_toolbar->name.utf8()));
           m_tagsMenu->changeItem(m_tagsMenu->idAt(i + 2), i18n(p_toolbar->name.utf8()));
           break;
         }
@@ -2920,7 +2920,7 @@ void QuantaApp::slotDeleteAction(KAction *action)
       //we found a toolbar that contains the action
       if (nodeList.item(j).toElement().attribute("name") == actionName)
       {
-        nodeList.item(j).parentNode().removeChild(nodeList.item(j));
+        nodeList.item(j).tqparentNode().removeChild(nodeList.item(j));
         KXMLGUIFactory::saveConfigFile(guiClient->domDocument(), guiClient->xmlFile());
         break;
       }
@@ -2936,7 +2936,7 @@ void QuantaApp::slotRemoveAction(const TQString& toolbarName, const TQString& a_
 {
   KAction *action = 0L;
   TQString actionName = a_actionName;
-  actionName.replace('&',"&&");
+  actionName.tqreplace('&',"&&");
   KActionCollection *ac = actionCollection();
   uint actionCount = ac->count();
   TQString str;
@@ -2976,7 +2976,7 @@ void QuantaApp::slotRemoveAction(const TQString& toolbarName, const TQString& a_
         {
           action->unplug(ToolbarTabWidget::ref()->page(toolbarName));
           action->unplug(p_toolbar->menu);
-          node.parentNode().removeChild(node);
+          node.tqparentNode().removeChild(node);
         }
         node = node.nextSibling();
       }
@@ -3014,10 +3014,10 @@ void QuantaApp::setDtep(const TQString& dtepName, bool convert)
   if (w)
   {
     TQString dtep = DTDs::ref()->getDTDNameFromNickName(dtepName);
-    if (!DTDs::ref()->find(dtep))
+    if (!DTDs::ref()->tqfind(dtep))
       return;
     w->setDTDIdentifier(dtep);
-    const DTDStruct *dtd = DTDs::ref()->find(w->getDTDIdentifier());
+    const DTDStruct *dtd = DTDs::ref()->tqfind(w->getDTDIdentifier());
     if (convert && dtd->family == Xml)
     {
       Tag *tag = 0L;
@@ -3096,7 +3096,7 @@ void QuantaApp::slotEditDTD()
     bool ok = false;
     TQString res = KInputDialog::getItem(
         i18n( "Edit DTD" ),
-    i18n( "Please select a DTD:" ), lst, lst.findIndex(nickName), false, &ok, this );
+    i18n( "Please select a DTD:" ), lst, lst.tqfindIndex(nickName), false, &ok, this );
 
     TQString s = i18n("Create a new DTEP description");
     s = i18n("Load DTEP description from disk");
@@ -3106,7 +3106,7 @@ void QuantaApp::slotEditDTD()
     TQString dtdName = DTDs::ref()->getDTDNameFromNickName(res);
 
     KDialogBase editDlg(this, "edit_dtep", true, i18n("Configure DTEP"), KDialogBase::Ok | KDialogBase::Cancel);
-    DTEPEditDlg dtepDlg(DTDs::ref()->find(dtdName)->fileName, &editDlg);
+    DTEPEditDlg dtepDlg(DTDs::ref()->tqfind(dtdName)->fileName, &editDlg);
     editDlg.setMainWidget(&dtepDlg);
     if (editDlg.exec())
     {
@@ -3122,7 +3122,7 @@ void QuantaApp::focusInEvent(TQFocusEvent* e)
  if (w)
  {
     w->view()->setFocus();
-    w->checkDirtyStatus();
+    w->checkDirtytqStatus();
  }
 }
 
@@ -3166,17 +3166,17 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName)
 
   if (!currentToolbarDTD.isEmpty())
   {
-     oldDtd = DTDs::ref()->find(currentToolbarDTD);
+     oldDtd = DTDs::ref()->tqfind(currentToolbarDTD);
      if (!oldDtd)
-       oldDtd = DTDs::ref()->find(Project::ref()->defaultDTD());
+       oldDtd = DTDs::ref()->tqfind(Project::ref()->defaultDTD());
   }
   TQString fileName;
-  const DTDStruct *newDtd = DTDs::ref()->find(dtdName);
+  const DTDStruct *newDtd = DTDs::ref()->tqfind(dtdName);
   if (!newDtd)
   {
-      newDtd = DTDs::ref()->find(Project::ref()->defaultDTD());
+      newDtd = DTDs::ref()->tqfind(Project::ref()->defaultDTD());
       if (!newDtd)
-          newDtd = DTDs::ref()->find(qConfig.defaultDocType); //extreme case
+          newDtd = DTDs::ref()->tqfind(qConfig.defaultDocType); //extreme case
   }
 
   ToolbarEntry *p_toolbar;
@@ -3200,7 +3200,7 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName)
       //first load the local version if it exists
       fileName = locateLocal("data", resourceDir + "toolbars/"+newDtd->toolbars[i]);
       QuantaCommon::setUrl(url, fileName);
-      if (QExtFileInfo::exists(url, true, this))
+      if (TQExtFileInfo::exists(url, true, this))
       {
         //showToolbarFile(url);
         newToolbars += url;
@@ -3208,7 +3208,7 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName)
       {
         fileName = qConfig.globalDataDir + resourceDir + "toolbars/"+newDtd->toolbars[i];
         QuantaCommon::setUrl(url, fileName);
-        if (QExtFileInfo::exists(url, true, this))
+        if (TQExtFileInfo::exists(url, true, this))
         {
           newToolbars += url;//  showToolbarFile(url);
         }
@@ -3225,7 +3225,7 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName)
         KURL urlLocal;
         fileName = locateLocal("data", resourceDir + "toolbars/"+oldDtd->toolbars[i]);
         QuantaCommon::setUrl(urlLocal, fileName);
-        if (newToolbars.contains(url) == 0)
+        if (newToolbars.tqcontains(url) == 0)
         {
           TQDictIterator<ToolbarEntry> iter(m_toolbarList);
           for( ; iter.current(); ++iter )
@@ -3309,8 +3309,8 @@ bool QuantaApp::slotRemoveToolbar(const TQString& a_name)
        name1.remove(" tab");
        TQString name2 = name1;
        name2.remove(TQRegExp("[\\s]\\([0-9]+\\)"));
-       s2.replace(name1, name2);
-       s2.replace(name1.lower(), name2.lower());
+       s2.tqreplace(name1, name2);
+       s2.tqreplace(name1.lower(), name2.lower());
      }
      bool useToolbarGUI = true;
      if ( s1 != s2 /*|| actionsModified */)
@@ -3318,12 +3318,12 @@ bool QuantaApp::slotRemoveToolbar(const TQString& a_name)
       int result;
       if (p_toolbar->url.isEmpty())
       {
-        result = KMessageBox::warningYesNoCancel(this, i18n("<qt>Toolbar <b>%1</b> is new and unsaved. Do you want to save it before it is removed?</qt>").arg(p_toolbar->name),
+        result = KMessageBox::warningYesNoCancel(this, i18n("<qt>Toolbar <b>%1</b> is new and unsaved. Do you want to save it before it is removed?</qt>").tqarg(p_toolbar->name),
              i18n("Save Toolbar"), KStdGuiItem::save(), KStdGuiItem::discard());
       } else
       {
          FourButtonMessageBox dlg(this, 0, true);
-         dlg.textLabel->setText(i18n("<qt>The toolbar <b>%1</b> was modified. Do you want to save it before it is removed?</qt>").arg(p_toolbar->name));
+         dlg.textLabel->setText(i18n("<qt>The toolbar <b>%1</b> was modified. Do you want to save it before it is removed?</qt>").tqarg(p_toolbar->name));
          dlg.setCaption(i18n("Save Toolbar"));
          dlg.pixmapLabel->setPixmap(BarIcon("messagebox_info", KIcon::SizeMedium));
          dlg.exec();
@@ -3461,7 +3461,7 @@ void QuantaApp::slotBuildPrjToolbarsMenu()
   if (Project::ref()->hasProject())
   {
     buildInProgress = true;
-    toolbarList = QExtFileInfo::allFiles(Project::ref()->toolbarURL(), "*"+toolbarExtension, this);
+    toolbarList = TQExtFileInfo::allFiles(Project::ref()->toolbarURL(), "*"+toolbarExtension, this);
     buildInProgress = false;
     projectToolbarFiles->setMaxItems(toolbarList.count());
     for (uint i = 0; i < toolbarList.count(); i++)
@@ -3542,7 +3542,7 @@ bool QuantaApp::allToolbarsHidden() const
 
 void QuantaApp::slotLoadDTEP()
 {
-  TQString dirName = KFileDialog::getExistingDirectory(TQString::null, 0, i18n("Select DTEP Directory"));
+  TQString dirName = KFileDialog::getExistingDirectory(TQString(), 0, i18n("Select DTEP Directory"));
   if (!dirName.isEmpty())
   {
      DTDs::ref()->slotLoadDTEP(dirName, true);
@@ -3559,10 +3559,10 @@ TQString QuantaApp::createDTEPTarball()
     bool ok = false;
     TQString res = KInputDialog::getItem(
         i18n( "Send DTD" ),
-    i18n( "Please select a DTD:" ), lst, lst.findIndex(nickName), false, &ok, this );
+    i18n( "Please select a DTD:" ), lst, lst.tqfindIndex(nickName), false, &ok, this );
 
     if (!ok)
-      return TQString::null;
+      return TQString();
 
     TQString dtdName = DTDs::ref()->getDTDNameFromNickName(res);
 
@@ -3570,17 +3570,17 @@ TQString QuantaApp::createDTEPTarball()
     KTempDir* tempDir = new KTempDir(tmpDir);
     tempDir->setAutoDelete(true);
     tempDirList.append(tempDir);
-    TQString tempFileName=tempDir->name() +"/"+ DTDs::ref()->getDTDNickNameFromName(dtdName).replace(TQRegExp("\\s|\\."), "_") + ".tgz";
+    TQString tempFileName=tempDir->name() +"/"+ DTDs::ref()->getDTDNickNameFromName(dtdName).tqreplace(TQRegExp("\\s|\\."), "_") + ".tgz";
 
   //pack the .tag files and the description.rc into a .tgz file
     KTar tar(tempFileName, "application/x-gzip");
     tar.open(IO_WriteOnly);
 
     KURL dirURL;
-    dirURL.setPath(DTDs::ref()->find(dtdName)->fileName);
+    dirURL.setPath(DTDs::ref()->tqfind(dtdName)->fileName);
     dirURL.setPath(dirURL.directory(false));
 
-    KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*", this);
+    KURL::List files = TQExtFileInfo::allFilesRelative(dirURL, "*", this);
     for ( KURL::List::Iterator it_f = files.begin(); it_f != files.end(); ++it_f )
     {
       TQString name = (*it_f).fileName();
@@ -3595,7 +3595,7 @@ TQString QuantaApp::createDTEPTarball()
     tar.close();
     return tempFileName;
   }
-  return TQString::null;
+  return TQString();
 }
 
 void QuantaApp::slotEmailDTEP()
@@ -3634,7 +3634,7 @@ void QuantaApp::slotEmailDTEP()
         return;
       }
 
-      kapp->invokeMailer(toStr, TQString::null, TQString::null, subjectStr, message, TQString::null, dtdFile);
+      kapp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), dtdFile);
     }
     delete mailDlg;
   }
@@ -3643,7 +3643,7 @@ void QuantaApp::slotEmailDTEP()
 void QuantaApp::slotDownloadDTEP()
 {
   if (!m_newDTEPStuff)
-    m_newDTEPStuff = new QNewDTEPStuff("quanta/dtep", this);
+    m_newDTEPStuff = new TQNewDTEPStuff("quanta/dtep", this);
   m_newDTEPStuff->downloadResource();
 }
 
@@ -3653,7 +3653,7 @@ void QuantaApp::slotUploadDTEP()
   if (tempFileName.isNull())
     return;
   if (!m_newDTEPStuff)
-    m_newDTEPStuff = new QNewDTEPStuff("quanta/dtep", this);
+    m_newDTEPStuff = new TQNewDTEPStuff("quanta/dtep", this);
 //  tempDirList.append(m_newDTEPStuff->uploadResource(tempFileName));
   m_newDTEPStuff->uploadResource(tempFileName);
 }
@@ -3664,7 +3664,7 @@ void QuantaApp::slotSmartTagInsertion()
   if(!action)
     return;
   if(!ViewManager::ref()->activeDocument() || !ViewManager::ref()->activeView() ||
-    ViewManager::ref()->activeDocument()->defaultDTD()->name.contains("HTML", false) == 0)
+    ViewManager::ref()->activeDocument()->defaultDTD()->name.tqcontains("HTML", false) == 0)
   {
     KMessageBox::error(this, "Smart Tag Insertion is available only for (X)HTML for the moment.");
     qConfig.smartTagInsertion = false;
@@ -3677,14 +3677,14 @@ void QuantaApp::slotSmartTagInsertion()
 void QuantaApp::slotDownloadTemplate()
 {
   if (!m_newTemplateStuff)
-    m_newTemplateStuff = new QNewTemplateStuff("quanta/template", this);
+    m_newTemplateStuff = new TQNewTemplateStuff("quanta/template", this);
   m_newTemplateStuff->downloadResource();
 }
 
 void QuantaApp::slotUploadTemplate(const TQString &fileName)
 {
   if (!m_newTemplateStuff)
-    m_newTemplateStuff = new QNewTemplateStuff("quanta/template", this);
+    m_newTemplateStuff = new TQNewTemplateStuff("quanta/template", this);
 //  tempDirList.append(m_newTemplateStuff->uploadResource(fileName));
   m_newTemplateStuff->uploadResource(fileName);
 }
@@ -3692,14 +3692,14 @@ void QuantaApp::slotUploadTemplate(const TQString &fileName)
 void QuantaApp::slotDownloadScript()
 {
     if (!m_newScriptStuff)
-      m_newScriptStuff = new QNewScriptStuff("quanta/script", this);
+      m_newScriptStuff = new TQNewScriptStuff("quanta/script", this);
     m_newScriptStuff->downloadResource();
 }
 
 void QuantaApp::slotUploadScript(const TQString &fileName)
 {
   if (!m_newScriptStuff)
-    m_newScriptStuff = new QNewScriptStuff("quanta/script", this);
+    m_newScriptStuff = new TQNewScriptStuff("quanta/script", this);
 //  tempDirList.append(m_newScriptStuff->uploadResource(fileName));
   m_newScriptStuff->uploadResource(fileName);
 }
@@ -3708,7 +3708,7 @@ void QuantaApp::slotDownloadDoc()
 {
   if (!m_newDocStuff)
   {
-    m_newDocStuff = new QNewDocStuff("quanta/documentation", this);
+    m_newDocStuff = new TQNewDocStuff("quanta/documentation", this);
     connect(m_newDocStuff, TQT_SIGNAL(installFinished()), dTab, TQT_SLOT(slotRefreshTree()));
   }
   m_newDocStuff->downloadResource();
@@ -3736,7 +3736,7 @@ void QuantaApp::documentProperties(bool forceInsertionOfMinimalTree)
   Document *w = ViewManager::ref()->activeDocument();
   if (w)
   {
-    if (w->defaultDTD()->name.contains("HTML", false) == 0)
+    if (w->defaultDTD()->name.tqcontains("HTML", false) == 0)
     {
       KMessageBox::information(this, i18n("The Document Properties Dialog is only for HTML and XHTML."));
       return;
@@ -3784,7 +3784,7 @@ TQStringList QuantaApp::openedURLs() const
           Document *w = qView->document();
           if ( w )
           {
-            list.prepend( TQString("%1:%2").arg(w->editIf->editInterfaceNumber()).arg(w->url().url()));
+            list.prepend( TQString("%1:%2").tqarg(w->editIf->editInterfaceNumber()).tqarg(w->url().url()));
           }
       }
   }
@@ -3808,7 +3808,7 @@ void QuantaApp::slotExpandAbbreviation()
     {
         bool found = false;
         Abbreviation abbrev = it.data();
-        if (abbrev.dteps.contains(dtd->name))
+        if (abbrev.dteps.tqcontains(dtd->name))
         {
             TQMap<TQString, TQString>::ConstIterator it2;
             for (it2 = abbrev.abbreviations.constBegin(); it2 != abbrev.abbreviations.constEnd(); ++it2)
@@ -3830,20 +3830,20 @@ void QuantaApp::slotExpandAbbreviation()
       w->editIf->removeText(line, col - text.length() + 1, line, col);
       w->activateParser(true);
       col -= (text.length() - 1);
-      int pos = textToInsert.find('|');
+      int pos = textToInsert.tqfind('|');
       if (pos != -1)
       {
         text = textToInsert.left(pos);
-        if (text.contains('\n'))
+        if (text.tqcontains('\n'))
         {
-          line += text.contains('\n');
-          col = text.length() - text.findRev('\n') - 1;
+          line += text.tqcontains('\n');
+          col = text.length() - text.tqfindRev('\n') - 1;
         } else
         {
           col += pos;
         }
       }
-      textToInsert.replace('|',"");
+      textToInsert.tqreplace('|',"");
       w->insertText(textToInsert, false);
       w->viewCursorIf->setCursorPositionReal(line, col);
     }
@@ -3957,7 +3957,7 @@ void QuantaApp::slotAutosaveTimer()
 void QuantaApp::slotGetScriptOutput(KProcess* ,char* buf,int buflen)
 {
  TQCString tmp( buf, buflen + 1 );
- m_scriptOutput = TQString::null;
+ m_scriptOutput = TQString();
  m_scriptOutput = TQString::fromLocal8Bit(tmp).remove(" ");
 }
 
@@ -3980,7 +3980,7 @@ void QuantaApp::slotProcessTimeout()
 {
   if (m_loopStarted)
   {
-    qApp->exit_loop();
+    tqApp->exit_loop();
     m_loopStarted = false;
   }
 }
@@ -4040,7 +4040,7 @@ void QuantaApp::slotReloadStructTreeView(bool groupOnly)
         }
         Tag *commentTag = n->tag;
         TQString text = commentTag->tagStr();
-        int pos = text.find("@annotation");
+        int pos = text.tqfind("@annotation");
         if (pos != -1)
         {
           pos += 11;
@@ -4048,7 +4048,7 @@ void QuantaApp::slotReloadStructTreeView(bool groupOnly)
           if (text[pos] == '(')
           {
             int p = pos;
-            pos = text.find(')');
+            pos = text.tqfind(')');
             if (pos != -1)
             {
               receiver = text.mid(p + 1, pos - p - 1);
@@ -4062,7 +4062,7 @@ void QuantaApp::slotReloadStructTreeView(bool groupOnly)
             n->next->tag->beginPos(l, c);
           else
             n->tag->endPos(l, c);
-          commentTag->write()->addAnnotation(l, qMakePair(text, receiver));
+          commentTag->write()->addAnnotation(l, tqMakePair(text, receiver));
         }
       }
       node = node->nextSibling();
@@ -4074,7 +4074,7 @@ TQString QuantaApp::saveCurrentFile()
 {
   Document *w = ViewManager::ref()->activeDocument();
   if (!w)
-    return TQString::null;
+    return TQString();
   if (w->isModified())
   {
     if ( KMessageBox::questionYesNo(this,
@@ -4094,7 +4094,7 @@ TQString QuantaApp::saveCurrentFile()
       }
     } else
     {
-      return TQString::null;
+      return TQString();
     }
   }
   KURL url = Project::ref()->urlWithPrefix(w->url());
@@ -4160,7 +4160,7 @@ bool QuantaApp::queryClose()
   {
     saveOptions();
    // kdDebug(24000) << "Quanta will exit" << endl;
-    emit eventHappened("quanta_exit", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString::null);
+    emit eventHappened("quanta_exit", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate), TQString());
   } else
     slotFileNew();
   return canExit;
@@ -4200,7 +4200,7 @@ void QuantaApp::saveOptions()
 
     m_config->writeEntry("Smart Tag Insertion", qConfig.smartTagInsertion);
 
-    m_config->writeEntry("Window layout", qConfig.windowLayout);
+    m_config->writeEntry("Window tqlayout", qConfig.windowLayout);
     m_config->writeEntry("Follow Cursor", StructTreeView::ref()->followCursor() );
     //If user choose the timer interval, it needs to restart the timer too
     m_config->writeEntry("Autosave interval", qConfig.autosaveInterval);
@@ -4297,10 +4297,10 @@ void QuantaApp::slotEditCurrentTag()
     if (dtd->family == Xml)
     {
       TQString currentLine = w->editIf->textLine(line);
-      int sPos = currentLine.findRev('<', col);
+      int sPos = currentLine.tqfindRev('<', col);
       if (sPos != -1)
       {
-        int ePos = currentLine.find('>', col);
+        int ePos = currentLine.tqfind('>', col);
         if (ePos != -1)
         {
           AreaStruct area(line, sPos, line, ePos);
@@ -4327,7 +4327,7 @@ void QuantaApp::slotEditCurrentTag()
   slotEnableIdleTimer(true);
   if (isUnknown)
   {
-    TQString message = i18n("Unknown tag: %1").arg(tagName);
+    TQString message = i18n("Unknown tag: %1").tqarg(tagName);
     slotStatusMsg( message );
   }
 }
@@ -4442,21 +4442,21 @@ void QuantaApp::slotInsertCSS()
   if (styleNode->tag->type == Tag::XmlTagEnd && styleNode->prev)
     styleNode = styleNode->prev;
 
-  while (styleNode && styleNode->parent && styleNode->tag->name.lower() != "style" && styleNode->tag->dtd()->name == "text/css")
-    styleNode = styleNode->parent;
+  while (styleNode && styleNode->tqparent && styleNode->tag->name.lower() != "style" && styleNode->tag->dtd()->name == "text/css")
+    styleNode = styleNode->tqparent;
 
-  Node *parentNode = node;
-  if (parentNode->tag->type == Tag::XmlTagEnd && parentNode->prev)
-    parentNode = parentNode->prev;
+  Node *tqparentNode = node;
+  if (tqparentNode->tag->type == Tag::XmlTagEnd && tqparentNode->prev)
+    tqparentNode = tqparentNode->prev;
   else
-    while (parentNode && parentNode->parent &&
-           parentNode->tag->type != Tag::XmlTag)
-      parentNode = parentNode->parent;
+    while (tqparentNode && tqparentNode->tqparent &&
+           tqparentNode->tag->type != Tag::XmlTag)
+      tqparentNode = tqparentNode->tqparent;
   TQString fullDocument = w->editIf->text().stripWhiteSpace();
 
-  if (styleNode->tag->name.lower() == "comment block" && styleNode->parent) {
-    if (styleNode->parent->tag->name.lower() == "style") {
-      styleNode = styleNode->parent;
+  if (styleNode->tag->name.lower() == "comment block" && styleNode->tqparent) {
+    if (styleNode->tqparent->tag->name.lower() == "style") {
+      styleNode = styleNode->tqparent;
     }
   }
 
@@ -4469,7 +4469,7 @@ void QuantaApp::slotInsertCSS()
 
     styleNode->next->tag->beginPos(eLine, eCol);
     TQString styleTagContent(w->text(bLine, bCol+1, eLine, eCol-1).remove("<!--").remove("-->"));// <style></style> block content
-        kdDebug(24000) << "Style tag contains: " << endl << styleTagContent << endl;
+        kdDebug(24000) << "Style tag tqcontains: " << endl << styleTagContent << endl;
     CSSSelector *dlg = new CSSSelector;
 
     dlg->setCallingFrom("XHTML");
@@ -4513,29 +4513,29 @@ void QuantaApp::slotInsertCSS()
       }
      delete dlg;
   } else
-  if (parentNode && parentNode->tag->type == Tag::XmlTag)
+  if (tqparentNode && tqparentNode->tag->type == Tag::XmlTag)
   {
-        kdDebug(24000) << "[CSS editor] We will add a style attribute to: " << parentNode->tag->name << endl;
+        kdDebug(24000) << "[CSS editor] We will add a style attribute to: " << tqparentNode->tag->name << endl;
     CSSEditor *dlg = new CSSEditor(this);
     TQFileInfo fi(ViewManager::ref()->currentURL());
     dlg->setFileToPreview(projectBaseURL().path() +  fi.baseName(),false);
 
 
-    parentNode->tag->beginPos(bLine, bCol);
-    parentNode->tag->endPos(eLine, eCol);
+    tqparentNode->tag->beginPos(bLine, bCol);
+    tqparentNode->tag->endPos(eLine, eCol);
     dlg->setFooter(">" + w->text(eLine, eCol + 1, lastLine, lastCol));
 
     TQString temp;
-    if (parentNode->tag->hasAttribute("style"))
+    if (tqparentNode->tag->hasAttribute("style"))
     {
-      dlg->setInlineStyleContent(parentNode->tag->attributeValue("style"));
-      Tag tempTag(*(parentNode->tag));
+      dlg->setInlineStyleContent(tqparentNode->tag->attributeValue("style"));
+      Tag tempTag(*(tqparentNode->tag));
       tempTag.deleteAttribute("style");
       temp = tempTag.toString();
 
     } else {
-      dlg->setInlineStyleContent(TQString::null);
-      temp = parentNode->tag->toString();
+      dlg->setInlineStyleContent(TQString());
+      temp = tqparentNode->tag->toString();
     }
     //using TQString::mid sometimes generates strange results; maybe this is due to a (random) blank in temp
     temp = temp.left(temp.length()-1);//remove >
@@ -4545,7 +4545,7 @@ void QuantaApp::slotInsertCSS()
     dlg->initialize();
     if( dlg->exec() )
     {
-      w->changeTagAttribute(parentNode->tag, "style", dlg->generateProperties());
+      w->changeTagAttribute(tqparentNode->tag, "style", dlg->generateProperties());
     }
     delete dlg;
    } else
@@ -4786,7 +4786,7 @@ void QuantaApp::slotViewInKFM()
   }
   if ( !w->isUntitled() )
   {
-    KProcess *show = new KProcess(this);
+    KProcess *show = new KProcess(TQT_TQOBJECT(this));
     KURL url = Project::ref()->urlWithPrefix(w->url());
     *show << "kfmclient" << "newTab" << url.url();
     show->start( KProcess::DontCare );
@@ -4820,7 +4820,7 @@ void QuantaApp::slotViewInLynx()
   }
   if ( !w->isUntitled() )
   {
-    KProcess *show = new KProcess(this);
+    KProcess *show = new KProcess(TQT_TQOBJECT(this));
     KURL url = Project::ref()->urlWithPrefix(w->url());
     *show << "konsole"
           << "--nohist"
@@ -4840,15 +4840,15 @@ void QuantaApp::slotPasteHTMLQuoted()
   Document *w = ViewManager::ref()->activeDocument();
   if (w)
   {
-    QClipboard *cb = qApp->clipboard();
+    TQClipboard *cb = tqApp->tqclipboard();
     TQString text = cb->text();
 
     if ( ( !text.isNull() ) && (!text.isEmpty() ) )
     {
-      text.replace( "&", "&amp;" );
-      text.replace( "<", "&lt;" );
-      text.replace( "\"", "&quot;" );
-      text.replace( ">", "&gt;" );
+      text.tqreplace( "&", "&amp;" );
+      text.tqreplace( "<", "&lt;" );
+      text.tqreplace( "\"", "&quot;" );
+      text.tqreplace( ">", "&gt;" );
 
 //TODO: Replace only the chars not present in the current encoding.
       TQString encoding = defaultEncoding();
@@ -4860,16 +4860,16 @@ void QuantaApp::slotPasteHTMLQuoted()
         for ( TQStringList::Iterator it = charList.begin(); it != charList.end(); ++it )
         {
           TQString s = *it;
-          int begin = s.find("(&#") + 3;
+          int begin = s.tqfind("(&#") + 3;
           if (begin == 1)
               continue;
-          int length = s.find(";)") - begin + 1;
+          int length = s.tqfind(";)") - begin + 1;
           s = s.mid(begin, length - 1);
           bool ok;
           int code = s.toInt(&ok);
           if (!ok || code < 191)
             continue;
-          text.replace(TQChar(code), TQString("&#%1;").arg(s));
+          text.tqreplace(TQChar(code), TQString("&#%1;").tqarg(s));
         }
       }
       unsigned int line, col;
@@ -4885,7 +4885,7 @@ void QuantaApp::slotPasteURLEncoded()
  Document *w = ViewManager::ref()->activeDocument();
   if (w)
   {
-    QClipboard *cb = qApp->clipboard();
+    TQClipboard *cb = tqApp->tqclipboard();
     TQString text = cb->text();
 
     if ( ( !text.isNull() ) && (!text.isEmpty() ) )
@@ -4907,7 +4907,7 @@ void QuantaApp::slotUndo ()
   if(ViewManager::ref()->activeView()->hadLastFocus() == QuantaView::VPLFocus && w)
   {
     /**MessageBox::information(this, i18n("VPL does not support this functionality yet."),
-      TQString::null, "show undo unavailable");*/
+      TQString(), "show undo unavailable");*/
     w->docUndoRedo->undo();
     return;
   }
@@ -4932,7 +4932,7 @@ void QuantaApp::slotRedo ()
   if(ViewManager::ref()->activeView()->hadLastFocus() == QuantaView::VPLFocus)
   {
     /**KMessageBox::information(this, i18n("VPL does not support this functionality yet."),
-      TQString::null, "show redo unavailable");*/
+      TQString(), "show redo unavailable");*/
     w->docUndoRedo->redo();
     return;
   }
@@ -4971,7 +4971,7 @@ void QuantaApp::slotCut()
   {
     /*
     KMessageBox::information(this, i18n("Sorry, VPL does not support this functionality yet."),
-      TQString::null, "show cut unavailable");
+      TQString(), "show cut unavailable");
     */
     KafkaDocument::ref()->slotCut();
     return;
@@ -4991,7 +4991,7 @@ void QuantaApp::slotCopy()
   if(view && view->hadLastFocus() == QuantaView::VPLFocus)
   {
     //KMessageBox::information(this, i18n("Sorry, VPL does not support this functionality yet."),
-      //TQString::null, "show copy unavailable");
+      //TQString(), "show copy unavailable");
     KafkaDocument::ref()->slotCopy();
     return;
   }
@@ -5004,15 +5004,15 @@ void QuantaApp::slotCopy()
   if (m_htmlPart->view()->hasFocus())
   {
     TQString selection = m_htmlPart->selectedText();
-    QClipboard *cb = TQApplication::clipboard();
-    cb->setText(selection, QClipboard::Clipboard);
+    TQClipboard *cb = TQApplication::tqclipboard();
+    cb->setText(selection, TQClipboard::Clipboard);
   }
   else
   if (m_htmlPartDoc->view()->hasFocus())
   {
     TQString selection = m_htmlPartDoc->selectedText();
-    QClipboard *cb = TQApplication::clipboard();
-    cb->setText(selection, QClipboard::Clipboard);
+    TQClipboard *cb = TQApplication::tqclipboard();
+    cb->setText(selection, TQClipboard::Clipboard);
   }
 
 }
@@ -5024,7 +5024,7 @@ void QuantaApp::slotPaste()
   if(view && view->hadLastFocus() == QuantaView::VPLFocus)
   {
     //KMessageBox::information(this, i18n("Sorry, VPL does not support this functionality yet."),
-      //TQString::null, "show paste unavailable");
+      //TQString(), "show paste unavailable");
     KafkaDocument::ref()->slotPaste();
     return;
   }
@@ -5120,9 +5120,9 @@ void QuantaApp::slotFileClosed(Document *w)
   if (w)
   {
     KURL url = w->url();
-    if (Project::ref()->hasProject() && Project::ref()->contains(url))
+    if (Project::ref()->hasProject() && Project::ref()->tqcontains(url))
     {
-      KURL u = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL());
+      KURL u = TQExtFileInfo::toRelative(url, Project::ref()->projectBaseURL());
       m_annotationOutput->writeAnnotations(QuantaCommon::qUrl(u), w->annotations());
     }
   }
@@ -5134,9 +5134,9 @@ void QuantaApp::slotCVSCommandExecuted(const TQString& command, const TQStringLi
    for (uint i = 0; i < files.count(); i++)
    {
       file = files[i];
-      if (Project::ref()->contains(KURL::fromPathOrURL(file)))
+      if (Project::ref()->tqcontains(KURL::fromPathOrURL(file)))
       {
-         emit eventHappened("after_" + command, file, TQString::null);
+         emit eventHappened("after_" + command, file, TQString());
       }
    }
 }
diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h
index e55c8814..b10d6480 100644
--- a/quanta/src/quanta.h
+++ b/quanta/src/quanta.h
@@ -30,7 +30,7 @@
 
 #define IDS_DEFAULT     "Ready."
 
-// include files for Qt
+// include files for TQt
 #include <tqmap.h>
 #include <tqdict.h>
 #include <tqvaluelist.h>
@@ -56,11 +56,11 @@ class QuantaPluginInterface;
 
 class QuantaDoc;
 class QuantaView;
-class QNewDTEPStuff;
-class QNewToolbarStuff;
-class QNewTemplateStuff;
-class QNewScriptStuff;
-class QNewDocStuff;
+class TQNewDTEPStuff;
+class TQNewToolbarStuff;
+class TQNewTemplateStuff;
+class TQNewScriptStuff;
+class TQNewDocStuff;
 
 class TQTabWidget;
 class TQWidgetStack;
@@ -112,6 +112,7 @@ struct ToolbarEntry;
 class QuantaApp : public KMdiMainFrm, public DCOPWindowManagerIf
 {
   Q_OBJECT
+  TQ_OBJECT
 
 friend class QuantaInit;
 
@@ -131,8 +132,8 @@ public:
   DebuggerManager *debugger() const {return m_debugger;}
   KParts::PartManager *partManager() {return m_partManager;}
 
-  TQWidget* createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id );
-  void removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id );
+  TQWidget* createContainer(TQWidget *tqparent, int index, const TQDomElement &element, int &id );
+  void removeContainer(TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id );
 /** Returns the project's base URL if it exists, the HOME dir if there is no project and no opened document (or the current opened document was not saved yet), and the base URL of the opened document, if it is saved somewhere.
 
   maps to the same function in Project*/
@@ -193,7 +194,7 @@ public:
    * @param attr The string containing the attrs of the new Node to create.
    * @return Returns a new Node created according to the contents of the TagDialog.
    */
-  Node *showTagDialogAndReturnNode(const TQString &tag, const TQString &attr = TQString::null);
+  Node *showTagDialogAndReturnNode(const TQString &tag, const TQString &attr = TQString());
   /** Returns the baseURL of the document. */
   KURL baseURL();
 
@@ -281,15 +282,15 @@ public slots:
        unexpected things may happen. */
   void slotStatusMsg(const TQString &text);
 
-  void slotNewStatus();
+  void slotNewtqStatus();
   void slotNewLineColumn();
-//  void slotUpdateStatus(TQWidget*);FIXME:
+//  void slotUpdatetqStatus(TQWidget*);FIXME:
 
-  /** repaint preview */
+  /** tqrepaint preview */
   void slotRepaintPreview();
   /** toggles showing the preview */
   void slotToggleShowPreview();
-  /** Shows the preview widget and repaints the preview or
+  /** Shows the preview widget and tqrepaints the preview or
         hides the preview widget and restores the original document
   */
   void slotShowPreviewWidget(bool show);
@@ -297,7 +298,7 @@ public slots:
         - hide if the preview was in the editor area
         - update if the preview is in a toolview
    */
-  void slotChangePreviewStatus();
+  void slotChangePreviewtqStatus();
   /** Called when the preview widget got or lost the focus */
   void slotPreviewHasFocus(bool focus);
 
@@ -315,7 +316,7 @@ public slots:
   void slotOptionsConfigureToolbars();
   void slotNewToolbarConfig();
   /** Configure toolbars, show defaultToolbar by default */
-  void slotConfigureToolbars(const TQString& defaultToolbar = TQString::null);
+  void slotConfigureToolbars(const TQString& defaultToolbar = TQString());
   void slotOptionsConfigureActions();
 
   void setCursorPosition(int row, int col );
@@ -523,12 +524,12 @@ protected slots:
 
 protected:
   /** Create a DTEP tarball which can be uploaded or sent in email. Returns
-  *   the name of the created file or TQString::null if creation has failed.
+  *   the name of the created file or TQString() if creation has failed.
   */
   TQString createDTEPTarball();
 
   /** Create a toolbar tarball which can be uploaded or sent in email. Returns
-  *   the name of the created file or TQString::null if creation has failed.
+  *   the name of the created file or TQString() if creation has failed.
   */
   TQString createToolbarTarball();
 
@@ -543,7 +544,7 @@ protected:
   virtual bool queryClose();
   void saveAsTemplate (bool projectTemplate, bool selectionOnly = false);
   /** Saves a toolbar as local or project specific. */
-  bool saveToolbar(bool localToolbar = true, const TQString& toolbarToSave = TQString::null, const KURL& destURL = KURL());
+  bool saveToolbar(bool localToolbar = true, const TQString& toolbarToSave = TQString(), const KURL& destURL = KURL());
   /** Saves the toolbar and the actions. Returns the name of the actions file*/
   KURL saveToolbarToFile(const TQString& toolbarName,const KURL& destFile);
   /** Makes the tabwidget look and behave like we want. If closeButtonsOnly is true,
@@ -643,11 +644,11 @@ protected: // Protected attributes
   DCOPQuanta *dcopQuanta;
   KParts::PartManager *m_partManager;  ///< the pointer to the part manager
   TQGuardedPtr<KTextEditor::View> m_oldKTextEditor;  ///< remembers the last activated GUI
-  QNewDTEPStuff *m_newDTEPStuff;
-  QNewToolbarStuff *m_newToolbarStuff;
-  QNewTemplateStuff *m_newTemplateStuff;
-  QNewScriptStuff *m_newScriptStuff;
-  QNewDocStuff *m_newDocStuff;
+  TQNewDTEPStuff *m_newDTEPStuff;
+  TQNewToolbarStuff *m_newToolbarStuff;
+  TQNewTemplateStuff *m_newTemplateStuff;
+  TQNewScriptStuff *m_newScriptStuff;
+  TQNewDocStuff *m_newDocStuff;
   TQDict<ToolbarEntry> m_toolbarList;
 
 public: //TODO: check if it's worth to make a read method for them
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index e7a5fa75..2fcdda6b 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -119,7 +119,7 @@ QuantaInit::QuantaInit(QuantaApp * quantaApp)
         : TQObject()
 {
   m_quanta = quantaApp;
-  connect(this, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash()));
+  connect(this, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
 }
 
 QuantaInit::~QuantaInit()
@@ -138,7 +138,7 @@ void QuantaInit::initQuanta()
   tmpDir = tmpDirs[0];
   for (uint i = 0; i < tmpDirs.count(); i++)
   {
-    if (tmpDirs[i].contains("kde-"))
+    if (tmpDirs[i].tqcontains("kde-"))
        tmpDir = tmpDirs[i];
   }
   dir.mkdir(tmpDir + "quanta");
@@ -154,9 +154,9 @@ void QuantaInit::initQuanta()
   //defaultDocType must be read before the Project object is created!!
   m_config->setGroup("General Options");
   qConfig.defaultDocType = m_config->readEntry("Default DTD",DEFAULT_DTD);
-  if (! DTDs::ref()->find(qConfig.defaultDocType))
+  if (! DTDs::ref()->tqfind(qConfig.defaultDocType))
      qConfig.defaultDocType = DEFAULT_DTD;
-  DTDs::ref()->find("dtd"); //load on startup
+  DTDs::ref()->tqfind("dtd"); //load on startup
 
   initView();
   initDocument();  // after initView because of init of treeViews
@@ -170,14 +170,14 @@ void QuantaInit::initQuanta()
   readAbbreviations();
 
   // Initialize debugger
-  m_quanta->m_debugger = new DebuggerManager(m_quanta);
+  m_quanta->m_debugger = new DebuggerManager(TQT_TQOBJECT(m_quanta));
   connect(Project::ref(), TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)),
           m_quanta->m_debugger, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &)));
   connect(Project::ref(), TQT_SIGNAL(eventHappened(const TQString &, const TQString &, const TQString &)),
           m_quanta->m_debugger, TQT_SLOT(slotHandleEvent(const TQString &, const TQString &, const TQString &)));
-  connect(m_quanta->m_debugger, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash()));
+  connect(m_quanta->m_debugger, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
 
-  //m_quanta->KDockMainWindow::createGUI( TQString::null, false /* conserveMemory */ );
+  //m_quanta->KDockMainWindow::createGUI( TQString(), false /* conserveMemory */ );
   m_quanta->createShellGUI(true);
 
   addToolTreeView(m_quanta->fTab, i18n("Files"), UserIcon("ftab"), KDockWidget::DockLeft);
@@ -191,13 +191,13 @@ void QuantaInit::initQuanta()
   m_quanta->m_problemsOutputView = addToolTreeView(m_quanta->m_problemOutput, i18n("Problems"), SmallIcon("info"), KDockWidget::DockBottom);
   m_quanta->m_annotationOutputView = addToolTreeView(m_quanta->m_annotationOutput, i18n("Annotations"), SmallIcon("stamp"), KDockWidget::DockBottom);
 
-  // Restore the dock layout
+  // Restore the dock tqlayout
   m_config->setGroup  ("General Options");
-  TQString layout = m_config->readEntry("Window layout", "Default");
+  TQString tqlayout = m_config->readEntry("Window tqlayout", "Default");
   int mdiMode = m_config->readNumEntry("MDI mode", -1);
-  if (mdiMode != -1 && layout != "Default")
+  if (mdiMode != -1 && tqlayout != "Default")
   {
-      m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window layout...
+      m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window tqlayout...
       if (mdiMode != KMdi::IDEAlMode)
         m_quanta->setToolviewStyle(qConfig.toolviewTabs);
   }
@@ -209,7 +209,7 @@ void QuantaInit::initQuanta()
   if (mdiMode == KMdi::ToplevelMode)
   {
       m_quanta->switchToChildframeMode();
-      TQTimer::singleShot(0, m_quanta, TQT_SLOT(switchToToplevelMode()));
+      TQTimer::singleShot(0, TQT_TQOBJECT(m_quanta), TQT_SLOT(switchToToplevelMode()));
   }
 
   // Always hide debugger toolbar at this point
@@ -229,7 +229,7 @@ void QuantaInit::initQuanta()
       TQDomElement el = node.toElement();
       m_quanta->oldShortcuts.insert(el.attribute("name"), el.attribute("shortcut"));
       node = node.nextSibling();
-      el.parentNode().removeChild(el);
+      el.tqparentNode().removeChild(el);
     } else
     {
       node = node.nextSibling();
@@ -253,22 +253,22 @@ void QuantaInit::initQuanta()
      toolviewMenu->plug(m_quanta->windowMenu());
 
   TQPopupMenu *toolbarsMenu  = (TQPopupMenu*)(m_quanta->guiFactory())->container("toolbars_load", m_quanta);
-  connect(toolbarsMenu, TQT_SIGNAL(aboutToShow()), m_quanta, TQT_SLOT(slotBuildPrjToolbarsMenu()));
+  connect(toolbarsMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotBuildPrjToolbarsMenu()));
 
   TQPopupMenu *contextMenu = (TQPopupMenu*)(m_quanta->guiFactory())->container("popup_editor", m_quanta);
-  connect(contextMenu, TQT_SIGNAL(aboutToShow()), m_quanta, TQT_SLOT(slotContextMenuAboutToShow()));
+  connect(contextMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotContextMenuAboutToShow()));
 
   connect(m_quanta->m_messageOutput, TQT_SIGNAL(clicked(const TQString&, int, int)),
-          m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
   connect(m_quanta->m_problemOutput, TQT_SIGNAL(clicked(const TQString&, int, int)),
-          m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
   connect(m_quanta->m_annotationOutput->currentFileAnnotations(), TQT_SIGNAL(clicked(const TQString&, int, int)),
-          m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
   connect(m_quanta->m_annotationOutput, TQT_SIGNAL(clicked(const TQString&, int, int)),
-          m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
 
   m_quanta->slotFileNew();
-  m_quanta->slotNewStatus();
+  m_quanta->slotNewtqStatus();
   initToolBars();
   Project::ref()->setProjectToolbarVisible(m_quanta->factory()->container("project_toolbar", m_quanta)->isShown());
   Project::ref()->slotShowProjectToolbar(Project::ref()->hasProject());
@@ -279,12 +279,12 @@ void QuantaInit::initQuanta()
   qConfig.backupDirPath = KGlobal::instance()->dirs()->saveLocation("data", resourceDir + "backups/");
 
   m_quanta->autosaveTimer = new TQTimer(m_quanta);
-  connect(m_quanta->autosaveTimer, TQT_SIGNAL(timeout()), m_quanta, TQT_SLOT(slotAutosaveTimer()));
+  connect(m_quanta->autosaveTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAutosaveTimer()));
   m_quanta->autosaveTimer->start(qConfig.autosaveInterval * 60000, false);
 
-  connect(m_quanta->m_doc, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash()));
+  connect(m_quanta->m_doc, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
   connect(parser, TQT_SIGNAL(rebuildStructureTree(bool)),
-          m_quanta, TQT_SLOT(slotReloadStructTreeView(bool)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReloadStructTreeView(bool)));
 
   // Read list of characters
   TQFile file(locate("appdata","chars"));
@@ -296,26 +296,26 @@ void QuantaInit::initQuanta()
     {
       s = t.readLine();
       charList << i18n(s.utf8()); // line excluding '\n'
-      int begin = s.find("(&") + 1;
+      int begin = s.tqfind("(&") + 1;
       if (begin == 1)
           continue;
-      int length = s.find(";)") - begin + 1;
+      int length = s.tqfind(";)") - begin + 1;
       TQString s2 = s.mid(begin, length - 1);
-      replacementMap[s[0].unicode()] = s2;
+      replacementMap[s[0].tqunicode()] = s2;
     }
     file.close();
   }
 
   TQString infoCss = tmpDir;
-  infoCss.replace(TQRegExp("/quanta$"),"");
+  infoCss.tqreplace(TQRegExp("/quanta$"),"");
   infoCss += "/info.css";
-  QExtFileInfo::copy(KURL().fromPathOrURL(qConfig.globalDataDir + resourceDir + "scripts/info.css"), KURL().fromPathOrURL(infoCss));
+  TQExtFileInfo::copy(KURL().fromPathOrURL(qConfig.globalDataDir + resourceDir + "scripts/info.css"), KURL().fromPathOrURL(infoCss));
 
   checkRuntimeDependencies();
   ViewManager::ref()->activeDocument()->view()->setFocus();
 
   m_quanta->refreshTimer = new TQTimer(m_quanta);
-  connect(m_quanta->refreshTimer, TQT_SIGNAL(timeout()), m_quanta, TQT_SLOT(slotReparse()));
+  connect(m_quanta->refreshTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReparse()));
   m_quanta->refreshTimer->start( qConfig.refreshFrequency*1000, false ); //update the structure tree every 5 seconds
   if (qConfig.instantUpdate || qConfig.refreshFrequency == 0)
   {
@@ -334,7 +334,7 @@ void QuantaInit::initStatusBar()
 {
   m_quanta->statusbarTimer = new TQTimer(m_quanta);
   connect(m_quanta->statusbarTimer,TQT_SIGNAL(timeout()),
-          m_quanta, TQT_SLOT(statusBarTimeout()));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(statusBarTimeout()));
 
   progressBar = new KProgress(m_quanta->statusBar());
   progressBar->setTextEnabled(false);
@@ -356,30 +356,30 @@ void QuantaInit::initStatusBar()
 void QuantaInit::initDocument()
 {
   m_quanta->m_doc = new QuantaDoc(0L);
-  connect(m_quanta->m_doc, TQT_SIGNAL(newStatus()),
-          m_quanta, TQT_SLOT(slotNewStatus()));
+  connect(m_quanta->m_doc, TQT_SIGNAL(newtqStatus()),
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus()));
 }
 
 void QuantaInit::initProject()
 {
   Project *m_project = Project::ref(m_quanta);
 
-  connect(m_project, TQT_SIGNAL(getTreeStatus(TQStringList *)),
-          pTab, TQT_SLOT(slotGetTreeStatus(TQStringList *)));
+  connect(m_project, TQT_SIGNAL(getTreetqStatus(TQStringList *)),
+          pTab, TQT_SLOT(slotGetTreetqStatus(TQStringList *)));
   connect(m_project, TQT_SIGNAL(loadToolbarFile(const KURL &)),
-          m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL &)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL &)));
   connect(m_project, TQT_SIGNAL(getUserToolbarFiles(KURL::List *)),
-          m_quanta, TQT_SLOT(slotGetUserToolbarFiles(KURL::List *)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetUserToolbarFiles(KURL::List *)));
   connect(m_project, TQT_SIGNAL(openFiles(const KURL::List &, const TQString&)),
-          m_quanta, TQT_SLOT(slotFileOpen(const KURL::List &, const TQString&)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen(const KURL::List &, const TQString&)));
   connect(m_project, TQT_SIGNAL(openFile(const KURL &, const TQString&)),
-          m_quanta, TQT_SLOT(slotFileOpen(const KURL &, const TQString&)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen(const KURL &, const TQString&)));
   connect(m_project, TQT_SIGNAL(closeFile(const KURL &)),
-          m_quanta, TQT_SLOT(slotFileClose(const KURL &)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileClose(const KURL &)));
   connect(m_project, TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)),
           pTab, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &)));
   connect(m_project, TQT_SIGNAL(closeFiles()), ViewManager::ref(), TQT_SLOT(closeAll()));
-  connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+  connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
 
   connect(m_quanta->fTab, TQT_SIGNAL(insertDirInProject(const KURL&)),
           m_project, TQT_SLOT(slotAddDirectory(const KURL&)));
@@ -393,8 +393,8 @@ void QuantaInit::initProject()
   connect(TemplatesTreeView::ref(), TQT_SIGNAL(insertFileInProject(const KURL&)),
           m_project, TQT_SLOT(slotInsertFile(const KURL&)));
   connect(TemplatesTreeView::ref(), TQT_SIGNAL(downloadTemplate()),
-          m_quanta, TQT_SLOT(slotDownloadTemplate()));
-  connect(TemplatesTreeView::ref(), TQT_SIGNAL(uploadTemplate(const TQString&)), m_quanta, TQT_SLOT(slotUploadTemplate(const TQString&)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadTemplate()));
+  connect(TemplatesTreeView::ref(), TQT_SIGNAL(uploadTemplate(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadTemplate(const TQString&)));
 
   // inform project if something was renamed
   connect(pTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)),
@@ -419,13 +419,13 @@ void QuantaInit::initProject()
   connect(m_project, TQT_SIGNAL(addProjectDoc(const KURL&)), m_quanta->dTab, TQT_SLOT(slotAddProjectDoc(const KURL&)));
 
   connect(m_project, TQT_SIGNAL(enableMessageWidget()),
-          m_quanta, TQT_SLOT(slotShowMessagesView()));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowMessagesView()));
 
   connect(m_project, TQT_SIGNAL(messages(const TQString&)),
           m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&)));
 
-  connect(m_project, TQT_SIGNAL(newStatus()),
-          m_quanta, TQT_SLOT(slotNewStatus()));
+  connect(m_project, TQT_SIGNAL(newtqStatus()),
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus()));
 
   connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)),
           TemplatesTreeView::ref(), TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &)));
@@ -438,20 +438,20 @@ void QuantaInit::initProject()
 
   connect(pTab, TQT_SIGNAL(changeFileDescription(const KURL&, const TQString&)),
           m_project, TQT_SLOT(slotFileDescChanged(const KURL&, const TQString&)));
-  connect(pTab, TQT_SIGNAL(changeUploadStatus(const KURL&, int)),
+  connect(pTab, TQT_SIGNAL(changeUploadtqStatus(const KURL&, int)),
           m_project, TQT_SLOT(slotUploadStatusChanged(const KURL&, int)));
-  connect(pTab, TQT_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)),
-          m_project, TQT_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool)));
+  connect(pTab, TQT_SIGNAL(changeDocumentFoldertqStatus(const KURL&, bool)),
+          m_project, TQT_SLOT(slotChangeDocumentFoldertqStatus(const KURL&, bool)));
 
-  connect(m_project, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash()));
+  connect(m_project, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
 
   connect(m_project, TQT_SIGNAL(statusMsg(const TQString &)),
-          m_quanta, TQT_SLOT(slotStatusMsg(const TQString & )));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & )));
 }
 
 void QuantaInit::initView()
 {
-  ViewManager *m_viewManager = ViewManager::ref(m_quanta);
+  ViewManager *m_viewManager = ViewManager::ref(TQT_TQOBJECT(m_quanta));
   connect(m_quanta, TQT_SIGNAL(viewActivated (KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewActivated(KMdiChildView*)));
   connect(m_quanta, TQT_SIGNAL(lastChildViewClosed()), m_viewManager, TQT_SLOT(slotLastViewClosed()));
 //   connect(m_quanta, TQT_SIGNAL(viewDeactivated(KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewDeactivated(KMdiChildView*)));
@@ -472,7 +472,7 @@ void QuantaInit::initView()
   m_quanta->setStandardMDIMenuEnabled(false);
   m_quanta->setManagedDockPositionModeEnabled(true);
 
-  m_quanta->fTab = new FilesTreeView(m_config,  m_quanta, "filestree");
+  m_quanta->fTab = new FilesTreeView(m_config, m_quanta, "filestree");
   m_quanta->aTab = new EnhancedTagAttributeTree(m_quanta, "TagAttributes");
   pTab = ProjectTreeView::ref(m_quanta, "Project");
   tTab = TemplatesTreeView::ref(m_quanta, "Templates");  // creates the treeview
@@ -481,15 +481,15 @@ void QuantaInit::initView()
   m_quanta->scriptTab = new ScriptTreeView(m_quanta, "Scripts");
 
   m_quanta->m_messageOutput = new MessageOutput(m_quanta, "Messages");
-  m_quanta->m_messageOutput->setFocusPolicy(TQWidget::NoFocus);
+  m_quanta->m_messageOutput->setFocusPolicy(TQ_NoFocus);
   m_quanta->m_messageOutput->showMessage(i18n("Message Window..."));
   connect(m_quanta, TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool)));
   connect(m_quanta, TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear()));
 
   m_quanta->m_problemOutput = new MessageOutput(m_quanta, "Problems");
-  m_quanta->m_problemOutput->setFocusPolicy(TQWidget::NoFocus);
+  m_quanta->m_problemOutput->setFocusPolicy(TQ_NoFocus);
   m_quanta->m_annotationOutput = new AnnotationOutput(m_quanta, "Annotations");
-  m_quanta->m_annotationOutput->setFocusPolicy(TQWidget::NoFocus);
+  m_quanta->m_annotationOutput->setFocusPolicy(TQ_NoFocus);
 
   m_quanta->createPreviewPart();
   m_quanta->createDocPart();
@@ -498,7 +498,7 @@ void QuantaInit::initView()
           m_quanta->fTab, TQT_SLOT(slotReloadAllTrees()));
 
   connect(pTab, TQT_SIGNAL(loadToolbarFile  (const KURL&)),
-          m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL&)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL&)));
   connect(m_viewManager, TQT_SIGNAL(viewActivated(const KURL&)),
           pTab, TQT_SLOT(slotViewActivated(const KURL&)));
 
@@ -512,39 +512,39 @@ void QuantaInit::initView()
           m_quanta->fTab, TQT_SLOT(slotDocumentClosed(const KURL&)));
 
   connect(tTab, TQT_SIGNAL(insertFile  (const KURL &)),
-          m_quanta, TQT_SLOT(slotInsertFile(const KURL &)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotInsertFile(const KURL &)));
 
   connect(m_quanta->scriptTab, TQT_SIGNAL(openFileInPreview(const KURL &)),
-          m_quanta, TQT_SLOT(slotOpenFileInPreview(const KURL &)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileInPreview(const KURL &)));
   connect(m_quanta->scriptTab, TQT_SIGNAL(showPreviewWidget(bool)),
-          m_quanta, TQT_SLOT(slotShowPreviewWidget(bool)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowPreviewWidget(bool)));
   connect(m_quanta->scriptTab, TQT_SIGNAL(assignActionToScript(const KURL &, const TQString&)),
-          m_quanta, TQT_SLOT(slotAssignActionToScript(const KURL &, const TQString&)));
-  connect(m_quanta->scriptTab, TQT_SIGNAL(downloadScript()), m_quanta, TQT_SLOT(slotDownloadScript()));
-  connect(m_quanta->scriptTab, TQT_SIGNAL(uploadScript(const TQString&)), m_quanta, TQT_SLOT(slotUploadScript(const TQString&)));
-  connect(m_quanta->dTab, TQT_SIGNAL(downloadDoc()), m_quanta, TQT_SLOT(slotDownloadDoc()));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAssignActionToScript(const KURL &, const TQString&)));
+  connect(m_quanta->scriptTab, TQT_SIGNAL(downloadScript()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadScript()));
+  connect(m_quanta->scriptTab, TQT_SIGNAL(uploadScript(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadScript(const TQString&)));
+  connect(m_quanta->dTab, TQT_SIGNAL(downloadDoc()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadDoc()));
 
   connect(m_quanta->m_htmlPart, TQT_SIGNAL(onURL(const TQString&)),
-              m_quanta, TQT_SLOT(slotStatusMsg(const TQString&)));
+              TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString&)));
   connect(m_quanta->m_htmlPartDoc, TQT_SIGNAL(onURL(const TQString&)),
-                 m_quanta, TQT_SLOT(slotStatusMsg(const TQString&)));
+                 TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString&)));
 
-  connect(sTab, TQT_SIGNAL(newCursorPosition(int,int)), m_quanta, TQT_SLOT(setCursorPosition(int,int)));
-  connect(sTab, TQT_SIGNAL(selectArea(int,int,int,int)), m_quanta, TQT_SLOT( selectArea(int,int,int,int)));
-  connect(sTab, TQT_SIGNAL(selectTagArea(Node*)), m_quanta, TQT_SLOT(slotSelectTagArea(Node*)));
-  connect(sTab, TQT_SIGNAL(needReparse()), m_quanta, TQT_SLOT(slotForceReparse()));
-  connect(sTab, TQT_SIGNAL(showGroupsForDTEP(const TQString&, bool)), m_quanta, TQT_SLOT(slotShowGroupsForDTEP(const TQString&, bool)));
+  connect(sTab, TQT_SIGNAL(newCursorPosition(int,int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(setCursorPosition(int,int)));
+  connect(sTab, TQT_SIGNAL(selectArea(int,int,int,int)), TQT_TQOBJECT(m_quanta), TQT_SLOT( selectArea(int,int,int,int)));
+  connect(sTab, TQT_SIGNAL(selectTagArea(Node*)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSelectTagArea(Node*)));
+  connect(sTab, TQT_SIGNAL(needReparse()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotForceReparse()));
+  connect(sTab, TQT_SIGNAL(showGroupsForDTEP(const TQString&, bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowGroupsForDTEP(const TQString&, bool)));
   connect(sTab, TQT_SIGNAL(openFile(const KURL &)),
-          m_quanta, TQT_SLOT  (slotFileOpen(const KURL &)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT  (slotFileOpen(const KURL &)));
   connect(sTab, TQT_SIGNAL(openImage  (const KURL&)),
-          m_quanta, TQT_SLOT(slotImageOpen(const KURL&)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotImageOpen(const KURL&)));
   connect(sTab, TQT_SIGNAL(showProblemMessage(const TQString&)),
           m_quanta->m_problemOutput, TQT_SLOT(showMessage(const TQString&)));
   connect(sTab, TQT_SIGNAL(clearProblemOutput()),
           m_quanta->m_problemOutput, TQT_SLOT(clear()));
   connect(parser, TQT_SIGNAL(nodeTreeChanged()), sTab, TQT_SLOT(slotNodeTreeChanged()));
 
-  connect(m_quanta->dTab, TQT_SIGNAL(openURL(const TQString&)), m_quanta, TQT_SLOT(openDoc(const TQString&)));
+  connect(m_quanta->dTab, TQT_SIGNAL(openURL(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(openDoc(const TQString&)));
 
   connect(m_viewManager, TQT_SIGNAL(dragInsert(TQDropEvent *)), tTab, TQT_SLOT(slotDragInsert(TQDropEvent *)));
 
@@ -679,7 +679,7 @@ void QuantaInit::openLastFiles()
   if (w) //w==0 might happen on quick close on startup
   {
     m_quanta->setTitle(w->url().prettyURL(0, KURL::StripFileProtocol) );
-//    m_quanta->slotUpdateStatus(w);//FIXME:
+//    m_quanta->slotUpdatetqStatus(w);//FIXME:
   }
 }
 
@@ -706,75 +706,75 @@ void QuantaInit::loadInitialProject(const TQString& url)
 void QuantaInit::initActions()
 {
     KActionCollection *ac = m_quanta->actionCollection();
-    new KAction(i18n("Annotate..."), 0, m_quanta, TQT_SLOT(slotAnnotate()),ac, "annotate");
+    new KAction(i18n("Annotate..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAnnotate()),ac, "annotate");
     m_quanta->editTagAction = new KAction( i18n( "&Edit Current Tag..." ), CTRL+Key_E,
-                        m_quanta, TQT_SLOT( slotEditCurrentTag() ),
-                        ac, "edit_current_tag" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditCurrentTag() ),
+                        TQT_TQOBJECT(ac), "edit_current_tag" );
     m_quanta->selectTagAreaAction = new KAction( i18n( "&Select Current Tag Area" ), 0,
-                        m_quanta, TQT_SLOT( slotSelectTagArea() ),
-                        ac, "select_tag_area" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotSelectTagArea() ),
+                        TQT_TQOBJECT(ac), "select_tag_area" );
     new KAction( i18n( "E&xpand Abbreviation" ), CTRL+SHIFT+Key_J,
-                        m_quanta, TQT_SLOT( slotExpandAbbreviation() ),
-                        ac, "expand_abbreviation" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotExpandAbbreviation() ),
+                        TQT_TQOBJECT(ac), "expand_abbreviation" );
 
-    new KAction(i18n("&Report Bug..."), 0, m_quanta, TQT_SLOT(slotReportBug()), ac, "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta
+    new KAction(i18n("&Report Bug..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReportBug()), TQT_TQOBJECT(ac), "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta
 
     //Kate actions
 
 //Edit menu
-    KStdAction::undo(m_quanta, TQT_SLOT(slotUndo()), ac);
-    KStdAction::redo(m_quanta, TQT_SLOT(slotRedo()), ac);
-    KStdAction::cut(m_quanta, TQT_SLOT(slotCut()), ac);
-    KStdAction::copy(m_quanta, TQT_SLOT(slotCopy()), ac) ;
-    KStdAction::pasteText(m_quanta, TQT_SLOT(slotPaste()), ac);
+    KStdAction::undo(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUndo()), ac);
+    KStdAction::redo(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRedo()), ac);
+    KStdAction::cut(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCut()), ac);
+    KStdAction::copy(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCopy()), ac) ;
+    KStdAction::pasteText(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPaste()), ac);
 
 //help
-   (void) new KAction(i18n("Ti&p of the Day"), "idea", "", m_quanta,
-      TQT_SLOT(slotHelpTip()), ac, "help_tip");
+   (void) new KAction(i18n("Ti&p of the Day"), "idea", "", TQT_TQOBJECT(m_quanta),
+      TQT_SLOT(slotHelpTip()), TQT_TQOBJECT(ac), "help_tip");
 
     // File actions
     //
-    KStdAction::openNew( m_quanta, TQT_SLOT( slotFileNew()  ), ac);
-    KStdAction::open   ( m_quanta, TQT_SLOT( slotFileOpen() ), ac, "file_open");
-    (void) new KAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), ac, "close_other_tabs");
+    KStdAction::openNew( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileNew()  ), ac);
+    KStdAction::open   ( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileOpen() ), ac, "file_open");
+    (void) new KAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), TQT_TQOBJECT(ac), "close_other_tabs");
 
-    m_quanta->fileRecent =  KStdAction::openRecent(m_quanta, TQT_SLOT(slotFileOpenRecent(const KURL&)),
+    m_quanta->fileRecent =  KStdAction::openRecent(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpenRecent(const KURL&)),
                                          ac, "file_open_recent");
     m_quanta->fileRecent->setToolTip(i18n("Open / Open Recent"));
-    connect(m_quanta->fileRecent, TQT_SIGNAL(activated()), m_quanta, TQT_SLOT(slotFileOpen()));
+    connect(m_quanta->fileRecent, TQT_SIGNAL(activated()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen()));
 
-    (void) new KAction( i18n( "Close All" ), 0, m_quanta,
+    (void) new KAction( i18n( "Close All" ), 0, TQT_TQOBJECT(m_quanta),
                         TQT_SLOT( slotFileCloseAll() ),
-                        ac, "file_close_all" );
+                        TQT_TQOBJECT(ac), "file_close_all" );
 
-    m_quanta->saveAction = KStdAction::save(m_quanta, TQT_SLOT( slotFileSave() ), ac);
+    m_quanta->saveAction = KStdAction::save(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSave() ), ac);
 
-    KStdAction::saveAs( m_quanta, TQT_SLOT( slotFileSaveAs() ), ac );
+    KStdAction::saveAs( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAs() ), ac );
 
     m_quanta->saveAllAction = new KAction( i18n( "Save All..." ), "save_all", SHIFT+KStdAccel::shortcut(KStdAccel::Save).keyCodeQt(),
-                        m_quanta, TQT_SLOT( slotFileSaveAll() ),
-                        ac, "file_save_all" );
-    (void)  new KAction(i18n("Reloa&d"), "revert", SHIFT+Key_F5, m_quanta,
-                        TQT_SLOT(slotFileReload()), ac, "file_reload");
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAll() ),
+                        TQT_TQOBJECT(ac), "file_save_all" );
+    (void)  new KAction(i18n("Reloa&d"), "revert", SHIFT+Key_F5, TQT_TQOBJECT(m_quanta),
+                        TQT_SLOT(slotFileReload()), TQT_TQOBJECT(ac), "file_reload");
 //    (void)  new KAction(i18n("Reload All "), 0, 0, m_quanta,
-//                        TQT_SLOT(slotFileReloadAll()), ac, "file_reload_all");
+//                        TQT_SLOT(slotFileReloadAll()), TQT_TQOBJECT(ac), "file_reload_all");
 
     (void) new KAction( i18n( "Save as Local Template..." ), 0,
-                        m_quanta, TQT_SLOT( slotFileSaveAsLocalTemplate() ),
-                        ac, "save_local_template" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAsLocalTemplate() ),
+                        TQT_TQOBJECT(ac), "save_local_template" );
 
     (void) new KAction( i18n( "Save Selection to Local Template File..." ), 0,
-                        m_quanta, TQT_SLOT( slotFileSaveSelectionAsLocalTemplate() ),
-                        ac, "save_selection_local_template" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveSelectionAsLocalTemplate() ),
+                        TQT_TQOBJECT(ac), "save_selection_local_template" );
 
-    KStdAction::quit( m_quanta, TQT_SLOT( slotFileQuit() ), ac );
+    KStdAction::quit( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileQuit() ), ac );
 
     // Edit actions
 
     (void) new KAction( i18n( "Find in Files..." ),
-                        SmallIcon("filefind"), CTRL+ALT+Key_F,
-                        m_quanta, TQT_SLOT( slotEditFindInFiles() ),
-                        ac, "find_in_files" );
+                        SmallIcon("filetqfind"), CTRL+ALT+Key_F,
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditFindInFiles() ),
+                        TQT_TQOBJECT(ac), "find_in_files" );
 
     KAction* aux = TagActionManager::self()->actionCollection()->action("apply_source_indentation");
     aux->setEnabled(false);
@@ -783,90 +783,90 @@ void QuantaInit::initActions()
     // Tool actions
 
     (void) new KAction( i18n( "&Context Help..." ), CTRL+Key_H,
-                        m_quanta, TQT_SLOT( slotContextHelp() ),
-                        ac, "context_help" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotContextHelp() ),
+                        TQT_TQOBJECT(ac), "context_help" );
 
     (void) new KAction( i18n( "&Quanta Homepage" ), 0,
-                        m_quanta, TQT_SLOT( slotHelpHomepage() ),
-                        ac, "help_homepage" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotHelpHomepage() ),
+                        TQT_TQOBJECT(ac), "help_homepage" );
 
     (void) new KAction( i18n( "&User Mailing List" ), 0,
-                        m_quanta, TQT_SLOT( slotHelpUserList() ),
-                        ac, "help_userlist" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotHelpUserList() ),
+                        TQT_TQOBJECT(ac), "help_userlist" );
 
     (void) new KAction( i18n( "Make &Donation" ), 0,
-                        m_quanta, TQT_SLOT( slotMakeDonation() ),
-                        ac, "help_donation" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotMakeDonation() ),
+                        TQT_TQOBJECT(ac), "help_donation" );
 
     (void) new KAction( i18n( "Tag &Attributes..." ), ALT+Key_Down,
                         m_quanta->m_doc, TQT_SLOT( slotAttribPopup() ),
-                        ac, "tag_attributes" );
+                        TQT_TQOBJECT(ac), "tag_attributes" );
 
     (void) new KAction( i18n( "&Change the DTD..." ), 0,
-                        m_quanta, TQT_SLOT( slotChangeDTD() ),
-                        ac, "change_dtd" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotChangeDTD() ),
+                        TQT_TQOBJECT(ac), "change_dtd" );
 
     (void) new KAction( i18n( "&Edit DTD Settings..." ), 0,
-    m_quanta, TQT_SLOT( slotEditDTD() ),
-    ac, "edit_dtd" );
+    TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditDTD() ),
+    TQT_TQOBJECT(ac), "edit_dtd" );
 
     (void) new KAction( i18n( "&Load && Convert DTD..." ), 0,
                         DTDs::ref(), TQT_SLOT( slotLoadDTD() ),
-                        ac, "load_dtd" );
+                        TQT_TQOBJECT(ac), "load_dtd" );
     (void) new KAction( i18n( "Load DTD E&ntities..." ), 0,
                         DTDs::ref(), TQT_SLOT( slotLoadEntities() ),
-                        ac, "load_entities" );
+                        TQT_TQOBJECT(ac), "load_entities" );
 
     (void) new KAction( i18n( "Load DTD &Package (DTEP)..." ), 0,
-                        m_quanta, TQT_SLOT( slotLoadDTEP() ),
-                        ac, "load_dtep" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotLoadDTEP() ),
+                        TQT_TQOBJECT(ac), "load_dtep" );
 
     (void) new KAction( i18n( "Send DTD Package (DTEP) in E&mail..." ), "mail_send", 0,
-                        m_quanta, TQT_SLOT( slotEmailDTEP() ),
-                        ac, "send_dtep" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEmailDTEP() ),
+                        TQT_TQOBJECT(ac), "send_dtep" );
 
     (void) new KAction( i18n( "&Download DTD Package (DTEP)..." ), "network", 0,
-                        m_quanta, TQT_SLOT( slotDownloadDTEP() ),
-                        ac, "download_dtep" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDownloadDTEP() ),
+                        TQT_TQOBJECT(ac), "download_dtep" );
     (void) new KAction( i18n( "&Upload DTD Package (DTEP)..." ), "network", 0,
-                        m_quanta, TQT_SLOT( slotUploadDTEP() ),
-                        ac, "upload_dtep" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ),
+                        TQT_TQOBJECT(ac), "upload_dtep" );
 /*
     (void) new KAction( i18n( "&Upload DTD Package (DTEP)..." ), 0,
-                        m_quanta, TQT_SLOT( slotUploadDTEP() ),
-                        ac, "send_dtep" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ),
+                        TQT_TQOBJECT(ac), "send_dtep" );
 */
     (void) new KAction( i18n( "&Document Properties" ), 0,
-                        m_quanta, TQT_SLOT( slotDocumentProperties() ),
-                        ac, "tools_document_properties" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDocumentProperties() ),
+                        TQT_TQOBJECT(ac), "tools_document_properties" );
 
     (void) new KAction ( i18n ("F&ormat XML Code"), 0,
-                        m_quanta, TQT_SLOT( slotCodeFormatting() ),
-                        ac, "tools_code_formatting");
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotCodeFormatting() ),
+                        TQT_TQOBJECT(ac), "tools_code_formatting");
 
     (void) new KAction( i18n( "&Convert Tag && Attribute Case..."), 0,
-                        m_quanta, TQT_SLOT(slotConvertCase()),
-                        ac, "tools_change_case");
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT(slotConvertCase()),
+                        TQT_TQOBJECT(ac), "tools_change_case");
 
     // View actions
 
 
     m_quanta->showSourceAction =
       new KToggleAction( i18n( "&Source Editor"), UserIcon ("view_text"), ALT+Key_F9,
-                         m_quanta, TQT_SLOT( slotShowSourceEditor()),
-                         ac, "show_quanta_editor");
+                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowSourceEditor()),
+                         TQT_TQOBJECT(ac), "show_quanta_editor");
     m_quanta->showSourceAction->setExclusiveGroup("view");
 
     m_quanta->showVPLAction =
       new KToggleAction( i18n( "&VPL Editor"), UserIcon ("vpl"), CTRL+SHIFT+Key_F9,
-      m_quanta, TQT_SLOT( slotShowVPLOnly() ),
-                          ac, "show_kafka_view");
+      TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLOnly() ),
+                          TQT_TQOBJECT(ac), "show_kafka_view");
     m_quanta->showVPLAction->setExclusiveGroup("view");
 
     m_quanta->showVPLSourceAction =
       new KToggleAction( i18n("VPL && So&urce Editors"), UserIcon ("vpl_text"), Key_F9,
-                         m_quanta, TQT_SLOT( slotShowVPLAndSourceEditor() ),
-                          ac, "show_kafka_and_quanta");
+                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLAndSourceEditor() ),
+                          TQT_TQOBJECT(ac), "show_kafka_and_quanta");
     m_quanta->showVPLSourceAction->setExclusiveGroup("view");
     /**kafkaSelectAction = new KSelectAction(i18n("Main &View"), 0, ac,"show_kafka");
     TQStringList list2;
@@ -874,73 +874,73 @@ void QuantaInit::initActions()
     list2.append(i18n("&VPL Editor (experimental)"));
     list2.append(i18n("&Both Editors"));
     kafkaSelectAction->setItems(list2);
-    connect(kafkaSelectAction, TQT_SIGNAL(activated(int)), m_quanta, TQT_SLOT(slotShowKafkaPartl(int)));*/
+    connect(kafkaSelectAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowKafkaPartl(int)));*/
 
 
     (void) new KAction( i18n( "&Reload Preview" ), "reload",
                         KStdAccel::shortcut(KStdAccel::Reload).keyCodeQt(),
-                        m_quanta, TQT_SLOT(slotRepaintPreview()),
-                        ac, "reload" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRepaintPreview()),
+                        TQT_TQOBJECT(ac), "reload" );
 
     (void) new KAction( i18n( "&Previous File" ), "1leftarrow", KStdAccel::back(),
-                        m_quanta, TQT_SLOT( slotBack() ),
-                        ac, "previous_file" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ),
+                        TQT_TQOBJECT(ac), "previous_file" );
 
     (void) new KAction( i18n( "&Next File" ), "1rightarrow", KStdAccel::forward(),
-                        m_quanta, TQT_SLOT( slotForward() ),
-                        ac, "next_file" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ),
+                        TQT_TQOBJECT(ac), "next_file" );
 
     // Options actions
     //
 
     (void) new KAction( i18n( "Configure &Actions..." ), UserIcon("ball"),0,
-                        m_quanta, TQT_SLOT( slotOptionsConfigureActions() ),
-                        ac, "configure_actions" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureActions() ),
+                        TQT_TQOBJECT(ac), "configure_actions" );
 
-    KStdAction::showMenubar(m_quanta, TQT_SLOT(slotShowMenuBar()), ac, "options_show_menubar");
-    KStdAction::keyBindings(m_quanta, TQT_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts");
-    KStdAction::configureToolbars( m_quanta, TQT_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars");
-    KStdAction::preferences(m_quanta, TQT_SLOT( slotOptions() ), ac, "general_options");
-    new KAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, m_quanta, TQT_SLOT(slotPreviewOptions()), ac, "preview_options");
+    KStdAction::showMenubar(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowMenuBar()), ac, "options_show_menubar");
+    KStdAction::keyBindings(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts");
+    KStdAction::configureToolbars(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars");
+    KStdAction::preferences(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptions() ), ac, "general_options");
+    new KAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPreviewOptions()), TQT_TQOBJECT(ac), "preview_options");
 
     // Toolbars actions
     m_quanta->projectToolbarFiles = new KRecentFilesAction(i18n("Load &Project Toolbar"),0,
-                                                           m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL&)),
-                                                           ac, "toolbars_load_project");
-
-    new KAction(i18n("Load &Global Toolbar..."), 0, m_quanta, TQT_SLOT(slotLoadGlobalToolbar()), ac, "toolbars_load_global");
-    new KAction(i18n("Load &Local Toolbar..."), 0, m_quanta, TQT_SLOT(slotLoadToolbar()), ac, "toolbars_load_user");
-    new KAction(i18n("Save as &Local Toolbar..."), 0, m_quanta, TQT_SLOT(slotSaveLocalToolbar()), ac, "toolbars_save_local");
-    new KAction(i18n("Save as &Project Toolbar..."), 0, m_quanta, TQT_SLOT(slotSaveProjectToolbar()), ac, "toolbars_save_project");
-    new KAction(i18n("&New User Toolbar..."),  0, m_quanta, TQT_SLOT(slotAddToolbar()), ac, "toolbars_add");
-    new KAction(i18n("&Remove User Toolbar..."), 0, m_quanta, TQT_SLOT(slotRemoveToolbar()), ac, "toolbars_remove");
-    new KAction(i18n("Re&name User Toolbar..."), 0, m_quanta, TQT_SLOT(slotRenameToolbar()), ac, "toolbars_rename");
-    new KAction(i18n("Send Toolbar in E&mail..."), "mail_send", 0, m_quanta, TQT_SLOT(slotSendToolbar()), ac, "toolbars_send");
-    new KAction(i18n("&Upload Toolbar..." ), "network", 0, m_quanta, TQT_SLOT(slotUploadToolbar()), ac, "toolbars_upload" );
-    new KAction(i18n("&Download Toolbar..." ), "network", 0, m_quanta, TQT_SLOT(slotDownloadToolbar()), ac, "toolbars_download" );
-
-    KToggleAction *toggle = new KToggleAction( i18n("Smart Tag Insertion"), 0, ac, "smart_tag_insertion");
-    connect(toggle, TQT_SIGNAL(toggled(bool)), m_quanta, TQT_SLOT(slotSmartTagInsertion()));
-
-    m_quanta->showDTDToolbar=new KToggleAction(i18n("Show DTD Toolbar"), 0, ac, "view_dtd_toolbar");
-
-    connect(m_quanta->showDTDToolbar, TQT_SIGNAL(toggled(bool)), m_quanta, TQT_SLOT(slotToggleDTDToolbar(bool)));
+                                                           TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL&)),
+                                                           TQT_TQOBJECT(ac), "toolbars_load_project");
+
+    new KAction(i18n("Load &Global Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadGlobalToolbar()), TQT_TQOBJECT(ac), "toolbars_load_global");
+    new KAction(i18n("Load &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbar()), TQT_TQOBJECT(ac), "toolbars_load_user");
+    new KAction(i18n("Save as &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveLocalToolbar()), TQT_TQOBJECT(ac), "toolbars_save_local");
+    new KAction(i18n("Save as &Project Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveProjectToolbar()), TQT_TQOBJECT(ac), "toolbars_save_project");
+    new KAction(i18n("&New User Toolbar..."),  0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAddToolbar()), TQT_TQOBJECT(ac), "toolbars_add");
+    new KAction(i18n("&Remove User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRemoveToolbar()), TQT_TQOBJECT(ac), "toolbars_remove");
+    new KAction(i18n("Re&name User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRenameToolbar()), TQT_TQOBJECT(ac), "toolbars_rename");
+    new KAction(i18n("Send Toolbar in E&mail..."), "mail_send", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSendToolbar()), TQT_TQOBJECT(ac), "toolbars_send");
+    new KAction(i18n("&Upload Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadToolbar()), TQT_TQOBJECT(ac), "toolbars_upload" );
+    new KAction(i18n("&Download Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadToolbar()), TQT_TQOBJECT(ac), "toolbars_download" );
+
+    KToggleAction *toggle = new KToggleAction( i18n("Smart Tag Insertion"), 0, TQT_TQOBJECT(ac), "smart_tag_insertion");
+    connect(toggle, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSmartTagInsertion()));
+
+    m_quanta->showDTDToolbar=new KToggleAction(i18n("Show DTD Toolbar"), 0, TQT_TQOBJECT(ac), "view_dtd_toolbar");
+
+    connect(m_quanta->showDTDToolbar, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotToggleDTDToolbar(bool)));
     m_quanta->showDTDToolbar->setCheckedState(i18n("Hide DTD Toolbar"));
 
     new KAction(i18n("Complete Text"), CTRL+Key_Space,
-                m_quanta, TQT_SLOT(slotShowCompletion()), ac,"show_completion");
+                TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletion()), ac,"show_completion");
     new KAction(i18n("Completion Hints"), CTRL+SHIFT+Key_Space,
-                m_quanta, TQT_SLOT(slotShowCompletionHint()), ac,"show_completion_hint");
+                TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletionHint()), ac,"show_completion_hint");
 
-    KStdAction::back(m_quanta, TQT_SLOT( slotBack() ), ac, "w_back");
-    KStdAction::forward(m_quanta, TQT_SLOT( slotForward() ), ac, "w_forward");
+    KStdAction::back(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ), ac, "w_back");
+    KStdAction::forward(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ), ac, "w_forward");
 
-    new KAction(i18n("Open File: none"), 0, m_quanta, TQT_SLOT(slotOpenFileUnderCursor()), ac, "open_file_under_cursor");
-    new KAction(i18n("Upload..."), 0, m_quanta, TQT_SLOT(slotUploadFile()), ac, "upload_file");
-    new KAction(i18n("Delete File"), 0, m_quanta, TQT_SLOT(slotDeleteFile()), ac, "delete_file");
+    new KAction(i18n("Open File: none"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileUnderCursor()), TQT_TQOBJECT(ac), "open_file_under_cursor");
+    new KAction(i18n("Upload..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadFile()), TQT_TQOBJECT(ac), "upload_file");
+    new KAction(i18n("Delete File"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDeleteFile()), TQT_TQOBJECT(ac), "delete_file");
 
     TQString ss = i18n("Upload Opened Project Files...");
-/*    new KAction(i18n("Upload Opened Project Files"), 0, m_quanta, TQT_SLOT(slotUploadOpenedFiles()), ac, "upload_opened_files"); */
+/*    new KAction(i18n("Upload Opened Project Files"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadOpenedFiles()), TQT_TQOBJECT(ac), "upload_opened_files"); */
 
     TQString error;
     int el, ec;
@@ -963,7 +963,7 @@ void QuantaInit::initActions()
           n = n.nextSibling();
         }
       } else
-        kdError(24000) << TQString("Error %1 at (%2, %3) in %4").arg(error).arg(el).arg(ec).arg(f.name()) << endl;
+        kdError(24000) << TQString("Error %1 at (%2, %3) in %4").tqarg(error).tqarg(el).tqarg(ec).tqarg(f.name()) << endl;
       f.close();
     }
     m_quanta->m_actions->clear();
@@ -990,7 +990,7 @@ void QuantaInit::initActions()
             n = n.nextSibling();
           }
         } else
-        kdError(24000) << TQString("Error %1 at (%2, %3) in %4").arg(error).arg(el).arg(ec).arg(f.name()) << endl;
+        kdError(24000) << TQString("Error %1 at (%2, %3) in %4").tqarg(error).tqarg(el).tqarg(ec).tqarg(f.name()) << endl;
         f.close();
       }
     } else
@@ -1001,17 +1001,17 @@ void QuantaInit::initActions()
     // create the preview action
     m_quanta->showPreviewAction =
       new KToolBarPopupAction( i18n( "&Preview" ), "preview", Key_F6,
-                         m_quanta, TQT_SLOT( slotToggleShowPreview() ),
-                         ac, "show_preview" );
+                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotToggleShowPreview() ),
+                         TQT_TQOBJECT(ac), "show_preview" );
 
     KAction *act = new KAction( i18n( "Preview Without Frames" ), "", 0,
-                                  m_quanta, TQT_SLOT(slotShowNoFramesPreview()),
-                                  ac, "show_preview_no_frames" );
+                                  TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowNoFramesPreview()),
+                                  TQT_TQOBJECT(ac), "show_preview_no_frames" );
     act->plug(m_quanta->showPreviewAction->popupMenu());
 
     act = new KAction( i18n( "View with &Konqueror" ), "konqueror", Key_F12,
-                        m_quanta, TQT_SLOT( slotViewInKFM() ),
-                        ac, "view_with_konqueror" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInKFM() ),
+                        TQT_TQOBJECT(ac), "view_with_konqueror" );
     act->plug(m_quanta->showPreviewAction->popupMenu());
 
 
@@ -1032,62 +1032,62 @@ void QuantaInit::initActions()
       act->plug(m_quanta->showPreviewAction->popupMenu());
 
     act = new KAction( i18n( "View with L&ynx" ), "terminal", 0,
-                        m_quanta, TQT_SLOT( slotViewInLynx() ),
-                        ac, "view_with_lynx" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInLynx() ),
+                        TQT_TQOBJECT(ac), "view_with_lynx" );
     act->plug(m_quanta->showPreviewAction->popupMenu());
 
 
     (void) new KAction( i18n( "Table Editor..." ), "quick_table", 0,
-                        m_quanta, TQT_SLOT( slotTagEditTable() ),
-                        ac, "tag_edit_table" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagEditTable() ),
+                        TQT_TQOBJECT(ac), "tag_edit_table" );
 
     (void) new KAction( i18n( "Quick List..." ), "quick_list", 0,
-                        m_quanta, TQT_SLOT( slotTagQuickList() ),
-                        ac, "tag_quick_list" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagQuickList() ),
+                        TQT_TQOBJECT(ac), "tag_quick_list" );
 
     (void) new KAction( i18n( "Color..." ), "colorize", CTRL+SHIFT+Key_C,
-                        m_quanta, TQT_SLOT( slotTagColor() ),
-                        ac, "tag_color" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagColor() ),
+                        TQT_TQOBJECT(ac), "tag_color" );
 
 
     (void) new KAction( i18n( "Email..." ), "tag_mail", 0,
-                        m_quanta, TQT_SLOT( slotTagMail() ),
-                        ac, "tag_mail" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMail() ),
+                        TQT_TQOBJECT(ac), "tag_mail" );
 
     (void) new KAction( i18n( "Misc. Tag..." ), "tag_misc", CTRL+SHIFT+Key_T,
-                        m_quanta, TQT_SLOT( slotTagMisc() ),
-                        ac, "tag_misc" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMisc() ),
+                        TQT_TQOBJECT(ac), "tag_misc" );
 
     (void) new KAction( i18n( "Frame Wizard..." ), "frame", 0,
-                        m_quanta, TQT_SLOT( slotFrameWizard() ),
-                        ac, "tag_frame_wizard" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFrameWizard() ),
+                        TQT_TQOBJECT(ac), "tag_frame_wizard" );
 
     (void) new KAction( i18n( "Paste &HTML Quoted" ), "editpaste", 0,
-                        m_quanta, TQT_SLOT( slotPasteHTMLQuoted() ),
-                        ac, "edit_paste_html_quoted" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteHTMLQuoted() ),
+                        TQT_TQOBJECT(ac), "edit_paste_html_quoted" );
 
     (void) new KAction( i18n( "Paste &URL Encoded" ), "editpaste", 0,
-                        m_quanta, TQT_SLOT( slotPasteURLEncoded() ),
-                        ac, "edit_paste_url_encoded" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteURLEncoded() ),
+                        TQT_TQOBJECT(ac), "edit_paste_url_encoded" );
 
     (void) new KAction( i18n( "Insert CSS..." ),"css", 0,
-                        m_quanta, TQT_SLOT( slotInsertCSS() ),
-                        ac, "insert_css" );
+                        TQT_TQOBJECT(m_quanta), TQT_SLOT( slotInsertCSS() ),
+                        TQT_TQOBJECT(ac), "insert_css" );
 
     // special-character combo
     KAction* char_action = new KAction(
                         i18n( "Insert Special Character" ), "charset", 0,
-                        ac, "insert_char" );
+                        TQT_TQOBJECT(ac), "insert_char" );
     connect( char_action, TQT_SIGNAL(activated()),
-             m_quanta, TQT_SLOT(slotInsertChar()) );
+             TQT_TQOBJECT(m_quanta), TQT_SLOT(slotInsertChar()) );
 
-    connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
-    connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
-    connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+    connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+    connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+    connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
 
-    QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(m_quanta));
+    QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(TQT_TQOBJECT(m_quanta)));
     m_bookmarks->createActions(ac);
-    connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
+    connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
 }
 
 /** Initialize the plugin architecture. */
@@ -1098,9 +1098,9 @@ void QuantaInit::initPlugins()
   m_quanta->m_pluginInterface = QuantaPluginInterface::ref(m_quanta);
 
   connect(m_quanta->m_pluginInterface, TQT_SIGNAL(hideSplash()),
-          m_quanta, TQT_SLOT(slotHideSplash()));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
   connect(m_quanta->m_pluginInterface, TQT_SIGNAL(statusMsg(const TQString &)),
-          m_quanta, TQT_SLOT(slotStatusMsg(const TQString & )));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & )));
 
   m_quanta->m_pluginInterface->readConfig();
   if (!m_quanta->m_pluginInterface->pluginAvailable("KFileReplace"))
@@ -1140,7 +1140,7 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
   {
     // when quanta crashes and file autoreloading option is on
     // then if user restarts quanta, the backup copies will reload
-    TQString backedUpFileName = (*backedUpUrlsIt).left((*backedUpUrlsIt).findRev(".")); //the filename without the PID
+    TQString backedUpFileName = (*backedUpUrlsIt).left((*backedUpUrlsIt).tqfindRev(".")); //the filename without the PID
     bool notFound;
     TQString autosavedPath = searchPathListEntry(backedUpFileName, autosavedUrlsList, notFound);
     if (!autosavedPath.isEmpty()) //the current item was autosaved and is not in use by another Quanta
@@ -1180,9 +1180,9 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
             "Backup file size: <b>%4</b><br>"
             "Backup created on: <b>%5</b><br><br>"
             "</qt>")
-            .arg(originalVersion.prettyURL(0, KURL::StripFileProtocol ))
-            .arg(KIO::convertSize(origSize)).arg(origTime)
-            .arg(KIO::convertSize(backupSize)).arg(backupTime));
+            .tqarg(originalVersion.prettyURL(0, KURL::StripFileProtocol ))
+            .tqarg(KIO::convertSize(origSize)).tqarg(origTime)
+            .tqarg(KIO::convertSize(backupSize)).tqarg(backupTime));
           w->buttonLoad->setText(i18n("&Restore the file from backup"));
           w->buttonIgnore->setText(i18n("Do &not restore the file from backup"));
           delete w->warningLabel;
@@ -1199,9 +1199,9 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
             //backup the current version and restore it from the autosaved backup
             KURL backupURL = originalVersion;
             backupURL.setPath(backupURL.path() + "." + TQString::number(getpid(),10) + ".backup");
-            QExtFileInfo::copy(originalVersion, backupURL, -1, true, false, m_quanta);
-            QExtFileInfo::copy(autosavedVersion, originalVersion, -1, true, false, m_quanta);
-            //we save a list of autosaved file names so "KQApplicationPrivate::init()"
+            TQExtFileInfo::copy(originalVersion, backupURL, -1, true, false, m_quanta);
+            TQExtFileInfo::copy(autosavedVersion, originalVersion, -1, true, false, m_quanta);
+            //we save a list of autosaved file names so "KTQApplicationPrivate::init()"
             //can open them. If autosavedVersion.path().right(1) == "U" then we are recovering
             //an untitled document
             if(isUntitledDocument)
@@ -1285,11 +1285,11 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
   *(execCommand) << TQStringList::split(" ",cmd);
 
   connect(execCommand, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
-          m_quanta, TQT_SLOT(slotGetScriptOutput(KProcess*,char*,int)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptOutput(KProcess*,char*,int)));
   connect(execCommand, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
-          m_quanta, TQT_SLOT(slotGetScriptError(KProcess*,char*,int)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptError(KProcess*,char*,int)));
   connect(execCommand, TQT_SIGNAL(processExited(KProcess*)),
-          m_quanta, TQT_SLOT(slotProcessExited(KProcess*)));
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessExited(KProcess*)));
 
   if (!execCommand->start(KProcess::NotifyOnExit,KProcess::All))
   {
@@ -1300,9 +1300,9 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
     //To avoid lock-ups, start a timer.
     TQTimer *timer = new TQTimer(m_quanta);
     connect(timer, TQT_SIGNAL(timeout()),
-            m_quanta, TQT_SLOT(slotProcessTimeout()));
+            TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessTimeout()));
     timer->start(180*1000, true);
-    QExtFileInfo internalFileInfo;
+    TQExtFileInfo internalFileInfo;
     m_quanta->m_loopStarted = true;
     internalFileInfo.enter_loop();
     delete timer;
@@ -1341,14 +1341,14 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
     }
 
   }
-  return TQString::null;
+  return TQString();
 }
 
 /** Retrieves hashed path from the name of a backup file */
 TQString QuantaInit::retrieveHashedPath(const TQString& filename)
 {
-  int lastPoint = filename.findRev(".");
-  int Ppos = filename.find("P", lastPoint);
+  int lastPoint = filename.tqfindRev(".");
+  int Ppos = filename.tqfind("P", lastPoint);
   return filename.mid(lastPoint + 1,
                       Ppos - lastPoint);
 }
@@ -1357,11 +1357,11 @@ TQString QuantaInit::retrieveHashedPath(const TQString& filename)
 /** Retrieves PID from the name of a backup file */
 TQString QuantaInit::retrievePID(const TQString& filename)
 {
- TQString strPID = TQString::null;
- strPID = filename.mid(filename.findRev("P") + 1);
+ TQString strPID = TQString();
+ strPID = filename.mid(filename.tqfindRev("P") + 1);
 
  if (strPID.isEmpty())
-  strPID = filename.mid(filename.findRev("N") + 1);
+  strPID = filename.mid(filename.tqfindRev("N") + 1);
 
  if (strPID.endsWith("U"))
    strPID = strPID.left(strPID.length() - 1);
@@ -1460,7 +1460,7 @@ void QuantaInit::checkRuntimeDependencies()
   dependencies.append(dependency);
 
 
-  dependency.name = "KLinkStatus";
+  dependency.name = "KLinktqStatus";
   dependency.execName = "Link Checker";
   dependency.url = "http://kde-apps.org/content/show.php?content=12318";
   dependency.description = i18n("link validity checking");
@@ -1482,13 +1482,13 @@ void QuantaInit::checkRuntimeDependencies()
     if (dependency.type == Dependency::Executable)
     {
       if (KStandardDirs::findExe(dependency.execName).isNull())
-        errorStr += TQString(stdErrorMsg).arg(dependency.name).arg(dependency.url).arg(dependency.description);
+        errorStr += TQString(stdErrorMsg).tqarg(dependency.name).tqarg(dependency.url).tqarg(dependency.description);
 
     } else
     if (dependency.type == Dependency::Plugin)
     {
       if (!QuantaPlugin::validatePlugin(m_quanta->m_pluginInterface->plugin(dependency.execName)))
-        errorStr += TQString(stdErrorMsg).arg(dependency.name).arg(dependency.url).arg(dependency.description);
+        errorStr += TQString(stdErrorMsg).tqarg(dependency.name).tqarg(dependency.url).tqarg(dependency.description);
     }
   }
 
@@ -1500,14 +1500,14 @@ void QuantaInit::checkRuntimeDependencies()
                                             &appId);
   if (appId.isEmpty())
   {
-     errorStr += TQString(stdErrorMsg).arg("Cervisia (cvsservice)").arg("http://www.kde.org/apps/cervisia").arg(i18n("integrated CVS management"));
+     errorStr += TQString(stdErrorMsg).tqarg("Cervisia (cvsservice)").tqarg("http://www.kde.org/apps/cervisia").tqarg(i18n("integrated CVS management"));
   } else
   {
      CVSService::ref(m_quanta->actionCollection())->setAppId(appId);
      connect(CVSService::ref(), TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear()));
      connect(CVSService::ref(), TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool)));
-     connect(CVSService::ref(), TQT_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), m_quanta, TQT_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&)));
-     //connect(CVSService::ref(), TQT_SIGNAL(statusMsg(const TQString &)),  m_quanta, TQT_SLOT(slotStatusMsg(const TQString & )));
+     connect(CVSService::ref(), TQT_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&)));
+     //connect(CVSService::ref(), TQT_SIGNAL(statusMsg(const TQString &)),  TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & )));
      m_quanta->fTab->plugCVSMenu();
      pTab->plugCVSMenu();
   }
@@ -1569,7 +1569,7 @@ void QuantaInit::readAbbreviations()
  TQStringList::Iterator it;
  for (it = filenameList.begin(); it != filenameList.end(); ++it)
  {
-    int pos =(*it).find('|');
+    int pos =(*it).tqfind('|');
     TQString dirName = (*it).mid(pos + 1);
     TQString dtepName = (*it).left(pos);
     KURL dirURL(dirName);
@@ -1622,7 +1622,7 @@ int QuantaInit::runningQuantas()
   int i = 0;
   for (QCStringList::iterator it = list.begin(); it != list.end(); ++it)
   {
-    if (TQString(*it).startsWith("quanta", false))
+    if (TQString(*it).tqstartsWith("quanta", false))
       ++i;
   }
   return i;
diff --git a/quanta/src/quanta_init.h b/quanta/src/quanta_init.h
index 0b1f6ae9..17bbb09a 100644
--- a/quanta/src/quanta_init.h
+++ b/quanta/src/quanta_init.h
@@ -19,7 +19,7 @@
 #define QUANTAINIT_H
 
 
-// include files for Qt
+// include files for TQt
 #include <tqobject.h>
 
 // include files for KDE
@@ -39,9 +39,10 @@ class KConfig;
 /**
   * The base class for Quanta application windows.
   */
-class QuantaInit : public QObject
+class QuantaInit : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   QuantaInit(QuantaApp * quantaApp);
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index 31fb795b..51729fb6 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-// include files for Qt
+// include files for TQt
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqwidget.h>
@@ -76,7 +76,7 @@
 #include "tagactionmanager.h"
 #include "tagactionset.h"
 
-QuantaDoc::QuantaDoc(TQWidget *parent, const char *name) : TQObject(parent, name)
+QuantaDoc::QuantaDoc(TQWidget *tqparent, const char *name) : TQObject(tqparent, name)
 {
   fileWatcher = new KDirWatch(this);
 
@@ -132,7 +132,7 @@ bool QuantaDoc::newDocument( const KURL& url, bool switchToExisting )
   else // select opened
   if (switchToExisting)
   {
-    view->document()->checkDirtyStatus();
+    view->document()->checkDirtytqStatus();
     if (view != ViewManager::ref()->activeView())
     {
       view->activate();
@@ -147,7 +147,7 @@ bool QuantaDoc::newDocument( const KURL& url, bool switchToExisting )
 void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
                              bool switchToExisting, bool readOnly)
 {
-  bool idleTimerStatus = quantaApp->slotEnableIdleTimer(false);
+  bool idleTimertqStatus = quantaApp->slotEnableIdleTimer(false);
   KURL url = urlToOpen;
   if (url.isLocalFile())
   {
@@ -158,7 +158,7 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
   TQString encoding = a_encoding;
   if (!newDocument(url, switchToExisting))
   {
-     quantaApp->slotEnableIdleTimer(idleTimerStatus);
+     quantaApp->slotEnableIdleTimer(idleTimertqStatus);
      return;
   }
   Document *w = ViewManager::ref()->activeDocument();
@@ -171,7 +171,7 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
   }
   if (!url.isEmpty())
   {
-    if (QExtFileInfo::exists(url, true, quantaApp))
+    if (TQExtFileInfo::exists(url, true, quantaApp))
     {
        if (encoding.isEmpty())
           encoding = quantaApp->defaultEncoding();
@@ -211,23 +211,23 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
             highlightIf->setHlMode(htmlIdx);
       }
     }
-    emit newStatus();
+    emit newtqStatus();
   }
-  quantaApp->slotEnableIdleTimer(idleTimerStatus);
+  quantaApp->slotEnableIdleTimer(idleTimertqStatus);
 }
 
 void QuantaDoc::slotOpeningFailed(const KURL &url)
 {
     Q_UNUSED(url);
-    bool signalStatus = signalsBlocked();
+    bool signaltqStatus = signalsBlocked();
     blockSignals(false);
     emit hideSplash();
     //Seems to be not needed anymore since KDE 3.2, but keep until it's completely verified
 /*
-    KMessageBox::error(quantaApp, i18n("<qt>Cannot open document <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
+    KMessageBox::error(quantaApp, i18n("<qt>Cannot open document <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
 */
     ViewManager::ref()->removeActiveView();
-    blockSignals(signalStatus);
+    blockSignals(signaltqStatus);
 }
 
 void QuantaDoc::slotOpeningCompleted(const KURL &url)
@@ -240,10 +240,10 @@ void QuantaDoc::slotOpeningCompleted(const KURL &url)
   quantaApp->reparse(true);
   if (url.isLocalFile())
     quantaApp->debugger()->fileOpened(url.prettyURL(0, KURL::StripFileProtocol));
-  quantaApp->slotNewStatus();
+  quantaApp->slotNewtqStatus();
   quantaApp->setTitle(url.prettyURL(0, KURL::StripFileProtocol));
   Project::ref()->loadCursorPosition(w->url(), dynamic_cast<KTextEditor::ViewCursorInterface*>(w->view()));
-  emit eventHappened("after_open", url.url(), TQString::null);
+  emit eventHappened("after_open", url.url(), TQString());
   
   bool flag = TagActionManager::canIndentDTD(w->defaultDTD()->name);
   quantaApp->actionCollection()->action("apply_source_indentation")->setEnabled(flag);
@@ -272,7 +272,7 @@ void QuantaDoc::slotAttribPopup()
 
     if ( QuantaCommon::isKnownTag(w->getDTDIdentifier(),tagName) )
     {
-      TQString caption = i18n("Attributes of <%1>").arg(tagName);
+      TQString caption = i18n("Attributes of <%1>").tqarg(tagName);
       attribMenu->insertTitle( caption );
 
       AttributeList *list = QuantaCommon::tagAttributes(w->getDTDIdentifier(),tagName );
@@ -281,23 +281,23 @@ void QuantaDoc::slotAttribPopup()
       {
         name = list->at(i)->name;
         attribMenu->insertItem( name , i);//list->findIndex(*item) );
-        if (attrList.contains(name.ascii()))
+        if (attrList.tqcontains(name.ascii()))
         {
           attribMenu->setItemEnabled( i , false );
         }
         menuId++;
       }
 
-      QTag* qtag = QuantaCommon::tagFromDTD(w->getDTDIdentifier(), tagName);
+      TQTag* qtag = QuantaCommon::tagFromDTD(w->getDTDIdentifier(), tagName);
       for (TQStringList::Iterator it = qtag->commonGroups.begin(); it != qtag->commonGroups.end(); ++it)
       {
        TQPopupMenu* popUpMenu = new TQPopupMenu(attribMenu, (*it).latin1());
-       AttributeList *attrs = qtag->parentDTD->commonAttrs->find(*it);
+       AttributeList *attrs = qtag->tqparentDTD->commonAttrs->tqfind(*it);
        for (uint j = 0; j < attrs->count(); j++)
        {
         name = attrs->at(j)->name;
         popUpMenu->insertItem(name, ++menuId);
-        if (attrList.contains(name.ascii()))
+        if (attrList.tqcontains(name.ascii()))
         {
           popUpMenu->setItemEnabled( menuId , false );
         }
@@ -317,7 +317,7 @@ void QuantaDoc::slotAttribPopup()
       }
     }
     else {
-      TQString message = i18n("Unknown tag: %1").arg(tagName);
+      TQString message = i18n("Unknown tag: %1").tqarg(tagName);
       quantaApp->slotStatusMsg( message );
     }
   }
@@ -345,10 +345,10 @@ void QuantaDoc::slotInsertAttrib( int id )
         attrStr = list->at(id)->name;
       } else
       {
-        QTag* qtag = QuantaCommon::tagFromDTD(w->getDTDIdentifier(), tagName);
+        TQTag* qtag = QuantaCommon::tagFromDTD(w->getDTDIdentifier(), tagName);
         for (TQStringList::Iterator it = qtag->commonGroups.begin(); it != qtag->commonGroups.end(); ++it)
         {
-          AttributeList *attrs = qtag->parentDTD->commonAttrs->find(*it);
+          AttributeList *attrs = qtag->tqparentDTD->commonAttrs->tqfind(*it);
           menuId += attrs->count();
           if (id <= menuId)
           {
diff --git a/quanta/src/quantadoc.h b/quanta/src/quantadoc.h
index 37891d69..48c3b631 100644
--- a/quanta/src/quantadoc.h
+++ b/quanta/src/quantadoc.h
@@ -25,17 +25,18 @@ class Document;
 class KConfig;
 class KURL;
 
-class QuantaDoc : public QObject
+class QuantaDoc : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  QuantaDoc(TQWidget *parent, const char *name=0);
+  QuantaDoc(TQWidget *tqparent, const char *name=0);
   ~QuantaDoc();
 
   bool newDocument(const KURL&, bool switchToExisting = true);
-  void openDocument(const KURL&, const TQString& a_encoding = TQString::null, bool switchToExisting = true, bool readOnly = false);
+  void openDocument(const KURL&, const TQString& a_encoding = TQString(), bool switchToExisting = true, bool readOnly = false);
 
 public slots:
   /** close documents. */
@@ -47,7 +48,7 @@ public slots:
   void slotOpeningFailed(const KURL &url);
 
 signals:
-  void newStatus();
+  void newtqStatus();
   void hideSplash();
   void eventHappened(const TQString&, const TQString&, const TQString& );
 
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index 51f93294..e0c761e9 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-// include files for Qt
+// include files for TQt
 #include <tqprinter.h>
 #include <tqpainter.h>
 #include <tqtabbar.h>
@@ -76,8 +76,8 @@
 extern int NN;
 extern TQValueList<Node*> nodes;
 
-QuantaView::QuantaView(TQWidget *parent, const char *name, const TQString &caption )
-  : KMdiChildView(parent, name)
+QuantaView::QuantaView(TQWidget *tqparent, const char *name, const TQString &caption )
+  : KMdiChildView(tqparent, name)
   , m_document(0L)
   , m_plugin(0L)
   , m_customWidget(0L)
@@ -95,7 +95,7 @@ QuantaView::QuantaView(TQWidget *parent, const char *name, const TQString &capti
 //get the reference to the user toolbar holding widget
   ToolbarTabWidget *m_toolbarTab = ToolbarTabWidget::ref();
   m_toolbarTab->reparent(this, 0, TQPoint(), true);
-  m_toolbarTab ->setFocusPolicy( TQWidget::NoFocus );
+  m_toolbarTab ->setFocusPolicy( TQ_NoFocus );
 
 //create a splitter to separate the VPL and document area
   m_splitter = new TQSplitter(Qt::Vertical, this);
@@ -159,7 +159,7 @@ bool QuantaView::mayRemove()
       KURL url = m_document->url();
       Project::ref()->saveBookmarks(url, dynamic_cast<KTextEditor::MarkInterface*>(m_document->doc()));
       if (!unmodifiedUntitled)
-        emit eventHappened("before_close", url.url(), TQString::null);
+        emit eventHappened("before_close", url.url(), TQString());
       m_currentViewsLayout = -1;
 //      m_document->closeTempFile();
       if (!m_document->isUntitled() && url.isLocalFile())
@@ -172,7 +172,7 @@ bool QuantaView::mayRemove()
       quantaApp->menuBar()->activateItemAt(-1);
       quantaApp->guiFactory()->removeClient(m_document->view());
       if (!unmodifiedUntitled)
-        emit eventHappened("after_close", url.url(), TQString::null);
+        emit eventHappened("after_close", url.url(), TQString());
     }
 /*      kdDebug(24000) << "Calling reparse from close " << endl;
       parser->setSAParserEnabled(true);
@@ -208,7 +208,7 @@ void QuantaView::addDocument(Document *document)
 
   reloadUpdateTimers();
 
-   m_currentViewsLayout = -1; //force loading of this layout
+   m_currentViewsLayout = -1; //force loading of this tqlayout
    slotSetSourceLayout();
 }
 
@@ -263,7 +263,7 @@ void QuantaView::addCustomWidget(TQWidget *widget, const TQString &label)
 void QuantaView::reloadLayout()
 {
   int currentViewsLayout = m_currentViewsLayout;
-  m_currentViewsLayout = -1; //force loading of this layout
+  m_currentViewsLayout = -1; //force loading of this tqlayout
   switch (currentViewsLayout)
   {
         case SourceOnly:
@@ -290,7 +290,7 @@ void QuantaView::updateTab()
         TQIconSet mimeIcon (KMimeType::pixmapForURL(m_document->url(), 0, KIcon::Small));
         if (mimeIcon.isNull())
           mimeIcon = TQIconSet(SmallIcon("document"));
-        TQString urlStr = QExtFileInfo::shortName(m_document->url().path());
+        TQString urlStr = TQExtFileInfo::shortName(m_document->url().path());
         if (m_document->isModified())
         {
             if (qConfig.showCloseButtons == "ShowAlways")
@@ -393,9 +393,9 @@ void QuantaView::slotSetSourceAndVPLLayout()
 
    KToggleAction *ta = (KToggleAction *) quantaApp->actionCollection()->action( "show_kafka_and_quanta" );
 
-   if (m_document->defaultDTD()->name.contains("HTML", false) == 0)
+   if (m_document->defaultDTD()->name.tqcontains("HTML", false) == 0)
    {
-      KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName));
+      KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName));
       KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" );
       if (ta2)
           ta2->setChecked(true);
@@ -442,9 +442,9 @@ void QuantaView::slotSetVPLOnlyLayout()
 
    KToggleAction *ta = (KToggleAction *) quantaApp->actionCollection()->action( "show_kafka_view" );
 
-   if (m_document->defaultDTD()->name.contains("HTML", false) == 0)
+   if (m_document->defaultDTD()->name.tqcontains("HTML", false) == 0)
    {
-      KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName));
+      KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName));
       KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" );
       if (ta2)
           ta2->setChecked(true);
@@ -786,9 +786,9 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString
   NodeModifsSet *modifs;
   DOM::Node domNode, domStartContainer, domEndContainer;
   TQString tagName;
-  QTag *nodeQTag, *qTag, *nodeParentQTag;
+  TQTag *nodeTQTag, *qTag, *nodeParentTQTag;
   Node *nodeCursor, *startContainer, *endContainer, *nodeParent, *dummy;
-  TQPtrList<QTag> qTagList;
+  TQPtrList<TQTag> qTagList;
   int startCol, startLine, endCol, endLine;
   bool specialTagInsertion = false;
   long nodeOffset, startOffset, endOffset, domNodeOffset;
@@ -833,24 +833,24 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString
 
     nodeParent = nodeCursor;
     if (nodeParent->tag->type == Tag::Text)
-        nodeParent = nodeParent->parent;
+        nodeParent = nodeParent->tqparent;
 
-  //Checking if at least one parent of node can have a Text Node as child, otherwise
+  //Checking if at least one tqparent of node can have a Text Node as child, otherwise
   //it is impossible for the
-  //user to add this node. In that case, try to insert the Node in the closest parent accepting it.
+  //user to add this node. In that case, try to insert the Node in the closest tqparent accepting it.
   //e.g. TR : a normal insertion would require to have the caret in the TABLE Node, but it is
               //impossible
-    nodeQTag = QuantaCommon::tagFromDTD(m_document->defaultDTD(),
+    nodeTQTag = QuantaCommon::tagFromDTD(m_document->defaultDTD(),
                                         node->tag->name);
 
-    if (!nodeQTag)
+    if (!nodeTQTag)
         return;
 
-    qTagList = nodeQTag->parents();
+    qTagList = nodeTQTag->tqparents();
 #ifdef HEAVY_DEBUG
-    kdDebug(25001)<< "nodeQTag name : " << nodeQTag->name() << endl;
-    /**kdDebug(25001)<< nodeQTag->isChild("#text", false) << endl;
-    kdDebug(25001)<< nodeQTag->isChild("#text", true) << endl;*/
+    kdDebug(25001)<< "nodeTQTag name : " << nodeTQTag->name() << endl;
+    /**kdDebug(25001)<< nodeTQTag->isChild("#text", false) << endl;
+    kdDebug(25001)<< nodeTQTag->isChild("#text", true) << endl;*/
 #endif
     for (qTag = qTagList.first(); qTag; qTag = qTagList.next())
     {
@@ -904,13 +904,13 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString
       nodeTreeModified = false;
       if (specialTagInsertion)
       {
-        //let's try to insert this node in the closest parent accepting it.
+        //let's try to insert this node in the closest tqparent accepting it.
         while (nodeParent)
         {
-          nodeParentQTag =
+          nodeParentTQTag =
                   QuantaCommon::tagFromDTD(m_document->defaultDTD(),
                   nodeParent->tag->name);
-          if (nodeParentQTag && nodeParentQTag->isChild(node))
+          if (nodeParentTQTag && nodeParentTQTag->isChild(node))
           {
             nodeCursor = kafkaCommon::createMandatoryNodeSubtree(node,
                     m_document);
@@ -919,10 +919,10 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString
             nodeTreeModified = true;
             break;
           }
-          nodeParent = nodeParent->parent;
+          nodeParent = nodeParent->tqparent;
         }
       }
-      else if (hasSelection && !nodeQTag->isSingle())
+      else if (hasSelection && !nodeTQTag->isSingle())
       {
         //If some text is selected in kafka, surround the selection with the new Node.
         if(!startContainer || !endContainer)
@@ -934,7 +934,7 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString
       else
       {
         //Nothing is selected, simply inserting the Node if it is not an inline.
-/*            if(!kafkaCommon::isInline(node->tag->name) || nodeQTag->isSingle())
+/*            if(!kafkaCommon::isInline(node->tag->name) || nodeTQTag->isSingle())
           {*/
         nodeTreeModified = kafkaCommon::DTDinsertRemoveNode(node, nodeCursor, (int)nodeOffset, nodeCursor,
                 (int)nodeOffset, m_document, &nodeCursor, nodeOffset, modifs);
@@ -1021,14 +1021,14 @@ void QuantaView::activated()
   ToolbarTabWidget::ref()->reparent(this, 0, TQPoint(), qConfig.enableDTDToolbar);
   m_viewLayout->addWidget(ToolbarTabWidget::ref(), 0 , 0);
   quantaApp->partManager()->setActivePart(m_document->doc(), m_document->view());
-  m_document->checkDirtyStatus();
+  m_document->checkDirtytqStatus();
   StructTreeView::ref()->useOpenLevelSetting = true;
   quantaApp->slotLoadToolbarForDTD(m_document->getDTDIdentifier());
 
   //TEMP : If the activated document is not a (X)HTML document, disable smartTagInsertion
   //Will be removed when VPL will support every DTD
   KAction *action = quantaApp->actionCollection()->action("smart_tag_insertion");
-  if(action && m_document->defaultDTD()->name.contains("HTML", false) == 0)
+  if(action && m_document->defaultDTD()->name.tqcontains("HTML", false) == 0)
   {
     qConfig.smartTagInsertion = false;
     (static_cast<KToggleAction* >(action))->setChecked(false);
@@ -1064,7 +1064,7 @@ bool QuantaView::saveModified(bool ask)
     int want_save;
     if (ask)
       want_save = KMessageBox::warningYesNoCancel(this,
-          i18n("The file \"%1\" has been modified.\nDo you want to save it?").arg(fileName),
+          i18n("The file \"%1\" has been modified.\nDo you want to save it?").tqarg(fileName),
           i18n("Warning"), KStdGuiItem::save(), KStdGuiItem::discard());
     else
       want_save = KMessageBox::Yes;
@@ -1108,7 +1108,7 @@ bool QuantaView::saveDocument(const KURL& url)
   if (url.isEmpty())
     return false;
 
-  emit eventHappened("before_save", url.url(), TQString::null);
+  emit eventHappened("before_save", url.url(), TQString());
   m_saveResult = true;
   KURL oldURL = m_document->url();
   if (!m_document->isUntitled() && oldURL.isLocalFile())
@@ -1125,7 +1125,7 @@ bool QuantaView::saveDocument(const KURL& url)
       return false; //saving to a local file failed
     } else //successful saving to a local file
     {
-      m_document->setDirtyStatus(false);
+      m_document->setDirtytqStatus(false);
       m_document->removeBackup(quantaApp->config());
       fileWatcher->addFile(m_document->url().path());
 //      kdDebug(24000) << "addFile[saveDocument, 2]: " << m_document->url().path() << endl;
@@ -1140,7 +1140,7 @@ bool QuantaView::saveDocument(const KURL& url)
     if (m_saveResult)
     {
       //start an event loop and wait until the saving finished
-      QExtFileInfo internalFileInfo;
+      TQExtFileInfo internalFileInfo;
       m_eventLoopStarted = true;
       internalFileInfo.enter_loop();
     }
@@ -1161,7 +1161,7 @@ bool QuantaView::saveDocument(const KURL& url)
   {
       setCaption(m_document->url().fileName());
   }
-  emit eventHappened("after_save", m_document->url().url(), TQString::null);
+  emit eventHappened("after_save", m_document->url().url(), TQString());
   return true;
 }
 
@@ -1170,16 +1170,16 @@ void QuantaView::slotSavingFailed(const TQString &error)
   Q_UNUSED(error);
   m_saveResult = false;
   if (m_eventLoopStarted)
-    qApp->exit_loop();
+    tqApp->exit_loop();
 }
 
 void QuantaView::slotSavingCompleted()
 {
   m_saveResult = true;
-  m_document->setDirtyStatus(false);
+  m_document->setDirtytqStatus(false);
   m_document->removeBackup(quantaApp->config());
   if (m_eventLoopStarted)
-    qApp->exit_loop();
+    tqApp->exit_loop();
 }
 
 #include "quantaview.moc"
diff --git a/quanta/src/quantaview.h b/quanta/src/quantaview.h
index e3688d93..dc6d7414 100644
--- a/quanta/src/quantaview.h
+++ b/quanta/src/quantaview.h
@@ -18,7 +18,7 @@
 #ifndef QUANTAVIEW_H
 #define QUANTAVIEW_H
 
-// include files for Qt
+// include files for TQt
 #include <tqguardedptr.h>
 #include <tqwidget.h>
 #include <tqptrlist.h>
@@ -64,10 +64,11 @@ class Node;
 class QuantaView : public KMdiChildView
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  QuantaView(TQWidget *parent = 0, const char *name=0, const TQString &caption = TQString::null);
+  QuantaView(TQWidget *tqparent = 0, const char *name=0, const TQString &caption = TQString());
   ~QuantaView();
 
   /** returns true if the view can be removed, false otherwise */
@@ -104,7 +105,7 @@ public:
   void reloadVPLView(bool force = false);
   /** reload the Quanta view from the Node Tree. Set force to true if you want to reload even if not necessary. */
   void reloadSourceView(bool force = false);
-  /** Return the curren views layout*/
+  /** Return the curren views tqlayout*/
   int currentViewsLayout() {return m_currentViewsLayout;}
 
   void reloadLayout();
@@ -129,12 +130,12 @@ public:
   void insertTag( const char *tag);
 
   /** Insert a new tag by bringing up the TagDialog. */
-  void insertNewTag(const TQString &tag, const TQString &attr = TQString::null, bool insertInLine = true);
+  void insertNewTag(const TQString &tag, const TQString &attr = TQString(), bool insertInLine = true);
   /**
     * This function take the output of the TagAction, parse it into Nodes and insert it
     * in the Node tree. Then kafka will take care of updating itself from the Node Tree.
     */
-  void insertOutputInTheNodeTree(const TQString &str1, const TQString &str2 = TQString::null, Node *node = 0L);
+  void insertOutputInTheNodeTree(const TQString &str1, const TQString &str2 = TQString(), Node *node = 0L);
 
   enum ViewFocus {
     SourceFocus = 0,
@@ -220,7 +221,7 @@ private:
   TQGuardedPtr<KafkaDocument> m_kafkaDocument;
   TQSplitter *m_splitter;
   TQGridLayout *m_viewLayout;
-  int m_currentViewsLayout; ///< holds the current layout, which can be SourceOnly, VPLOnly or SourceAndVPL
+  int m_currentViewsLayout; ///< holds the current tqlayout, which can be SourceOnly, VPLOnly or SourceAndVPL
   int m_currentFocus;
   bool m_saveResult;
   bool m_eventLoopStarted;
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 5d9ea103..152063c8 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -61,7 +61,7 @@
 #define UPLOAD_ID 12
 #define DELETE_ID 13
 
-ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent, name)
+ViewManager::ViewManager(TQObject *tqparent, const char *name) : TQObject(tqparent, name)
 {
     m_lastActiveView = 0L;
     m_lastActiveEditorView = 0L;
@@ -95,11 +95,11 @@ QuantaView* ViewManager::createView(const TQString &caption)
     connect(view, TQT_SIGNAL(cursorPositionChanged()), quantaApp, TQT_SLOT(slotNewLineColumn()));
     connect(view, TQT_SIGNAL(title(const TQString &)), quantaApp, TQT_SLOT(slotNewLineColumn()));
     connect(view, TQT_SIGNAL(dragInsert(TQDropEvent*)), this, TQT_SIGNAL(dragInsert(TQDropEvent *)));
-    connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewStatus()));
+    connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewtqStatus()));
     disconnect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 );
     connect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQT_SLOT(slotCloseRequest(KMdiChildView*)));
     connect(view, TQT_SIGNAL(documentClosed(const KURL&)), this, TQT_SLOT(slotDocumentClosed(const KURL&)));
-    connect(view, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+    connect(view, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
 
     return view;
 }
@@ -107,8 +107,8 @@ QuantaView* ViewManager::createView(const TQString &caption)
 void ViewManager::createNewDocument()
 {
   int i = 1;
-  while (isOpened(KURL("file:"+i18n("Untitled%1").arg(i)))) i++;
-  TQString fname = i18n("Untitled%1").arg(i);
+  while (isOpened(KURL("file:"+i18n("Untitled%1").tqarg(i)))) i++;
+  TQString fname = i18n("Untitled%1").tqarg(i);
   QuantaView *view = createView(fname);
 
 #ifdef ENABLE_EDITORS
@@ -118,10 +118,10 @@ void ViewManager::createNewDocument()
                                 "KTextEditor::Document"
                                 );
 #else
-  KTextEditor::Document *doc = KTextEditor::createDocument ("libkatepart", view, "KTextEditor::Document");
+  KTextEditor::Document *doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(view), "KTextEditor::Document");
 #endif
   Document *w = new Document(doc, 0L);
-  connect(w, TQT_SIGNAL(showAnnotation(uint, const TQString&, const QPair<TQString, TQString>&)), quantaApp->annotationOutput(), TQT_SLOT(insertAnnotation(uint, const TQString&, const QPair<TQString, TQString>&)));
+  connect(w, TQT_SIGNAL(showAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&)), quantaApp->annotationOutput(), TQT_SLOT(insertAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&)));
   TQString encoding = quantaApp->defaultEncoding();
   KTextEditor::EncodingInterface* encodingIf = dynamic_cast<KTextEditor::EncodingInterface*>(doc);
   if (encodingIf)
@@ -138,8 +138,8 @@ void ViewManager::createNewDocument()
      popupIf->installPopup((TQPopupMenu *)quantaApp->factory()->container("popup_editor", quantaApp));
 
   quantaApp->setFocusProxy(w->view());
-  w->view()->setFocusPolicy(TQWidget::WheelFocus);
-  connect( v, TQT_SIGNAL(newStatus()), quantaApp, TQT_SLOT(slotNewStatus()));
+  w->view()->setFocusPolicy(TQ_WheelFocus);
+  connect( v, TQT_SIGNAL(newtqStatus()), quantaApp, TQT_SLOT(slotNewtqStatus()));
 
   quantaApp->slotNewPart(doc, true);  // register new part in partmanager and make active
   view->addDocument(w);
@@ -226,7 +226,7 @@ void ViewManager::slotViewActivated(KMdiChildView *view)
   parser->clearGroups();
   parser->setSAParserEnabled(true);
   quantaApp->reparse(true); //FIXME
-  quantaApp->slotNewStatus();
+  quantaApp->slotNewtqStatus();
   quantaApp->slotNewLineColumn();
   typingInProgress = false; //need to reset, as it's set to true in the above slots
   m_lastActiveView = qView;
@@ -257,16 +257,16 @@ void ViewManager::slotCloseOtherTabs()
    if (dynamic_cast<QuantaView*>(currentView) && !static_cast<QuantaView*>(currentView)->document())
      ToolbarTabWidget::ref()->reparent(0, 0, TQPoint(), false);
   KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator();
-  //save the children first to a list, as removing invalidates our iterator
-  TQValueList<KMdiChildView *> children;
+  //save the tqchildren first to a list, as removing tqinvalidates our iterator
+  TQValueList<KMdiChildView *> tqchildren;
   for (it->first(); !it->isDone(); it->next())
   {
-      children.append(it->currentItem());
+      tqchildren.append(it->currentItem());
   }
   delete it;
   KURL::List modifiedList;
   TQValueListIterator<KMdiChildView *> childIt;
-  for (childIt = children.begin(); childIt != children.end(); ++childIt)
+  for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
   {
     view = *childIt;
     qView = dynamic_cast<QuantaView*>(view);
@@ -286,7 +286,7 @@ void ViewManager::slotCloseOtherTabs()
     if (dlg.exec() == TQDialog::Accepted)
     {
       filesToSave = dlg.filesToSave();
-      for (childIt = children.begin(); childIt != children.end(); ++childIt)
+      for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
       {
         view = *childIt;
         qView = dynamic_cast<QuantaView*>(view);
@@ -295,7 +295,7 @@ void ViewManager::slotCloseOtherTabs()
           Document *w = qView->document();
           if (w)
           {
-            if (filesToSave.contains(w->url()))
+            if (filesToSave.tqcontains(w->url()))
               if (!qView->saveModified(false))
             {
               return;  //save aborted
@@ -311,7 +311,7 @@ void ViewManager::slotCloseOtherTabs()
     }
   }
 
-  for (childIt = children.begin(); childIt != children.end(); ++childIt)
+  for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
   {
       view = *childIt;
       if (view != currentView)
@@ -400,13 +400,13 @@ bool ViewManager::saveAll()
           {
               if (!w->isUntitled())
               {
-                  emit eventHappened("before_save", w->url().url(), TQString::null);
+                  emit eventHappened("before_save", w->url().url(), TQString());
                   w->docUndoRedo->fileSaved();
                   w->save();
                   w->removeBackup(quantaApp->config());
                   if (w->isModified())
                       flagsave = false;
-                  emit eventHappened("after_save", w->url().url(), TQString::null);
+                  emit eventHappened("after_save", w->url().url(), TQString());
               } else
               {
                   if (!view->saveModified())
@@ -427,16 +427,16 @@ bool ViewManager::closeAll(bool createNew)
   parser->setSAParserEnabled(false);
   KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator();
   QuantaView *view;
-  //save the children first to a list, as removing invalidates our iterator
-  TQValueList<KMdiChildView *> children;
+  //save the tqchildren first to a list, as removing tqinvalidates our iterator
+  TQValueList<KMdiChildView *> tqchildren;
   for (it->first(); !it->isDone(); it->next())
   {
-      children.append(it->currentItem());
+      tqchildren.append(it->currentItem());
   }
   delete it;
   KURL::List modifiedList;
   TQValueListIterator<KMdiChildView *> childIt;
-  for (childIt = children.begin(); childIt != children.end(); ++childIt)
+  for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
   {
     view = dynamic_cast<QuantaView*>(*childIt);
     if (view)
@@ -455,7 +455,7 @@ bool ViewManager::closeAll(bool createNew)
     if (dlg.exec() == TQDialog::Accepted)
     {
       filesToSave = dlg.filesToSave();
-      for (childIt = children.begin(); childIt != children.end(); ++childIt)
+      for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
       {
         view = dynamic_cast<QuantaView*>(*childIt);
         if (view)
@@ -463,7 +463,7 @@ bool ViewManager::closeAll(bool createNew)
           Document *w = view->document();
           if (w)
           {
-            if (filesToSave.contains(w->url()))
+            if (filesToSave.tqcontains(w->url()))
               if (!view->saveModified(false))
               {
                 emit filesClosed(false);
@@ -484,7 +484,7 @@ bool ViewManager::closeAll(bool createNew)
   disconnect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed()));
   ToolbarTabWidget::ref()->reparent(0L, 0, TQPoint(), false);
 
-  for (childIt = children.begin(); childIt != children.end(); ++childIt)
+  for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
   {
       view = dynamic_cast<QuantaView*>(*childIt);
       if (view)
@@ -528,7 +528,7 @@ bool ViewManager::closeAll(bool createNew)
   if (createNew)
   {
       createNewDocument();
-      quantaApp->slotNewStatus();
+      quantaApp->slotNewtqStatus();
   }
   emit filesClosed(true);
   return true;
@@ -604,7 +604,7 @@ void ViewManager::slotTabContextMenu(TQWidget *widget, const TQPoint& point)
          m_separatorVisible = true;
          m_tabPopup->insertSeparator(SEPARATOR_INDEX);
        }
-       if (Project::ref()->hasProject() && Project::ref()->contains(w->url()))
+       if (Project::ref()->hasProject() && Project::ref()->tqcontains(w->url()))
          m_tabPopup->setItemVisible(UPLOAD_ID, true);
        else
          m_tabPopup->setItemVisible(UPLOAD_ID, false);
@@ -647,7 +647,7 @@ void ViewManager::slotTabContextMenu(TQWidget *widget, const TQPoint& point)
        m_tabPopup->insertSeparator();
        m_cvsMenuId = m_tabPopup->insertItem(SmallIcon("cervisia"), i18n("CVS"), CVSService::ref()->menu());
      }
-     if (Project::ref()->contains(w->url()))
+     if (Project::ref()->tqcontains(w->url()))
        CVSService::ref()->setRepository(Project::ref()->projectBaseURL().path());
      else
          CVSService::ref()->setRepository(w->url().directory());
diff --git a/quanta/src/viewmanager.h b/quanta/src/viewmanager.h
index 05278901..9b600d00 100644
--- a/quanta/src/viewmanager.h
+++ b/quanta/src/viewmanager.h
@@ -29,22 +29,23 @@ class KMdiChildView;
 /** This singleton class takes care of creating new views for documents, help, plugins, preview and so.
 * As the name says, it also manages the views. */
 
-class ViewManager : public QObject
+class ViewManager : public TQObject
 {
    Q_OBJECT
+  TQ_OBJECT
 public:
   /** Returns a reference to the viewmanager object */
-  static ViewManager* const ref(TQObject *parent = 0L, const char *name = 0L)
+  static ViewManager* const ref(TQObject *tqparent = 0L, const char *name = 0L)
   {
     static ViewManager *m_ref;
-    if (!m_ref) m_ref = new ViewManager(parent, name);
+    if (!m_ref) m_ref = new ViewManager(tqparent, name);
     return m_ref;
   }
   /** The destructor. */
   virtual ~ViewManager(){};
 
   /** Creates a QuantaView object */
-  QuantaView *createView(const TQString &caption = TQString::null);
+  QuantaView *createView(const TQString &caption = TQString());
   /** Removes a QuantaView object. Returns false on failure (eg. the view was not saved and it refused
   the delete itself.) If force is true, the view is removed without asking for save.
   */
@@ -123,7 +124,7 @@ private slots:
 
 private:
   /** Private constructor for the singleton object. */
-  ViewManager(TQObject * parent = 0, const char * name = 0);
+  ViewManager(TQObject * tqparent = 0, const char * name = 0);
   /** Returns true if there isn't any opened view holding an editor */
   bool allEditorsClosed();
 
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index 952badbe..efe8bb69 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -67,10 +67,10 @@
 
 #include <X11/Xlib.h>
 
-class BaseTreeViewToolTip : public QToolTip
+class BaseTreeViewToolTip : public TQToolTip
 {
 public:
-    BaseTreeViewToolTip( TQWidget *parent, BaseTreeView *lv );
+    BaseTreeViewToolTip( TQWidget *tqparent, BaseTreeView *lv );
 
     void maybeTip( const TQPoint &pos );
 
@@ -79,14 +79,14 @@ private:
 
 };
 
-BaseTreeViewToolTip::BaseTreeViewToolTip( TQWidget *parent, BaseTreeView *lv )
-    : TQToolTip( parent ), m_view( lv )
+BaseTreeViewToolTip::BaseTreeViewToolTip( TQWidget *tqparent, BaseTreeView *lv )
+    : TQToolTip( tqparent ), m_view( lv )
 {
 }
 
 void BaseTreeViewToolTip::maybeTip( const TQPoint &pos )
 {
-    if ( !parentWidget() || !m_view || !m_view->showToolTips() )
+    if ( !tqparentWidget() || !m_view || !m_view->showToolTips() )
 	return;
 
     TQListViewItem *item = m_view->itemAt(pos);
@@ -106,13 +106,13 @@ void BaseTreeViewToolTip::maybeTip( const TQPoint &pos )
         text.append( "<br>" + item->text(1));
     }
     if ( !text.isEmpty() )
-      tip(m_view->itemRect(item), text);
+      tip(m_view->tqitemRect(item), text);
 }
 
 
 //BaseTreeViewItem implementation
-BaseTreeViewItem::BaseTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch )
-: KFileTreeViewItem( parent, item, brnch)
+BaseTreeViewItem::BaseTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch )
+: KFileTreeViewItem( tqparent, item, brnch)
 {
 }
 
@@ -163,11 +163,11 @@ void BaseTreeViewItem::refreshIcon()
 
 
 //BaseTreeBranch implementation
-BaseTreeBranch::BaseTreeBranch(KFileTreeView *parent, const KURL& url,
+BaseTreeBranch::BaseTreeBranch(KFileTreeView *tqparent, const KURL& url,
                                  const TQString& name, const TQPixmap& pix,
                                  bool showHidden ,
                                  KFileTreeViewItem *branchRoot)
-  : KFileTreeBranch(parent, url, name, pix, showHidden, branchRoot)
+  : KFileTreeBranch(tqparent, url, name, pix, showHidden, branchRoot)
 {
   bool localFile = url.isLocalFile();
   setAutoUpdate(localFile);
@@ -184,13 +184,13 @@ bool BaseTreeBranch::matchesFilter(const KFileItem *item) const
   return KFileTreeBranch::matchesFilter(item);
 }
 
-KFileTreeViewItem* BaseTreeBranch::createTreeViewItem(KFileTreeViewItem *parent,
+KFileTreeViewItem* BaseTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent,
                                                       KFileItem *fileItem)
 {
   BaseTreeViewItem  *tvi = 0;
-  if( parent && fileItem)
+  if( tqparent && fileItem)
   {
-    tvi = new BaseTreeViewItem(parent, fileItem, this);
+    tvi = new BaseTreeViewItem(tqparent, fileItem, this);
     // we assume there are childs
     if (tvi)
     {
@@ -198,7 +198,7 @@ KFileTreeViewItem* BaseTreeBranch::createTreeViewItem(KFileTreeViewItem *parent,
     }
   }
   else
-    kdDebug(24000) << "createTreeViewItem: Have no parent" << endl;
+    kdDebug(24000) << "createTreeViewItem: Have no tqparent" << endl;
   return tvi;
 }
 
@@ -230,7 +230,7 @@ void BaseTreeBranch::addOpenFolder(TQStringList* openFolder)
       }
       else
       {
-        item = dynamic_cast<KFileTreeViewItem *>(item->parent());
+        item = dynamic_cast<KFileTreeViewItem *>(item->tqparent());
       }
     }
     if (item == root())
@@ -265,7 +265,7 @@ void BaseTreeBranch::updateOpenFolder()
   while (item) {
     if (item->isDir() && item->isOpen()) {
       updateDirectory( item->url() );
-      kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+      kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
       // dive into the tree first
       newItem = dynamic_cast<KFileTreeViewItem *>(item->firstChild());
       if (newItem) {
@@ -276,7 +276,7 @@ void BaseTreeBranch::updateOpenFolder()
     };
     // go up if no sibling available
     if (! item->nextSibling())
-      item = dynamic_cast<KFileTreeViewItem *>(item->parent());
+      item = dynamic_cast<KFileTreeViewItem *>(item->tqparent());
     if (item == root())
       break;
     if (item)
@@ -291,11 +291,11 @@ void BaseTreeBranch::updateOpenFolder()
 //
 ////////////////////////////////////////////////////////////////////////////////////
 
-BaseTreeView::BaseTreeView(TQWidget *parent, const char *name)
-: KFileTreeView(parent, name), fileInfoDlg(0), m_saveOpenFolder(false), m_openWithMenu(0L), m_openWithMenuId(-1)
+BaseTreeView::BaseTreeView(TQWidget *tqparent, const char *name)
+: KFileTreeView(tqparent, name), fileInfoDlg(0), m_saveOpenFolder(false), m_openWithMenu(0L), m_openWithMenuId(-1)
 {
-  m_parent = parent;
-  TQToolTip::remove(viewport());  // remove the tooltip from QListView
+  m_parent = tqparent;
+  TQToolTip::remove(viewport());  // remove the tooltip from TQListView
   m_tooltip = new BaseTreeViewToolTip(viewport(), this);
   setFrameStyle( Panel | Sunken );
   setRootIsDecorated(true);
@@ -303,7 +303,7 @@ BaseTreeView::BaseTreeView(TQWidget *parent, const char *name)
   setLineWidth(2);
   setFullWidth(true);
   setShowSortIndicator(true);
-  setFocusPolicy(TQWidget::ClickFocus);
+  setFocusPolicy(TQ_ClickFocus);
   setShowFolderOpenPixmap(false);
 
   connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)),
@@ -371,7 +371,7 @@ void BaseTreeView::slotSelectFile(TQListViewItem *item)
     if ( QuantaCommon::checkMimeGroup(urlToOpen,"text") )
     {
       emit openFile(urlToOpen);
-      item->repaint();
+      item->tqrepaint();
     }
     else if ( QuantaCommon::checkMimeGroup(urlToOpen, "image") ) //it may be an image
       {
@@ -385,7 +385,7 @@ void BaseTreeView::slotSelectFile(TQListViewItem *item)
           if (QuantaCommon::denyBinaryInsert(this) == KMessageBox::Yes)
           {
             emit openFile(urlToOpen);
-            item->repaint();
+            item->tqrepaint();
           }
         }
    }
@@ -452,7 +452,7 @@ FileInfoDlg* BaseTreeView::addFileInfoPage(KPropertiesDialog* propDlg)
        fsize=qfile.size();                              //html file size
 
        TQString mimetype = KMimeType::findByFileContent(nameForInfo)->name();
-       if (mimetype.contains("text"))
+       if (mimetype.tqcontains("text"))
        {
         qfile.open(IO_ReadOnly);
         TQString imgname,imgpath;
@@ -462,23 +462,23 @@ FileInfoDlg* BaseTreeView::addFileInfoPage(KPropertiesDialog* propDlg)
         {
           imgname = stream.readLine();
           ct++;
-          position=imgname.find("<img",0,false);              //check for images
+          position=imgname.tqfind("<img",0,false);              //check for images
           if (position!=-1)
           {
             imgname.remove(0,position+4);
-            position=imgname.find("src=",0,false);              //extract images names
+            position=imgname.tqfind("src=",0,false);              //extract images names
             imgname.remove(0,position+4);
             if (imgname.startsWith("\"")) imgname.remove(0,1);
             if (imgname.startsWith("'")) imgname.remove(0,1);
-            position=imgname.find(" ",0,false);
+            position=imgname.tqfind(" ",0,false);
             if (position!=-1) imgname=imgname.left(position);
-            position=imgname.find(">",0,false);
+            position=imgname.tqfind(">",0,false);
             if (position!=-1) imgname=imgname.left(position);
-            position=imgname.find("\"",0,false);
+            position=imgname.tqfind("\"",0,false);
             if (position!=-1) imgname=imgname.left(position);
-            position=imgname.find("'",0,false);
+            position=imgname.tqfind("'",0,false);
             if (position!=-1) imgname=imgname.left(position);
-            if (!quantaFileProperties->imageList->findItem(imgname,Qt::ExactMatch))     //check if image was already counted
+            if (!quantaFileProperties->imageList->tqfindItem(imgname,TQt::ExactMatch))     //check if image was already counted
             {
               KURL v(KURL::fromPathOrURL( path ),imgname);
               imgpath=v.path();
@@ -494,15 +494,15 @@ FileInfoDlg* BaseTreeView::addFileInfoPage(KPropertiesDialog* propDlg)
          }
          qfile.close();
 
-         quantaFileProperties->lineNum->setText(i18n("Number of lines: %1").arg(ct));
-         quantaFileProperties->imageNum->setText(i18n("Number of images included: %1").arg(imgct));
-         quantaFileProperties->imageSize->setText(i18n("Size of the included images: %1 bytes").arg(fimgsize));
-         quantaFileProperties->totalSize->setText(i18n("Total size with images: %1 bytes").arg(fsize+fimgsize));
+         quantaFileProperties->lineNum->setText(i18n("Number of lines: %1").tqarg(ct));
+         quantaFileProperties->imageNum->setText(i18n("Number of images included: %1").tqarg(imgct));
+         quantaFileProperties->imageSize->setText(i18n("Size of the included images: %1 bytes").tqarg(fimgsize));
+         quantaFileProperties->totalSize->setText(i18n("Total size with images: %1 bytes").tqarg(fsize+fimgsize));
         }
-        else if (mimetype.contains("image"))
+        else if (mimetype.tqcontains("image"))
         {              // assume it's an image file
           TQImage imagefile=TQImage(nameForInfo);
-          quantaFileProperties->lineNum->setText(i18n("Image size: %1 x %2").arg(imagefile.width()).arg(imagefile.height()));
+          quantaFileProperties->lineNum->setText(i18n("Image size: %1 x %2").tqarg(imagefile.width()).tqarg(imagefile.height()));
           quantaFileProperties->imageNum->hide();
           quantaFileProperties->imageSize->hide();
           quantaFileProperties->totalSize->hide();
@@ -536,7 +536,7 @@ void BaseTreeView::slotOpen()
   if (item)
   {
     emit open(item);
-    item->repaint();
+    item->tqrepaint();
   }
 }
 
@@ -554,7 +554,7 @@ void BaseTreeView::slotOpenWith()
 
 void BaseTreeView::slotOpenWithApplication()
 {
-  KService::Ptr ptr = KService::serviceByDesktopPath(sender()->name());
+  KService::Ptr ptr = KService::serviceByDesktopPath(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
   if (ptr)
   {
     KURL::List list;
@@ -565,7 +565,7 @@ void BaseTreeView::slotOpenWithApplication()
 
 void BaseTreeView::slotOpenWithActivated(int id)
 {
-  if (m_pluginIds.contains(id))
+  if (m_pluginIds.tqcontains(id))
   {
     QuantaPlugin *plugin = m_pluginIds[id];
     plugin->unload(true);
@@ -648,7 +648,7 @@ void BaseTreeView::slotCopy()
 {
    if (currentItem())
    {
-     QClipboard *cb = TQApplication::clipboard();
+     TQClipboard *cb = TQApplication::tqclipboard();
      cb->setText( currentURL().prettyURL() );
    }
 }
@@ -658,7 +658,7 @@ void BaseTreeView::slotPaste()
 {
   if (currentItem())
   {
-    QClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) );
 
     KURL url = currentURL();
@@ -923,16 +923,16 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil
 }
 
 
-void BaseTreeView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after)
+void BaseTreeView::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after)
 {
   TQPoint p (contentsToViewport(pos));
   TQListViewItem *atpos = itemAt(p);
-//   if (atpos && atpos->parent()) {
+//   if (atpos && atpos->tqparent()) {
 //     after = atpos;
-//     parent = atpos->parent();
+//     tqparent = atpos->tqparent();
 //   } else {
     after = atpos;
-    parent = atpos;
+    tqparent = atpos;
 //   }
 }
 
@@ -952,7 +952,7 @@ bool BaseTreeView::isFileOpen(const KURL &url)
 
 bool BaseTreeView::isPathInClipboard()
 {
-  QClipboard *cb = TQApplication::clipboard();
+  TQClipboard *cb = TQApplication::tqclipboard();
   KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) );
   for ( KURL::List::Iterator it = list.begin(); it != list.end(); ++it )
   {
@@ -972,13 +972,13 @@ void BaseTreeView::slotDocumentClosed(const KURL& url)
     item = (*it)->findTVIByURL(url);
     if (item)
     {
-      item->repaint();
+      item->tqrepaint();
     }
   }
 /*  TQListViewItemIterator iter(this);
   for ( ; iter.current(); ++iter )
   {
-    iter.current()->repaint();
+    iter.current()->tqrepaint();
   }*/
 }
 
@@ -1036,9 +1036,9 @@ void BaseTreeView::doRename(KFileTreeViewItem* kftvi, const TQString & newName)
   if ( oldURL != newURL )
   {
     bool proceed = true;
-    if (QExtFileInfo::exists(newURL, false, this))
+    if (TQExtFileInfo::exists(newURL, false, this))
     {
-      proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(newURL.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue;
+      proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(newURL.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue;
     }
     if (proceed)
     {
@@ -1159,7 +1159,7 @@ void BaseTreeView::slotCreateSiteTemplate()
    bool error = false;
    if (tar.open(IO_WriteOnly))
    {
-      KURL::List fileList = QExtFileInfo::allFiles(url, "*", this);
+      KURL::List fileList = TQExtFileInfo::allFiles(url, "*", this);
       for (KURL::List::Iterator it = fileList.begin(); it != fileList.end(); ++it)
       {
          if (!(*it).path().endsWith("/"))
@@ -1184,7 +1184,7 @@ void BaseTreeView::slotCreateSiteTemplate()
      error = true;
 
    if (error)
-     KMessageBox::error(this, i18n("<qt>There was an error while creating the site template tarball.<br>Check that you can read the files from <i>%1</i>, you have write access to <i>%2</i> and that you have enough free space in your temporary folder.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)).arg(targetURL.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error"));
+     KMessageBox::error(this, i18n("<qt>There was an error while creating the site template tarball.<br>Check that you can read the files from <i>%1</i>, you have write access to <i>%2</i> and that you have enough free space in your temporary folder.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)).tqarg(targetURL.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error"));
    delete tempFile;
 }
 
@@ -1214,9 +1214,9 @@ void BaseTreeView::slotCreateFile()
       url.setPath(url.path() + "/" + fileName);
     else
       url.setPath(url.directory() + "/" + fileName);
-    if (QExtFileInfo::exists(url, false, this))
+    if (TQExtFileInfo::exists(url, false, this))
     {
-      KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").arg(fileName), i18n("Error Creating File"));
+      KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").tqarg(fileName), i18n("Error Creating File"));
       return;
     }
     KTempFile *tempFile = new KTempFile(tmpDir);
diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h
index 75dbaf9d..36c2d7fe 100644
--- a/quanta/treeviews/basetreeview.h
+++ b/quanta/treeviews/basetreeview.h
@@ -54,7 +54,7 @@ class QuantaPlugin;
 class BaseTreeViewItem : public KFileTreeViewItem {
 
 public:
-  BaseTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch );
+  BaseTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch );
 
   /**
   sorts folders separate from files
@@ -84,15 +84,16 @@ public:
  */
 class BaseTreeBranch : public KFileTreeBranch {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-  BaseTreeBranch(KFileTreeView *parent, const KURL& url,
+  BaseTreeBranch(KFileTreeView *tqparent, const KURL& url,
                   const TQString& name, const TQPixmap& pix,
                   bool showHidden = false, KFileTreeViewItem *branchRoot = 0);
   /**
   get the BaseTreeViewItem
   */
-  virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem *parent,
+  virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem *tqparent,
                                                  KFileItem *fileItem );
   /**
   does custom filtering
@@ -133,13 +134,14 @@ public:
  */
 class BaseTreeView : public KFileTreeView {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-  BaseTreeView(TQWidget *parent = 0L, const char *name = 0L);
+  BaseTreeView(TQWidget *tqparent = 0L, const char *name = 0L);
   virtual ~BaseTreeView();
 
   /**
-   * Saves the list view's layout (column widtsh, column order, sort column)
+   * Saves the list view's tqlayout (column widtsh, column order, sort column)
    * to a KConfig group. Reimplemented to save the open folders.
    *
    * @param config the KConfig object to write to
@@ -148,7 +150,7 @@ public:
   void saveLayout(KConfig *config, const TQString &group);
 
   /**
-   * Reads the list view's layout from a KConfig group as stored with
+   * Reads the list view's tqlayout from a KConfig group as stored with
    * saveLayout. Reimplemented to load the open folders.
    *
    * @param config the KConfig object to read from
@@ -171,7 +173,7 @@ public slots:
   */
   void slotNewProjectLoaded(const TQString &, const KURL &, const KURL &);
   /**
-  repaints all treeview items
+  tqrepaints all treeview items
   */
   void slotDocumentClosed(const KURL& url);
 
@@ -305,7 +307,7 @@ protected:
   */
   bool expandArchiv (KFileTreeViewItem *item);
   bool acceptDrag(TQDropEvent* e ) const;
-  void findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after);
+  void findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after);
 
   /**
   this is for project and template tree to reduce includes there
@@ -324,7 +326,7 @@ protected:
   TQString m_projectName;
   KURL m_projectBaseURL;
   FileInfoDlg* fileInfoDlg;
-  /** the parent of the treeview
+  /** the tqparent of the treeview
       the passwords are cached there
     */
   TQWidget * m_parent;
diff --git a/quanta/treeviews/docfolder.cpp b/quanta/treeviews/docfolder.cpp
index 0a1d941d..8ecf9c0f 100644
--- a/quanta/treeviews/docfolder.cpp
+++ b/quanta/treeviews/docfolder.cpp
@@ -28,8 +28,8 @@
 #include "docfolder.h"
 #include "docitem.h"
 
-DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, KConfig *config, const TQString &basePath)
-  : KListViewItem(parent)
+DocFolder::DocFolder(TQListViewItem *tqparent, const TQString &_name, KConfig *config, const TQString &basePath)
+  : KListViewItem(tqparent)
 {
   name = _name;
   topLevel = false;
@@ -59,8 +59,8 @@ DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, KConfig *con
   }
 }
 
-DocFolder::DocFolder(TQListView *parent, const TQString &_name, KConfig *config, const TQString &basePath)
-  : KListViewItem(parent)
+DocFolder::DocFolder(TQListView *tqparent, const TQString &_name, KConfig *config, const TQString &basePath)
+  : KListViewItem(tqparent)
 {
   name = _name;
   topLevel = false;
diff --git a/quanta/treeviews/docfolder.h b/quanta/treeviews/docfolder.h
index f3c8db87..945fa786 100644
--- a/quanta/treeviews/docfolder.h
+++ b/quanta/treeviews/docfolder.h
@@ -33,8 +33,8 @@ class KConfig;
 
 class DocFolder : public KListViewItem  {
 public:
-  DocFolder(TQListViewItem *parent, const TQString &_name, KConfig *config, const TQString &basePath);
-  DocFolder(TQListView *parent, const TQString &_name, KConfig *config, const TQString &basePath);
+  DocFolder(TQListViewItem *tqparent, const TQString &_name, KConfig *config, const TQString &basePath);
+  DocFolder(TQListView *tqparent, const TQString &_name, KConfig *config, const TQString &basePath);
   ~DocFolder();
   TQString text( int column ) const;
   void setup();
diff --git a/quanta/treeviews/docitem.cpp b/quanta/treeviews/docitem.cpp
index f24c3bb9..782d6140 100644
--- a/quanta/treeviews/docitem.cpp
+++ b/quanta/treeviews/docitem.cpp
@@ -21,15 +21,15 @@
 
 #include "docitem.h"
 
-DocItem::DocItem(TQListViewItem *parent, const TQString &_name, const TQString &_url)
-  : KListViewItem(parent)
+DocItem::DocItem(TQListViewItem *tqparent, const TQString &_name, const TQString &_url)
+  : KListViewItem(tqparent)
 {
   url = _url;
   name = _name;
 }
 
-DocItem::DocItem(TQListView *parent, const TQString &_name, const TQString &_url)
-  : KListViewItem(parent)
+DocItem::DocItem(TQListView *tqparent, const TQString &_name, const TQString &_url)
+  : KListViewItem(tqparent)
 {
   url = _url;
   name = _name;
diff --git a/quanta/treeviews/docitem.h b/quanta/treeviews/docitem.h
index 59b126a1..7c261012 100644
--- a/quanta/treeviews/docitem.h
+++ b/quanta/treeviews/docitem.h
@@ -31,8 +31,8 @@ class KConfig;
 class DocItem : public KListViewItem  {
 
 public:
-  DocItem(TQListViewItem *parent, const TQString &_name, const TQString &_url);
-  DocItem(TQListView *parent, const TQString &_name, const TQString &_url);
+  DocItem(TQListViewItem *tqparent, const TQString &_name, const TQString &_url);
+  DocItem(TQListView *tqparent, const TQString &_name, const TQString &_url);
   ~DocItem();
   TQString text( int column ) const;
 
diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp
index d0234faf..0541b25b 100644
--- a/quanta/treeviews/doctreeview.cpp
+++ b/quanta/treeviews/doctreeview.cpp
@@ -35,8 +35,8 @@
 #include "docfolder.h"
 #include "docitem.h"
 
-DocTreeView::DocTreeView(TQWidget *parent, const char *name )
-  : KListView(parent,name)
+DocTreeView::DocTreeView(TQWidget *tqparent, const char *name )
+  : KListView(tqparent,name)
 {
 
   contextHelpDict = new TQDict<TQString>( 101, false );
@@ -54,7 +54,7 @@ DocTreeView::DocTreeView(TQWidget *parent, const char *name )
   projectDocFolder = new KListViewItem(this, i18n("Project Documentation"));
   projectDocFolder->setOpen(true);
   slotRefreshTree();
-  setFocusPolicy(TQWidget::ClickFocus);
+  setFocusPolicy(TQ_ClickFocus);
 
   connect(this, TQT_SIGNAL(executed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *)) );
   connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *)));
@@ -138,11 +138,11 @@ void DocTreeView::clickItem( TQListViewItem *)
 
 TQString * DocTreeView::contextHelp(const TQString &keyword)
 {
-  TQString word = keyword.mid(keyword.find("|"));
-  if (contextHelpDict->find(keyword))
-    return contextHelpDict->find(keyword);
+  TQString word = keyword.mid(keyword.tqfind("|"));
+  if (contextHelpDict->tqfind(keyword))
+    return contextHelpDict->tqfind(keyword);
   else
-    return contextHelpDict->find(word); //to support old documentation packages
+    return contextHelpDict->tqfind(word); //to support old documentation packages
 }
 
 void DocTreeView::slotDoubleClicked(TQListViewItem *item )
@@ -156,7 +156,7 @@ void DocTreeView::slotDoubleClicked(TQListViewItem *item )
 void DocTreeView::slotAddProjectDoc(const KURL& url)
 {
   TQString path = url.path();
-  int pos = path.find("/doc/");
+  int pos = path.tqfind("/doc/");
   path = path.mid(pos + 5);
   new DocItem(projectDocFolder, path, url.url());
 }
diff --git a/quanta/treeviews/doctreeview.h b/quanta/treeviews/doctreeview.h
index ef60d468..bba36a04 100644
--- a/quanta/treeviews/doctreeview.h
+++ b/quanta/treeviews/doctreeview.h
@@ -35,8 +35,9 @@ class KPopupMenu;
 
 class DocTreeView : public KListView  {
    Q_OBJECT
+  TQ_OBJECT
 public:
-  DocTreeView(TQWidget *parent=0, const char *name=0);
+  DocTreeView(TQWidget *tqparent=0, const char *name=0);
   ~DocTreeView();
 
   TQString *contextHelp(const TQString &keyword);
diff --git a/quanta/treeviews/fileinfodlg.ui b/quanta/treeviews/fileinfodlg.ui
index f2fbd5fa..145b4f4e 100644
--- a/quanta/treeviews/fileinfodlg.ui
+++ b/quanta/treeviews/fileinfodlg.ui
@@ -8,7 +8,7 @@
  *                                                                         *
  ***************************************************************************/
 </comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>FileInfoDlg</cstring>
     </property>
@@ -24,7 +24,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>lineNum</cstring>
             </property>
@@ -32,7 +32,7 @@
                 <string>Number of lines:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>imageNum</cstring>
             </property>
@@ -40,7 +40,7 @@
                 <string>Number of images included:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>imageSize</cstring>
             </property>
@@ -48,7 +48,7 @@
                 <string>Size of the included images:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>totalSize</cstring>
             </property>
@@ -56,7 +56,7 @@
                 <string>Total file size:</string>
             </property>
         </widget>
-        <widget class="QListBox" row="5" column="0">
+        <widget class="TQListBox" row="5" column="0">
             <property name="name">
                 <cstring>imageList</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <enum>NoSelection</enum>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>includedLabel</cstring>
             </property>
@@ -72,7 +72,7 @@
                 <string>Included images:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="6" column="0">
+        <widget class="TQLabel" row="6" column="0">
             <property name="name">
                 <cstring>fileDescLbl</cstring>
             </property>
@@ -83,12 +83,12 @@
                 <cstring>fileDesc</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="7" column="0">
+        <widget class="TQLineEdit" row="7" column="0">
             <property name="name">
                 <cstring>fileDesc</cstring>
             </property>
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index fd943139..7d7146e2 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -40,8 +40,8 @@
 
 //FilesTreeView implementation
 
-FilesTreeView::FilesTreeView(KConfig *config, TQWidget *parent, const char *name)
-  : BaseTreeView(parent, name)
+FilesTreeView::FilesTreeView(KConfig *config, TQWidget *tqparent, const char *name)
+  : BaseTreeView(tqparent, name)
 {
   setAcceptDrops(true);
   setDragEnabled(true);
@@ -59,7 +59,7 @@ FilesTreeView::FilesTreeView(KConfig *config, TQWidget *parent, const char *name
   {
     url = KURL();
     QuantaCommon::setUrl(url, topStrList[i]);
-    if (!topURLList.contains(url))
+    if (!topURLList.tqcontains(url))
     {
       topURLList.append(url);
       if (i < topStrAliasList.count())
@@ -74,11 +74,11 @@ FilesTreeView::FilesTreeView(KConfig *config, TQWidget *parent, const char *name
   {
     url = KURL();
     url.setPath("/");
-    if (!topURLList.contains(url))
+    if (!topURLList.tqcontains(url))
         topURLList.append(url);
     url = KURL();
-    url.setPath(QExtFileInfo::homeDirPath() + "/");
-    if (!topURLList.contains(url))
+    url.setPath(TQExtFileInfo::homeDirPath() + "/");
+    if (!topURLList.tqcontains(url))
         topURLList.append(url);
   }
 
@@ -153,7 +153,7 @@ KFileTreeBranch* FilesTreeView::newBranch(const KURL& url)
     newBrnch = new BaseTreeBranch(this, url, i18n("Root Folder"), SmallIcon(fileItem.iconName()), true);
   } else
   {
-    if (url.isLocalFile() && url.equals(KURL(QExtFileInfo::homeDirPath() + "/"), true))
+    if (url.isLocalFile() && url.equals(KURL(TQExtFileInfo::homeDirPath() + "/"), true))
     {
       newBrnch = new BaseTreeBranch(this, url, i18n("Home Folder"), SmallIcon(fileItem.iconName()), true);
     } else
@@ -161,7 +161,7 @@ KFileTreeBranch* FilesTreeView::newBranch(const KURL& url)
       TQString s = url.fileName();
       if (s.isEmpty())
         s = "/";
-      if (topURLAliases.contains(url.url()))
+      if (topURLAliases.tqcontains(url.url()))
         s = topURLAliases[url.url()];
       s += " [" + url.prettyURL() + "]";
       newBrnch = new BaseTreeBranch(this, url, s, SmallIcon(fileItem.iconName()), true);
@@ -180,7 +180,7 @@ void FilesTreeView::slotMenu(KListView* listView, TQListViewItem *item, const TQ
   Q_UNUSED(listView);
 #ifdef ENABLE_CVSSERVICE
   KURL url = currentURL();
-  if (Project::ref()->contains(url))
+  if (Project::ref()->tqcontains(url))
     CVSService::ref()->setRepository(Project::ref()->projectBaseURL().path());
   else
     CVSService::ref()->setRepository(url.directory());
@@ -218,7 +218,7 @@ void FilesTreeView::slotMenu(KListView* listView, TQListViewItem *item, const TQ
         m_folderMenu->setItemVisible(m_menuFolderRename, false);
 
         m_config->setGroup("General Options");
-        if ((url == KURL("file:/") || url == KURL("file:" + QExtFileInfo::homeDirPath() + "/")) &&
+        if ((url == KURL("file:/") || url == KURL("file:" + TQExtFileInfo::homeDirPath() + "/")) &&
             m_config->readBoolEntry("Home-Root Folder On", true) )
           m_folderMenu ->setItemVisible(m_menuTop, false);
         m_folderMenu ->setItemVisible(m_reloadMenuId, true);
@@ -227,7 +227,7 @@ void FilesTreeView::slotMenu(KListView* listView, TQListViewItem *item, const TQ
       {
         m_folderMenu->changeItem( m_menuTop, i18n("&Add Folder to Top"));
         url.adjustPath(+1);
-        m_folderMenu->setItemVisible(m_menuTop, (topURLList.findIndex(url) == -1));
+        m_folderMenu->setItemVisible(m_menuTop, (topURLList.tqfindIndex(url) == -1));
         m_folderMenu->setItemVisible(m_reloadMenuId, false);
       }
       m_folderMenu->popup( point);
@@ -251,7 +251,7 @@ void FilesTreeView::slotAddToTop()
     url.adjustPath(+1);
     if ( curItem != curItem->branch()->root() )  //it is not a top folder
     { // add
-      if (topURLList.findIndex(url) == -1)
+      if (topURLList.tqfindIndex(url) == -1)
       {
         topURLList.append(url);
         bool ok;
@@ -261,7 +261,7 @@ void FilesTreeView::slotAddToTop()
         topURLAliases.insert(url.url(), aliasName);
         newBranch(url);
       } else {
-        KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url()));
+        KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").tqarg(url.url()));
       }
     } else
     { // remove
@@ -274,10 +274,10 @@ void FilesTreeView::slotAddToTop()
 
 void FilesTreeView::slotNewTopFolder()
 {
-  KURL url = KFileDialog::getExistingURL(TQString::null, this, i18n("Choose Local or Remote Folder"));
+  KURL url = KFileDialog::getExistingURL(TQString(), this, i18n("Choose Local or Remote Folder"));
   if (url.isEmpty()) return;
   url.adjustPath(+1);
-  if (topURLList.findIndex(url) == -1)
+  if (topURLList.tqfindIndex(url) == -1)
   {
     bool ok;
     TQString aliasName = KInputDialog::getText(i18n("Set Alias"), i18n("Alternative folder name:"), url.fileName(), &ok, this);
@@ -287,7 +287,7 @@ void FilesTreeView::slotNewTopFolder()
     newBranch(url);
     topURLList.append(url);
   } else {
-    KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url()));
+    KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").tqarg(url.url()));
   }
 }
 
@@ -313,18 +313,18 @@ void FilesTreeView::slotChangeAlias()
     url.adjustPath(+1);
     if ( curItem == curItem->branch()->root() )  //it is not a top folder
     {
-      if (topURLList.findIndex(url) != -1)
+      if (topURLList.tqfindIndex(url) != -1)
       {
         bool ok;
         TQString aliasName = KInputDialog::getText(i18n("Change Alias"), i18n("Alternative folder name:"), topURLAliases[url.url()], &ok, this);
         if (ok)
         {
-          topURLAliases.replace(url.url(), aliasName);
+          topURLAliases.tqreplace(url.url(), aliasName);
           removeBranch(curItem->branch());
           newBranch(url);
         }
       } else {
-        KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url()));
+        KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").tqarg(url.url()));
       }
     }
   }
diff --git a/quanta/treeviews/filestreeview.h b/quanta/treeviews/filestreeview.h
index 1b9e6068..dfef213c 100644
--- a/quanta/treeviews/filestreeview.h
+++ b/quanta/treeviews/filestreeview.h
@@ -33,9 +33,10 @@ class KURL;
 
 class FilesTreeView : public BaseTreeView {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-  FilesTreeView(KConfig *config, TQWidget *parent, const char *name = 0L);
+  FilesTreeView(KConfig *config, TQWidget *tqparent, const char *name = 0L);
   virtual ~FilesTreeView();
   KURL::List topURLList;
   TQMap<TQString, TQString> topURLAliases;
diff --git a/quanta/treeviews/newtemplatedirdlg.cpp b/quanta/treeviews/newtemplatedirdlg.cpp
index 48fd6b5e..cf960923 100644
--- a/quanta/treeviews/newtemplatedirdlg.cpp
+++ b/quanta/treeviews/newtemplatedirdlg.cpp
@@ -17,7 +17,7 @@
 #include "newtemplatedirdlg.h"
 #include "newtemplatedirdlg.moc"
 
-NewTemplateDirDlg::NewTemplateDirDlg(TQWidget *parent, const char *name ) : TemplateDirForm(parent,name)
+NewTemplateDirDlg::NewTemplateDirDlg(TQWidget *tqparent, const char *name ) : TemplateDirForm(tqparent,name)
 {
   setCaption(name);
   connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
diff --git a/quanta/treeviews/newtemplatedirdlg.h b/quanta/treeviews/newtemplatedirdlg.h
index 730246e7..56dbba5c 100644
--- a/quanta/treeviews/newtemplatedirdlg.h
+++ b/quanta/treeviews/newtemplatedirdlg.h
@@ -25,8 +25,9 @@
 
 class NewTemplateDirDlg : public TemplateDirForm  {
    Q_OBJECT
+  TQ_OBJECT
 public:
-  NewTemplateDirDlg(TQWidget *parent=0, const char *name=0);
+  NewTemplateDirDlg(TQWidget *tqparent=0, const char *name=0);
   ~NewTemplateDirDlg();
 };
 
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index 205e5bf0..3068fb55 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -46,8 +46,8 @@
 #endif
 
 //ProjectTreeViewItem implementation
-ProjectTreeViewItem::ProjectTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch )
-: BaseTreeViewItem( parent, item, brnch)
+ProjectTreeViewItem::ProjectTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch )
+: BaseTreeViewItem( tqparent, item, brnch)
 {
 }
 
@@ -70,38 +70,38 @@ void ProjectTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,
 }
 
 //ProjectTreeBranch implementation
-ProjectTreeBranch::ProjectTreeBranch(KFileTreeView *parent, const KURL& url,
+ProjectTreeBranch::ProjectTreeBranch(KFileTreeView *tqparent, const KURL& url,
                                      const TQString& name, const TQPixmap& pix,
                                      bool showHidden,
                                      KFileTreeViewItem *branchRoot)
-    : BaseTreeBranch(parent, url, name, pix, showHidden, branchRoot)
+    : BaseTreeBranch(tqparent, url, name, pix, showHidden, branchRoot)
 {
 }
 
-KFileTreeViewItem* ProjectTreeBranch::createTreeViewItem(KFileTreeViewItem *parent,
+KFileTreeViewItem* ProjectTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent,
                                                          KFileItem *fileItem )
 {
   BaseTreeViewItem  *tvi = 0;
-  if( parent && fileItem )
+  if( tqparent && fileItem )
   {
-    tvi = new ProjectTreeViewItem( parent, fileItem, this );
+    tvi = new ProjectTreeViewItem( tqparent, fileItem, this );
     if (tvi)
     {
       // we assume there are childs
       tvi->setExpandable(tvi->isDir());
       if (urlList) {
-        tvi->setVisible(urlList->contains(fileItem->url()));  // only listelements
+        tvi->setVisible(urlList->tqcontains(fileItem->url()));  // only listelements
       }
     }
   }
   else
-    kdDebug(24000) << "ProjectTreeBranch::createTreeViewItem: Have no parent" << endl;
+    kdDebug(24000) << "ProjectTreeBranch::createTreeViewItem: Have no tqparent" << endl;
   return tvi;
 }
 
 //ProjectTreeView implementation
-ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
-  : BaseTreeView(parent,name), m_projectFiles(0)
+ProjectTreeView::ProjectTreeView(TQWidget *tqparent, const char *name )
+  : BaseTreeView(tqparent,name), m_projectFiles(0)
 {
   //setSelectionModeExt(KListView::Extended);
   setRootIsDecorated(false);
@@ -136,7 +136,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
   m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int)));
   m_fileMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
+  m_fileMenu->insertItem(i18n("Upload &tqStatus"), m_uploadStatusMenu);
   m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   KPopupMenu *createNewMenu = new KPopupMenu(this);
@@ -154,8 +154,8 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
   m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int)));
   m_folderMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_folderMenu->insertSeparator();
-  m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus()));
-  m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
+  m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFoldertqStatus()));
+  m_folderMenu->insertItem(i18n("Upload &tqStatus"), m_uploadStatusMenu);
   m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   m_projectMenu = new KPopupMenu(this);
@@ -166,7 +166,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
   m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQT_SLOT(slotOptions()));
   m_projectMenu->insertItem(SmallIcon("revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
   m_projectMenu->insertSeparator();
-  m_projectMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
+  m_projectMenu->insertItem(i18n("Upload &tqStatus"), m_uploadStatusMenu);
 
 
   connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
@@ -261,7 +261,7 @@ void ProjectTreeView::slotMenu(KListView *listView, TQListViewItem *item, const
         m_fileMenu->popup(point);
       } else
       {
-        if (m_documentFolderList.contains(url))
+        if (m_documentFolderList.tqcontains(url))
           m_folderMenu->setItemChecked(m_setDocumentRootId, true);
         else
           m_folderMenu->setItemChecked(m_setDocumentRootId, false);
@@ -345,7 +345,7 @@ void ProjectTreeView::slotReloadTree( ProjectList *fileList, bool buildNewTree,
       for ( ; iter.current(); ++iter )
       {
         item = dynamic_cast <KFileTreeViewItem*> (iter.current());
-        item->setVisible(m_projectFiles->contains(item->url()) || item == rootItem);
+        item->setVisible(m_projectFiles->tqcontains(item->url()) || item == rootItem);
       }
       rootItem->setEnabled(true);
     }
@@ -380,7 +380,7 @@ void ProjectTreeView::slotCreateFolder()
        url.setPath(url.path() + "/" + folderName + "/");
      else
        url.setPath(url.directory() + "/" + folderName +"/");
-     if (QExtFileInfo::createDir(url, this))
+     if (TQExtFileInfo::createDir(url, this))
      {
         emit insertToProject(url);
      }
@@ -398,15 +398,15 @@ void ProjectTreeView::slotCreateFile()
       url.setPath(url.path() + "/" + fileName);
     else
       url.setPath(url.directory() + "/" + fileName);
-    if (QExtFileInfo::exists(url, false, this))
+    if (TQExtFileInfo::exists(url, false, this))
     {
-      KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").arg(fileName), i18n("Error Creating File"));
+      KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").tqarg(fileName), i18n("Error Creating File"));
       return;
     }
     KTempFile *tempFile = new KTempFile(tmpDir);
     tempFile->setAutoDelete(true);
     tempFile->close();
-    if (QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url))
+    if (TQExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url))
     {
       emit insertToProject(url);
       emit openFile(url);
@@ -422,10 +422,10 @@ void ProjectTreeView::slotRemoveFromProject(int askForRemove)
   if (item)
   {
     KURL url = currentURL();
-    TQString nice = QExtFileInfo::toRelative(url, m_projectBaseURL).path();
+    TQString nice = TQExtFileInfo::toRelative(url, m_projectBaseURL).path();
     nice = KStringHandler::lsqueeze(nice, 60);
     if ( !askForRemove ||
-         KMessageBox::warningContinueCancel(this,i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").arg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") == KMessageBox::Continue )
+         KMessageBox::warningContinueCancel(this,i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").tqarg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") == KMessageBox::Continue )
     {
       if ( currentKFileTreeViewItem()->isDir() ) url.adjustPath(+1);
       emit removeFromProject(url);
@@ -525,9 +525,9 @@ void ProjectTreeView::slotAlwaysUpload()
     KURL url = currentURL();
     if (kftvi->isDir())
       url.adjustPath(+1);
-    if (m_projectFiles->contains(url) || url == m_projectBaseURL)
+    if (m_projectFiles->tqcontains(url) || url == m_projectBaseURL)
     {
-       emit changeUploadStatus(url, ProjectURL::AlwaysUpload);
+       emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload);
     }
 }
 
@@ -539,9 +539,9 @@ void ProjectTreeView::slotNeverUpload()
     KURL url = currentURL();
     if (kftvi->isDir())
       url.adjustPath(+1);
-    if (m_projectFiles->contains(url) || url == m_projectBaseURL)
+    if (m_projectFiles->tqcontains(url) || url == m_projectBaseURL)
     {
-       emit changeUploadStatus(url, ProjectURL::NeverUpload);
+       emit changeUploadtqStatus(url, ProjectURL::NeverUpload);
     }
 }
 
@@ -553,9 +553,9 @@ void ProjectTreeView::slotConfirmUpload()
     KURL url = currentURL();
     if (kftvi->isDir())
       url.adjustPath(+1);
-    if (m_projectFiles->contains(url) || url == m_projectBaseURL)
+    if (m_projectFiles->tqcontains(url) || url == m_projectBaseURL)
     {
-       emit changeUploadStatus(url, ProjectURL::ConfirmUpload);
+       emit changeUploadtqStatus(url, ProjectURL::ConfirmUpload);
     }
 }
 
@@ -570,10 +570,10 @@ void ProjectTreeView::slotUploadMenuAboutToShow()
     KURL url = currentURL();
     if (kftvi->isDir())
       url.adjustPath(+1);
-    ProjectURL *proUrl = m_projectFiles->find( url );
+    ProjectURL *proUrl = m_projectFiles->tqfind( url );
     if (proUrl)
     {
-        switch (proUrl->uploadStatus)
+        switch (proUrl->uploadtqStatus)
         {
             case ProjectURL::NeverUpload:
                {
@@ -595,7 +595,7 @@ void ProjectTreeView::slotUploadMenuAboutToShow()
     }
 }
 
-void ProjectTreeView::slotChangeDocumentFolderStatus()
+void ProjectTreeView::slotChangeDocumentFoldertqStatus()
 {
     KFileTreeViewItem *kftvi = currentKFileTreeViewItem();
     if (! kftvi)
@@ -603,22 +603,22 @@ void ProjectTreeView::slotChangeDocumentFolderStatus()
     KURL url = currentURL();
     if (kftvi->isDir())
       url.adjustPath(+1);
-    if (!m_documentFolderList.contains(currentURL()))
+    if (!m_documentFolderList.tqcontains(currentURL()))
     {
       m_documentFolderList.append(currentURL());
-      emit changeUploadStatus(url, ProjectURL::AlwaysUpload);
-      emit changeDocumentFolderStatus(url, true);
+      emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload);
+      emit changeDocumentFoldertqStatus(url, true);
     } else
     {
       m_documentFolderList.remove(currentURL());
-      emit changeUploadStatus(url, false);
+      emit changeUploadtqStatus(url, false);
     }
-    currentItem()->repaint();
+    currentItem()->tqrepaint();
 }
 
 bool ProjectTreeView::isDocumentFolder(const KURL &url)
 {
-   return (m_documentFolderList.contains(url) > 0);
+   return (m_documentFolderList.tqcontains(url) > 0);
 }
 
 
diff --git a/quanta/treeviews/projecttreeview.h b/quanta/treeviews/projecttreeview.h
index 463f660c..dafa3a2f 100644
--- a/quanta/treeviews/projecttreeview.h
+++ b/quanta/treeviews/projecttreeview.h
@@ -28,7 +28,7 @@ class ProjectList;
 class ProjectTreeViewItem : public BaseTreeViewItem {
 
 public:
-  ProjectTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch );
+  ProjectTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch );
   /** makes document root italics */
   void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align);
 };
@@ -36,12 +36,12 @@ public:
 class ProjectTreeBranch : public BaseTreeBranch {
 
 public:
-  ProjectTreeBranch(KFileTreeView *parent, const KURL& url,
+  ProjectTreeBranch(KFileTreeView *tqparent, const KURL& url,
                     const TQString& name, const TQPixmap& pix,
                     bool showHidden = false, KFileTreeViewItem *branchRoot = 0L);
 
   /** check for CVS and visible*/
-  virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *parent,
+  virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *tqparent,
                                                 KFileItem *fileItem );
 
   /** only files in list will be shown */
@@ -52,6 +52,7 @@ public:
 
 class ProjectTreeView : public BaseTreeView  {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
@@ -60,10 +61,10 @@ public:
    *  the parameters are only used at the first call to create the class
    *
    */
-  static ProjectTreeView* const ref(TQWidget *parent = 0L, const char *name = 0L)
+  static ProjectTreeView* const ref(TQWidget *tqparent = 0L, const char *name = 0L)
   {
     static ProjectTreeView *m_ref;
-    if (!m_ref) m_ref = new ProjectTreeView(parent, name);
+    if (!m_ref) m_ref = new ProjectTreeView(tqparent, name);
     return m_ref;
   }
 
@@ -82,7 +83,7 @@ public slots: // Public slots
   /** makes the url visible in the tree */
   void slotViewActivated(const KURL&);
   /** fills the list with the url's of the open folder  */
-  void slotGetTreeStatus(TQStringList *folderToOpen)
+  void slotGetTreetqStatus(TQStringList *folderToOpen)
   {
     m_projectDir->addOpenFolder(folderToOpen);
   }
@@ -106,8 +107,8 @@ signals: // Signals
   void loadToolbarFile(const KURL&);
   void uploadProject();
   void changeFileDescription(const KURL& url, const TQString& desc);
-  void changeUploadStatus(const KURL& url, int status);
-  void changeDocumentFolderStatus(const KURL& url, bool status);
+  void changeUploadtqStatus(const KURL& url, int status);
+  void changeDocumentFoldertqStatus(const KURL& url, bool status);
   void reloadProject();
 
 private:
@@ -115,7 +116,7 @@ private:
    *  If you need the class use ProjectTreeView::ref() for
    *  construction and reference
    */
-  ProjectTreeView(TQWidget *parent, const char *name);
+  ProjectTreeView(TQWidget *tqparent, const char *name);
 
   ProjectTreeBranch *m_projectDir;
   KPopupMenu *m_fileMenu;
@@ -169,7 +170,7 @@ private slots: // Private slots
   void slotNeverUpload();
   void slotConfirmUpload();
   void slotUploadMenuAboutToShow();
-  void slotChangeDocumentFolderStatus();
+  void slotChangeDocumentFoldertqStatus();
 };
 
 #endif
diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui
index 5c7a9096..6498445a 100644
--- a/quanta/treeviews/quantapropertiespage.ui
+++ b/quanta/treeviews/quantapropertiespage.ui
@@ -9,7 +9,7 @@
  ***************************************************************************/
 </comment>
 <author>(C) 2002 Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>QuantaPropertiesPage</cstring>
     </property>
@@ -29,7 +29,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>300</width>
             <height>400</height>
@@ -42,11 +42,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>typeStack</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>WStackPage</cstring>
                 </property>
@@ -57,15 +57,15 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="4">
+                    <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="4">
                         <property name="name">
-                            <cstring>parentAttr</cstring>
+                            <cstring>tqparentAttr</cstring>
                         </property>
                         <property name="text">
-                            <string>&amp;Inherit type from parent (nothing)</string>
+                            <string>&amp;Inherit type from tqparent (nothing)</string>
                         </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 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>92</width>
                                 <height>20</height>
@@ -98,7 +98,7 @@
                             <cstring>typesCombo</cstring>
                         </property>
                     </widget>
-                    <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="4">
+                    <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="4">
                         <property name="name">
                             <cstring>prePostGroup</cstring>
                         </property>
@@ -109,7 +109,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>usePrePostText</cstring>
                                 </property>
@@ -117,7 +117,7 @@
                                     <string>Use &amp;pre/post text</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>
@@ -125,7 +125,7 @@
                                     <string>Pre-text:</string>
                                 </property>
                             </widget>
-                            <widget class="QTextEdit" row="2" column="0">
+                            <widget class="TQTextEdit" row="2" column="0">
                                 <property name="name">
                                     <cstring>preTextEdit</cstring>
                                 </property>
@@ -133,7 +133,7 @@
                                     <bool>false</bool>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="3" column="0">
+                            <widget class="TQLabel" row="3" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2</cstring>
                                 </property>
@@ -141,7 +141,7 @@
                                     <string>Post-text:</string>
                                 </property>
                             </widget>
-                            <widget class="QTextEdit" row="4" column="0">
+                            <widget class="TQTextEdit" row="4" column="0">
                                 <property name="name">
                                     <cstring>postTextEdit</cstring>
                                 </property>
@@ -161,7 +161,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>93</width>
                                 <height>20</height>
@@ -170,7 +170,7 @@
                     </spacer>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>WStackPage</cstring>
                 </property>
@@ -181,7 +181,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>filteringLabel</cstring>
                         </property>
@@ -207,7 +207,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -221,7 +221,7 @@
 </widget>
 <connections>
     <connection>
-        <sender>parentAttr</sender>
+        <sender>tqparentAttr</sender>
         <signal>toggled(bool)</signal>
         <receiver>typesCombo</receiver>
         <slot>setDisabled(bool)</slot>
@@ -241,7 +241,7 @@
 </connections>
 <tabstops>
     <tabstop>typesCombo</tabstop>
-    <tabstop>parentAttr</tabstop>
+    <tabstop>tqparentAttr</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp
index 2e7959bf..1652cf18 100644
--- a/quanta/treeviews/scripttreeview.cpp
+++ b/quanta/treeviews/scripttreeview.cpp
@@ -58,8 +58,8 @@
 
 extern int xmlLoadExtDtdDefaultValue;
 
-ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name )
-  : BaseTreeView(parent,name)
+ScriptTreeView::ScriptTreeView(TQWidget *tqparent, const char *name )
+  : BaseTreeView(tqparent,name)
 {
   setSaveOpenFolder(true);
   addColumn(i18n("Scripts"), -1);
@@ -224,8 +224,8 @@ void ScriptTreeView::slotAssignAction()
     TQString execApp = infoOptionValue(infoURL, "interpreter");
     if (execApp.isEmpty())
         execApp = "sh";
-    url.setPath(url.path().replace(locateLocal("data", resourceDir + "scripts/"), "%scriptdir/"));
-    url.setPath(url.path().replace(qConfig.globalDataDir + resourceDir + "scripts/", "%scriptdir/"));
+    url.setPath(url.path().tqreplace(locateLocal("data", resourceDir + "scripts/"), "%scriptdir/"));
+    url.setPath(url.path().tqreplace(qConfig.globalDataDir + resourceDir + "scripts/", "%scriptdir/"));
     emit assignActionToScript(url, execApp);
   }
 }
@@ -293,7 +293,7 @@ void ScriptTreeView::slotSendScriptInMail()
         delete mailDlg;
         return;
       }
-      kapp->invokeMailer(toStr, TQString::null, TQString::null, subjectStr, message, TQString::null, attachmentFile);
+      kapp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), attachmentFile);
     }
     delete mailDlg;
 
diff --git a/quanta/treeviews/scripttreeview.h b/quanta/treeviews/scripttreeview.h
index 1bfa934d..d5d69ea9 100644
--- a/quanta/treeviews/scripttreeview.h
+++ b/quanta/treeviews/scripttreeview.h
@@ -41,10 +41,11 @@
  */
 class ScriptTreeView : public BaseTreeView  {
    Q_OBJECT
+  TQ_OBJECT
 
 
 public:
-   ScriptTreeView(TQWidget *parent, const char *name = 0L);
+   ScriptTreeView(TQWidget *tqparent, const char *name = 0L);
   ~ScriptTreeView();
 
 protected slots:
@@ -63,11 +64,11 @@ protected slots:
   virtual void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point);
 
   /**
-   *  slot of QListView
+   *  slot of TQListView
    *
    *  shows the .info file for the script
    *
-   *  @param item the selected QListViewItem
+   *  @param item the selected TQListViewItem
    */
   virtual void slotSelectFile(TQListViewItem *item);
 
@@ -204,7 +205,7 @@ private:
   TQString infoOptionValue(const KURL& infoURL, const TQString& optionName);
   
   /** Create a script tarball which can be uploaded or sent in email. Returns
-   *   the name of the created file or TQString::null if creation has failed.
+   *   the name of the created file or TQString() if creation has failed.
    */
   TQString createScriptTarball();
 
diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp
index 16d42b45..3d410c03 100644
--- a/quanta/treeviews/servertreeview.cpp
+++ b/quanta/treeviews/servertreeview.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-// Qt includes
+// TQt includes
 #include <tqpainter.h>
 
 // KDE includes
@@ -36,8 +36,8 @@
 #include "qextfileinfo.h"
 
 
-ServerTreeViewItem::ServerTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch )
-: BaseTreeViewItem( parent, item, brnch)
+ServerTreeViewItem::ServerTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch )
+: BaseTreeViewItem( tqparent, item, brnch)
 {
 }
 
@@ -47,9 +47,9 @@ void ServerTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,
   TQColorGroup _cg( cg );
   KURL baseURL = Project::ref()->projectBaseURL();
   KURL relURL = baseURL;
-  relURL.setPath(QExtFileInfo::toRelative(url(), branch()->url()).path());
-  KURL url = QExtFileInfo::toAbsolute(relURL, baseURL);
-  if ( !Project::ref()->contains(url) )
+  relURL.setPath(TQExtFileInfo::toRelative(url(), branch()->url()).path());
+  KURL url = TQExtFileInfo::toAbsolute(relURL, baseURL);
+  if ( !Project::ref()->tqcontains(url) )
   {
     TQFont f = p->font();
     f.setItalic(true);
@@ -63,22 +63,22 @@ void ServerTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,
 }
 
 //ServerTreeBranch implementation
-ServerTreeBranch::ServerTreeBranch(KFileTreeView *parent, const KURL& url,
+ServerTreeBranch::ServerTreeBranch(KFileTreeView *tqparent, const KURL& url,
                                    const TQString& name, const TQPixmap& pix,
                                    bool showHidden, KFileTreeViewItem *branchRoot)
-    : BaseTreeBranch(parent, url, name, pix, showHidden, branchRoot)
+    : BaseTreeBranch(tqparent, url, name, pix, showHidden, branchRoot)
 {
 }
 
-KFileTreeViewItem* ServerTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem )
+KFileTreeViewItem* ServerTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem )
 {
   BaseTreeViewItem  *tvi = 0;
-  if( parent && fileItem )
+  if( tqparent && fileItem )
   {
-    tvi = new ServerTreeViewItem( parent, fileItem, this );
+    tvi = new ServerTreeViewItem( tqparent, fileItem, this );
   }
   else
-    kdDebug(24000) << "ServerTreeBranch::createTreeViewItem: Have no parent" << endl;
+    kdDebug(24000) << "ServerTreeBranch::createTreeViewItem: Have no tqparent" << endl;
   return tvi;
 }
 
@@ -87,8 +87,8 @@ KFileTreeViewItem* ServerTreeBranch::createTreeViewItem(KFileTreeViewItem *paren
 // ServerTreeView implementation
 //
 //
-ServerTreeView::ServerTreeView(KConfig *config, TQWidget *parent, const KURL &url, const char *name)
-  : BaseTreeView(parent, name)
+ServerTreeView::ServerTreeView(KConfig *config, TQWidget *tqparent, const KURL &url, const char *name)
+  : BaseTreeView(tqparent, name)
 {
   setAcceptDrops(true);
   setDragEnabled(true);
@@ -188,7 +188,7 @@ void ServerTreeView::slotReloadTree( ProjectList *fileList, bool buildNewTree, c
   TQListViewItemIterator iter(this);
   for ( ; iter.current(); ++iter )
   {
-    iter.current()->repaint();
+    iter.current()->tqrepaint();
   }
 }
 
diff --git a/quanta/treeviews/servertreeview.h b/quanta/treeviews/servertreeview.h
index 162540e0..294bb23a 100644
--- a/quanta/treeviews/servertreeview.h
+++ b/quanta/treeviews/servertreeview.h
@@ -35,7 +35,7 @@ class ProjectList;
 class ServerTreeViewItem : public BaseTreeViewItem {
 
 public:
-  ServerTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch );
+  ServerTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch );
   /** makes document not in project lighter */
   void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align);
 };
@@ -47,28 +47,29 @@ public:
 class ServerTreeBranch : public BaseTreeBranch {
 
 public:
-  ServerTreeBranch(KFileTreeView *parent, const KURL& url,
+  ServerTreeBranch(KFileTreeView *tqparent, const KURL& url,
                    const TQString& name, const TQPixmap& pix,
                    bool showHidden = false, KFileTreeViewItem *branchRoot = 0L);
 
   /** check for CVS and visible*/
-  virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *parent,
+  virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *tqparent,
                                                 KFileItem *fileItem );
 };
 
 
 class ServerTreeView : public BaseTreeView {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-  ServerTreeView(KConfig *config, TQWidget *parent, const KURL &url, const char *name = 0L);
+  ServerTreeView(KConfig *config, TQWidget *tqparent, const KURL &url, const char *name = 0L);
   virtual ~ServerTreeView();
 
 protected slots:
 
   void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point);
   
-  /** repaints the treeview items, because they might be added to or removed from the project*/
+  /** tqrepaints the treeview items, because they might be added to or removed from the project*/
   void slotReloadTree( ProjectList *fileList, bool buildNewTree, const TQStringList &folderToOpen);
   
 protected:
diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp
index 596143d7..a0ac8baa 100644
--- a/quanta/treeviews/structtreetag.cpp
+++ b/quanta/treeviews/structtreetag.cpp
@@ -31,20 +31,20 @@
 #include "document.h"
 #include "resource.h"
 
-StructTreeTag::StructTreeTag(TQListView *parent, TQString a_title)
-  : KListViewItem(parent, a_title)
+StructTreeTag::StructTreeTag(TQListView *tqparent, TQString a_title)
+  : KListViewItem(tqparent, a_title)
 {
   node = 0L;
   hasOpenFileMenu = false;
   groupTag = 0L;
-  parentTree = static_cast<StructTreeView*>(parent);
+  tqparentTree = static_cast<StructTreeView*>(tqparent);
 }
 
-StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString a_title,
+StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQString a_title,
                              TQListViewItem *after )
-: KListViewItem(parent, after, a_title)
+: KListViewItem(tqparent, after, a_title)
 {
-  parentTree = parent->parentTree;
+  tqparentTree = tqparent->tqparentTree;
   hasOpenFileMenu = false;
   groupTag = 0L;
   static const TQString space = " ";
@@ -105,36 +105,36 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString
 
               if (!typingInProgress)
               {
-                QTag *parentQTag = 0L;
-                if (node->parent)
-                  parentQTag = QuantaCommon::tagFromDTD(node->parent);
+                TQTag *tqparentTQTag = 0L;
+                if (node->tqparent)
+                  tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
                 TQString qTagName = node->tag->dtd()->caseSensitive ? node->tag->name : node->tag->name.upper();
                 int line, col;
                 node->tag->beginPos(line, col);
-                if (parentQTag && !parentQTag->childTags.contains(qTagName) &&
-                !parentQTag->childTags.isEmpty())
+                if (tqparentTQTag && !tqparentTQTag->childTags.tqcontains(qTagName) &&
+                !tqparentTQTag->childTags.isEmpty())
                 {
                   node->tag->write()->setErrorMark(line);
-                  TQString parentTagName = node->tag->dtd()->caseSensitive ? node->parent->tag->name : node->parent->tag->name.upper();
-                  parentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").arg(line + 1).arg(qTagName).arg(parentTagName));
+                  TQString tqparentTagName = node->tag->dtd()->caseSensitive ? node->tqparent->tag->name : node->tqparent->tag->name.upper();
+                  tqparentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").tqarg(line + 1).tqarg(qTagName).tqarg(tqparentTagName));
                 }
                 TQString nextTagName;
                 if (node->next)
                 {
                   nextTagName = node->tag->dtd()->caseSensitive ? node->next->tag->name : node->next->tag->name.upper();
                 }
-                parentQTag = QuantaCommon::tagFromDTD(node);
-                if (parentQTag && !parentQTag->isSingle() &&
-                    !parentQTag->isOptional() &&
+                tqparentTQTag = QuantaCommon::tagFromDTD(node);
+                if (tqparentTQTag && !tqparentTQTag->isSingle() &&
+                    !tqparentTQTag->isOptional() &&
                     (!node->next || ( !node->getClosingNode()))  )
                 {
                   node->tag->write()->setErrorMark(line);
-                  parentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").arg(line + 1).arg(col + 1).arg(qTagName));
+                  tqparentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName));
                 } else
-                if (!parentQTag && node->tag->name.upper() != "!DOCTYPE")
+                if (!tqparentTQTag && node->tag->name.upper() != "!DOCTYPE")
                 {
                   node->tag->write()->setErrorMark(line);
-                  parentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").arg(line + 1).arg(col + 1).arg(qTagName).arg(node->tag->dtd()->nickName));
+                  tqparentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName).tqarg(node->tag->dtd()->nickName));
                 }
               }
               break;
@@ -143,7 +143,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString
             {
               title = tag->tagStr();
               title = title.left(70).stripWhiteSpace();
-              title.replace( nbspRx," ");
+              title.tqreplace( nbspRx," ");
               break;
             }
         case Tag::Comment:
@@ -151,7 +151,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString
               setPixmap( 0, UserIcon("tag_comm") );
               title = tag->tagStr();
               title = title.left(70).stripWhiteSpace();
-              title.replace( nbspRx," ");
+              title.tqreplace( nbspRx," ");
               break;
             }
          case Tag::ScriptTag:
@@ -182,7 +182,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString
                 if (!node->prev || qTagName != "/" + qPrevTagName)
                 {
                   node->tag->write()->setErrorMark(line);
-                  parentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").arg(line + 1).arg(col + 1).arg(qTagName));
+                  tqparentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName));
                 }
               }
               title = tag->tagStr().left(70).stripWhiteSpace();
@@ -195,23 +195,23 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString
       title = a_title;
     }
 
-    title.replace(newLineRx," ");
+    title.tqreplace(newLineRx," ");
     setText(0, title);
     node->listItems.append(this);
   }
 }
 
-StructTreeTag::StructTreeTag(StructTreeTag *parent, TQString a_title )
-: KListViewItem(parent, a_title)
+StructTreeTag::StructTreeTag(StructTreeTag *tqparent, TQString a_title )
+: KListViewItem(tqparent, a_title)
 {
   node = 0L;
   hasOpenFileMenu = false;
   groupTag = 0L;
-  parentTree = parent->parentTree;
+  tqparentTree = tqparent->tqparentTree;
 }
 
 
 StructTreeTag::~StructTreeTag(){
   if (node)
-    node->listItems.remove(node->listItems.find(this));
+    node->listItems.remove(node->listItems.tqfind(this));
 }
diff --git a/quanta/treeviews/structtreetag.h b/quanta/treeviews/structtreetag.h
index c49f07e8..cd0e35b8 100644
--- a/quanta/treeviews/structtreetag.h
+++ b/quanta/treeviews/structtreetag.h
@@ -30,16 +30,16 @@ class StructTreeView;
 class StructTreeTag : public KListViewItem  {
 
 public:
-  StructTreeTag(TQListView *parent, const TQString a_title = TQString::null );
-  StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString a_title = TQString::null, TQListViewItem *after = 0L);
-  StructTreeTag(StructTreeTag *parent, const TQString a_title = TQString::null );
+  StructTreeTag(TQListView *tqparent, const TQString a_title = TQString() );
+  StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQString a_title = TQString(), TQListViewItem *after = 0L);
+  StructTreeTag(StructTreeTag *tqparent, const TQString a_title = TQString() );
   ~StructTreeTag();
 
   Node *node;
   bool hasOpenFileMenu;
   Tag* groupTag;
   TQRegExp fileNameRx;
-  StructTreeView *parentTree;
+  StructTreeView *tqparentTree;
 };
 
 #endif
diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp
index 1f22e594..00c78845 100644
--- a/quanta/treeviews/structtreeview.cpp
+++ b/quanta/treeviews/structtreeview.cpp
@@ -57,8 +57,8 @@
 #include "structtreeview.moc"
 extern GroupElementMapList globalGroupMap;
 
-StructTreeView::StructTreeView(TQWidget *parent, const char *name )
-    : KListView(parent,name), m_marker(0), m_draggedItem(0)/*, m_thisWidget(0)*/
+StructTreeView::StructTreeView(TQWidget *tqparent, const char *name )
+    : KListView(tqparent,name), m_marker(0), m_draggedItem(0)/*, m_thisWidget(0)*/
 {
   for (int i = 0; i < 15; i++)
     groupOpened.append(false);
@@ -83,7 +83,7 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name )
   setLineWidth( 2 );
   addColumn( i18n("Name"), -1 );
 
-  setFocusPolicy(TQWidget::ClickFocus);
+  setFocusPolicy(TQ_ClickFocus);
 
   dtdMenu = new KPopupMenu(this);
 
@@ -159,7 +159,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
   Node *currentNode = baseNode;
   StructTreeTag *currentItem = top; //after this
   StructTreeTag *item = 0L;
-  StructTreeTag *parentItem = top; //under this
+  StructTreeTag *tqparentItem = top; //under this
   int level = 0;
   TQString title;
   TQString tagStr;
@@ -219,7 +219,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
     if (!groupOnly)
     {
       title = "";
-      item = new StructTreeTag(parentItem, currentNode, title, currentItem);
+      item = new StructTreeTag(tqparentItem, currentNode, title, currentItem);
       item->setOpen(level < openLevel);
       currentNode->mainListItem = item;
 
@@ -236,14 +236,14 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
     for (TQValueList<GroupElement*>::ConstIterator it = currentNode->m_groupElements.constBegin(); it != currentNode->m_groupElements.constEnd(); ++it)
     {
       GroupElement *groupElement = (*it);
-      if (!groupIds.contains(groupElement->group->name + dtd->name))
+      if (!groupIds.tqcontains(groupElement->group->name + dtd->name))
         continue;
       StructTreeTag *groupItem = groups[groupIds[groupElement->group->name + dtd->name]];
       TQListViewItem* insertAfter = 0L;
       TQListViewItem* insertUnder = groupItem;
-      if (groupItems.contains(groupElement->group->name + groupElement->tag->name))
+      if (groupItems.tqcontains(groupElement->group->name + groupElement->tag->name))
         insertUnder = groupItems[groupElement->group->name  + groupElement->tag->name];
-      if (lastItemInGroup.contains(groupElement->group->name))
+      if (lastItemInGroup.tqcontains(groupElement->group->name))
         insertAfter = lastItemInGroup[groupElement->group->name];
 
       StructTreeTag *item = new StructTreeTag(static_cast<StructTreeTag*>(insertUnder), currentNode, groupElement->tag->name, insertAfter);
@@ -264,7 +264,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
     if (currentNode->child)
     {
       currentNode = currentNode->child;
-      parentItem = item;
+      tqparentItem = item;
       currentItem = 0L;
       level++;
     } else
@@ -276,35 +276,35 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly)
         currentItem = item;
       } else
       {
-        //go up some levels, to the parent, if the node has no child or next
+        //go up some levels, to the tqparent, if the node has no child or next
         while (currentNode)
         {
           level--;
-          //parentItem = dynamic_cast<StructTreeTag*>(parentItem->parent());
-          if (currentNode->parent && currentNode->parent->next)
+          //tqparentItem = dynamic_cast<StructTreeTag*>(tqparentItem->tqparent());
+          if (currentNode->tqparent && currentNode->tqparent->next)
           {
-            currentNode = currentNode->parent->next;
+            currentNode = currentNode->tqparent->next;
             break;
           } else
           {
-            currentNode = currentNode->parent;
+            currentNode = currentNode->tqparent;
           }
         }
         if (!groupOnly && currentNode)
         {
           if (currentNode->prev)
               currentItem = static_cast<StructTreeTag*>(currentNode->prev->mainListItem);
-          if (currentNode->parent)
+          if (currentNode->tqparent)
           {
-            parentItem = static_cast<StructTreeTag*>(currentNode->parent->mainListItem);
-            if (!parentItem)
+            tqparentItem = static_cast<StructTreeTag*>(currentNode->tqparent->mainListItem);
+            if (!tqparentItem)
             {
-              parentItem = top;
+              tqparentItem = top;
             }
           }
           else
           {
-            parentItem = top;
+            tqparentItem = top;
           }
         }
 
@@ -376,7 +376,7 @@ void StructTreeView::deleteList(bool groupOnly)
   groupsCount = 0;
 }
 
-/** repaint document structure */
+/** tqrepaint document structure */
 void StructTreeView::slotReparse(Document *w, Node* node, int openLevel, bool groupOnly)
 {
   timer->restart();
@@ -505,7 +505,7 @@ void StructTreeView::slotMouseClicked(int button, TQListViewItem *item, const TQ
            setOpen(item, !isOpen(item));
       setSelected(item, true);
       
-      bool const ctrlPressed = KApplication::keyboardMouseState() & Qt::ControlButton;
+      bool const ctrlPressed = KApplication::keyboardMouseState() & TQt::ControlButton;
       
       if(ctrlPressed)
           setContiguousSelectedItems();
@@ -764,9 +764,9 @@ bool StructTreeView::acceptDrag(TQDropEvent* e) const
     {
         e->accept(last_accept);
 /*        if(last_accept)
-        m_thisWidget->setCursor(Qt::ForbiddenCursor);
+        m_thisWidget->setCursor(TQt::ForbiddenCursor);
         else
-        m_thisWidget->setCursor(Qt::ForbiddenCursor);*/
+        m_thisWidget->setCursor(TQt::ForbiddenCursor);*/
         kdDebug(25001) << "Princ�io: " << last_accept << endl;
 
         return last_accept;
@@ -780,9 +780,9 @@ bool StructTreeView::acceptDrag(TQDropEvent* e) const
         e->accept(false);
         last_accept = false;
 /*        if(last_accept)
-        m_thisWidget->setCursor(Qt::ForbiddenCursor);
+        m_thisWidget->setCursor(TQt::ForbiddenCursor);
         else
-        m_thisWidget->setCursor(Qt::ForbiddenCursor);*/
+        m_thisWidget->setCursor(TQt::ForbiddenCursor);*/
         kdDebug(25001) << "PROIBIDO! #1" << endl;
         return false;
     }
@@ -794,14 +794,14 @@ bool StructTreeView::acceptDrag(TQDropEvent* e) const
         e->accept(false);
         last_accept = false;
 /*        if(last_accept)
-        m_thisWidget->setCursor(Qt::ForbiddenCursor);
+        m_thisWidget->setCursor(TQt::ForbiddenCursor);
         else
-        m_thisWidget->setCursor(Qt::ForbiddenCursor);*/
+        m_thisWidget->setCursor(TQt::ForbiddenCursor);*/
         kdDebug(25001) << "PROIBIDO! #2" << endl;
         return false;
     }    
-    QTag* nodeQTag = QuantaCommon::tagFromDTD(after_node->parent);
-    bool is_child = (nodeQTag && nodeQTag->isChild(dragged_node));
+    TQTag* nodeTQTag = QuantaCommon::tagFromDTD(after_node->tqparent);
+    bool is_child = (nodeTQTag && nodeTQTag->isChild(dragged_node));
     
     if(!is_child)
         kdDebug(25001) << "PROIBIDO! #3" << endl;
@@ -811,14 +811,14 @@ bool StructTreeView::acceptDrag(TQDropEvent* e) const
     e->accept(is_child);
     last_accept = is_child;
 //     if(last_accept)
-//         m_thisWidget->setCursor(Qt::ForbiddenCursor);
+//         m_thisWidget->setCursor(TQt::ForbiddenCursor);
 //     else
-//         m_thisWidget->setCursor(Qt::ForbiddenCursor);
+//         m_thisWidget->setCursor(TQt::ForbiddenCursor);
 
     return is_child;
 }
 
-void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after)
+void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after)
 {
     if(!e) 
         return;
@@ -837,10 +837,10 @@ void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListV
     
     switch(id) {
         case DRAG_COPY:
-            copySelectedItems(parent, after);
+            copySelectedItems(tqparent, after);
             break;
         case DRAG_MOVE:
-            moveSelectedItems(parent, after);
+            moveSelectedItems(tqparent, after);
             break;
             case DRAG_CANCEL: // cancelled by menuitem
                 break;
@@ -866,7 +866,7 @@ void StructTreeView::startDrag()
 
 void StructTreeView::contentsMousePressEvent(TQMouseEvent* e)
 {
-    if(e->button() == LeftButton)
+    if(e->button() == Qt::LeftButton)
     {
         TQPoint p = contentsToViewport(e->pos());
         m_draggedItem = itemAt(p);
@@ -875,11 +875,11 @@ void StructTreeView::contentsMousePressEvent(TQMouseEvent* e)
     KListView::contentsMousePressEvent(e);
 }
 
-void StructTreeView::copySelectedItems(TQListViewItem* parent, TQListViewItem* after)
+void StructTreeView::copySelectedItems(TQListViewItem* tqparent, TQListViewItem* after)
 {
-    StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (parent);
+    StructTreeTag* tqparent_item = dynamic_cast<StructTreeTag*> (tqparent);
     StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (after);
-    if(!parent_item/* || !after_item*/) // can happen if the element is inserted as the first child
+    if(!tqparent_item/* || !after_item*/) // can happen if the element is inserted as the first child
         return;
     
     TQPtrList<TQListViewItem> selected_items = selectedItems(false);        
@@ -896,28 +896,28 @@ void StructTreeView::copySelectedItems(TQListViewItem* parent, TQListViewItem* a
     else
         start_node_subtree = kafkaCommon::getNodeSubtree(start_node, 0, end_node, end_node->tag->tagStr().length());
 
-    Node* parent_node = parent_item->node;
-    if(!parent_node)
+    Node* tqparent_node = tqparent_item->node;
+    if(!tqparent_node)
         return;
     Node* next_node = 0;
     if(after_item)
         next_node = after_item->node->SNext();
     else
-        next_node = parent_node->firstChild();
+        next_node = tqparent_node->firstChild();
     
     NodeSelection cursor_holder;
     NodeModifsSet *modifs = new NodeModifsSet();
     
-    kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, parent_node, next_node, cursor_holder, modifs);
+    kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, tqparent_node, next_node, cursor_holder, modifs);
     
     write->docUndoRedo->addNewModifsSet(modifs, undoRedo::NodeTreeModif, 0, false);    
 }
 
-void StructTreeView::moveSelectedItems(TQListViewItem* parent, TQListViewItem* after)
+void StructTreeView::moveSelectedItems(TQListViewItem* tqparent, TQListViewItem* after)
 {
-    StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (parent);
+    StructTreeTag* tqparent_item = dynamic_cast<StructTreeTag*> (tqparent);
     StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (after);
-    if(!parent_item || !after_item)
+    if(!tqparent_item || !after_item)
         return;
     
     TQPtrList<TQListViewItem> selected_items = selectedItems(false);        
@@ -939,14 +939,14 @@ void StructTreeView::moveSelectedItems(TQListViewItem* parent, TQListViewItem* a
         start_node_subtree = kafkaCommon::DTDExtractNodeSubtree(start_node, 0, end_node, end_node->tag->tagStr().length(), 
             &cursor_node, cursor_offset, modifs);
 
-    Node* parent_node = parent_item->node;
-    if(!parent_node)
+    Node* tqparent_node = tqparent_item->node;
+    if(!tqparent_node)
         return;
     Node* next_node = after_item->node->SNext();
     
     NodeSelection cursor_holder(cursor_node, cursor_offset);
     
-    kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, parent_node, next_node, cursor_holder, modifs);
+    kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, tqparent_node, next_node, cursor_holder, modifs);
     
     write->docUndoRedo->addNewModifsSet(modifs, undoRedo::NodeTreeModif, &cursor_holder, false);    
 }
@@ -979,7 +979,7 @@ void StructTreeView::setParsingDTDs(const TQStringList &parsingDTDList)
       if (dtdList[i] == dtdNickName)
         dtdMenu->setItemChecked(i, true);
     }
-    m_parsingDTDList.append(DTDs::ref()->find(*it));
+    m_parsingDTDList.append(DTDs::ref()->tqfind(*it));
   }
 }
 
@@ -990,11 +990,11 @@ void StructTreeView::slotOpenFile()
   {
     TQString text = item->groupTag->name;
     text.remove(item->fileNameRx);
-    KURL baseUrl = QExtFileInfo::path(write->url());
+    KURL baseUrl = TQExtFileInfo::path(write->url());
     KURL url = baseUrl;
     QuantaCommon::setUrl(url, text.stripWhiteSpace());
-    url = QExtFileInfo::toAbsolute(url, baseUrl);
-    if (QExtFileInfo::exists(url, true, this))
+    url = TQExtFileInfo::toAbsolute(url, baseUrl);
+    if (TQExtFileInfo::exists(url, true, this))
     {
       if (QuantaCommon::checkMimeGroup(url, "text" ))
       {
@@ -1005,7 +1005,7 @@ void StructTreeView::slotOpenFile()
         emit openImage(url);
       }
     } else
-      KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
+      KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
   }
 }
 
diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h
index 45150579..09a95a07 100644
--- a/quanta/treeviews/structtreeview.h
+++ b/quanta/treeviews/structtreeview.h
@@ -40,6 +40,7 @@ struct DTDStruct;
 
 class StructTreeView : public KListView  {
    Q_OBJECT
+  TQ_OBJECT
 public:
 
   /**
@@ -48,10 +49,10 @@ public:
    *  the parameters are only used at the first call to create the class
    *
    */
-  static StructTreeView* const ref(TQWidget *parent = 0L, const char *name = 0L)
+  static StructTreeView* const ref(TQWidget *tqparent = 0L, const char *name = 0L)
   {
     static StructTreeView *m_ref;
-    if (!m_ref) m_ref = new StructTreeView (parent, name);
+    if (!m_ref) m_ref = new StructTreeView (tqparent, name);
     return m_ref;
   }
 
@@ -71,7 +72,7 @@ public:
   bool useOpenLevelSetting;
 
 public slots: // Public slots
-  /** repaint document structure */
+  /** tqrepaint document structure */
   void slotReparse(Document *w, Node* node, int openLevel = 3,bool groupOnly=false);
   void slotMouseClicked(int button, TQListViewItem*, const TQPoint&, int);
   void slotDoubleClicked( TQListViewItem * );
@@ -112,7 +113,7 @@ private:
    *  If you need the class use StructTreeView::ref() for
    *  construction and reference
    */
-  StructTreeView(TQWidget *parent=0, const char *name=0);
+  StructTreeView(TQWidget *tqparent=0, const char *name=0);
   /** builds the structure tree */
   void buildTree(Node *baseNode, int openLevel, bool groupOnly);
   /** Do the recursive opening or closing of the trees */
@@ -121,8 +122,8 @@ private:
   /** Make ctrl have the same behavior has shift */
   void setContiguousSelectedItems();
   
-  void copySelectedItems(TQListViewItem* parent, TQListViewItem* after);
-  void moveSelectedItems(TQListViewItem* parent, TQListViewItem* after);
+  void copySelectedItems(TQListViewItem* tqparent, TQListViewItem* after);
+  void moveSelectedItems(TQListViewItem* tqparent, TQListViewItem* after);
   
 private:
 
@@ -166,7 +167,7 @@ protected slots: // Protected slots
   void slotDTDChanged(int id);
     
   void slotMouseClickedVPL(int button, TQListViewItem*, const TQPoint&, int);
-  virtual void slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after);
+  virtual void slotDropped(TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after);
 
 protected: // Protected attributes
   Document *write;
diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp
index 176928c0..aa6c5215 100644
--- a/quanta/treeviews/tagattributeitems.cpp
+++ b/quanta/treeviews/tagattributeitems.cpp
@@ -40,13 +40,13 @@
 #include "qextfileinfo.h"
 #include "styleeditor.h"
 
-TopLevelItem::TopLevelItem(KListView* parent, const TQString &title)
-: KListViewItem(parent, title)
+TopLevelItem::TopLevelItem(KListView* tqparent, const TQString &title)
+: KListViewItem(tqparent, title)
 {
 }
 
-TopLevelItem::TopLevelItem(KListView* parent, TQListViewItem* after, const TQString &title)
-: KListViewItem(parent, after, title)
+TopLevelItem::TopLevelItem(KListView* tqparent, TQListViewItem* after, const TQString &title)
+: KListViewItem(tqparent, after, title)
 {
 }
 
@@ -62,7 +62,7 @@ void TopLevelItem::paintCell(TQPainter *p, const TQColorGroup &cg,
         return;
 
     // make toplevel item names bold
-    if (column == 0 && !parent())
+    if (column == 0 && !tqparent())
     {
         TQFont f = p->font();
         f.setBold(true);
@@ -76,16 +76,16 @@ void TopLevelItem::paintCell(TQPainter *p, const TQColorGroup &cg,
     }
 }
 
-ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* parent)
-: KListViewItem(parent)
+ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* tqparent)
+: KListViewItem(tqparent)
 {
   m_listView = listView;
   comboBox = new TQComboBox(false, m_listView->viewport() );
-  TQRect r = m_listView->itemRect( this );
+  TQRect r = m_listView->tqitemRect( this );
   if ( !r.size().isValid() )
   {
     m_listView->ensureItemVisible( this );
-    r = m_listView->itemRect( this );
+    r = m_listView->tqitemRect( this );
   }
   r.setX( m_listView->header()->sectionPos( 0 ) + 20);
   r.setWidth( m_listView->header()->sectionSize( 0 ) - 20);
@@ -143,15 +143,15 @@ void ParentItem::showList(bool show)
 }
 
 //Generic attribute item
-AttributeItem::AttributeItem(TQListViewItem* parent, const TQString &title, const TQString& title2)
-: KListViewItem(parent, title, title2)
+AttributeItem::AttributeItem(TQListViewItem* tqparent, const TQString &title, const TQString& title2)
+: KListViewItem(tqparent, title, title2)
 {
   lin = 0L;
   lin2 = 0L;
 }
 
-AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2)
-: KListViewItem(parent, title, title2)
+AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2)
+: KListViewItem(tqparent, title, title2)
 {
   m_listView = listView;
   lin = new TQLineEdit( m_listView->viewport() );
@@ -262,11 +262,11 @@ void AttributeItem::hideEditor(int column)
 
 void AttributeItem::placeEditor( TQWidget *w, int column)
 {
-  TQRect r = m_listView->itemRect( this );
+  TQRect r = m_listView->tqitemRect( this );
   if ( !r.size().isValid() )
   {
     m_listView->ensureItemVisible( this );
-    r = m_listView->itemRect( this );
+    r = m_listView->tqitemRect( this );
   }
   if(column == 1)
   {
@@ -284,8 +284,8 @@ void AttributeItem::placeEditor( TQWidget *w, int column)
 }
 
 //Boolean attribute item
-AttributeBoolItem::AttributeBoolItem(TagAttributeTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2)
-: AttributeItem(parent, title, title2)
+AttributeBoolItem::AttributeBoolItem(TagAttributeTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2)
+: AttributeItem(tqparent, title, title2)
 {
   m_listView = listView;
   combo = new TQComboBox( m_listView->viewport() );
@@ -324,8 +324,8 @@ void AttributeBoolItem::hideEditor(int)
 }
 
 //Boolean attribute item
-AttributeUrlItem::AttributeUrlItem(TagAttributeTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2)
-: AttributeItem(parent, title, title2)
+AttributeUrlItem::AttributeUrlItem(TagAttributeTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2)
+: AttributeItem(tqparent, title, title2)
 {
   m_listView = listView;
   urlRequester = new KURLRequester( m_listView->viewport() );
@@ -345,7 +345,7 @@ TQString AttributeUrlItem::editorText(int)
   QuantaCommon::setUrl(url, urlRequester->url());
   baseURL = (static_cast<TagAttributeTree *>(m_listView))->node()->tag->write()->url();
   baseURL.setPath(baseURL.directory());
-  url = QExtFileInfo::toRelative(url, baseURL);
+  url = TQExtFileInfo::toRelative(url, baseURL);
   TQString s = url.url();
   if (url.protocol() == (static_cast<TagAttributeTree *>(m_listView))->node()->tag->write()->url().protocol())
     s.remove(0, url.protocol().length() + 3);
@@ -360,7 +360,7 @@ void AttributeUrlItem::showEditor(int)
   baseURL = (static_cast<TagAttributeTree *>(m_listView))->node()->tag->write()->url();
   baseURL.setPath(baseURL.directory());
   QuantaCommon::setUrl(url, text(1));
-  url= QExtFileInfo::toAbsolute(url, baseURL);
+  url= TQExtFileInfo::toAbsolute(url, baseURL);
   urlRequester->setURL(url.url());
   urlRequester->setFocus();
 }
@@ -375,13 +375,13 @@ void AttributeUrlItem::hideEditor(int)
 
 //editable listbox
 //Boolean attribute item
-AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2, Attribute *attr)
-: AttributeItem(parent, title, title2)
+AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2, Attribute *attr)
+: AttributeItem(tqparent, title, title2)
 {
   m_listView = listView;
   combo = new TQComboBox( m_listView->viewport() );
   Node *node = (static_cast<TagAttributeTree *>(m_listView))->node();
-  QTag *qTag = QuantaCommon::tagFromDTD(node);
+  TQTag *qTag = QuantaCommon::tagFromDTD(node);
   if (qTag)
   {
     if (!attr)
@@ -395,7 +395,7 @@ AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* par
         if (!attr->interface.isEmpty())
           interface = attr->interface;
         TQString arguments = attr->arguments;
-        arguments.replace("%tagname%", node->tag->name);
+        arguments.tqreplace("%tagname%", node->tag->name);
         DCOPReply reply = QuantaCommon::callDCOPMethod(interface, attr->method, arguments);
         if (reply.isValid())
         {
@@ -428,13 +428,13 @@ void AttributeListItem::showEditor(int)
   combo->show();
   int index = -1;
   Node *node = (static_cast<TagAttributeTree *>(m_listView))->node();
-  QTag *qTag = QuantaCommon::tagFromDTD(node);
+  TQTag *qTag = QuantaCommon::tagFromDTD(node);
   if (qTag)
   {
     Attribute *attr = qTag->attribute(text(0));
     if (attr)
     {
-      index = attr->values.findIndex(text(1));
+      index = attr->values.tqfindIndex(text(1));
     }
   }
   if (index != -1)
@@ -455,8 +455,8 @@ void AttributeListItem::hideEditor(int)
 }
 
 //editable color combobox
-AttributeColorItem::AttributeColorItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2)
-: AttributeItem(parent, title, title2)
+AttributeColorItem::AttributeColorItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2)
+: AttributeItem(tqparent, title, title2)
 {
   m_listView = listView;
   combo = new KColorCombo( m_listView->viewport() );
@@ -499,8 +499,8 @@ void AttributeColorItem::hideEditor(int)
 }
 
 //editable style combobox
-AttributeStyleItem::AttributeStyleItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2)
-: AttributeItem(parent, title, title2)
+AttributeStyleItem::AttributeStyleItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2)
+: AttributeItem(tqparent, title, title2)
 {
   m_listView = listView;
   m_se = new StyleEditor( m_listView->viewport() );
diff --git a/quanta/treeviews/tagattributeitems.h b/quanta/treeviews/tagattributeitems.h
index 81f5cb43..6992e14e 100644
--- a/quanta/treeviews/tagattributeitems.h
+++ b/quanta/treeviews/tagattributeitems.h
@@ -35,8 +35,8 @@ class TopLevelItem : public KListViewItem
 {
 
 public:
-    TopLevelItem(KListView *parent, const TQString& title);
-    TopLevelItem(KListView *parent, TQListViewItem* after, const TQString& title);
+    TopLevelItem(KListView *tqparent, const TQString& title);
+    TopLevelItem(KListView *tqparent, TQListViewItem* after, const TQString& title);
 
     virtual ~TopLevelItem();
 
@@ -50,7 +50,7 @@ class ParentItem : public KListViewItem
 {
 
 public:
-    ParentItem(TagAttributeTree *listView, TQListViewItem *parent);
+    ParentItem(TagAttributeTree *listView, TQListViewItem *tqparent);
 
     virtual ~ParentItem();
     Node *node(int index);
@@ -71,8 +71,8 @@ private:
 class AttributeItem : public KListViewItem
 {
 public:
-    AttributeItem(TQListViewItem* parent, const TQString& title, const TQString& title2);
-    AttributeItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2);
+    AttributeItem(TQListViewItem* tqparent, const TQString& title, const TQString& title2);
+    AttributeItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2);
     AttributeItem(EditableTree *listView, const TQString& title, const TQString& title2);
     AttributeItem(EditableTree *listView, const TQString& title, const TQString& title2, TQListViewItem* after);
 
@@ -97,8 +97,8 @@ protected:
 class AttributeNameSpaceItem:public AttributeItem
 {
 public:
-    AttributeNameSpaceItem(TQListViewItem* parent, const TQString& title, const TQString& title2): AttributeItem(parent, title, title2){};
-    AttributeNameSpaceItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2):AttributeItem(listView, parent, title, title2){};
+    AttributeNameSpaceItem(TQListViewItem* tqparent, const TQString& title, const TQString& title2): AttributeItem(tqparent, title, title2){};
+    AttributeNameSpaceItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2):AttributeItem(listView, tqparent, title, title2){};
     virtual ~AttributeNameSpaceItem(){};
 
 };
@@ -106,7 +106,7 @@ public:
 class AttributeBoolItem : public AttributeItem
 {
 public:
-    AttributeBoolItem(TagAttributeTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2);
+    AttributeBoolItem(TagAttributeTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2);
 
     virtual ~AttributeBoolItem();
     virtual void showEditor(int column = 1);
@@ -120,7 +120,7 @@ private:
 class AttributeUrlItem : public AttributeItem
 {
 public:
-    AttributeUrlItem(TagAttributeTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2);
+    AttributeUrlItem(TagAttributeTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2);
 
     virtual ~AttributeUrlItem();
     virtual void showEditor(int column = 1);
@@ -134,7 +134,7 @@ private:
 class AttributeListItem : public AttributeItem
 {
 public:
-    AttributeListItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2, Attribute *attr = 0L);
+    AttributeListItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2, Attribute *attr = 0L);
 
     virtual ~AttributeListItem();
     virtual void showEditor(int column = 1);
@@ -148,7 +148,7 @@ private:
 class AttributeColorItem : public AttributeItem
 {
 public:
-    AttributeColorItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2);
+    AttributeColorItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2);
 
     virtual ~AttributeColorItem();
     virtual void showEditor(int column = 1);
@@ -162,7 +162,7 @@ private:
 class AttributeStyleItem : public AttributeItem
 {
 public:
-    AttributeStyleItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2);
+    AttributeStyleItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2);
 
     virtual ~AttributeStyleItem();
     virtual void showEditor(int column = 1);
diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp
index 9ea6fc40..46de89b3 100644
--- a/quanta/treeviews/tagattributetree.cpp
+++ b/quanta/treeviews/tagattributetree.cpp
@@ -50,8 +50,8 @@
 
 #include "viewmanager.h"
 
-EditableTree::EditableTree(TQWidget *parent, const char *name)
-: KListView(parent, name)
+EditableTree::EditableTree(TQWidget *tqparent, const char *name)
+: KListView(tqparent, name)
 {
   m_editable = true;
 }
@@ -100,11 +100,11 @@ void EditableTree::focusOutEvent(TQFocusEvent *)
   }*/
 }
 
-DualEditableTree::DualEditableTree(TQWidget *parent, const char *name)
-: EditableTree(parent, name)
+DualEditableTree::DualEditableTree(TQWidget *tqparent, const char *name)
+: EditableTree(tqparent, name)
 {
   curCol = 0;
-  setFocusPolicy(TQWidget::ClickFocus);
+  setFocusPolicy(TQ_ClickFocus);
   this->installEventFilter(this);
   connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int )),
     this, TQT_SLOT(itemClicked(TQListViewItem *, const TQPoint &, int )));
@@ -128,7 +128,7 @@ bool DualEditableTree::eventFilter(TQObject *object, TQEvent *event)
 
   if(event->type() == TQEvent::KeyPress && m_editable)
   {
-    TQKeyEvent *keyevent = static_cast<TQKeyEvent *>(event);
+    TQKeyEvent *keyevent = TQT_TQKEYEVENT(event);
     switch(keyevent->key())
     {
       case Key_Left:
@@ -216,14 +216,14 @@ void DualEditableTree::itemClicked(TQListViewItem *item, const TQPoint &, int co
   }
 }
 
-TagAttributeTree::TagAttributeTree(TQWidget *parent, const char *name)
-: EditableTree(parent, name)
+TagAttributeTree::TagAttributeTree(TQWidget *tqparent, const char *name)
+: EditableTree(tqparent, name)
 {
   setRootIsDecorated( true );
   setSorting(-1);
   setFrameStyle( Panel | Sunken );
   setLineWidth( 2 );
-  setFocusPolicy(TQWidget::ClickFocus);
+  setFocusPolicy(TQ_ClickFocus);
   addColumn(i18n("Attribute Name"));
   addColumn(i18n("Value"));
   setResizeMode(TQListView::LastColumn);
@@ -247,9 +247,9 @@ void TagAttributeTree::setCurrentNode(Node *node)
       return;
   clear();
   m_parentItem = 0L;
-  //We don't want to be able to edit the text node but it's parent.
+  //We don't want to be able to edit the text node but it's tqparent.
   if (node && node->tag->type == Tag::Text)
-    m_node = node = node->parent;
+    m_node = node = node->tqparent;
   if (!node)
       return;
 #ifdef HEAVY_DEBUG
@@ -259,8 +259,8 @@ void TagAttributeTree::setCurrentNode(Node *node)
   AttributeItem *item = 0L;
   TopLevelItem *group = 0L;
   TQString attrName;
-  QTag *qTag = QuantaCommon::tagFromDTD(node);
-  Node *n = node->parent;
+  TQTag *qTag = QuantaCommon::tagFromDTD(node);
+  Node *n = node->tqparent;
   while (n)
   {
     if (n->tag->type == Tag::XmlTag)
@@ -272,7 +272,7 @@ void TagAttributeTree::setCurrentNode(Node *node)
       }
       m_parentItem->addNode(n);
     }
-    n = n->parent;
+    n = n->tqparent;
   }
 
   if (m_parentItem)
@@ -333,7 +333,7 @@ void TagAttributeTree::setCurrentNode(Node *node)
     for (uint i = 0; i < qTag->commonGroups.count(); i++)
     {
       group = new TopLevelItem(this, group, i18n(qTag->commonGroups[i].utf8()));
-      AttributeList *groupAttrs = qTag->parentDTD->commonAttrs->find(qTag->commonGroups[i]);
+      AttributeList *groupAttrs = qTag->tqparentDTD->commonAttrs->tqfind(qTag->commonGroups[i]);
       for (uint j = 0; j < groupAttrs->count(); j++)
       {
         Attribute *attr = groupAttrs->at(j);
@@ -429,13 +429,13 @@ void TagAttributeTree::slotParentSelected(int index)
 
 void TagAttributeTree::slotCollapsed(TQListViewItem *item)
 {
-  if (m_parentItem && item == m_parentItem->parent())
+  if (m_parentItem && item == m_parentItem->tqparent())
       m_parentItem->showList(false);
 }
 
 void TagAttributeTree::slotExpanded(TQListViewItem *item)
 {
-  if (m_parentItem && item == m_parentItem->parent())
+  if (m_parentItem && item == m_parentItem->tqparent())
       m_parentItem->showList(true);
 }
 
@@ -451,18 +451,18 @@ void TagAttributeTree::slotDelayedSetCurrentNode()
   }
 }
 
-EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char *name)
-: TQWidget(parent, name)
+EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *tqparent, const char *name)
+: TQWidget(tqparent, name)
 {
 
   widgetLayout = new TQGridLayout( this, 1, 1, 11, 6, "MainLayout");
 
   attrTree = new TagAttributeTree(this, "TagAttributeTree");
-  attrTree->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
+  attrTree->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
   widgetLayout->addMultiCellWidget( attrTree, 1, 1, 0, 3 );
 
   nodeName = new TQLabel(this, i18n( "Node Name" ).ascii());
-  nodeName->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed, 0, 0, nodeName->sizePolicy().hasHeightForWidth() ) );
+  nodeName->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed, 0, 0, nodeName->sizePolicy().hasHeightForWidth() ) );
 
   widgetLayout->addWidget( nodeName, 0, 0 );
   deleteTag = new KPushButton(this, i18n( "Delete Tag" ).ascii());
@@ -475,7 +475,7 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char
   deleteAll->setPixmap(SmallIcon("editdelete"));
   deleteAll->setMaximumHeight(32);
   deleteAll->setMaximumWidth(32);
-  TQToolTip::add(deleteAll, i18n("Delete the current tag and all its children."));
+  TQToolTip::add(deleteAll, i18n("Delete the current tag and all its tqchildren."));
 
   widgetLayout->addWidget( deleteTag, 0, 2 );
   widgetLayout->addWidget( deleteAll, 0, 3 );
@@ -501,9 +501,9 @@ void EnhancedTagAttributeTree::setCurrentNode(Node *node)
 void EnhancedTagAttributeTree::NodeSelected(Node *node)
 {
   curNode = node;
-  //We don't want to be able to edit the text node but it's parent.
+  //We don't want to be able to edit the text node but it's tqparent.
   if (node && node->tag->type == Tag::Text)
-    curNode = node = node->parent;
+    curNode = node = node->tqparent;
   showCaption();
   emit newNodeSelected(node);
 }
@@ -515,7 +515,7 @@ void EnhancedTagAttributeTree::showCaption()
     if(curNode->tag->type == Tag::XmlTag || curNode->tag->type == Tag::XmlTagEnd ||
       curNode->tag->type == Tag::ScriptTag)
     {
-      TQString s = i18n("Current tag: <b>%1</b>").arg(curNode->tag->name);
+      TQString s = i18n("Current tag: <b>%1</b>").tqarg(curNode->tag->name);
       nodeName->setText(KStringHandler::rPixelSqueeze(s, nodeName->fontMetrics(), attrTree->width()- 50));
     }
     else if(curNode->tag->type == Tag::Text)
@@ -586,7 +586,7 @@ void EnhancedTagAttributeTree::deleteNode()
     return;
 
   Node *oldCurNode, *oldCurNodeParent, *child;
-  QTag *oldCurNodeParentQTag;
+  TQTag *oldCurNodeParentTQTag;
   int curLine, curCol;
   long offset;
   DOM::Node domNode;
@@ -614,23 +614,23 @@ void EnhancedTagAttributeTree::deleteNode()
 
   //remove the Nodes
   oldCurNode = curNode;
-  oldCurNodeParent = curNode->parent;
+  oldCurNodeParent = curNode->tqparent;
   curNode = 0L;
   attrTree->setCurrentNode(curNode);
 
   modifs = new NodeModifsSet();
   kafkaCommon::extractAndDeleteNode(oldCurNode, modifs, false);
 
-  //Then we see if the new parent - child relationships are valid, and if not, delete the child and restart
+  //Then we see if the new tqparent - child relationships are valid, and if not, delete the child and restart
   if(oldCurNodeParent)
   {
-    oldCurNodeParentQTag = QuantaCommon::tagFromDTD(oldCurNodeParent);
-    if(oldCurNodeParentQTag)
+    oldCurNodeParentTQTag = QuantaCommon::tagFromDTD(oldCurNodeParent);
+    if(oldCurNodeParentTQTag)
     {
       child = oldCurNodeParent->child;
       while(child)
       {
-        if(!oldCurNodeParentQTag->isChild(child))
+        if(!oldCurNodeParentTQTag->isChild(child))
         {
           kafkaCommon::extractAndDeleteNode(child, modifs, false);
           //too lazy to get the real next node ;-)
diff --git a/quanta/treeviews/tagattributetree.h b/quanta/treeviews/tagattributetree.h
index f396589f..32dea87a 100644
--- a/quanta/treeviews/tagattributetree.h
+++ b/quanta/treeviews/tagattributetree.h
@@ -33,9 +33,10 @@ class TQGridLayout;
 
 class EditableTree : public KListView {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-  EditableTree(TQWidget *parent = 0, const char *name = 0);
+  EditableTree(TQWidget *tqparent = 0, const char *name = 0);
   virtual ~EditableTree();
 
   virtual void setCurrentItem( TQListViewItem *i);
@@ -55,8 +56,9 @@ protected:
 class DualEditableTree : public EditableTree
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  DualEditableTree(TQWidget *parent = 0, const char *name = 0);
+  DualEditableTree(TQWidget *tqparent = 0, const char *name = 0);
   virtual ~DualEditableTree();
 
   virtual void setCurrentItem ( TQListViewItem *i);
@@ -81,9 +83,10 @@ private:
 
 class TagAttributeTree : public EditableTree  {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-  TagAttributeTree(TQWidget *parent=0, const char *name=0);
+  TagAttributeTree(TQWidget *tqparent=0, const char *name=0);
   virtual ~TagAttributeTree();
 
   void setCurrentNode(Node *node);
@@ -110,11 +113,12 @@ private:
 };
 
 //An enhanced TagAttributeTree with the tag name and buttons to delete the tag.
-class EnhancedTagAttributeTree : public QWidget
+class EnhancedTagAttributeTree : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  EnhancedTagAttributeTree(TQWidget *parent = 0, const char *name = 0);
+  EnhancedTagAttributeTree(TQWidget *tqparent = 0, const char *name = 0);
   virtual ~EnhancedTagAttributeTree();
 
   void setCurrentNode(Node *node);
diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui
index 4ab6d6c1..6e2f41bb 100644
--- a/quanta/treeviews/templatedirform.ui
+++ b/quanta/treeviews/templatedirform.ui
@@ -10,7 +10,7 @@
 
 </comment>
 <author>(C) 2002 by Andras Mantia &lt;amantia@kde.org&gt;</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>TemplateDirForm</cstring>
     </property>
@@ -29,7 +29,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>
@@ -37,7 +37,7 @@
                 <string>Type:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -50,22 +50,22 @@
                 <cstring>typesCombo</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="0" column="1">
+        <widget class="TQLineEdit" row="0" column="1">
             <property name="name">
                 <cstring>dirName</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>parentAttr</cstring>
+                <cstring>tqparentAttr</cstring>
             </property>
             <property name="text">
-                <string>&amp;Inherit parent attribute</string>
+                <string>&amp;Inherit tqparent attribute</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>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -81,14 +81,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>38</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -109,14 +109,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>25</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -134,7 +134,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>38</width>
                             <height>20</height>
@@ -147,7 +147,7 @@
 </widget>
 <connections>
     <connection>
-        <sender>parentAttr</sender>
+        <sender>tqparentAttr</sender>
         <signal>toggled(bool)</signal>
         <receiver>typesCombo</receiver>
         <slot>setDisabled(bool)</slot>
@@ -156,14 +156,14 @@
 <tabstops>
     <tabstop>dirName</tabstop>
     <tabstop>typesCombo</tabstop>
-    <tabstop>parentAttr</tabstop>
+    <tabstop>tqparentAttr</tabstop>
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>okBtn_clicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
 </includehints>
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index f1eaca73..75218842 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -79,22 +79,22 @@ TQMap<TQString, TQString> i18nToType;
 
 
 //TemplatesTreeBranch implementation
-TemplatesTreeBranch::TemplatesTreeBranch(KFileTreeView *parent, const KURL& url,
+TemplatesTreeBranch::TemplatesTreeBranch(KFileTreeView *tqparent, const KURL& url,
                                          const TQString& name, const TQPixmap& pix,
                                          bool showHidden,
                                          KFileTreeViewItem *branchRoot)
-    : BaseTreeBranch(parent, url, name, pix, showHidden, branchRoot)
+    : BaseTreeBranch(tqparent, url, name, pix, showHidden, branchRoot)
 {
 }
 
-KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *parent,
+KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent,
                                                            KFileItem *fileItem )
 {
   BaseTreeViewItem  *tvi = 0;
-  if( parent && fileItem )
+  if( tqparent && fileItem )
   {
     KURL url = fileItem->url();
-    tvi = new BaseTreeViewItem( parent, fileItem, this );
+    tvi = new BaseTreeViewItem( tqparent, fileItem, this );
     if (tvi && fileItem->isDir())
     {
       if (url.isLocalFile())
@@ -106,7 +106,7 @@ KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *pa
       }
     } else
     {
-      url = static_cast<BaseTreeViewItem*>(parent)->url();
+      url = static_cast<BaseTreeViewItem*>(tqparent)->url();
     }
     TQFileInfo dotFileInfo(url.path() + "/.dirinfo");
     while ((!dotFileInfo.exists()) && (dotFileInfo.dirPath() != "/"))
@@ -123,14 +123,14 @@ KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *pa
 
   }
   else
-    kdDebug(24000) << "TemplatesTreeBranch::createTreeViewItem: Have no parent" << endl;
+    kdDebug(24000) << "TemplatesTreeBranch::createTreeViewItem: Have no tqparent" << endl;
   return tvi;
 }
 
 
 
-TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name )
-  : BaseTreeView(parent,name), m_projectDir(0), m_mainWindow(parent)
+TemplatesTreeView::TemplatesTreeView(KMainWindow *tqparent, const char *name )
+  : BaseTreeView(tqparent,name), m_projectDir(0), m_mainWindow(tqparent)
 {
   typeToi18n["text/all"] = i18n("Text Snippet");
   typeToi18n["file/all"] = i18n("Binary File");
@@ -285,13 +285,13 @@ void TemplatesTreeView::slotMenu(KListView*, TQListViewItem *item, const TQPoint
 
    TQString menuText = "";
 
-   if (m_dirInfo.mimeType.upper().contains("TEXT"))
+   if (m_dirInfo.mimeType.upper().tqcontains("TEXT"))
      menuText = i18n(textMenu.utf8());
-   else if (m_dirInfo.mimeType.upper().contains("FILE"))
+   else if (m_dirInfo.mimeType.upper().tqcontains("FILE"))
      menuText = i18n(binaryMenu.utf8());
-   else if (m_dirInfo.mimeType.upper().contains("TEMPLATE"))
+   else if (m_dirInfo.mimeType.upper().tqcontains("TEMPLATE"))
      menuText = i18n(docMenu.utf8());
-   else if (m_dirInfo.mimeType.upper().contains("SITE"))
+   else if (m_dirInfo.mimeType.upper().tqcontains("SITE"))
      menuText = i18n(siteMenu.utf8());
 
    if (menuText.isEmpty())
@@ -350,17 +350,17 @@ void TemplatesTreeView::slotSelectFile(TQListViewItem *item)
   if ( !kftvItem->isDir() )
   {
     m_dirInfo = readDirInfo();
-/*    if (m_dirInfo.mimeType.upper().contains("SITE"))
+/*    if (m_dirInfo.mimeType.upper().tqcontains("SITE"))
     {
       slotExtractSiteTemplate();
       return;
     }*/
     if (expandArchiv(kftvItem)) return;
-    if (m_dirInfo.mimeType.upper().contains("TEXT"))
+    if (m_dirInfo.mimeType.upper().tqcontains("TEXT"))
         slotInsertInDocument();
-    else if (m_dirInfo.mimeType.upper().contains("FILE"))
+    else if (m_dirInfo.mimeType.upper().tqcontains("FILE"))
         slotInsertTag();
-    else if (m_dirInfo.mimeType.upper().contains("TEMPLATE"))
+    else if (m_dirInfo.mimeType.upper().tqcontains("TEMPLATE"))
         slotNewDocument();
   }
 }
@@ -383,10 +383,10 @@ void TemplatesTreeView::slotNewDir()
 
    if (m_dirInfo.mimeType.isEmpty())
    {
-    createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (nothing)"));
+    createDirDlg->tqparentAttr->setText(i18n("&Inherit tqparent attribute (nothing)"));
    } else
    {
-     createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (%1)").arg(typeToi18n[m_dirInfo.mimeType]));
+     createDirDlg->tqparentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType]));
    }
    if (createDirDlg->exec())
    {
@@ -404,10 +404,10 @@ void TemplatesTreeView::slotNewDir()
    if (!dir.mkdir(startDir+"/"+createDirDlg->dirName->text()))
    {
       KMessageBox::error(this,i18n("Error while creating the new folder.\n \
-                   Maybe you do not have permission to write in the %1 folder.").arg(startDir));
+                   Maybe you do not have permission to write in the %1 folder.").tqarg(startDir));
       return;
    }
-   if (! createDirDlg->parentAttr->isChecked())
+   if (! createDirDlg->tqparentAttr->isChecked())
    {
       m_dirInfo.mimeType = i18nToType[createDirDlg->typesCombo->currentText()];
       m_dirInfo.preText = "";
@@ -465,15 +465,15 @@ void TemplatesTreeView::contentsDropEvent(TQDropEvent *e)
         *(tempFile->textStream()) << content;
         tempFile->close();
         bool proceed = true;
-        if (QExtFileInfo::exists(url, false, this))
+        if (TQExtFileInfo::exists(url, false, this))
         {
-          proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue;
+          proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue;
         }
         if (proceed)
         {
           if (!QuantaNetAccess::upload(tempFile->name(), url, m_parent, false))
           {
-            KMessageBox::error(this,i18n("<qt>Could not write to file <b>%1</b>.<br>Check if you have rights to write there or that your connection is working.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
+            KMessageBox::error(this,i18n("<qt>Could not write to file <b>%1</b>.<br>Check if you have rights to write there or that your connection is working.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
           }
         }
         delete tempFile;
@@ -612,14 +612,14 @@ void TemplatesTreeView::slotProperties()
   m_parentDirInfo = readDirInfo(dotFileInfo.dirPath());
   if (!dotFileInfo.exists() || m_dirInfo.mimeType == m_parentDirInfo.mimeType)
   {
-     m_quantaProperties->parentAttr->setChecked(true);
+     m_quantaProperties->tqparentAttr->setChecked(true);
   }
   if (m_parentDirInfo.mimeType.isEmpty())
    {
-    m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (nothing)"));
+    m_quantaProperties->tqparentAttr->setText(i18n("&Inherit tqparent attribute (nothing)"));
    } else
    {
-    m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (%1)").arg(typeToi18n[m_parentDirInfo.mimeType]));
+    m_quantaProperties->tqparentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType]));
    }
    m_quantaProperties->preTextEdit->setText(m_dirInfo.preText);
    m_quantaProperties->postTextEdit->setText(m_dirInfo.postText);
@@ -652,7 +652,7 @@ void TemplatesTreeView::slotProperties()
       TQString type = el.attribute("type", "tag");
       if (type == "script")
       {
-        tmpStr = action->text().replace(TQRegExp("\\&(?!\\&)"),"");
+        tmpStr = action->text().tqreplace(TQRegExp("\\&(?!\\&)"),"");
         m_quantaProperties->actionCombo->insertItem(tmpStr);
         if (tmpStr == name)
             pos = j;
@@ -681,7 +681,7 @@ void TemplatesTreeView::slotPropertiesApplied()
   DirInfo m_localDirInfo;
   TQString typeString = "";
 
-  if (!m_quantaProperties->parentAttr->isChecked())
+  if (!m_quantaProperties->tqparentAttr->isChecked())
   {
     m_localDirInfo.mimeType = m_quantaProperties->typesCombo->currentText();
     typeString = m_localDirInfo.mimeType;
@@ -709,10 +709,10 @@ void TemplatesTreeView::slotPropertiesApplied()
     bool result = writeDirInfo();
     KFileTreeViewItem *item = currentKFileTreeViewItem();
     if (item && !item->isDir())
-      item = static_cast<KFileTreeViewItem *>(item->parent());
+      item = static_cast<KFileTreeViewItem *>(item->tqparent());
     if (result && item && !typeString.isEmpty())
     {
-      if (item->parent() && item->isDir())
+      if (item->tqparent() && item->isDir())
           item->setText(1, typeString);
       updateTypeDescription(item, typeString);
     }
@@ -723,7 +723,7 @@ void TemplatesTreeView::slotPropertiesApplied()
 
 void TemplatesTreeView::updateTypeDescription(KFileTreeViewItem *item, const TQString &typeString)
 {
-  if (item->parent() && item->isDir())
+  if (item->tqparent() && item->isDir())
       item->setText(1, typeString);
   KFileTreeViewItem *curItem = static_cast<KFileTreeViewItem *>(item->firstChild());
   while (curItem && curItem != static_cast<KFileTreeViewItem *>(item->nextSibling()))
@@ -783,7 +783,7 @@ void TemplatesTreeView::slotDragInsert(TQDropEvent *e)
    {
      if(m_dirInfo.mimeType == "text/all") // default to inserting in document
      {
-      if(!mimeType.contains("text", false) && QuantaCommon::denyBinaryInsert(this) != KMessageBox::Yes)
+      if(!mimeType.tqcontains("text", false) && QuantaCommon::denyBinaryInsert(this) != KMessageBox::Yes)
       {
         return;
       }
@@ -798,7 +798,7 @@ void TemplatesTreeView::slotDragInsert(TQDropEvent *e)
      else
      if(m_dirInfo.mimeType == "template/all")
      {
-       if(!mimeType.contains("text", false) && QuantaCommon::denyBinaryInsert(this) != KMessageBox::Yes)
+       if(!mimeType.tqcontains("text", false) && QuantaCommon::denyBinaryInsert(this) != KMessageBox::Yes)
        {
          return;
        }
@@ -846,7 +846,7 @@ void TemplatesTreeView::slotPaste()
 {
   if (currentItem())
   {
-    QClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) );
 
     KURL url;
@@ -873,11 +873,11 @@ void TemplatesTreeView::slotDelete()
     KURL url = currentURL();
     TQString msg;
     if ( currentKFileTreeViewItem()->isDir() )
-      msg = i18n("Do you really want to delete folder \n%1 ?\n").arg(url.path());
+      msg = i18n("Do you really want to delete folder \n%1 ?\n").tqarg(url.path());
     else
-      msg = i18n("Do you really want to delete file \n%1 ?\n").arg(url.path());
+      msg = i18n("Do you really want to delete file \n%1 ?\n").tqarg(url.path());
 
-    if ( KMessageBox::warningContinueCancel(this, msg, TQString::null, KStdGuiItem::del()) == KMessageBox::Continue )
+    if ( KMessageBox::warningContinueCancel(this, msg, TQString(), KStdGuiItem::del()) == KMessageBox::Continue )
     {
       KIO::Job *job = KIO::del(url);
       connect( job, TQT_SIGNAL( result( KIO::Job *) ), this , TQT_SLOT( slotJobFinished( KIO::Job *) ) );
@@ -911,7 +911,7 @@ KURL TemplatesTreeView::filterTemplate()
      TQDomElement el = action->data();
      TQString type = el.attribute("type", "tag");
      tmpStr = action->text();
-     tmpStr.replace(TQRegExp("\\&(?!\\&)"),"");
+     tmpStr.tqreplace(TQRegExp("\\&(?!\\&)"),"");
      if (type == "script" && tmpStr == name)
      {
        filterAction = action;
@@ -925,7 +925,7 @@ KURL TemplatesTreeView::filterTemplate()
    filterAction->setInputFileName(url.path());
    filterAction->execute(true);
    filterAction->setOutputFile(0L);
-   filterAction->setInputFileName(TQString::null);
+   filterAction->setInputFileName(TQString());
    tempFile->close();
    tempFileList.append(tempFile);
    url.setPath(tempFile->name());
@@ -953,14 +953,14 @@ TQString TemplatesTreeView::createTemplateTarball()
   if ( ! currentKFileTreeViewItem()->isDir() )
     files.append(url);
   else {
-    files = QExtFileInfo::allFiles(dirURL, "*", this) ;
+    files = TQExtFileInfo::allFiles(dirURL, "*", this) ;
     dirURL = dirURL.upURL();
   }
 
   for ( KURL::List::Iterator it_f = files.begin(); it_f != files.end(); ++it_f )
   {
     if (!(*it_f).fileName(false).isEmpty()) {
-      url = QExtFileInfo::toRelative( (*it_f), dirURL) ;
+      url = TQExtFileInfo::toRelative( (*it_f), dirURL) ;
 
       TQFile file((*it_f).path());
       file.open(IO_ReadOnly);
@@ -1006,7 +1006,7 @@ void TemplatesTreeView::slotSendInMail()
         delete mailDlg;
         return;
       }
-      kapp->invokeMailer(toStr, TQString::null, TQString::null, subjectStr, message, TQString::null, attachmentFile);
+      kapp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), attachmentFile);
     }
     delete mailDlg;
 }
@@ -1062,9 +1062,9 @@ void TemplatesTreeView::slotExtractSiteTemplate()
           } else
              error = true;
           KIO::NetAccess::removeTempFile(tempFile);
-          if (!m_projectBaseURL.isEmpty() && !QExtFileInfo::toRelative(targetURL, m_projectBaseURL).url().startsWith("."))
+          if (!m_projectBaseURL.isEmpty() && !TQExtFileInfo::toRelative(targetURL, m_projectBaseURL).url().startsWith("."))
           {
-             if (KMessageBox::questionYesNo(this, i18n("You have extracted the site template to a folder which is not under your main project folder.\nDo you want to copy the folder into the main project folder?"), TQString::null, i18n("Copy Folder"), i18n("Do Not Copy")) == KMessageBox::Yes)
+             if (KMessageBox::questionYesNo(this, i18n("You have extracted the site template to a folder which is not under your main project folder.\nDo you want to copy the folder into the main project folder?"), TQString(), i18n("Copy Folder"), i18n("Do Not Copy")) == KMessageBox::Yes)
              {
                  emit insertDirInProject(targetURL);
              }
@@ -1072,7 +1072,7 @@ void TemplatesTreeView::slotExtractSiteTemplate()
       } else
          error = true;
       if (error)
-        KMessageBox::error(this, i18n("<qt>Some error happened while extracting the <i>%1</i> site template file.<br>Check that you have write permission for <i>%2</i> and that there is enough free space in your temporary folder.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)).arg(targetURL.prettyURL(0, KURL::StripFileProtocol)));
+        KMessageBox::error(this, i18n("<qt>Some error happened while extracting the <i>%1</i> site template file.<br>Check that you have write permission for <i>%2</i> and that there is enough free space in your temporary folder.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)).tqarg(targetURL.prettyURL(0, KURL::StripFileProtocol)));
    }
 }
 
diff --git a/quanta/treeviews/templatestreeview.h b/quanta/treeviews/templatestreeview.h
index 7816cffd..efccc56a 100644
--- a/quanta/treeviews/templatestreeview.h
+++ b/quanta/treeviews/templatestreeview.h
@@ -27,18 +27,19 @@ class KMainWindow;
 class TemplatesTreeBranch : public BaseTreeBranch {
 
 public:
-  TemplatesTreeBranch(KFileTreeView *parent, const KURL& url,
+  TemplatesTreeBranch(KFileTreeView *tqparent, const KURL& url,
                       const TQString& name, const TQPixmap& pix,
                       bool showHidden = false, KFileTreeViewItem *branchRoot = 0L);
 
   /** read the mimetype */
-  virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *parent,
+  virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *tqparent,
                                                 KFileItem *fileItem );
 };
 
 
 class TemplatesTreeView : public BaseTreeView  {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -48,18 +49,18 @@ public:
    *  the parameter are only used at the first call to create the class
    *
    */
-  static TemplatesTreeView* const ref(KMainWindow *parent = 0L, const char *name = 0L)
+  static TemplatesTreeView* const ref(KMainWindow *tqparent = 0L, const char *name = 0L)
   {
     static TemplatesTreeView *m_ref;
-    if (!m_ref) m_ref = new TemplatesTreeView (parent, name);
+    if (!m_ref) m_ref = new TemplatesTreeView (tqparent, name);
     return m_ref;
   }
 
   ~TemplatesTreeView();
   /** Writes a .dirinfo file from the selected item's path */
-  bool writeDirInfo(const TQString& dirInfoFile = TQString::null);
+  bool writeDirInfo(const TQString& dirInfoFile = TQString());
   /** Reads a .dirinfo file from the selected item's path */
-  DirInfo readDirInfo(const TQString& dir = TQString::null);
+  DirInfo readDirInfo(const TQString& dir = TQString());
 
 
 public slots:
@@ -118,7 +119,7 @@ private:
    *  If you need the class use TemplatesTreeView::ref() for
    *  construction and reference
    */
-  TemplatesTreeView(KMainWindow *parent, const char *name = 0L);
+  TemplatesTreeView(KMainWindow *tqparent, const char *name = 0L);
   /** Filters the template through and action, and returns the modified/filtered
   template file */
   KURL filterTemplate();
diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp
index 9c055424..f43b8f99 100644
--- a/quanta/treeviews/uploadtreefile.cpp
+++ b/quanta/treeviews/uploadtreefile.cpp
@@ -27,12 +27,12 @@
 #include "uploadtreefile.h"
 #include "resource.h"
 
-UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem)
-    : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString())
+UploadTreeFile::UploadTreeFile( UploadTreeFolder *tqparent, const KURL &a_url, const KFileItem &a_fileItem)
+    : KListViewItem( tqparent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString())
 {
   m_url = a_url;
   isDir = false;
-  parentFolder = parent;
+  tqparentFolder = tqparent;
   m_fileItem = new KFileItem(a_fileItem);
   m_confirm = false;
 
@@ -40,12 +40,12 @@ UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, con
   setText(0, m_url.fileName());
 }
 
-UploadTreeFile::UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem)
-    : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString())
+UploadTreeFile::UploadTreeFile( TQListView *tqparent, const KURL &a_url, const KFileItem &a_fileItem)
+    : KListViewItem( tqparent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString())
 {
   m_url = a_url;
   isDir = false;
-  parentFolder = 0L;
+  tqparentFolder = 0L;
   m_fileItem = new KFileItem(a_fileItem);
   m_confirm = false;
 
diff --git a/quanta/treeviews/uploadtreefile.h b/quanta/treeviews/uploadtreefile.h
index 736a3a88..c2a118fc 100644
--- a/quanta/treeviews/uploadtreefile.h
+++ b/quanta/treeviews/uploadtreefile.h
@@ -28,8 +28,8 @@ class KFileItem;
 
 class UploadTreeFile : public KListViewItem  {
 public:
-  UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem);
-  UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem);
+  UploadTreeFile( UploadTreeFolder *tqparent, const KURL &a_url, const KFileItem &a_fileItem);
+  UploadTreeFile( TQListView *tqparent, const KURL &a_url, const KFileItem &a_fileItem);
   ~UploadTreeFile();
 
   void setWhichPixmap(const TQString& pixmap);
@@ -43,7 +43,7 @@ public:
   bool confirmUpload() {return m_confirm;}
 
 public:
-  UploadTreeFolder * parentFolder;
+  UploadTreeFolder * tqparentFolder;
   KURL m_url;
   bool isDir;
   bool m_confirm;
diff --git a/quanta/treeviews/uploadtreefolder.cpp b/quanta/treeviews/uploadtreefolder.cpp
index 123eaf35..dc43419c 100644
--- a/quanta/treeviews/uploadtreefolder.cpp
+++ b/quanta/treeviews/uploadtreefolder.cpp
@@ -27,10 +27,10 @@
 #include "uploadtreefile.h"
 #include "resource.h"
 
-UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * parent, const char * name )
-    : KListViewItem( parent, name, "", "", "" )
+UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * tqparent, const char * name )
+    : KListViewItem( tqparent, name, "", "", "" )
 {
-  parentFolder = parent;
+  tqparentFolder = tqparent;
   m_url = a_url;
   m_url.adjustPath(1);
 
@@ -40,10 +40,10 @@ UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * parent,
 
 }
 
-UploadTreeFolder::UploadTreeFolder(const KURL &a_url, TQListView * parent, const char * name )
-    : KListViewItem( parent, name, "", "", "" )
+UploadTreeFolder::UploadTreeFolder(const KURL &a_url, TQListView * tqparent, const char * name )
+    : KListViewItem( tqparent, name, "", "", "" )
 {
-  parentFolder = 0L;
+  tqparentFolder = 0L;
   m_url = a_url;
   m_url.adjustPath(1);
 
@@ -64,9 +64,9 @@ TQString UploadTreeFolder::fullName()
 {
   TQString s="";
 
-  if ( parentFolder )
+  if ( tqparentFolder )
   {
-    s = parentFolder->fullName();
+    s = tqparentFolder->fullName();
     s += m_url.fileName()+"/";
   }
   else {
diff --git a/quanta/treeviews/uploadtreefolder.h b/quanta/treeviews/uploadtreefolder.h
index d6959ab3..000c14bf 100644
--- a/quanta/treeviews/uploadtreefolder.h
+++ b/quanta/treeviews/uploadtreefolder.h
@@ -32,8 +32,8 @@ class KURL;
 
 class UploadTreeFolder : public KListViewItem  {
 public:
-  UploadTreeFolder( const KURL &a_url, TQListView * parent, const char * name);
-  UploadTreeFolder( const KURL &a_url, UploadTreeFolder * parent, const char * name );
+  UploadTreeFolder( const KURL &a_url, TQListView * tqparent, const char * name);
+  UploadTreeFolder( const KURL &a_url, UploadTreeFolder * tqparent, const char * name );
   virtual ~UploadTreeFolder();
 
   /** used for sorting */
@@ -46,7 +46,7 @@ public:
   void setWhichPixmap(const TQString& pixmap );
 
 public:
-  UploadTreeFolder * parentFolder;
+  UploadTreeFolder * tqparentFolder;
   KURL m_url;
 
 public slots: // Public slots
diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp
index 486a6156..250cc3a2 100644
--- a/quanta/treeviews/uploadtreeview.cpp
+++ b/quanta/treeviews/uploadtreeview.cpp
@@ -23,8 +23,8 @@
 #include "uploadtreeview.h"
 #include "quantacommon.h"
 
-UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) :
-  KListView(parent, name)
+UploadTreeView::UploadTreeView( TQWidget *tqparent, const char *name ) :
+  KListView(tqparent, name)
 {
   setRootIsDecorated( true );
   setSorting( 0 );
@@ -37,7 +37,7 @@ UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) :
   addColumn( i18n("Size") );
   addColumn( i18n("Date") );
 
-  setFocusPolicy(TQWidget::ClickFocus);
+  setFocusPolicy(TQ_ClickFocus);
 
   connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectFile()));
   connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
@@ -52,12 +52,12 @@ UploadTreeView::~UploadTreeView()
 
 int UploadTreeView::checkboxTree( TQListViewItem *it )
 {
-  parentWidget()->setCursor(KCursor::workingCursor());
+  tqparentWidget()->setCursor(KCursor::workingCursor());
 
   TQListViewItem *itIter = it ? it->firstChild() : firstChild();
 
-  // bitFlag structure: (0/1)all children exist (0/1)no children exist.
-  // We don't need some children as a bit flag, because that's implied if the bits are "00".
+  // bitFlag structure: (0/1)all tqchildren exist (0/1)no tqchildren exist.
+  // We don't need some tqchildren as a bit flag, because that's implied if the bits are "00".
 
   int bitFlags = 3;
   int retVal = 1;
@@ -73,17 +73,17 @@ int UploadTreeView::checkboxTree( TQListViewItem *it )
         UploadTreeFolder *itF = static_cast<UploadTreeFolder *>(itIter);
 
         if (hadCheckFlags == 2) {
-          // All children exist.
+          // All tqchildren exist.
           itF->setWhichPixmap( "check" );
           itF->setSelected( true );
         }
         else if (hadCheckFlags == 1) {
-          // No children exist.
+          // No tqchildren exist.
           itF->setWhichPixmap( "check_clear" );
           itF->setSelected( false );
         }
         else {
-          // Some children exist.
+          // Some tqchildren exist.
           itF->setWhichPixmap( "check_grey" );
           itF->setSelected( true );
         }
@@ -95,13 +95,13 @@ int UploadTreeView::checkboxTree( TQListViewItem *it )
         if ( itF->isSelected() )
         {
           itF->setWhichPixmap("check");
-          // Turn off "no children"
+          // Turn off "no tqchildren"
           if ( bitFlags % 2 == 1 ) bitFlags -= 1;
         }
         else
         {
           itF->setWhichPixmap("check_clear");
-          // Turn off "all children".
+          // Turn off "all tqchildren".
           if (bitFlags >> 1 == 1) bitFlags -= 2;
         }
 
@@ -127,7 +127,7 @@ int UploadTreeView::checkboxTree( TQListViewItem *it )
     }
   }
 
-  parentWidget()->setCursor(KCursor::arrowCursor());
+  tqparentWidget()->setCursor(KCursor::arrowCursor());
 
   return retVal;
 }
@@ -162,22 +162,22 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it )
   if ( itF )
   {
     if (hadCheckFlags == 2) {
-      // All children exist.
+      // All tqchildren exist.
       itF->setWhichPixmap( "check" );
       itF->setSelected( true );
     }
     else if (hadCheckFlags == 1) {
-      // No children exist.
+      // No tqchildren exist.
       itF->setWhichPixmap( "check_clear" );
       itF->setSelected( false );
     }
     else {
-      // Some children exist.
+      // Some tqchildren exist.
       itF->setWhichPixmap( "check_grey" );
       itF->setSelected( true );
     }
 
-    itF = itF->parentFolder;
+    itF = itF->tqparentFolder;
   }
   else
   {
@@ -191,15 +191,15 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it )
       itFile->setWhichPixmap("check_clear");
       itFile->setSelected(false);
     }
-    itF = itFile->parentFolder;
+    itF = itFile->tqparentFolder;
   }
 
-  //iterate through the item's parents and set the correct checkboxes for them
+  //iterate through the item's tqparents and set the correct checkboxes for them
   while (itF)
   {
     bool hasSelected = false;
     bool allSelected = true;
-    //check if the item has any children's selected
+    //check if the item has any tqchildren's selected
     TQListViewItemIterator iter(itF->firstChild());
     while ( iter.current() && iter.current() != itF->nextSibling())
     {
@@ -227,7 +227,7 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it )
       itF->setWhichPixmap( "check_clear" );
       itF->setSelected( false );
     }
-    itF = itF->parentFolder;
+    itF = itF->tqparentFolder;
   }
 }
 
@@ -253,7 +253,7 @@ UploadTreeFolder* UploadTreeView::findFolder( UploadTreeFolder *it, const TQStri
   return 0;
 }
 
-UploadTreeFolder* UploadTreeView::printTree( UploadTreeFolder *it = 0,const TQString& indent = TQString::null )
+UploadTreeFolder* UploadTreeView::printTree( UploadTreeFolder *it = 0,const TQString& indent = TQString() )
 {
   TQListViewItem *itIter = 0;
   if (it == 0) itIter = firstChild();
@@ -276,7 +276,7 @@ TQListViewItem* UploadTreeView::findItem(const TQString& path )
   TQString item = path;
   UploadTreeFolder *it = 0;
   int i;
-  while ( ( i = item.find('/') ) >= 0 )
+  while ( ( i = item.tqfind('/') ) >= 0 )
   {
     it = findFolder( it, item.left(i) );
     if ( it == 0 )
@@ -306,7 +306,7 @@ UploadTreeFile* UploadTreeView::addItem(const KURL &a_url, const KFileItem& a_fi
   uint col = 0;
   UploadTreeFolder *it = 0;
   KURL u;
-  while ( ( i = item.find('/', col) ) >= 0 )
+  while ( ( i = item.tqfind('/', col) ) >= 0 )
   {
     if ( i!=0 )
     {
diff --git a/quanta/treeviews/uploadtreeview.h b/quanta/treeviews/uploadtreeview.h
index 629f728d..19d487db 100644
--- a/quanta/treeviews/uploadtreeview.h
+++ b/quanta/treeviews/uploadtreeview.h
@@ -31,8 +31,9 @@ class KFileItem;
 
 class UploadTreeView : public KListView {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  UploadTreeView( TQWidget *parent, const char *name=0L );
+  UploadTreeView( TQWidget *tqparent, const char *name=0L );
   ~UploadTreeView();
   UploadTreeFile* addItem( const KURL &a_url, const KFileItem &a_fileItem);
   TQListViewItem* findItem( const TQString& );
diff --git a/quanta/utility/myprocess.h b/quanta/utility/myprocess.h
index a495cdf9..13820fb5 100644
--- a/quanta/utility/myprocess.h
+++ b/quanta/utility/myprocess.h
@@ -21,6 +21,7 @@
 class MyProcess:public KProcess
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     MyProcess();
diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp
index bc3a052f..12eb12c9 100644
--- a/quanta/utility/newstuff.cpp
+++ b/quanta/utility/newstuff.cpp
@@ -29,7 +29,7 @@
 #include "quantacommon.h"
 #include "qextfileinfo.h"
 
-void QNewDTEPStuff::installResource()
+void TQNewDTEPStuff::installResource()
 {
     bool ok = true;
     KTar tar(m_tarName, "application/x-gzip");
@@ -50,64 +50,64 @@ void QNewDTEPStuff::installResource()
     } else
         ok = false;
     if (!ok)
-        KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded DTEP tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("DTEP Installation Error"));
+        KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded DTEP tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("DTEP Installation Error"));
 }
 
-QNewToolbarStuff::QNewToolbarStuff(const TQString &type,  TQWidget *parentWidget)
-  :KNewStuffSecure(type, parentWidget)
+TQNewToolbarStuff::TQNewToolbarStuff(const TQString &type,  TQWidget *tqparentWidget)
+  :KNewStuffSecure(type, tqparentWidget)
 {
-  connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&)));
+  connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), tqparentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&)));
 }
 
 
-void QNewToolbarStuff::installResource()
+void TQNewToolbarStuff::installResource()
 {
     KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "toolbars/" + TQFileInfo(m_tarName).fileName());
     bool ok = true;
-    if (QuantaCommon::checkOverwrite(destURL, parentWidget()))
+    if (QuantaCommon::checkOverwrite(destURL, tqparentWidget()))
     {
-        if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, parentWidget()))
+        if (!TQExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget()))
           ok = false;
         else
         {
-           if (KMessageBox::questionYesNo(parentWidget(), i18n("Do you want to load the newly downloaded toolbar?"), i18n("Load Toolbar"), i18n("Load"), KStdGuiItem::cancel()) == KMessageBox::Yes)
+           if (KMessageBox::questionYesNo(tqparentWidget(), i18n("Do you want to load the newly downloaded toolbar?"), i18n("Load Toolbar"), i18n("Load"), KStdGuiItem::cancel()) == KMessageBox::Yes)
            {
               emit loadToolbarFile(destURL);
            }
         }
         if (!ok)
-            KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded toolbar tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Toolbar Installation Error"));
+            KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded toolbar tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Toolbar Installation Error"));
      }
 }
 
-QNewTemplateStuff::QNewTemplateStuff(const TQString &type,  TQWidget *parentWidget)
-  :KNewStuffSecure(type, parentWidget)
+TQNewTemplateStuff::TQNewTemplateStuff(const TQString &type,  TQWidget *tqparentWidget)
+  :KNewStuffSecure(type, tqparentWidget)
 {
-  connect(this, TQT_SIGNAL(openFile(const KURL&)), parentWidget, TQT_SLOT(slotFileOpen(const KURL&)));
+  connect(this, TQT_SIGNAL(openFile(const KURL&)), tqparentWidget, TQT_SLOT(slotFileOpen(const KURL&)));
 }
 
 
-void QNewTemplateStuff::installResource()
+void TQNewTemplateStuff::installResource()
 {
     KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "templates/" + TQFileInfo(m_tarName).fileName());
     bool ok = true;
-    if (QuantaCommon::checkOverwrite(destURL, parentWidget()))
+    if (QuantaCommon::checkOverwrite(destURL, tqparentWidget()))
     {
-        if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, parentWidget()))
+        if (!TQExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget()))
           ok = false;
         else
         {
-           if (KMessageBox::questionYesNo(parentWidget(), i18n("Do you want to open the newly downloaded template?"), i18n("Open Template"), KStdGuiItem::open(), KStdGuiItem::cancel()) == KMessageBox::Yes)
+           if (KMessageBox::questionYesNo(tqparentWidget(), i18n("Do you want to open the newly downloaded template?"), i18n("Open Template"), KStdGuiItem::open(), KStdGuiItem::cancel()) == KMessageBox::Yes)
            {
               emit openFile(destURL);
            }
         }
         if (!ok)
-            KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded template file."), i18n("Template Installation Error"));
+            KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded template file."), i18n("Template Installation Error"));
      }
 }
 
-void QNewScriptStuff::installResource()
+void TQNewScriptStuff::installResource()
 {
     bool ok = true;
     KTar tar(m_tarName, "application/x-gzip");
@@ -121,10 +121,10 @@ void QNewScriptStuff::installResource()
         ok = false;
 
     if (!ok)
-        KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Script Installation Error"));
+        KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Script Installation Error"));
 }
 
-void QNewDocStuff::installResource()
+void TQNewDocStuff::installResource()
 {
   bool ok = true;
   KTar tar(m_tarName, "application/x-gzip");
@@ -138,7 +138,7 @@ void QNewDocStuff::installResource()
     ok = false;
 
     if (!ok)
-      KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Documentation Installation Error"));
+      KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Documentation Installation Error"));
 }
 
 #include "newstuff.moc"
diff --git a/quanta/utility/newstuff.h b/quanta/utility/newstuff.h
index bdd49a50..e25639a0 100644
--- a/quanta/utility/newstuff.h
+++ b/quanta/utility/newstuff.h
@@ -29,14 +29,15 @@ Makes possible downloading and installing a DTEP resource files from a server.
 
 class KURL;
 
-class QNewDTEPStuff: public KNewStuffSecure
+class TQNewDTEPStuff: public KNewStuffSecure
 {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QNewDTEPStuff(const TQString &type,  TQWidget *parentWidget=0)
-      :KNewStuffSecure(type, parentWidget){};
-    ~QNewDTEPStuff() {};
+    TQNewDTEPStuff(const TQString &type,  TQWidget *tqparentWidget=0)
+      :KNewStuffSecure(type, tqparentWidget){};
+    ~TQNewDTEPStuff() {};
 
 private:
      virtual void installResource();
@@ -47,13 +48,14 @@ Makes possible downloading and installing a Toolbar resource files from a server
 
 @author Andras Mantia
 */
-class QNewToolbarStuff: public KNewStuffSecure
+class TQNewToolbarStuff: public KNewStuffSecure
 {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-  QNewToolbarStuff(const TQString &type,  TQWidget *parentWidget=0);
-  ~QNewToolbarStuff() {};
+  TQNewToolbarStuff(const TQString &type,  TQWidget *tqparentWidget=0);
+  ~TQNewToolbarStuff() {};
   
 signals:
   void loadToolbarFile(const KURL&);       
@@ -67,13 +69,14 @@ Makes possible downloading and installing a template resource files from a serve
 
 @author Andras Mantia
 */
-class QNewTemplateStuff: public KNewStuffSecure
+class TQNewTemplateStuff: public KNewStuffSecure
 {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-  QNewTemplateStuff(const TQString &type,  TQWidget *parentWidget=0);
-  ~QNewTemplateStuff() {};
+  TQNewTemplateStuff(const TQString &type,  TQWidget *tqparentWidget=0);
+  ~TQNewTemplateStuff() {};
 
 signals:
   void openFile(const KURL&);
@@ -87,14 +90,15 @@ Makes possible downloading and installing a script resource files from a server.
 
 @author Andras Mantia
 */
-class QNewScriptStuff: public KNewStuffSecure
+class TQNewScriptStuff: public KNewStuffSecure
 {
    Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QNewScriptStuff(const TQString &type,  TQWidget *parentWidget=0)
-      :KNewStuffSecure(type, parentWidget){};
-    ~QNewScriptStuff() {};
+    TQNewScriptStuff(const TQString &type,  TQWidget *tqparentWidget=0)
+      :KNewStuffSecure(type, tqparentWidget){};
+    ~TQNewScriptStuff() {};
 
 private:
      virtual void installResource();
@@ -105,14 +109,15 @@ Makes possible downloading and installing a documentation resource files from a
 
 @author Andras Mantia
  */
-class QNewDocStuff: public KNewStuffSecure
+class TQNewDocStuff: public KNewStuffSecure
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
-    QNewDocStuff(const TQString &type,  TQWidget *parentWidget=0)
-  :KNewStuffSecure(type, parentWidget){};
-    ~QNewDocStuff() {};
+    TQNewDocStuff(const TQString &type,  TQWidget *tqparentWidget=0)
+  :KNewStuffSecure(type, tqparentWidget){};
+    ~TQNewDocStuff() {};
 
   private:
     virtual void installResource();
diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp
index 3426b83f..7be8fc66 100644
--- a/quanta/utility/qpevents.cpp
+++ b/quanta/utility/qpevents.cpp
@@ -36,8 +36,8 @@
 #include "tagaction.h"
 
 //TODO: Better create a class for each internal event action
-QPEvents::QPEvents(TQObject *parent, const char *name)
- : TQObject(parent, name)
+TQPEvents::TQPEvents(TQObject *tqparent, const char *name)
+ : TQObject(tqparent, name)
 {
    m_eventNames["before_save"] = i18n("Before Document Save");
    m_eventNames["after_save"] = i18n("After Document Save");
@@ -66,17 +66,17 @@ QPEvents::QPEvents(TQObject *parent, const char *name)
 }
 
 
-QPEvents::~QPEvents()
+TQPEvents::~TQPEvents()
 {
 }
 
-void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1, const TQString& argument2)
+void TQPEvents::slotEventHappened(const TQString& name, const TQString& argument1, const TQString& argument2)
 {
   if (!quantaApp || !Project::ref()->eventsEnabled())
     return;
   EventActions *events = Project::ref()->events();
   if (!events) return;
-  if (events->contains(name))
+  if (events->tqcontains(name))
   {
     m_eventName = name;
     TQValueList<EventAction> evList = (*events)[name];
@@ -85,18 +85,18 @@ void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1
       EventAction ev = *it;
       if (ev.type == EventAction::Internal)
       {
-        if (KMessageBox::warningContinueCancel(0L, i18n("<qt>An internal action (<i>%1</i>) associated with an event (<i>%2</i>) will be executed.  Do you want to allow the execution of this action?</qt>").arg(ev.action).arg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about internal actions") == KMessageBox::Cancel)
+        if (KMessageBox::warningContinueCancel(0L, i18n("<qt>An internal action (<i>%1</i>) associated with an event (<i>%2</i>) will be executed.  Do you want to allow the execution of this action?</qt>").tqarg(ev.action).tqarg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about internal actions") == KMessageBox::Cancel)
           return;
       } else
       {
-        if (KMessageBox::warningContinueCancel(0L, i18n("<qt>An external action (<i>%1</i>) associated with an event (<i>%2</i>) will be executed.  Do you want to allow the execution of this action?</qt>").arg(ev.action).arg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about external actions") == KMessageBox::Cancel)
+        if (KMessageBox::warningContinueCancel(0L, i18n("<qt>An external action (<i>%1</i>) associated with an event (<i>%2</i>) will be executed.  Do you want to allow the execution of this action?</qt>").tqarg(ev.action).tqarg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about external actions") == KMessageBox::Cancel)
           return;
       }
       KURL url = KURL::fromPathOrURL(argument1);
       KURL url2 = KURL::fromPathOrURL(argument2);
       if (url.isValid())
       {
-        bool inProject = Project::ref()->contains(url);
+        bool inProject = Project::ref()->tqcontains(url);
         if (inProject)
         {
           if (name == "upload_requested")
@@ -131,7 +131,7 @@ void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1
             }
         } else
         {
-            TQString relativePath = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()).path();
+            TQString relativePath = TQExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()).path();
             if (inProject && name == "after_save")
             {
               ev.arguments << i18n("Document saved");
@@ -220,11 +220,11 @@ void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1
       }
     }
   }
-  if (!m_eventNames.contains(name))
-    KMessageBox::sorry(0L, i18n("<qt>Unsupported event <b>%1</b>.</qt>").arg(name), i18n("Event Handling Error"));
+  if (!m_eventNames.tqcontains(name))
+    KMessageBox::sorry(0L, i18n("<qt>Unsupported event <b>%1</b>.</qt>").tqarg(name), i18n("Event Handling Error"));
 }
 
-bool QPEvents::handleEvent(const EventAction& ev)
+bool TQPEvents::handleEvent(const EventAction& ev)
 {
   if (ev.type == EventAction::Internal)
   {
@@ -294,7 +294,7 @@ bool QPEvents::handleEvent(const EventAction& ev)
         TQTextStream stream(&file);
         stream.setEncoding(TQTextStream::UnicodeUTF8);
         //Note: the log text should not be translated.
-        TQString s = TQDateTime::currentDateTime().toString(Qt::ISODate) + ": ";
+        TQString s = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + ": ";
         s.append( "Event : " + m_eventName + " : ");
         s.append( "Action: " + ev.action + " : ");
         if (ev.arguments[1] == "full")
@@ -309,11 +309,11 @@ bool QPEvents::handleEvent(const EventAction& ev)
       }
       if (!result)
       {
-        KMessageBox::sorry(0L, i18n("<qt>Logging failed. Check that you have write access to <i>%1</i>.").arg(url.path()));
+        KMessageBox::sorry(0L, i18n("<qt>Logging failed. Check that you have write access to <i>%1</i>.").tqarg(url.path()));
         return false;
       }
     } else
-      KMessageBox::sorry(0L, i18n("<qt>Unsupported internal event action : <b>%1</b>.</qt>").arg(ev.action));
+      KMessageBox::sorry(0L, i18n("<qt>Unsupported internal event action : <b>%1</b>.</qt>").tqarg(ev.action));
   } else
   if (ev.type == EventAction::External)
   {
@@ -336,7 +336,7 @@ bool QPEvents::handleEvent(const EventAction& ev)
           {
             action->activate();
           } else
-            KMessageBox::sorry(0L, i18n("<qt>The <b>%1</b> script action was not found on your system.</qt>").arg(name), i18n("Action Execution Error"));
+            KMessageBox::sorry(0L, i18n("<qt>The <b>%1</b> script action was not found on your system.</qt>").tqarg(name), i18n("Action Execution Error"));
       }  else
       KMessageBox::sorry(0L, i18n("Unsupported external event action."));
   } else
@@ -344,23 +344,23 @@ bool QPEvents::handleEvent(const EventAction& ev)
   return false;
 }
 
-TQString QPEvents::fullEventName(const TQString &name)
+TQString TQPEvents::fullEventName(const TQString &name)
 {
-   if (m_eventNames.contains(name))
+   if (m_eventNames.tqcontains(name))
      return m_eventNames[name];
    else
      return name;
 }
 
-TQString QPEvents::fullActionName(const TQString& name)
+TQString TQPEvents::fullActionName(const TQString& name)
 {
-   if (m_actionNames.contains(name))
+   if (m_actionNames.tqcontains(name))
      return m_actionNames[name];
    else
      return name;
 }
 
-TQString QPEvents::eventName(const TQString &fullName)
+TQString TQPEvents::eventName(const TQString &fullName)
 {
    for (TQMap<TQString, TQString>::ConstIterator it = m_eventNames.constBegin(); it != m_eventNames.constEnd(); ++it)
   {
@@ -370,7 +370,7 @@ TQString QPEvents::eventName(const TQString &fullName)
   return fullName;
 }
 
-TQString QPEvents::actionName(const TQString &fullName)
+TQString TQPEvents::actionName(const TQString &fullName)
 {
    for (TQMap<TQString, TQString>::ConstIterator it = m_actionNames.constBegin(); it != m_actionNames.constEnd(); ++it)
   {
@@ -380,7 +380,7 @@ TQString QPEvents::actionName(const TQString &fullName)
   return fullName;
 }
 
-TQStringList QPEvents::eventNames()
+TQStringList TQPEvents::eventNames()
 {
    TQStringList names;
    for (TQMap<TQString, TQString>::ConstIterator it = m_eventNames.constBegin(); it != m_eventNames.constEnd(); ++it)
@@ -390,7 +390,7 @@ TQStringList QPEvents::eventNames()
   return names;
 }
 
-TQStringList QPEvents::actionNames()
+TQStringList TQPEvents::actionNames()
 {
    TQStringList names;
    for (TQMap<TQString, TQString>::ConstIterator it = m_actionNames.constBegin(); it != m_actionNames.constEnd(); ++it)
diff --git a/quanta/utility/qpevents.h b/quanta/utility/qpevents.h
index 373ae089..31c05235 100644
--- a/quanta/utility/qpevents.h
+++ b/quanta/utility/qpevents.h
@@ -14,8 +14,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QPEVENTS_H
-#define QPEVENTS_H
+#ifndef TQPEVENTS_H
+#define TQPEVENTS_H
 
 #include <tqobject.h>
 
@@ -50,17 +50,18 @@ after_project_remove, after_commit
 */
 typedef  TQMap<TQString, TQValueList<EventAction> > EventActions;
 
-class QPEvents : public QObject
+class TQPEvents : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    static QPEvents* const ref(TQObject *parent = 0L)
+    static TQPEvents* const ref(TQObject *tqparent = 0L)
     {
-      static QPEvents *m_ref;
-      if (!m_ref) m_ref = new QPEvents(parent);
+      static TQPEvents *m_ref;
+      if (!m_ref) m_ref = new TQPEvents(tqparent);
       return m_ref;
     }
-    ~QPEvents();
+    ~TQPEvents();
     TQString fullEventName(const TQString &name);
     TQString fullActionName(const TQString &name);
     TQString eventName(const TQString &fullName);
@@ -73,7 +74,7 @@ public slots:
    void slotEventHappened(const TQString& name, const TQString& argument1, const TQString& argument2);
 
 private:
-    QPEvents(TQObject *parent = 0, const char *name = 0);
+    TQPEvents(TQObject *tqparent = 0, const char *name = 0);
   /** Calls the action associated with an event. Returns true if the call succeeded, false
   otherwise. The call might fail if:
     - the action type is unknown
diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp
index 12ba69c5..9b91220d 100644
--- a/quanta/utility/quantabookmarks.cpp
+++ b/quanta/utility/quantabookmarks.cpp
@@ -61,12 +61,12 @@ static void ssort( TQMemArray<uint> &a, int max )
 
 // TODO add a insort() or bubble_sort - more efficient for aboutToShow() ?
 
-QuantaBookmarks::QuantaBookmarks(ViewManager *parent,Sorting sort, bool onlyFromActualDocument )
-  : TQObject( parent, "bookmarks" )
+QuantaBookmarks::QuantaBookmarks(ViewManager *tqparent,Sorting sort, bool onlyFromActualDocument )
+  : TQObject( tqparent, "bookmarks" )
   , m_sorting(sort)
   , m_onlyFromActualDocument(onlyFromActualDocument)
 {
-  m_viewManager = parent;
+  m_viewManager = tqparent;
   _tries=0;
   m_bookmarksMenu = 0L;
   m_doc = 0L;
@@ -182,21 +182,21 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse
         TQString bText = KStringHandler::rEmSqueeze
             ( doc->editIf->textLine( (*it)->line ),
                           menu.fontMetrics(), 32 );
-        bText.replace(re, "&&"); // kill undesired accellerators!
-        bText.replace('\t', ' '); // kill tabs, as they are interpreted as shortcuts
+        bText.tqreplace(re, "&&"); // kill undesired accellerators!
+        bText.tqreplace('\t', ' '); // kill tabs, as they are interpreted as shortcuts
           
         if ( m_sorting == Position )
         {
           sortArray[i] = (*it)->line;
           ssort( sortArray, i );
-          idx = sortArray.find( (*it)->line );
+          idx = sortArray.tqfind( (*it)->line );
           if (insertNavigationItems)
             idx += 3;
           i++;
         }
   
         menu.insertItem(
-            TQString("%1 - \"%2\"").arg( (*it)->line+1 ).arg( bText ),
+            TQString("%1 - \"%2\"").tqarg( (*it)->line+1 ).tqarg( bText ),
              0, (*it)->line, idx );
         insertedItems++;
   
@@ -219,15 +219,15 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse
       idx = ++old_menu_count;
       if ( next )
       {
-        m_goNext->setText( i18n("&Next: %1 - \"%2\"").arg( next->line + 1 )
-            .arg( KStringHandler::rsqueeze( doc->editIf->textLine( next->line ), 24 ) ) );
+        m_goNext->setText( i18n("&Next: %1 - \"%2\"").tqarg( next->line + 1 )
+            .tqarg( KStringHandler::rsqueeze( doc->editIf->textLine( next->line ), 24 ) ) );
         m_goNext->plug( &menu, idx );
         idx++;
       }
       if ( prev )
       {
-        m_goPrevious->setText( i18n("&Previous: %1 - \"%2\"").arg(prev->line + 1 )
-            .arg( KStringHandler::rsqueeze( doc->editIf->textLine( prev->line ), 24 ) ) );
+        m_goPrevious->setText( i18n("&Previous: %1 - \"%2\"").tqarg(prev->line + 1 )
+            .tqarg( KStringHandler::rsqueeze( doc->editIf->textLine( prev->line ), 24 ) ) );
         m_goPrevious->plug( &menu, idx );
         idx++;
       }
@@ -361,10 +361,10 @@ void QuantaBookmarks::gotoLineNumber(int line)
   Document *doc = m_doc;
   if (!doc)
     doc = m_viewManager->activeDocument();
-  const TQObject *s = sender();
+  TQObject *s = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
   for (uint i = 0; i < m_othersMenuList.count(); i++)
   {
-    if (s == m_othersMenuList[i])
+    if (TQT_BASE_OBJECT(s) == TQT_BASE_OBJECT(m_othersMenuList[i]))
     {
       doc = m_others[i];
       break;
@@ -396,4 +396,4 @@ void QuantaBookmarks::marksChanged ()
 
 #include "quantabookmarks.moc"
 
-// kate: space-indent on; indent-width 2; replace-tabs on;
+// kate: space-indent on; indent-width 2; tqreplace-tabs on;
diff --git a/quanta/utility/quantabookmarks.h b/quanta/utility/quantabookmarks.h
index 440f4fea..7dac33d5 100644
--- a/quanta/utility/quantabookmarks.h
+++ b/quanta/utility/quantabookmarks.h
@@ -40,13 +40,14 @@ class TQMenuData;
 
 
 
-class QuantaBookmarks : public QObject
+class QuantaBookmarks : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum Sorting { Position, Creation };
-    QuantaBookmarks(ViewManager *parent, Sorting sort=Position, bool onlyFromActualDocument = false );
+    QuantaBookmarks(ViewManager *tqparent, Sorting sort=Position, bool onlyFromActualDocument = false );
     virtual ~QuantaBookmarks();
 
     void createActions( KActionCollection* );
@@ -95,5 +96,5 @@ class QuantaBookmarks : public QObject
 
 #endif
 
-// kate: space-indent on; indent-width 2; replace-tabs on;
+// kate: space-indent on; indent-width 2; tqreplace-tabs on;
 // vim: noet ts=2
diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp
index 93421764..6b709ca3 100644
--- a/quanta/utility/quantacommon.cpp
+++ b/quanta/utility/quantacommon.cpp
@@ -41,7 +41,7 @@
 #include <ktempdir.h>
 #include <ktempfile.h>
 
-//remove the below ones when KQPasteAction is removed
+//remove the below ones when KTQPasteAction is removed
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kpopupmenu.h>
@@ -60,7 +60,7 @@
 //#include "resource.h"
 
 
-QConfig qConfig; //holds the main configuration settings
+TQConfig qConfig; //holds the main configuration settings
 TQString tmpDir;
 
 TQRegExp scriptBeginRx;
@@ -144,11 +144,11 @@ bool QuantaCommon::isSingleTag(const TQString& dtdName, const TQString& tag)
   if(tag.lower() == "!doctype" || tag.lower() == "?xml")
     return true;
 
-  const DTDStruct* dtd = DTDs::ref()->find(dtdName);
+  const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName);
   if (dtd && !tag.isEmpty())
   {
     TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper();
-    QTag* qtag = dtd->tagsList->find(searchForTag);
+    TQTag* qtag = dtd->tagsList->tqfind(searchForTag);
     if (qtag)
         single = qtag->isSingle();
   }
@@ -161,11 +161,11 @@ bool QuantaCommon::isOptionalTag(const TQString& dtdName, const TQString& tag)
 {
   bool optional = false;
 
-  const DTDStruct* dtd = DTDs::ref()->find(dtdName);
+  const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName);
   if (dtd && !tag.isEmpty())
   {
     TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper();
-    QTag* qtag = dtd->tagsList->find(searchForTag);
+    TQTag* qtag = dtd->tagsList->tqfind(searchForTag);
     if (qtag)
         optional = qtag->isOptional();
   }
@@ -177,11 +177,11 @@ bool QuantaCommon::isKnownTag(const TQString& dtdName, const TQString& tag)
 {
   bool known = false;
 
-  const DTDStruct* dtd = DTDs::ref()->find(dtdName);
+  const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName);
   if (dtd && !tag.isEmpty())
   {
     TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper();
-    if (dtd->tagsList->find(searchForTag))
+    if (dtd->tagsList->tqfind(searchForTag))
         known = true;
   }
 
@@ -192,11 +192,11 @@ AttributeList* QuantaCommon::tagAttributes(const TQString& dtdName, const TQStri
 {
   AttributeList* attrs = 0L;
 
-  const DTDStruct* dtd = DTDs::ref()->find(dtdName);
+  const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName);
   if (dtd && !tag.isEmpty())
   {
     TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper();
-    QTag* qtag = dtd->tagsList->find(searchForTag);
+    TQTag* qtag = dtd->tagsList->tqfind(searchForTag);
     if (qtag)
         attrs = qtag->attributes();
   }
@@ -204,28 +204,28 @@ AttributeList* QuantaCommon::tagAttributes(const TQString& dtdName, const TQStri
   return attrs;
 }
 
-/** Returns the QTag object for the tag "tag" from the DTD named "dtdname". */
-QTag* QuantaCommon::tagFromDTD(const TQString& dtdName, const TQString& tag)
+/** Returns the TQTag object for the tag "tag" from the DTD named "dtdname". */
+TQTag* QuantaCommon::tagFromDTD(const TQString& dtdName, const TQString& tag)
 {
-  const DTDStruct* dtd = DTDs::ref()->find(dtdName);
+  const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName);
   return tagFromDTD(dtd, tag);
 }
 
-/** Returns the QTag object for the tag "tag" from the DTD. */
-QTag* QuantaCommon::tagFromDTD(const DTDStruct *dtd, const TQString& tag)
+/** Returns the TQTag object for the tag "tag" from the DTD. */
+TQTag* QuantaCommon::tagFromDTD(const DTDStruct *dtd, const TQString& tag)
 {
-  QTag *qtag = 0;
+  TQTag *qtag = 0;
   if (dtd && !tag.isEmpty())
   {
     TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper();
-    qtag = dtd->tagsList->find(searchForTag);
+    qtag = dtd->tagsList->tqfind(searchForTag);
   }
 
  return qtag;
 }
 
-/** Returns the QTag object for the node "node" from node's DTD. */
-QTag* QuantaCommon::tagFromDTD(Node *node)
+/** Returns the TQTag object for the node "node" from node's DTD. */
+TQTag* QuantaCommon::tagFromDTD(Node *node)
 {
   if(!node || !node->tag)
     return 0L;
@@ -311,7 +311,7 @@ bool QuantaCommon::checkMimeGroup(const KURL& url, const TQString& group)
  mimetype = mimetype.section('/',-1);
  for ( it = list.begin(); it != list.end(); ++it )
  {
-    if ( ((*it)->name().contains(group)) && ((*it)->name().find(mimetype) != -1)
+    if ( ((*it)->name().tqcontains(group)) && ((*it)->name().tqfind(mimetype) != -1)
 )    {
       status = true;
       break;
@@ -381,9 +381,9 @@ TQString QuantaCommon::qUrl(const KURL &url)
 /** No descriptions */
 void QuantaCommon::dirCreationError(TQWidget *widget, const KURL& url)
 {
-  KMessageBox::error(widget, i18n("<qt>Cannot create folder<br><b>%1</b>.<br>Check that you have write permission in the parent folder or that the connection to<br><b>%2</b><br> is valid.</qt>")
-                             .arg(url.prettyURL(0, KURL::StripFileProtocol))
-                             .arg(url.protocol()+"://"+url.user()+"@"+url.host()));}
+  KMessageBox::error(widget, i18n("<qt>Cannot create folder<br><b>%1</b>.<br>Check that you have write permission in the tqparent folder or that the connection to<br><b>%2</b><br> is valid.</qt>")
+                             .tqarg(url.prettyURL(0, KURL::StripFileProtocol))
+                             .tqarg(url.protocol()+"://"+url.user()+"@"+url.host()));}
 
 /**
 Adds the backslash before the special chars (like ?, *, . ) so the returned
@@ -410,7 +410,7 @@ TQString QuantaCommon::makeRxCompatible(const TQString& s)
   TQString str = s;
   for (uint i = 0; i < max - 1; i++)
   {
-    str.replace(rxs[i], strs[i]);
+    str.tqreplace(rxs[i], strs[i]);
   }
 
   return str;
@@ -488,7 +488,7 @@ void QuantaCommon::removeCommentsAndQuotes(TQString &str, const DTDStruct *dtd)
      } else
      {
        s = dtd->comments[s];
-       l = str.find(s, pos);
+       l = str.tqfind(s, pos);
        l = (l == -1) ? str.length() : l;
        for (int i = pos; i < l ; i++)
        {
@@ -554,7 +554,7 @@ bool QuantaCommon::insideCommentsOrQuotes(int position, const TQString &string,
      } else
      {
        s = dtd->comments[s];
-       l = str.find(s, pos);
+       l = str.tqfind(s, pos);
        l = (l == -1) ? str.length() : l;
        for (int i = pos; i < l ; i++)
        {
@@ -596,7 +596,7 @@ DCOPReply QuantaCommon::callDCOPMethod(const TQString& interface, const TQString
   if (!kapp->inherits("KUniqueApplication"))
   {
     pid_t pid = ::getpid();
-    app += TQString("-%1").arg(pid);
+    app += TQString("-%1").tqarg(pid);
   }
   DCOPRef quantaRef(app.utf8(), interface.utf8());
   DCOPReply reply;
@@ -633,12 +633,12 @@ void QuantaCommon::normalizeStructure(TQString f,TQStringList& l)
  f.remove("\n");
  f.remove("\r");
 
- while(f.contains("<"))
+ while(f.tqcontains("<"))
   {
      TQString z(f);
-     z.truncate(z.find(">")+1);
-     z.remove(0,z.find("<"));
-     f.remove(0,f.find(">")+1);
+     z.truncate(z.tqfind(">")+1);
+     z.remove(0,z.tqfind("<"));
+     f.remove(0,f.tqfind(">")+1);
      l.append(z);
   }
 }
@@ -704,10 +704,10 @@ bool QuantaCommon::checkOverwrite(const KURL& url, TQWidget *window)
 {
   bool result = true;
 
-  if (QExtFileInfo::exists(url, false, window))
+  if (TQExtFileInfo::exists(url, false, window))
   {
     if (KMessageBox::warningContinueCancel(window,
-            i18n( "<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>" ).arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString::null, i18n("Overwrite")) == KMessageBox::Cancel)
+            i18n( "<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>" ).tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), i18n("Overwrite")) == KMessageBox::Cancel)
             result = false;
   }
 
@@ -723,7 +723,7 @@ TQStringList QuantaCommon::readPathListEntry(KConfig *config, const TQString &pK
     KURL u = KURL::fromPathOrURL(*it);
     if (u.isValid() && u.isLocalFile())
     {
-      u.setPath(QExtFileInfo::canonicalPath(u.path()));
+      u.setPath(TQExtFileInfo::canonicalPath(u.path()));
       *it = u.url();
     }
   }
@@ -736,7 +736,7 @@ TQString QuantaCommon::readPathEntry(KConfig *config, const TQString &pKey)
   KURL u = KURL::fromPathOrURL(path);
   if (u.isValid() && u.isLocalFile())
   {
-    u.setPath(QExtFileInfo::canonicalPath(u.path()));
+    u.setPath(TQExtFileInfo::canonicalPath(u.path()));
     path = u.url();
   }
   return path;
@@ -745,9 +745,9 @@ TQString QuantaCommon::readPathEntry(KConfig *config, const TQString &pKey)
 TQString QuantaCommon::encodedChar(uint code)
 {
    
-  if (replacementMap.contains(code))
-    return TQString("%1;").arg(replacementMap[code]);
+  if (replacementMap.tqcontains(code))
+    return TQString("%1;").tqarg(replacementMap[code]);
   else
-    return TQString("&#%1;").arg(code);
+    return TQString("&#%1;").tqarg(code);
 }
 
diff --git a/quanta/utility/quantacommon.h b/quanta/utility/quantacommon.h
index 915de6fb..61c86f9e 100644
--- a/quanta/utility/quantacommon.h
+++ b/quanta/utility/quantacommon.h
@@ -48,7 +48,7 @@ public:
 
 
 //Quanta main configuration structure
-class QConfig{
+class TQConfig{
 public:
           //Tag style options
           uint tagCase;
@@ -137,12 +137,12 @@ quotation setting*/
   static bool isKnownTag(const TQString& dtdName, const TQString& tag);
   /** No descriptions */
   static AttributeList* tagAttributes(const TQString& dtdName, const TQString& tag);
-  /** Returns the QTag object for the tag "tag" from the DTD named "dtdname". */
-  static QTag* tagFromDTD(const TQString& dtdName, const TQString& tag);
-  /** Returns the QTag object for the tag "tag" from the DTD. */
-  static QTag* tagFromDTD(const DTDStruct* dtd, const TQString& tag);
-  /** Returns the QTag object for the node "node" from node's DTD. */
-  static QTag* tagFromDTD(Node *node);
+  /** Returns the TQTag object for the tag "tag" from the DTD named "dtdname". */
+  static TQTag* tagFromDTD(const TQString& dtdName, const TQString& tag);
+  /** Returns the TQTag object for the tag "tag" from the DTD. */
+  static TQTag* tagFromDTD(const DTDStruct* dtd, const TQString& tag);
+  /** Returns the TQTag object for the node "node" from node's DTD. */
+  static TQTag* tagFromDTD(Node *node);
   /** Returns an XML style string containing the GUI for attributes. */
   static TQString xmlFromAttributes(AttributeList* attributes);
   /** Returns 0 if the (line,col) is inside the area specified by the other arguments,
diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp
index dbaf1ce3..93c664e3 100644
--- a/quanta/utility/quantanetaccess.cpp
+++ b/quanta/utility/quantanetaccess.cpp
@@ -176,13 +176,13 @@ void QuantaNetAccess::checkProjectInsert(const KURL& target, TQWidget* window, b
   if ( !Project::ref()->hasProject()) return;
   KURL saveUrl = adjustURL(target);
   KURL baseURL = Project::ref()->projectBaseURL();
-  if ( baseURL.isParentOf(saveUrl) && !Project::ref()->contains(saveUrl) )
+  if ( baseURL.isParentOf(saveUrl) && !Project::ref()->tqcontains(saveUrl) )
   {
     if (confirm)
     {
-      TQString nice = QExtFileInfo::toRelative(saveUrl, baseURL).path();
+      TQString nice = TQExtFileInfo::toRelative(saveUrl, baseURL).path();
       nice = KStringHandler::lsqueeze(nice, 60);
-      if ( KMessageBox::Yes != KMessageBox::questionYesNo(window, i18n("<qt>Do you want to add <br><b>%1</b><br> to the project?</qt>").arg(nice), i18n("Add to Project"), KStdGuiItem::add(), i18n("Do Not Add"), "AddToProject") )
+      if ( KMessageBox::Yes != KMessageBox::questionYesNo(window, i18n("<qt>Do you want to add <br><b>%1</b><br> to the project?</qt>").tqarg(nice), i18n("Add to Project"), KStdGuiItem::add(), i18n("Do Not Add"), "AddToProject") )
       {
         return;
       }
@@ -201,13 +201,13 @@ bool QuantaNetAccess::checkProjectRemove(const KURL& src, TQWidget* window, bool
   if ( !Project::ref()->hasProject() ) return true;
   KURL url = adjustURL(src);
   KURL baseURL = Project::ref()->projectBaseURL();
-  if ( baseURL.isParentOf(url) && Project::ref()->contains(url) )
+  if ( baseURL.isParentOf(url) && Project::ref()->tqcontains(url) )
   {
     if (confirm)
     {
-      TQString nice = QExtFileInfo::toRelative(url, baseURL).path();
+      TQString nice = TQExtFileInfo::toRelative(url, baseURL).path();
       nice = KStringHandler::lsqueeze(nice, 60);
-      if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").arg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") )
+      if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").tqarg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") )
       {
         return false;
       }
@@ -224,13 +224,13 @@ bool QuantaNetAccess::checkProjectDel(const KURL& src, TQWidget* window, bool co
   KURL url = adjustURL(src);
   if ( Project::ref()->hasProject() )
   {
-    if ( Project::ref()->projectBaseURL().isParentOf(url) && Project::ref()->contains(url) )
+    if ( Project::ref()->projectBaseURL().isParentOf(url) && Project::ref()->tqcontains(url) )
     {
       if (confirm)
       {
         TQString nice = url.prettyURL(0, KURL::StripFileProtocol);
         nice = KStringHandler::csqueeze(nice, 60);
-        if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to delete <br><b>%1</b><br> and remove it from the project?</qt>").arg(nice), i18n("Delete & Remove From Project"), KStdGuiItem::del(), "DeleteAndRemoveFromProject") )
+        if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to delete <br><b>%1</b><br> and remove it from the project?</qt>").tqarg(nice), i18n("Delete & Remove From Project"), KStdGuiItem::del(), "DeleteAndRemoveFromProject") )
         {
           return false;
         }
@@ -243,7 +243,7 @@ bool QuantaNetAccess::checkProjectDel(const KURL& src, TQWidget* window, bool co
   if (confirm) {
     TQString nice = url.prettyURL(0, KURL::StripFileProtocol);
     nice = KStringHandler::csqueeze(nice, 60);
-    return (KMessageBox::Continue == KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to delete <br><b>%1</b>?</qt>").arg(nice), i18n("Delete File or Folder"), KStdGuiItem::del(), "DeleteFileOrFolder") );
+    return (KMessageBox::Continue == KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to delete <br><b>%1</b>?</qt>").tqarg(nice), i18n("Delete File or Folder"), KStdGuiItem::del(), "DeleteFileOrFolder") );
   }
   return true;
 }
diff --git a/quanta/utility/resource.h b/quanta/utility/resource.h
index 6e7bf950..8bb344d3 100644
--- a/quanta/utility/resource.h
+++ b/quanta/utility/resource.h
@@ -28,11 +28,11 @@ class KTempDir;
 
 class Node;
 class Parser;
-struct QConfig;
+struct TQConfig;
 struct DTDStruct;
 
 
-extern QConfig qConfig;
+extern TQConfig qConfig;
 extern TQString tmpDir;
 
 extern TQRegExp scriptBeginRx;
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index 9787d047..33bf5313 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -72,14 +72,14 @@ int MyProcess::commSetupDoneC()
   return KProcess::commSetupDoneC();
 }
 
-TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool toggle)
+TagAction::TagAction( TQDomElement *element, KMainWindow *tqparentMainWindow, bool toggle)
     : KToggleAction(element->attribute("text").isEmpty() ? TQString("") : i18n(element->attribute("text").utf8()), 
-                    KShortcut(element->attribute("shortcut")), 0, 0, parentMainWindow->actionCollection(), element->attribute("name").ascii()),
+                    KShortcut(element->attribute("shortcut")), 0, 0, tqparentMainWindow->actionCollection(), element->attribute("name").ascii()),
  //disable toggle now m_toggle(toggle)
   m_toggle(false)
 {
   setToolTip(element->attribute("tooltip"));
-  m_parentMainWindow = parentMainWindow;
+  m_parentMainWindow = tqparentMainWindow;
   m_modified = false;
   m_useInputFile = false;
   m_useOutputFile = false;
@@ -93,8 +93,8 @@ TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool
   m_file = 0L;
   loopStarted = false;
 #if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
-  connect(this, TQT_SIGNAL(activated(KAction::ActivationReason, Qt::ButtonState)), 
-          TQT_SLOT(slotActionActivated(KAction::ActivationReason, Qt::ButtonState)));
+  connect(this, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), 
+          TQT_SLOT(slotActionActivated(KAction::ActivationReason, TQt::ButtonState)));
 #else
   connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActionActivated()));
 #endif
@@ -114,7 +114,7 @@ TQString TagAction::type()
 }
 
 #if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
-bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::ButtonState /*state*/)
+bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::ButtonState /*state*/)
 {
     QuantaView *view = ViewManager::ref()->activeView();
     if ( !view || !view->document())
@@ -162,7 +162,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button
               start_node = end_node = current_node;
               start_offset = end_offset = current_offset;
   
-              QTag* tag_description = QuantaCommon::tagFromDTD(KafkaDocument::ref()->getCurrentDoc()->defaultDTD(), XMLTagName());
+              TQTag* tag_description = QuantaCommon::tagFromDTD(KafkaDocument::ref()->getCurrentDoc()->defaultDTD(), XMLTagName());
               scope = tag_description->scope();
   //             Q_ASSERT(!scope.isNull());
               if(scope.isNull())
@@ -281,7 +281,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button
                 s1 += " "+QuantaCommon::attrCase(attr);
             if (otag.text().right(1) == ">")
             {
-                QTag *dtdTag = QuantaCommon::tagFromDTD(w->defaultDTD(), name);
+                TQTag *dtdTag = QuantaCommon::tagFromDTD(w->defaultDTD(), name);
                 if ( w->defaultDTD()->singleTagStyle == "xml" && dtdTag &&
                      (dtdTag->isSingle() || (!qConfig.closeOptionalTags && dtdTag->isOptional()))
                    )
@@ -332,16 +332,16 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button
                 TQString fname = w->url().url();
                 if ( w->url().protocol() == "file")
                     fname = w->url().path();
-                command.replace("%f", fname );
+                command.tqreplace("%f", fname );
             }
 
             pid_t pid = ::getpid();
             if (kapp->inherits("KUniqueApplication"))
             {
-                command.replace("%pid", TQString("unique %1").arg(pid));
+                command.tqreplace("%pid", TQString("unique %1").tqarg(pid));
             } else
             {
-                command.replace("%pid", TQString("%1").arg(pid));
+                command.tqreplace("%pid", TQString("%1").tqarg(pid));
             }
             TQString buffer;
             TQString inputType = script.attribute("input","none");
@@ -352,9 +352,9 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button
                 if ( inputType == "selected" && w->selectionIf) {
                     buffer = w->selectionIf->selection();
                 }
-                command.replace("%input", buffer);
+                command.tqreplace("%input", buffer);
                 command = command.stripWhiteSpace();
-                int pos = command.find(' ');
+                int pos = command.tqfind(' ');
                 TQString args;
                 if (pos != -1)
                 {
@@ -374,46 +374,46 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button
                     pos = 0;
                     while (pos != -1 )
                     {
-                        pos = args.find("%scriptdir");
+                        pos = args.tqfind("%scriptdir");
                         TQString scriptname;
                         if (pos != -1)
                         {
-                            int begin = args.findRev('"', pos);
+                            int begin = args.tqfindRev('"', pos);
                             int end = -1;
                             if (begin == -1)
                             {
-                                begin = args.findRev('\'', pos);
+                                begin = args.tqfindRev('\'', pos);
                                 if (begin != -1)
-                                    end = args.find('\'', pos);
+                                    end = args.tqfind('\'', pos);
                             }  else
                             {
-                                end = args.find('"', pos);
+                                end = args.tqfind('"', pos);
                             }
                             if (begin == -1 || end != -1)
                             {
-                                begin = args.findRev(' ', pos);
+                                begin = args.tqfindRev(' ', pos);
                                 if (begin == -1)
                                     begin = 0;
-                                end = args.find(' ', pos);
+                                end = args.tqfind(' ', pos);
                                 if (end == -1)
                                     end = args.length();
                             }
                             scriptname = args.mid(begin, end - begin).stripWhiteSpace();
-                            scriptname.replace("%scriptdir","scripts");
+                            scriptname.tqreplace("%scriptdir","scripts");
    //       kdDebug(24000) << "Script name is: |" << scriptname << "|" << endl;
                             scriptname = " " + locate("appdata", scriptname);
    //       kdDebug(24000) << "Script found at: " << scriptname << endl;
-                            args.replace(begin, end - begin, scriptname);
+                            args.tqreplace(begin, end - begin, scriptname);
    //       kdDebug(24000) << "Modified argument list: " << args << endl;
                         }
                     }
-                    int pos = args.find("%projectbase");
+                    int pos = args.tqfind("%projectbase");
                     if (pos != -1)
                     {
                         TQString s;
                         if (Project::ref()->hasProject())
                             s = Project::ref()->projectBaseURL().url();
-                        args.replace("%projectbase", s);
+                        args.tqreplace("%projectbase", s);
                     }
                     TQStringList argsList1 = TQStringList::split(' ', args);
                     TQStringList argsList;
@@ -461,7 +461,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button
                 if (proc->start(KProcess::NotifyOnExit, KProcess::All))
                 {
                     emit clearMessages();
-                    emit showMessage(i18n("The \"%1\" script started.\n").arg(actionText()), false);
+                    emit showMessage(i18n("The \"%1\" script started.\n").tqarg(actionText()), false);
                     if (!m_useInputFile)
                     {
                         if ( inputType == "current" || inputType == "selected" )
@@ -472,11 +472,11 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button
                     proc->closeStdin();
                 } else
                 {
-                    KMessageBox::error(m_parentMainWindow, i18n("<qt>There was an error running <b>%1</b>.<br>Check that you have the <i>%2</i> executable installed and it is accessible.</qt>").arg(command + " " + args).arg(command), i18n("Script Not Found"));
+                    KMessageBox::error(m_parentMainWindow, i18n("<qt>There was an error running <b>%1</b>.<br>Check that you have the <i>%2</i> executable installed and it is accessible.</qt>").tqarg(command + " " + args).tqarg(command), i18n("Script Not Found"));
                     ViewManager::ref()->activeView()->setFocus();
                     if (loopStarted)
                     {
-                        qApp->exit_loop();
+                        tqApp->exit_loop();
                         loopStarted = false;
                     }
                     return false;
@@ -486,9 +486,9 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button
     return true;
 }
 #else
- // hack to compile. moc doesn't check the "#ifdef" at the declaration and the compiler complains 
+ // hack to compile. tqmoc doesn't check the "#ifdef" at the declaration and the compiler complains 
  // of no matching function.
-bool TagAction::slotActionActivated(KAction::ActivationReason /*reason*/, Qt::ButtonState /*state*/)
+bool TagAction::slotActionActivated(KAction::ActivationReason /*reason*/, TQt::ButtonState /*state*/)
 {return true;}
 #endif
 
@@ -535,7 +535,7 @@ bool TagAction::slotActionActivated()
           s1 += " "+QuantaCommon::attrCase(attr);
        if (otag.text().right(1) == ">")
        {
-         QTag *dtdTag = QuantaCommon::tagFromDTD(w->defaultDTD(), name);
+         TQTag *dtdTag = QuantaCommon::tagFromDTD(w->defaultDTD(), name);
          if ( w->defaultDTD()->singleTagStyle == "xml" && dtdTag &&
               (dtdTag->isSingle() || (!qConfig.closeOptionalTags && dtdTag->isOptional()))
             )
@@ -586,16 +586,16 @@ bool TagAction::slotActionActivated()
       TQString fname = w->url().url();
       if ( w->url().protocol() == "file")
         fname = w->url().path();
-      command.replace("%f", fname );
+      command.tqreplace("%f", fname );
     }
 
     pid_t pid = ::getpid();
     if (kapp->inherits("KUniqueApplication"))
     {
-      command.replace("%pid", TQString("unique %1").arg(pid));
+      command.tqreplace("%pid", TQString("unique %1").tqarg(pid));
     } else
     {
-      command.replace("%pid", TQString("%1").arg(pid));
+      command.tqreplace("%pid", TQString("%1").tqarg(pid));
     }
     TQString buffer;
     TQString inputType = script.attribute("input","none");
@@ -606,9 +606,9 @@ bool TagAction::slotActionActivated()
     if ( inputType == "selected" && w->selectionIf) {
       buffer = w->selectionIf->selection();
     }
-    command.replace("%input", buffer);
+    command.tqreplace("%input", buffer);
     command = command.stripWhiteSpace();
-    int pos = command.find(' ');
+    int pos = command.tqfind(' ');
     TQString args;
     if (pos != -1)
     {
@@ -628,46 +628,46 @@ bool TagAction::slotActionActivated()
       pos = 0;
       while (pos != -1 )
       {
-        pos = args.find("%scriptdir");
+        pos = args.tqfind("%scriptdir");
         TQString scriptname;
         if (pos != -1)
         {
-          int begin = args.findRev('"', pos);
+          int begin = args.tqfindRev('"', pos);
           int end = -1;
           if (begin == -1)
           {
-            begin = args.findRev('\'', pos);
+            begin = args.tqfindRev('\'', pos);
             if (begin != -1)
-                end = args.find('\'', pos);
+                end = args.tqfind('\'', pos);
           }  else
           {
-            end = args.find('"', pos);
+            end = args.tqfind('"', pos);
           }
           if (begin == -1 || end != -1)
           {
-            begin = args.findRev(' ', pos);
+            begin = args.tqfindRev(' ', pos);
             if (begin == -1)
                 begin = 0;
-            end = args.find(' ', pos);
+            end = args.tqfind(' ', pos);
             if (end == -1)
                 end = args.length();
           }
           scriptname = args.mid(begin, end - begin).stripWhiteSpace();
-          scriptname.replace("%scriptdir","scripts");
+          scriptname.tqreplace("%scriptdir","scripts");
    //       kdDebug(24000) << "Script name is: |" << scriptname << "|" << endl;
           scriptname = " " + locate("appdata", scriptname);
    //       kdDebug(24000) << "Script found at: " << scriptname << endl;
-          args.replace(begin, end - begin, scriptname);
+          args.tqreplace(begin, end - begin, scriptname);
    //       kdDebug(24000) << "Modified argument list: " << args << endl;
         }
       }
-      int pos = args.find("%projectbase");
+      int pos = args.tqfind("%projectbase");
       if (pos != -1)
       {
           TQString s;
           if (Project::ref()->hasProject())
             s = Project::ref()->projectBaseURL().url();
-          args.replace("%projectbase", s);
+          args.tqreplace("%projectbase", s);
       }
       TQStringList argsList1 = TQStringList::split(' ', args);
       TQStringList argsList;
@@ -715,7 +715,7 @@ bool TagAction::slotActionActivated()
     if (proc->start(KProcess::NotifyOnExit, KProcess::All))
     {
       emit clearMessages();
-      emit showMessage(i18n("The \"%1\" script started.\n").arg(actionText()), false);
+      emit showMessage(i18n("The \"%1\" script started.\n").tqarg(actionText()), false);
       if (!m_useInputFile)
       {
         if ( inputType == "current" || inputType == "selected" )
@@ -726,11 +726,11 @@ bool TagAction::slotActionActivated()
       proc->closeStdin();
     } else
     {
-      KMessageBox::error(m_parentMainWindow, i18n("<qt>There was an error running <b>%1</b>.<br>Check that you have the <i>%2</i> executable installed and it is accessible.</qt>").arg(command + " " + args).arg(command), i18n("Script Not Found"));
+      KMessageBox::error(m_parentMainWindow, i18n("<qt>There was an error running <b>%1</b>.<br>Check that you have the <i>%2</i> executable installed and it is accessible.</qt>").tqarg(command + " " + args).tqarg(command), i18n("Script Not Found"));
       ViewManager::ref()->activeView()->setFocus();
       if (loopStarted)
       {
-          qApp->exit_loop();
+          tqApp->exit_loop();
           loopStarted = false;
       }
       return false;
@@ -767,7 +767,7 @@ void TagAction::slotGetScriptOutput( KProcess *, char *buffer, int buflen )
      }
      w->insertTag( text );
   } else
-  if ( scriptOutputDest == "replace" )
+  if ( scriptOutputDest == "tqreplace" )
   {
     if ( firstOutput )
        w->editIf->clear();
@@ -787,7 +787,7 @@ void TagAction::slotGetScriptOutput( KProcess *, char *buffer, int buflen )
     if ( firstOutput )
     {
       emit showMessagesView();
-      emit showMessage(i18n("The \"%1\" script output:\n").arg(actionText()), false);
+      emit showMessage(i18n("The \"%1\" script output:\n").tqarg(actionText()), false);
     }
     emit showMessage(text, true);
   } else
@@ -827,7 +827,7 @@ void TagAction::slotGetScriptError( KProcess *, char *buffer, int buflen )
      }
      w->insertTag( text );
   } else
-  if ( scriptErrorDest == "replace" )
+  if ( scriptErrorDest == "tqreplace" )
   {
     if ( firstError )
        w->editIf->clear();
@@ -847,7 +847,7 @@ void TagAction::slotGetScriptError( KProcess *, char *buffer, int buflen )
     if ( firstError )
     {
       emit showMessagesView();
-      emit showMessage(i18n("The \"%1\" script output:\n").arg(actionText()), false);
+      emit showMessage(i18n("The \"%1\" script output:\n").tqarg(actionText()), false);
     }
     emit showMessage(text, true);
   }
@@ -874,7 +874,7 @@ void TagAction::setInputFileName(const TQString& fileName)
 TQString TagAction::actionText()
 {
    TQString t = tag.attribute("text");
-   int pos = t.find('&');
+   int pos = t.tqfind('&');
    if (pos < (int)t.length()-1 && t[pos+1] != '&')
      return t.remove(pos, 1);
    else
@@ -925,7 +925,7 @@ TQString TagAction::openXMLTagString() const
     if (otag.text().right(1) == ">")
     {
         Document* w = ViewManager::ref()->activeView()->document();
-        QTag *dtdTag = QuantaCommon::tagFromDTD(w->defaultDTD(), name);
+        TQTag *dtdTag = QuantaCommon::tagFromDTD(w->defaultDTD(), name);
         if ( w->defaultDTD()->singleTagStyle == "xml" && dtdTag &&
              (dtdTag->isSingle() || (!qConfig.closeOptionalTags && dtdTag->isOptional()))
            )
@@ -967,10 +967,10 @@ void TagAction::slotProcessExited(KProcess *process)
 {
   if (loopStarted)
   {
-    qApp->exit_loop();
+    tqApp->exit_loop();
     loopStarted = false;
   }
-  emit showMessage(i18n("The \"%1\" script has exited.").arg(actionText()), false);
+  emit showMessage(i18n("The \"%1\" script has exited.").tqarg(actionText()), false);
   delete process;
 }
 
@@ -993,7 +993,7 @@ void TagAction::execute(bool blocking)
         timer = new TQTimer(this);
         connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
         timer->start(180*1000, true);
-        QExtFileInfo internalFileInfo;
+        TQExtFileInfo internalFileInfo;
         loopStarted = true;
         m_killCount = 0;
         internalFileInfo.enter_loop();
@@ -1008,7 +1008,7 @@ void TagAction::execute(bool blocking)
 /** Timeout occurred while waiting for some network function to return. */
 void TagAction::slotTimeout()
 {
-  if ((m_killCount == 0) && (KMessageBox::questionYesNo(m_parentMainWindow, i18n("<qt>The filtering action <b>%1</b> seems to be locked.<br>Do you want to terminate it?</qt>").arg(actionText()), i18n("Action Not Responding"), i18n("Terminate"), i18n("Keep Running")) == KMessageBox::Yes))
+  if ((m_killCount == 0) && (KMessageBox::questionYesNo(m_parentMainWindow, i18n("<qt>The filtering action <b>%1</b> seems to be locked.<br>Do you want to terminate it?</qt>").tqarg(actionText()), i18n("Action Not Responding"), i18n("Terminate"), i18n("Keep Running")) == KMessageBox::Yes))
   {
     if (::kill(-proc->pid(), SIGTERM))
     {
@@ -1021,7 +1021,7 @@ void TagAction::slotTimeout()
     ::kill(-proc->pid(), SIGKILL);
     if (loopStarted)
     {
-        qApp->exit_loop();
+        tqApp->exit_loop();
         loopStarted = false;
     }
     return;
@@ -1055,19 +1055,19 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en
     Node* nodeCursor = start_node;        
     Node* nodeParent = start_node;
     if (nodeParent->tag->type == Tag::Text)
-        nodeParent = nodeParent->parent;
+        nodeParent = nodeParent->tqparent;
 
-    //Checking if at least one parent of node can have a Text Node as child, otherwise
+    //Checking if at least one tqparent of node can have a Text Node as child, otherwise
     //it is impossible for the
-    //user to add this node. In that case, try to insert the Node in the closest parent accepting it.
+    //user to add this node. In that case, try to insert the Node in the closest tqparent accepting it.
     //e.g. TR : a normal insertion would require to have the caret in the TABLE Node, but it is
     //impossible
-    QTag* nodeQTag = QuantaCommon::tagFromDTD(w->defaultDTD(), node->tag->name);
-    if (!nodeQTag) return;
+    TQTag* nodeTQTag = QuantaCommon::tagFromDTD(w->defaultDTD(), node->tag->name);
+    if (!nodeTQTag) return;
 
     bool specialTagInsertion = false;
-    TQPtrList<QTag> qTagList = nodeQTag->parents();
-    QTag* qTag = 0;
+    TQPtrList<TQTag> qTagList = nodeTQTag->tqparents();
+    TQTag* qTag = 0;
     for (qTag = qTagList.first(); qTag; qTag = qTagList.next())
     {
         if (qTag->isChild("#text", false))
@@ -1080,11 +1080,11 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en
     
     if (specialTagInsertion) // Attention: not smartTagInsertion
     {
-        //let's try to insert this node in the closest parent accepting it.
+        //let's try to insert this node in the closest tqparent accepting it.
         while (nodeParent)
         {
-            QTag* nodeParentQTag = QuantaCommon::tagFromDTD(w->defaultDTD(), nodeParent->tag->name);
-            if (nodeParentQTag && nodeParentQTag->isChild(node))
+            TQTag* nodeParentTQTag = QuantaCommon::tagFromDTD(w->defaultDTD(), nodeParent->tag->name);
+            if (nodeParentTQTag && nodeParentTQTag->isChild(node))
             {
                 nodeCursor = kafkaCommon::createMandatoryNodeSubtree(node, w);
                 start_offset = 0;
@@ -1092,10 +1092,10 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en
                 nodeTreeModified = true;
                 break;
             }
-            nodeParent = nodeParent->parent;
+            nodeParent = nodeParent->tqparent;
         }
     }
-    else if(!nodeQTag->isSingle())
+    else if(!nodeTQTag->isSingle())
     {
         //If some text is selected in kafka, surround the selection with the new Node.
         if(!start_node|| !end_node)
@@ -1248,15 +1248,15 @@ void TagAction::deapplyTagInSelection(Node* start_node, int start_offset, Node*
         Node* common_parent_start_child = kafkaCommon::getCommonParentChild(start_node, tag_parent);
         Node* common_parent_end_child = kafkaCommon::getCommonParentChild(end_node, tag_parent);
     
-        Node* parent_of_tag_parent = tag_parent->parent;
+        Node* tqparent_of_tag_parent = tag_parent->tqparent;
         if(common_parent_end_child == common_parent_start_child)
             common_parent_end_child = 0;
         if(!common_parent_start_child)
             common_parent_start_child = kafkaCommon::getCommonParentChild(start_node, commonParent);
-        kafkaCommon::moveNode(common_parent_start_child, parent_of_tag_parent, tag_parent, selection, modifs, true, true);
+        kafkaCommon::moveNode(common_parent_start_child, tqparent_of_tag_parent, tag_parent, selection, modifs, true, true);
     
         if(common_parent_end_child)
-            kafkaCommon::moveNode(common_parent_end_child, parent_of_tag_parent, tag_parent, selection, modifs, true, true);
+            kafkaCommon::moveNode(common_parent_end_child, tqparent_of_tag_parent, tag_parent, selection, modifs, true, true);
     
     // Remove tag_parent node subtree if empty
         if(!tag_parent->hasChildNodes())
diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h
index b24addac..d940faf7 100644
--- a/quanta/utility/tagaction.h
+++ b/quanta/utility/tagaction.h
@@ -47,6 +47,7 @@ class NodeSelection;
 class TagAction : public KToggleAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
@@ -54,7 +55,7 @@ public:
      * @param toggle If set to true, the class behaves like a KToggleAction;
      *               Else it behaves like a KAction. This avoids the multi-inheritance problem.
      */
-    TagAction(TQDomElement *element, KMainWindow *parentMainWindow, bool toggle = false);
+    TagAction(TQDomElement *element, KMainWindow *tqparentMainWindow, bool toggle = false);
     virtual ~TagAction();
 
     TQDomElement data() const { return tag; }
@@ -93,7 +94,7 @@ public slots:
      * We need this information in order to know if queued actions should be applied.
      * It's public because it can be activated by other classes if there are any queued actions.
      */
-    virtual bool slotActionActivated(KAction::ActivationReason reason, Qt::ButtonState state);
+    virtual bool slotActionActivated(KAction::ActivationReason reason, TQt::ButtonState state);
 
 protected slots:
     virtual void slotGetScriptOutput( KProcess *, char *buffer, int buflen );
diff --git a/quanta/utility/tagactionmanager.cpp b/quanta/utility/tagactionmanager.cpp
index 3733aaaf..b11525ec 100644
--- a/quanta/utility/tagactionmanager.cpp
+++ b/quanta/utility/tagactionmanager.cpp
@@ -54,18 +54,18 @@ TagActionManager* TagActionManager::self()
     return s_mSelf;
 }
 
-void TagActionManager::initActions(TQWidget* parent)
+void TagActionManager::initActions(TQWidget* tqparent)
 {
-    Q_ASSERT(parent);
+    Q_ASSERT(tqparent);
     
-    m_actionCollection = new KActionCollection(parent);
+    m_actionCollection = new KActionCollection(tqparent);
     
     TagActionSet* general(new TagActionSet());
-    general->initActions(parent);
+    general->initActions(tqparent);
     m_tagActionSets.append(general);
         
     TableTagActionSet* table(new TableTagActionSet());
-    table->initActions(parent);
+    table->initActions(tqparent);
     m_tagActionSets.append(table);
 }
 
@@ -78,6 +78,6 @@ void TagActionManager::fillWithTagActions(TQWidget* widget, DOM::Node const& nod
 
 bool TagActionManager::canIndentDTD(TQString const& dtd)
 {
-    return (dtd.contains("HTML", false) ||
-            dtd.contains("XML", false));
+    return (dtd.tqcontains("HTML", false) ||
+            dtd.tqcontains("XML", false));
 }
diff --git a/quanta/utility/tagactionmanager.h b/quanta/utility/tagactionmanager.h
index 0977d32c..77f7ad23 100644
--- a/quanta/utility/tagactionmanager.h
+++ b/quanta/utility/tagactionmanager.h
@@ -62,7 +62,7 @@ private:
     TagActionManager(TagActionManager const&)
     {}
 
-    void initActions(TQWidget* parent);
+    void initActions(TQWidget* tqparent);
 
 private:
     static TagActionManager* s_mSelf;
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index 28f01ef8..dc994716 100644
--- a/quanta/utility/tagactionset.cpp
+++ b/quanta/utility/tagactionset.cpp
@@ -40,20 +40,20 @@
 #include "resource.h"
 
 
-TagActionSetAbstract::TagActionSetAbstract(TQObject *parent, const char *name)
-        : TQObject(parent, name), m_currentNode(0)
+TagActionSetAbstract::TagActionSetAbstract(TQObject *tqparent, const char *name)
+        : TQObject(tqparent, name), m_currentNode(0)
 {}
 
 TagActionSetAbstract::~TagActionSetAbstract()
 {}
 
-Node* TagActionSetAbstract::parentTag(Node* node, TQString const& tagName)
+Node* TagActionSetAbstract::tqparentTag(Node* node, TQString const& tagName)
 {
     Q_ASSERT(node);
 
     Node* aux = node;
     while(aux && aux->nodeName().lower() != tagName)
-        aux = aux->parent;
+        aux = aux->tqparent;
 
     return aux;
 }
@@ -81,8 +81,8 @@ bool TagActionSetAbstract::fillWithTagActions(TQWidget* /*widget*/, DOM::Node co
 
 //_____________________________________________________________________________
 
-TagActionSet::TagActionSet(TQObject *parent, const char *name)
-    : TagActionSetAbstract(parent, name), m_separator(0)
+TagActionSet::TagActionSet(TQObject *tqparent, const char *name)
+    : TagActionSetAbstract(tqparent, name), m_separator(0)
 {
     m_separator = new KActionSeparator();
 }
@@ -96,7 +96,7 @@ void TagActionSet::initActionMenus(TQWidget* /*widget*/)
 {
 }
 
-void TagActionSet::initActions(TQWidget* /*parent*/)
+void TagActionSet::initActions(TQWidget* /*tqparent*/)
 {
     KActionCollection* ac(TagActionManager::self()->actionCollection());
 
@@ -221,14 +221,14 @@ bool TagActionSet::isInDivArea() const
 {
     Q_ASSERT(m_currentNode);
     
-    return parentTag(m_currentNode, "div");
+    return tqparentTag(m_currentNode, "div");
 }
 
 void TagActionSet::slotCopyDivElement()
 {
     Q_ASSERT(m_currentNode);
     
-    Node* divNode = parentTag(m_currentNode, "div");
+    Node* divNode = tqparentTag(m_currentNode, "div");
     Q_ASSERT(divNode);
     
     Node* divClosingNode = divNode->getClosingNode();
@@ -245,7 +245,7 @@ void TagActionSet::slotCutDivElement()
 {
     Q_ASSERT(m_currentNode);
     
-    Node* divNode = parentTag(m_currentNode, "div");
+    Node* divNode = tqparentTag(m_currentNode, "div");
     Q_ASSERT(divNode);
     
     Node* divClosingNode = divNode->getClosingNode();
@@ -266,31 +266,31 @@ void TagActionSet::slotCutDivElement()
         
 //_____________________________________________________________________________
 
-TableTagActionSet::TableTagActionSet(TQObject *parent, const char *name)
-    : TagActionSetAbstract(parent, name), m_separator(0), m_tableActionMenu_0(0), m_insertActionMenu_1(0)
+TableTagActionSet::TableTagActionSet(TQObject *tqparent, const char *name)
+    : TagActionSetAbstract(tqparent, name), m_separator(0), m_tableActionMenu_0(0), m_insertActionMenu_1(0)
 {
     m_separator = new KActionSeparator();
 }
 
 bool TableTagActionSet::isInTagContext() const
 {
-    return parentTag(m_currentNode, "table");
+    return tqparentTag(m_currentNode, "table");
 }
 
 void TableTagActionSet::initActionMenus(TQWidget* widget)
 {
     Q_ASSERT(!m_tableActionMenu_0);
 
-    m_tableActionMenu_0 = new KActionMenu(i18n("Table..."), widget);
+    m_tableActionMenu_0 = new KActionMenu(i18n("Table..."), TQT_TQOBJECT(widget));
     m_insertActionMenu_1 = new KActionMenu(i18n("Insert..."), m_tableActionMenu_0);
     m_removeActionMenu_1 = new KActionMenu(i18n("Remove..."), m_tableActionMenu_0);
 }
 
 
-void TableTagActionSet::initActions(TQWidget* parent)
+void TableTagActionSet::initActions(TQWidget* tqparent)
 {
     if(!m_tableActionMenu_0)
-        initActionMenus(parent);
+        initActionMenus(tqparent);
 
     KActionCollection* ac(TagActionManager::self()->actionCollection());
 
@@ -575,19 +575,19 @@ void TableTagActionSet::slotInsertTable()
 
 bool TableTagActionSet::canInsertRowAbove() const
 {
-    return isInTagContext() && parentTag(m_currentNode, "tbody");
+    return isInTagContext() && tqparentTag(m_currentNode, "tbody");
 }
 
 void TableTagActionSet::slotInsertRowAbove()
 {
     Q_ASSERT(m_currentNode);
 
-    Node* nearRow = parentTag(m_currentNode, "tr");
+    Node* nearRow = tqparentTag(m_currentNode, "tr");
 
     if(!nearRow)
         return;
 
-    Node* nodeParent= nearRow->parent;
+    Node* nodeParent= nearRow->tqparent;
 
     QuantaView* view = ViewManager::ref()->activeView();
     NodeModifsSet *modifs = new NodeModifsSet();
@@ -610,16 +610,16 @@ void TableTagActionSet::slotInsertRowBelow()
     Q_ASSERT(m_currentNode);
 
     Node* nearRow = 0;
-    Node* aux = parentTag(m_currentNode, "thead");
+    Node* aux = tqparentTag(m_currentNode, "thead");
     if(aux)
         nearRow= firstChildTag(tableStart(), "tr");
     else
-        nearRow = parentTag(m_currentNode, "tr");
+        nearRow = tqparentTag(m_currentNode, "tr");
 
     if(!nearRow)
         return;
 
-    Node* nodeParent= nearRow->parent;
+    Node* nodeParent= nearRow->tqparent;
     Node* nextSibling = nearRow->SNext();
 
     QuantaView* view = ViewManager::ref()->activeView();
@@ -781,7 +781,7 @@ void TableTagActionSet::slotRemoveRows()
 
     if(!selection.hasSelection())
     {
-        Node* nearTr = parentTag(m_currentNode, "tr");
+        Node* nearTr = tqparentTag(m_currentNode, "tr");
         kafkaCommon::extractAndDeleteNode(nearTr, modifs, true, true);
     }
     else
@@ -789,8 +789,8 @@ void TableTagActionSet::slotRemoveRows()
         Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode());
         Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel());
 
-        Node* startTr = parentTag(startSelection, "tr");
-        Node* endTr = parentTag(endSelection, "tr");
+        Node* startTr = tqparentTag(startSelection, "tr");
+        Node* endTr = tqparentTag(endSelection, "tr");
 
         Node* iteratorNode = startTr;
         bool loop(true);
@@ -844,7 +844,7 @@ void TableTagActionSet::slotRemoveColumns()
         if(startColumnIndex == -1 || endColumnIndex == -1)
             return;
             
-        m_currentNode = parentTag(m_currentNode, "tbody"); // m_currentNode will become invalid
+        m_currentNode = tqparentTag(m_currentNode, "tbody"); // m_currentNode will become invalid
         for(int i = 0; i != numberOfColumnsSelected; ++i)
             removeColumn(startColumnIndex, modifs);
     }
@@ -880,9 +880,9 @@ void TableTagActionSet::slotRemoveCellsContent()
     if(!selection.hasSelection())
     {
         Node* aux = m_currentNode;
-        m_currentNode = parentTag(m_currentNode, "tbody");
+        m_currentNode = tqparentTag(m_currentNode, "tbody");
         
-        Node* nearTd = parentTag(aux, "td");
+        Node* nearTd = tqparentTag(aux, "td");
         clearCellContents(nearTd, modifs);
     }
     else
@@ -890,8 +890,8 @@ void TableTagActionSet::slotRemoveCellsContent()
         Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode());
         Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel());
 
-        Node* startTd = parentTag(startSelection, "td");
-        Node* endTd = parentTag(endSelection, "td");
+        Node* startTd = tqparentTag(startSelection, "td");
+        Node* endTd = tqparentTag(endSelection, "td");
         
         if(!startTd || !endTd)
             return;
@@ -933,8 +933,8 @@ void TableTagActionSet::slotMergeSelectedCells()
     Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode());
     Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel());
     
-    Node* startTd = parentTag(startSelection, "td");
-    Node* endTd = parentTag(endSelection, "td");
+    Node* startTd = tqparentTag(startSelection, "td");
+    Node* endTd = tqparentTag(endSelection, "td");
     
     Node* nodeIterator = startTd->SNext();
     Node* stopNode = endTd->SNext();
@@ -975,7 +975,7 @@ Node* TableTagActionSet::tableStart() const
     Q_ASSERT(isInTagContext());
     Q_ASSERT(m_currentNode);
 
-    return parentTag(m_currentNode, "table");
+    return tqparentTag(m_currentNode, "table");
 }
 
 int TableTagActionSet::numberOfColumns() const
@@ -1004,7 +1004,7 @@ int TableTagActionSet::numberOfColumns() const
 int TableTagActionSet::currentColumnIndex() const
 {
     return columnIndex(m_currentNode);
-/*    Node* nearTd = parentTag(m_currentNode, "td");
+/*    Node* nearTd = tqparentTag(m_currentNode, "td");
     if(!nearTd)
         return -1;
 
@@ -1012,7 +1012,7 @@ int TableTagActionSet::currentColumnIndex() const
     if(!_tableStart)
         return -1;
 
-    Node* firstTd = firstChildTag(parentTag(m_currentNode, "tr"), "td");
+    Node* firstTd = firstChildTag(tqparentTag(m_currentNode, "tr"), "td");
     //Node* firstTd = firstChildTag(_tableStart, "td");
     if(!firstTd)
         return -1;
@@ -1032,7 +1032,7 @@ int TableTagActionSet::currentColumnIndex() const
 
 int TableTagActionSet::columnIndex(Node* node) const
 {
-    Node* nearTd = parentTag(node, "td");
+    Node* nearTd = tqparentTag(node, "td");
     if(!nearTd)
         return -1;
 
@@ -1040,7 +1040,7 @@ int TableTagActionSet::columnIndex(Node* node) const
     if(!_tableStart)
         return -1;
 
-    Node* firstTd = firstChildTag(parentTag(node, "tr"), "td");
+    Node* firstTd = firstChildTag(tqparentTag(node, "tr"), "td");
     if(!firstTd)
         return -1;
 
diff --git a/quanta/utility/tagactionset.h b/quanta/utility/tagactionset.h
index 00d3341f..5b813acb 100644
--- a/quanta/utility/tagactionset.h
+++ b/quanta/utility/tagactionset.h
@@ -35,20 +35,21 @@ class NodeModifsSet;
 /**
 @author Paulo Moura Guedes
 */
-class TagActionSetAbstract : public QObject
+class TagActionSetAbstract : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    TagActionSetAbstract(TQObject *parent = 0, const char *name = 0);
+    TagActionSetAbstract(TQObject *tqparent = 0, const char *name = 0);
     virtual ~TagActionSetAbstract();
     
     DOM::Node const& currentDomNode() const {return m_currentDomNode;}
 
-    static Node* parentTag(Node* node, TQString const& tagName);
+    static Node* tqparentTag(Node* node, TQString const& tagName);
     static Node* firstChildTag(Node* node, TQString const& tagName);
     
     virtual bool isInTagContext(/*DOM::Node const& node*/) const = 0;
-    virtual void initActions(TQWidget* parent) = 0;
+    virtual void initActions(TQWidget* tqparent) = 0;
     virtual bool fillWithTagActions(TQWidget* widget, DOM::Node const& node);
     virtual void unplugAllActions(TQWidget* widget) const = 0;
 
@@ -66,12 +67,13 @@ private:
 class TagActionSet : public TagActionSetAbstract
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    TagActionSet(TQObject *parent = 0, const char *name = 0);
+    TagActionSet(TQObject *tqparent = 0, const char *name = 0);
     virtual ~TagActionSet() {}
     
     virtual bool isInTagContext() const;
-    virtual void initActions(TQWidget* parent);
+    virtual void initActions(TQWidget* tqparent);
     virtual bool fillWithTagActions(TQWidget* widget, DOM::Node const& node);
     virtual void unplugAllActions(TQWidget* widget) const;
     
@@ -94,13 +96,14 @@ private:
 class TableTagActionSet : public TagActionSetAbstract
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    TableTagActionSet(TQObject *parent = 0, const char *name = 0);
+    TableTagActionSet(TQObject *tqparent = 0, const char *name = 0);
     virtual ~TableTagActionSet()
     {}
 
     virtual bool isInTagContext(/*DOM::Node const& node*/) const;
-    virtual void initActions(TQWidget* parent);
+    virtual void initActions(TQWidget* tqparent);
     virtual bool fillWithTagActions(TQWidget* widget, DOM::Node const& node);
     virtual void unplugAllActions(TQWidget* widget) const;
 
diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp
index 29c7cfa9..cd3ac37e 100644
--- a/quanta/utility/toolbartabwidget.cpp
+++ b/quanta/utility/toolbartabwidget.cpp
@@ -38,36 +38,36 @@
 //app includes
 #include "toolbartabwidget.h"
 
-ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags f)
-:TQTabWidget(parent, name, f)
+ToolbarTabWidget::ToolbarTabWidget(TQWidget * tqparent, const char * name, WFlags f)
+:TQTabWidget(tqparent, name, f)
 {
   m_popupMenu = new KPopupMenu(this);
   m_popupMenu->insertTitle(i18n("Toolbar Menu"), 1);
-  m_popupMenu->insertItem(i18n("New Action..."), parent, TQT_SLOT(slotNewAction()));
+  m_popupMenu->insertItem(i18n("New Action..."), tqparent, TQT_SLOT(slotNewAction()));
   m_popupMenu->insertSeparator();
-  m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQT_SLOT(slotAddToolbar()));
+  m_popupMenu->insertItem(i18n("New Toolbar..."), tqparent, TQT_SLOT(slotAddToolbar()));
   m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar()));
   m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQT_SLOT(slotRenameToolbar()));
   m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQT_SLOT(slotEditToolbar()));
 
   connect(this, TQT_SIGNAL(removeToolbar(const TQString&)),
-          parent, TQT_SLOT(slotRemoveToolbar(const TQString&)));
+          tqparent, TQT_SLOT(slotRemoveToolbar(const TQString&)));
   connect(this, TQT_SIGNAL(renameToolbar(const TQString&)),
-          parent, TQT_SLOT(slotRenameToolbar(const TQString&)));
+          tqparent, TQT_SLOT(slotRenameToolbar(const TQString&)));
   connect(this, TQT_SIGNAL(editToolbar(const TQString&)),
-          parent, TQT_SLOT(slotConfigureToolbars(const TQString&)));
+          tqparent, TQT_SLOT(slotConfigureToolbars(const TQString&)));
   connect(this, TQT_SIGNAL(newAction()),
-          parent, TQT_SLOT(slotNewAction()));
+          tqparent, TQT_SLOT(slotNewAction()));
   connect(this, TQT_SIGNAL(addToolbar()),
-          parent, TQT_SLOT(slotAddToolbar()));
+          tqparent, TQT_SLOT(slotAddToolbar()));
   KAcceleratorManager::setNoAccel(this);
 }
 
 void ToolbarTabWidget::insertTab(TQWidget *child, const TQString &label, const TQString &id)
 {
-  if (child->inherits("KToolBar") && child->parentWidget())
+  if (child->inherits("KToolBar") && child->tqparentWidget())
   {
-    TQTabWidget::insertTab(child->parentWidget(), label);
+    TQTabWidget::insertTab(child->tqparentWidget(), label);
     toolbarList.insert(id, child);
   }
 }
@@ -78,7 +78,7 @@ TQWidget* ToolbarTabWidget::page(int index)
 
   for (TQMap<TQString, TQWidget*>::Iterator it = toolbarList.begin(); it != toolbarList.end(); ++it)
   {
-    if (it.data()->parentWidget() == w)
+    if (it.data()->tqparentWidget() == w)
     {
       w = *it;
       break;
@@ -92,7 +92,7 @@ TQString ToolbarTabWidget::id(TQWidget *w) const
   TQString idStr;
   for (TQMap<TQString, TQWidget*>::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it)
   {
-    if (it.data()->parentWidget() == w)
+    if (it.data()->tqparentWidget() == w)
     {
       idStr = it.key();
       break;
@@ -107,7 +107,7 @@ TQString ToolbarTabWidget::id(int index) const
   TQString idStr;
   for (TQMap<TQString, TQWidget*>::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it)
   {
-    if (it.data()->parentWidget() == w)
+    if (it.data()->tqparentWidget() == w)
     {
       idStr = it.key();
       break;
@@ -118,16 +118,16 @@ TQString ToolbarTabWidget::id(int index) const
 
 TQWidget* ToolbarTabWidget::page(const TQString& id)
 {
-  TQWidget *w = toolbarList.find(id).data();
+  TQWidget *w = toolbarList.tqfind(id).data();
   return w;
 }
 
 void ToolbarTabWidget::removePage(TQWidget * w)
 {
-  TQWidget *parent = w->parentWidget();
-  if (w->inherits("KToolBar") && parent)
+  TQWidget *tqparent = w->tqparentWidget();
+  if (w->inherits("KToolBar") && tqparent)
   {
-    TQTabWidget::removePage(parent);
+    TQTabWidget::removePage(tqparent);
     for (TQMap<TQString, TQWidget*>::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it)
     {
       if (it.data() == w)
@@ -136,7 +136,7 @@ void ToolbarTabWidget::removePage(TQWidget * w)
         break;
       }
     }
-    delete parent;
+    delete tqparent;
   }
 }
 
@@ -169,7 +169,7 @@ void ToolbarTabWidget::mousePressEvent ( TQMouseEvent * e )
       TQRect r = tab->rect();
       TQPoint p1 = mapToGlobal(r.topLeft());
       TQPoint p2 = mapToGlobal(r.bottomRight());
-      if (TQRect(p1, p2).contains(p))
+      if (TQRect(p1, p2).tqcontains(p))
           break;
       else
         tab = 0L;
@@ -179,7 +179,7 @@ void ToolbarTabWidget::mousePressEvent ( TQMouseEvent * e )
       pageW = currentPage();
     for (TQMap<TQString, TQWidget*>::Iterator it = toolbarList.begin(); it != toolbarList.end(); ++it)
     {
-      if (it.data()->parentWidget() == pageW)
+      if (it.data()->tqparentWidget() == pageW)
       {
         tabUnderMouse = it.key();
         break;
@@ -223,11 +223,11 @@ int ToolbarTabWidget::tabHeight() const
 }
 
 
-QuantaToolBar::QuantaToolBar(TQWidget *parent, const char *name, bool honor_style, bool readConfig)
-:KToolBar (parent, name=0, honor_style, readConfig)
+QuantaToolBar::QuantaToolBar(TQWidget *tqparent, const char *name, bool honor_style, bool readConfig)
+:KToolBar (tqparent, name=0, honor_style, readConfig)
 {
   m_popupMenu = new KPopupMenu(this);
-  m_toolbarTab = dynamic_cast<ToolbarTabWidget*>(parent->parentWidget());
+  m_toolbarTab = dynamic_cast<ToolbarTabWidget*>(tqparent->tqparentWidget());
   currentActionName = "";
   m_iconTextMenu = new KPopupMenu(this);
   m_iconTextMenu->setCheckable(true);
@@ -307,18 +307,18 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e)
       m_popupMenu->insertTitle(i18n("Toolbar Menu") + " - "
                                + i18n(m_toolbarTab->tabUnderMouseLabel.utf8()));
       m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQT_SIGNAL(newAction()));
-      TQObjectList* childrenList = queryList("KToolBarButton");
-      for (uint i = 0; i < childrenList->count(); i++)
+      TQObjectList* tqchildrenList = queryList("KToolBarButton");
+      for (uint i = 0; i < tqchildrenList->count(); i++)
       {
-        KToolBarButton *w = static_cast<KToolBarButton*>(childrenList->at(i));
-        TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos());
+        KToolBarButton *w = static_cast<KToolBarButton*>(TQT_TQWIDGET(tqchildrenList->at(i)));
+        TQPoint p1 = w->tqparentWidget()->mapToGlobal(w->pos());
         TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height());
-        if (TQRect(p1, p2).contains(p))
+        if (TQRect(p1, p2).tqcontains(p))
         {
           currentActionName = w->textLabel();
           TQString actionName = currentActionName;
-          m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction()));
-          m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQT_SLOT(slotEditAction()));
+          m_popupMenu->insertItem(i18n("Remove Action - %1").tqarg(actionName.tqreplace('&',"&&")), this, TQT_SLOT(slotRemoveAction()));
+          m_popupMenu->insertItem(i18n("Edit Action - %1").tqarg(actionName), this, TQT_SLOT(slotEditAction()));
           break;
         }
       }
@@ -341,7 +341,7 @@ void QuantaToolBar::slotEditAction()
 
 void QuantaToolBar::slotRemoveAction()
 {
-    if ( KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure you want to remove the <b>%1</b> action?</qt>").arg(currentActionName),TQString::null,KStdGuiItem::del()) == KMessageBox::Continue )
+    if ( KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure you want to remove the <b>%1</b> action?</qt>").tqarg(currentActionName),TQString(),KStdGuiItem::del()) == KMessageBox::Continue )
   {
     emit removeAction(m_toolbarTab->tabUnderMouse, currentActionName);
   }
diff --git a/quanta/utility/toolbartabwidget.h b/quanta/utility/toolbartabwidget.h
index 6be17eda..11318394 100644
--- a/quanta/utility/toolbartabwidget.h
+++ b/quanta/utility/toolbartabwidget.h
@@ -24,16 +24,17 @@ class TQWidgetStack;
 class TQTabBar;
 class KToolBar;
 
-class ToolbarTabWidget: public QTabWidget
+class ToolbarTabWidget: public TQTabWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
   TQWidgetStack *m_widgetStack;
 
-  static ToolbarTabWidget* const ref(TQWidget *parent = 0L, const char *name = 0L)
+  static ToolbarTabWidget* const ref(TQWidget *tqparent = 0L, const char *name = 0L)
   {
     static ToolbarTabWidget *m_ref;
-    if (!m_ref) m_ref = new ToolbarTabWidget (parent, name);
+    if (!m_ref) m_ref = new ToolbarTabWidget (tqparent, name);
     return m_ref;
   }
   virtual ~ToolbarTabWidget(){};
@@ -76,7 +77,7 @@ protected:
   TQMap<TQString, TQWidget*> toolbarList;
 
 private:
-  ToolbarTabWidget(TQWidget * parent = 0, const char * name = 0, WFlags f = 0);
+  ToolbarTabWidget(TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0);
   KToolBar::IconText m_iconText;
 
 };
@@ -84,9 +85,10 @@ private:
 class QuantaToolBar: public KToolBar
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  QuantaToolBar (TQWidget *parent, const char *name=0, bool honor_style=FALSE, bool readConfig=TRUE);
+  QuantaToolBar (TQWidget *tqparent, const char *name=0, bool honor_style=FALSE, bool readConfig=TRUE);
   virtual ~QuantaToolBar() {};
 
 private slots: