Rename a number of old tq methods that are no longer tq specific

456 files changed, 3514 insertions, 3514 deletions

diff --git a/kfilereplace/commandengine.cpp b/kfilereplace/commandengine.cpp
index e8955556..6d4ef03a 100644
--- a/kfilereplace/commandengine.cpp
+++ b/kfilereplace/commandengine.cpp
@@ -19,7 +19,7 @@
 // QT
 #include <tqdatetime.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdom.h>
 
 // KDE
@@ -34,9 +34,9 @@ TQString CommandEngine::datetime(const TQString& opt, const TQString& arg)
 {
   Q_UNUSED(arg);
   if(opt == "iso")
-    return TQDateTime::tqcurrentDateTime(Qt::LocalTime).toString(Qt::ISODate);
+    return TQDateTime::currentDateTime(Qt::LocalTime).toString(Qt::ISODate);
   if(opt == "local")
-    return TQDateTime::tqcurrentDateTime(Qt::LocalTime).toString(Qt::LocalDate);
+    return TQDateTime::currentDateTime(Qt::LocalTime).toString(Qt::LocalDate);
   return TQString();
 }
 
diff --git a/kfilereplace/configurationclasses.cpp b/kfilereplace/configurationclasses.cpp
index bb66c3ef..f0c6bcc4 100644
--- a/kfilereplace/configurationclasses.cpp
+++ b/kfilereplace/configurationclasses.cpp
@@ -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 ").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));
+  //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));
 }
 
 int ResultViewEntry::keyLength() const
diff --git a/kfilereplace/kaddstringdlg.cpp b/kfilereplace/kaddstringdlg.cpp
index 9c555ee6..8eded32e 100644
--- a/kfilereplace/kaddstringdlg.cpp
+++ b/kfilereplace/kaddstringdlg.cpp
@@ -16,7 +16,7 @@
  *                                                                         *
  ***************************************************************************/
 // QT
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -58,8 +58,8 @@ KAddStringDlg::KAddStringDlg(RCOptions* info, bool wantEdit, TQWidget *parent, c
 //PRIVATE
 void KAddStringDlg::initGUI()
 {
-  m_pbAdd->setIconSet(SmallIconSet(TQString::tqfromLatin1("forward")));
-  m_pbDel->setIconSet(SmallIconSet(TQString::tqfromLatin1("back")));
+  m_pbAdd->setIconSet(SmallIconSet(TQString::fromLatin1("forward")));
+  m_pbDel->setIconSet(SmallIconSet(TQString::fromLatin1("back")));
 
   m_stack->addWidget(m_stringView);
   m_stack->addWidget(m_stringView_2);
diff --git a/kfilereplace/kaddstringdlgs.ui b/kfilereplace/kaddstringdlgs.ui
index 820b1769..563aa33f 100644
--- a/kfilereplace/kaddstringdlgs.ui
+++ b/kfilereplace/kaddstringdlgs.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout14</cstring>
+                <cstring>layout14</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -84,7 +84,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>tqlayout11</cstring>
+                                <cstring>layout11</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -92,7 +92,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout13</cstring>
+                                        <cstring>layout13</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -118,7 +118,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout14</cstring>
+                                        <cstring>layout14</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -155,7 +155,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="0" column="1">
                             <property name="name">
-                                <cstring>tqlayout16</cstring>
+                                <cstring>layout16</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -171,7 +171,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>90</height>
@@ -180,7 +180,7 @@
                                 </spacer>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout15</cstring>
+                                        <cstring>layout15</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -190,7 +190,7 @@
                                             <property name="name">
                                                 <cstring>m_pbDel</cstring>
                                             </property>
-                                            <property name="tqmaximumSize">
+                                            <property name="maximumSize">
                                                 <size>
                                                     <width>30</width>
                                                     <height>32767</height>
@@ -204,7 +204,7 @@
                                             <property name="name">
                                                 <cstring>m_pbAdd</cstring>
                                             </property>
-                                            <property name="tqmaximumSize">
+                                            <property name="maximumSize">
                                                 <size>
                                                     <width>30</width>
                                                     <height>32767</height>
@@ -229,7 +229,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>90</height>
@@ -348,7 +348,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -375,7 +375,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>90</width>
                                     <height>20</height>
@@ -384,7 +384,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout1</cstring>
+                                <cstring>layout1</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/kfilereplace/kfilereplacelib.cpp b/kfilereplace/kfilereplacelib.cpp
index b9073dea..5a3bfcd4 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").tqarg(TQString::number(d,'f',2));
+      stringSize = i18n("%1 KB").arg(TQString::number(d,'f',2));
     }
   else
   if(size >= mega && size < giga)
     {
       double d = size / mega;
-      stringSize = i18n("%1 MB").tqarg(TQString::number(d,'f',2));
+      stringSize = i18n("%1 MB").arg(TQString::number(d,'f',2));
     }
   else
   if(size >= giga)
     {
       double d = size / giga;
-      stringSize =  i18n("%1 GB").tqarg(TQString::number(d,'f',2));
+      stringSize =  i18n("%1 GB").arg(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>").tqarg(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>").arg(fileName));
    return ;
  }
 
diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp
index 2a7934e2..dae70133 100644
--- a/kfilereplace/kfilereplacepart.cpp
+++ b/kfilereplace/kfilereplacepart.cpp
@@ -17,7 +17,7 @@
 #include <tqdatastream.h>
 #include <tqregexp.h>
 #include <tqimage.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 // KDE
 #include <dcopclient.h>
@@ -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>").tqarg(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>").arg(m_option->m_encoding), i18n("File Encoding Warning"), KStdGuiItem::cont(), "ShowEncodingWarning") == KMessageBox::Cancel)
     return;
   if(!checkBeforeOperation())
     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>").tqarg(documentName));
+      KMessageBox::error(m_w, i18n("<qt>A folder or a file named <b>%1</b> already exists.</qt>").arg(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>").tqarg(documentName));
+      KMessageBox::error(m_w, i18n("<qt>Cannot create the <b>%1</b> folder.</qt>").arg(documentName));
       return ;
     }
 
@@ -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>").tqarg(oldFileName),TQString(), rcNotifyOnErrors);
+      KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for reading.</qt>").arg(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>").tqarg(oldFileName),TQString(), rcNotifyOnErrors);
+              KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").arg(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]").tqarg(oldFileInfo.owner()).tqarg(oldFileInfo.ownerId()));
-       item->setText(6,TQString("%1[%2]").tqarg(oldFileInfo.group()).tqarg(oldFileInfo.groupId()));
+       item->setText(5,TQString("%1[%2]").arg(oldFileInfo.owner()).arg(oldFileInfo.ownerId()));
+       item->setText(6,TQString("%1[%2]").arg(oldFileInfo.group()).arg(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>").tqarg(oldFile.name()),TQString(), rcNotifyOnErrors);
+      KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for reading.</qt>").arg(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>").tqarg(newFile.name()),TQString(), rcNotifyOnErrors);
+              KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").arg(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]").tqarg(oldFileInfo.owner()).tqarg(oldFileInfo.ownerId()));
-      item->setText(6,TQString("%1[%2]").tqarg(oldFileInfo.group()).tqarg(oldFileInfo.groupId()));
+      item->setText(5,TQString("%1[%2]").arg(oldFileInfo.owner()).arg(oldFileInfo.ownerId()));
+      item->setText(6,TQString("%1[%2]").arg(oldFileInfo.group()).arg(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>").tqarg(it.key()).tqarg(it.data()),
+		                                      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("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>").tqarg(fileName), TQString(), rcNotifyOnErrors);
+      KMessageBox::information(m_w, i18n("<qt>Cannot open file <b>%1</b> for reading.</qt>").arg(fileName), TQString(), rcNotifyOnErrors);
       return ;
     }
   // Creates a stream with the file
@@ -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\"").tqarg(capturedText).tqarg(TQString::number(lineNumber,10)).tqarg(TQString::number(columnNumber,10));
+	      msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10));
               tempItem->setMultiLinesEnabled(true);
               tempItem->setText(0,msg);
               occurrence = 1;
@@ -1443,7 +1443,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
                   pos = line.find(strKey,pos+strKey.length());
                 }
 
-              msg = i18n(" Line:%2, Col:%3 - \"%1\"").tqarg(capturedText).tqarg(TQString::number(lineNumber,10)).tqarg(TQString::number(columnNumber,10));
+              msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(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]").tqarg(fileInfo.owner()).tqarg(fileInfo.ownerId()));
-       item->setText(5,TQString("%1[%2]").tqarg(fileInfo.group()).tqarg(fileInfo.groupId()));
+       item->setText(4,TQString("%1[%2]").arg(fileInfo.owner()).arg(fileInfo.ownerId()));
+       item->setText(5,TQString("%1[%2]").arg(fileInfo.group()).arg(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>").tqarg(fileName));
+      KMessageBox::error(m_w, i18n("<qt>Cannot open the file <b>%1</b> and load the string list.</qt>").arg(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>").tqarg(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>").arg(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>").tqarg(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>").arg(fileName),i18n("Warning"),i18n("Load"),i18n("Do Not Load"));
 
       if(answer == KMessageBox::Yes)
         searchAttribute = "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>").tqarg(directory));
+      KMessageBox::error(m_w, i18n("<qt>The main folder of the project <b>%1</b> does not exist.</qt>").arg(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>").tqarg(directory));
+      KMessageBox::error(m_w, i18n("<qt>Access denied in the main folder of the project:<br><b>%1</b></qt>").arg(directory));
       return false;
     }
 
diff --git a/kfilereplace/kfilereplaceview.cpp b/kfilereplace/kfilereplaceview.cpp
index 9800f119..2de52edd 100644
--- a/kfilereplace/kfilereplaceview.cpp
+++ b/kfilereplace/kfilereplaceview.cpp
@@ -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>").tqarg(searchText));
+      KMessageBox::error(0, i18n("<qt>Cannot invert string <b>%1</b>, because the search string would be empty.</qt>").arg(searchText));
       return;
     }
 
@@ -256,7 +256,7 @@ void KFileReplaceView::slotResultEdit()
 
               if(!success)
                 {
-                  TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").tqarg(path);
+                  TQString message = i18n("File %1 cannot be opened. Might be a DCOP problem.").arg(path);
                   KMessageBox::error(parentWidget(), message);
                 }
             }
@@ -278,7 +278,7 @@ void KFileReplaceView::slotResultDelete()
   if (!currItem.isEmpty())
     {
       TQFile fi;
-      int answer = KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete %1?").tqarg(currItem),
+      int answer = KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete %1?").arg(currItem),
                                                       TQString(),KStdGuiItem::del());
 
       if(answer == KMessageBox::Continue)
@@ -417,7 +417,7 @@ 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>").tqarg(lvi->text(0)).tqarg(lvi->text(1));
+	"\n\t</replacement>").arg(lvi->text(0)).arg(lvi->text(1));
     lvi = lvi->nextSibling();
   }
 
@@ -434,7 +434,7 @@ void KFileReplaceView::slotStringsSave()
   TQFile file( fileName );
   if(!file.open( IO_WriteOnly ))
   {
-    KMessageBox::error(0, i18n("File %1 cannot be saved.").tqarg(fileName));
+    KMessageBox::error(0, i18n("File %1 cannot be saved.").arg(fileName));
     return ;
   }
   TQTextStream oTStream( &file );
@@ -498,7 +498,7 @@ void KFileReplaceView::initGUI()
 
 
 
-  m_menuResult->insertItem(SmallIconSet(TQString::tqfromLatin1("fileopen")),
+  m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("fileopen")),
                            i18n("&Open"),
                            this,
                            TQT_SLOT(slotResultOpen()));
@@ -517,16 +517,16 @@ void KFileReplaceView::initGUI()
                                TQT_SLOT(slotResultEdit()));
     }
 
-  m_menuResult->insertItem(SmallIconSet(TQString::tqfromLatin1("up")),
+  m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("up")),
                            i18n("Open Parent &Folder"),
                            this,
                            TQT_SLOT(slotResultDirOpen()));
-  m_menuResult->insertItem(SmallIconSet(TQString::tqfromLatin1("editdelete")),
+  m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("editdelete")),
                            i18n("&Delete"),
                            this,
                            TQT_SLOT(slotResultDelete()));
   m_menuResult->insertSeparator();
-  m_menuResult->insertItem(SmallIconSet(TQString::tqfromLatin1("info")),
+  m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("info")),
                            i18n("&Properties"),
                            this,
                            TQT_SLOT(slotResultProperties()));
diff --git a/kfilereplace/kfilereplaceviewwdg.ui b/kfilereplace/kfilereplaceviewwdg.ui
index bb3af48e..c8fca48d 100644
--- a/kfilereplace/kfilereplaceviewwdg.ui
+++ b/kfilereplace/kfilereplaceviewwdg.ui
@@ -389,7 +389,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -397,7 +397,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -407,7 +407,7 @@
                             <property name="name">
                                 <cstring>m_ledGo</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -434,7 +434,7 @@
                             <property name="name">
                                 <cstring>m_ledWait</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -461,7 +461,7 @@
                             <property name="name">
                                 <cstring>m_ledStop</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -490,7 +490,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>354</width>
                             <height>20</height>
@@ -499,7 +499,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kfilereplace/knewprojectdlg.cpp b/kfilereplace/knewprojectdlg.cpp
index 21e986ad..2988f864 100644
--- a/kfilereplace/knewprojectdlg.cpp
+++ b/kfilereplace/knewprojectdlg.cpp
@@ -24,7 +24,7 @@
 #include <tqdatetimeedit.h>
 #include <tqlabel.h>
 #include <tqradiobutton.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqlistview.h>
 
 //KDE
diff --git a/kfilereplace/knewprojectdlgs.ui b/kfilereplace/knewprojectdlgs.ui
index 7cb3b392..b3509c1d 100644
--- a/kfilereplace/knewprojectdlgs.ui
+++ b/kfilereplace/knewprojectdlgs.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout28</cstring>
+                <cstring>layout28</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -48,13 +48,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>70</width>
                             <height>32767</height>
@@ -74,7 +74,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>150</width>
                             <height>20</height>
@@ -118,7 +118,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>70</width>
                             <height>32767</height>
@@ -570,7 +570,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout8</cstring>
+                                    <cstring>layout8</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -578,7 +578,7 @@
                                     </property>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout18</cstring>
+                                            <cstring>layout18</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -612,7 +612,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout19</cstring>
+                                            <cstring>layout19</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -718,7 +718,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>190</width>
                                                 <height>16</height>
@@ -742,7 +742,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout32</cstring>
+                                    <cstring>layout32</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -750,7 +750,7 @@
                                     </property>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout31</cstring>
+                                            <cstring>layout31</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -776,7 +776,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout30</cstring>
+                                            <cstring>layout30</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -808,7 +808,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout31</cstring>
+                                            <cstring>layout31</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -842,7 +842,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>330</width>
                                                 <height>16</height>
diff --git a/kfilereplace/koptionsdlgs.ui b/kfilereplace/koptionsdlgs.ui
index 2c377b15..131e01f0 100644
--- a/kfilereplace/koptionsdlgs.ui
+++ b/kfilereplace/koptionsdlgs.ui
@@ -208,7 +208,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="1" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout9</cstring>
+                                    <cstring>layout9</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -224,7 +224,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>20</height>
@@ -281,7 +281,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>202</width>
                     <height>20</height>
diff --git a/kfilereplace/report.cpp b/kfilereplace/report.cpp
index 62e59173..6d485eba 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>").tqarg(xmlFileName));
+      KMessageBox::error(0, i18n("<qt>Cannot open the file <b>%1</b>.</qt>").arg(xmlFileName));
       return ;
     }
 
   // b) Write the header of the XML file
 
-  TQDateTime datetime = TQDateTime::tqcurrentDateTime(Qt::LocalTime);
+  TQDateTime datetime = TQDateTime::currentDateTime(Qt::LocalTime);
   TQString dateString = datetime.toString(Qt::LocalDate);
   KUser user;
   TQString columnTextFour,
@@ -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>").tqarg(cssFileName));
+      KMessageBox::error(0, i18n("<qt>Cannot open the file <b>%1</b>.</qt>").arg(cssFileName));
       return ;
     }
 
diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp
index ba1ea48d..d6fdc2d1 100644
--- a/kimagemapeditor/drawzone.cpp
+++ b/kimagemapeditor/drawzone.cpp
@@ -545,7 +545,7 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
 		drawCurrent=translateFromZoom(drawCurrent);
 
 		if (currentAction==DrawRectangle) {
-			// To avoid flicker, only tqrepaint the minimum rect
+			// To avoid flicker, only repaint the minimum rect
 			TQRect oldRect=translateToZoom(currentArea->rect());
 			currentArea->setRect(TQRect(drawStart,drawCurrent).normalize());
 			TQRect newRect=translateToZoom(currentArea->selectionRect());
@@ -629,10 +629,10 @@ void DrawZone::contentsMouseMoveEvent(TQMouseEvent *e)
       			imageMapEditor->deselectWithoutUpdate( it.current() );
 			}
 */
-      // We don't have to tqrepaint the hole selection rectangle
+      // We don't have to repaint the hole selection rectangle
       // only the borders have to be repainted.
       // So we have to create 4 rectangles for every rectangle
-      // which represent the borders and then tqrepaint them.
+      // which represent the borders and then repaint them.
 
       TQRect lb,rb,tb,bb;
       createBorderRectangles(translateToZoom(r),lb,rb,tb,bb);
diff --git a/kimagemapeditor/drawzone.h b/kimagemapeditor/drawzone.h
index 3934a8aa..d9b564a6 100644
--- a/kimagemapeditor/drawzone.h
+++ b/kimagemapeditor/drawzone.h
@@ -97,7 +97,7 @@ private:
   KImageMapEditor *imageMapEditor;
   // Only the rect of the zoomed image, perhaps redundant
   TQRect imageRect;
-  // Only for tqrepaint issues
+  // Only for repaint issues
   Area *oldArea;
 
   TQRect oldSelectionRect;
diff --git a/kimagemapeditor/imagemap.cpp b/kimagemapeditor/imagemap.cpp
index 04c1908e..4489508d 100644
--- a/kimagemapeditor/imagemap.cpp
+++ b/kimagemapeditor/imagemap.cpp
@@ -259,7 +259,7 @@ void ImageMap::contentsMouseMoveEvent(TQMouseEvent *e) {
 		drawCurrent=translateFromZoom(drawCurrent);
 		
 		if (currentAction==DrawRectangle) {
-			// To avoid flicker, only tqrepaint the minimum rect
+			// To avoid flicker, only repaint the minimum rect
 			TQRect oldRect=translateToZoom(currentArea->rect());
 			currentArea->setRect(TQRect(drawStart,drawCurrent).normalize());
 			TQRect newRect=translateToZoom(currentArea->rect());
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index 6dbb1a32..2c59cf3d 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -19,7 +19,7 @@
 #include <assert.h>
 
 // QT
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
 #include <tqvbox.h>
@@ -28,7 +28,7 @@
 #include <tqsplitter.h>
 #include <tqfileinfo.h>
 #include <tqmultilineedit.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqpopupmenu.h>
 #include <tqdict.h>
 #include <tqwhatsthis.h>
@@ -396,7 +396,7 @@ void KImageMapEditor::slotConfigChanged()
   }
 
   updateAllAreas();
-  drawZone->viewport()->tqrepaint();
+  drawZone->viewport()->repaint();
 }
 
 void KImageMapEditor::openLastURL(KConfig* config) {
@@ -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").tqarg(config->group()).tqarg(url().path()));
+  //KMessageBox::information(0L, TQString("Group: %1 Saving ... %2").arg(config->group()).arg(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").tqarg(name) << endl;
+      kdWarning() << TQString("KImageMapEditorPart: Missing XML definition for %1\n").arg(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 ").tqarg(x).tqarg(y),STATUS_CURSOR);
-  cursorStatusText = i18n(" Cursor: x: %1, y: %2 ").tqarg(x).tqarg(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);
   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 ").tqarg(r.left()).tqarg(r.top()).tqarg(r.width()).tqarg(r.height());
+    selectionStatusText = i18n(" Selection: x: %1, y: %2, w: %3, h: %4 ").arg(r.left()).arg(r.top()).arg(r.width()).arg(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 ").tqarg(r.left()).tqarg(r.top()).tqarg(r.width()).tqarg(r.height());
+  selectionStatusText = i18n(" Selection: x: %1, y: %2, w: %3, h: %4 ").arg(r.left()).arg(r.top()).arg(r.width()).arg(r.height());
   updateStatusBar();
   kapp->processEvents();
 }
@@ -990,7 +990,7 @@ void KImageMapEditor::deleteArea( Area * area )
 {
   if (!area) return;
 
-  // only for tqrepaint reasons
+  // only for repaint reasons
   TQRect redrawRect = area->selectionRect();
 
   // Perhaps we've got a selection of areas
@@ -1055,7 +1055,7 @@ void KImageMapEditor::deleteAllAreas()
     a=areas->first(); // because the current is deleted
   }
 
-  drawZone->viewport()->tqrepaint();
+  drawZone->viewport()->repaint();
 
 }
 
@@ -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()->tqrepaint();
+  drawZone->viewport()->repaint();
 }
 
 void KImageMapEditor::updateSelection() const {
@@ -1407,10 +1407,10 @@ void KImageMapEditor::setPicture(const KURL & url) {
          imageUsemapAction->setEnabled(true);
      }
      else
-         kdError() << TQString("The image %1 could not be opened.").tqarg(url.path()) << endl;
+         kdError() << TQString("The image %1 could not be opened.").arg(url.path()) << endl;
   }
   else
-     kdError() << TQString("The image %1 does not exist.").tqarg(url.path()) << endl;
+     kdError() << TQString("The image %1 does not exist.").arg(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.").tqarg(input));
+            KMessageBox::sorry(this->widget(), i18n("The name <em>%1</em> already exists.").arg(input));
         else {
             setMapName(input);
         }
@@ -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>").tqarg(fileInfo.fileName()),
+      i18n("<qt>The file <em>%1</em> already exists.<br>Do you want to overwrite it?</qt>").arg(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>").tqarg(fileInfo.fileName()));
+      KMessageBox::sorry(widget(), i18n("<qt>You do not have write permission for the file <em>%1</em>.</qt>").arg(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>").tqarg(fileInfo.fileName()),
+        i18n("<qt>The file <b>%1</b> does not exist.</qt>").arg(fileInfo.fileName()),
         i18n("File Does Not Exist"));
       return false;
   }
 
   openHTMLFile(url());
 
-  drawZone->viewport()->tqrepaint();
+  drawZone->viewport()->repaint();
   recentFilesAction->addURL(url());
   setModified(false);
   backupFileCreated = false;
@@ -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 *tqshapeStr = 0L;
+    TQString *shapeStr = 0L;
 
     switch (a->type()) {
-      case Area::Rectangle : tqshapeStr = new TQString("rect");break;
-      case Area::Circle : tqshapeStr = new TQString("circle");break;
-      case Area::Polygon : tqshapeStr = new TQString("poly");break;
+      case Area::Rectangle : shapeStr = new TQString("rect");break;
+      case Area::Circle : shapeStr = new TQString("circle");break;
+      case Area::Polygon : shapeStr = new TQString("poly");break;
       default : continue;
     }
 
-    dict->insert("tqshape",tqshapeStr);
+    dict->insert("shape",shapeStr);
 
     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("tqshape",new TQString("default"));
+    dict->insert("shape",new TQString("default"));
 
     for (AttributeIterator it = defaultArea->firstAttribute();it!=defaultArea->lastAttribute();++it)  {
       dict->insert(it.key(),new TQString(it.data()));
@@ -2159,16 +2159,16 @@ void KImageMapEditor::setMap(HtmlMapElement* mapElement) {
     _mapName = map->name;
     for (AreaTag *tag=map->first();tag!=0L;tag=map->next())
     {
-        TQString tqshape="rect";
-        if (tag->find("tqshape"))
-          tqshape=*tag->find("tqshape");
+        TQString shape="rect";
+        if (tag->find("shape"))
+          shape=*tag->find("shape");
 
         Area::ShapeType type=Area::Rectangle;
-        if (tqshape=="circle")
+        if (shape=="circle")
           type=Area::Circle;
-        else if (tqshape=="poly")
+        else if (shape=="poly")
           type=Area::Polygon;
-        else if (tqshape=="default")
+        else if (shape=="default")
           type=Area::Default;
 
         Area* a=AreaCreator::create(type);
@@ -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>").tqarg(url.path()));
+      i18n("<qt>The file <i>%1</i> could not be saved, because you do not have the required write permissions.</qt>").arg(url.path()));
     return;
   }
 
@@ -2556,7 +2556,7 @@ void KImageMapEditor::slotHightlightAreas()
 //  highlightAreasAction->setChecked(b);
   Area::highlightArea = b;
   updateAllAreas();
-  drawZone->viewport()->tqrepaint();
+  drawZone->viewport()->repaint();
 }
 
 void KImageMapEditor::slotShowAltTag()
@@ -2564,7 +2564,7 @@ void KImageMapEditor::slotShowAltTag()
   bool b = showAltAction->isChecked();
 //  showAltAction->setChecked(b);
   Area::showAlt = b;
-  drawZone->viewport()->tqrepaint();
+  drawZone->viewport()->repaint();
 }
 
 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>").tqarg(selectedMap),
+         " <br><b>There is no way to undo this.</b></qt>").arg(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>").tqarg(url().fileName()), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()) ) {
+   i18n("<qt>The file <i>%1</i> has been modified.<br>Do you want to save it?</qt>").arg(url().fileName()), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()) ) {
            case KMessageBox::Yes :
              saveFile();
              return true;
diff --git a/kimagemapeditor/kimearea.cpp b/kimagemapeditor/kimearea.cpp
index 52cccf9f..835cdf55 100644
--- a/kimagemapeditor/kimearea.cpp
+++ b/kimagemapeditor/kimearea.cpp
@@ -21,8 +21,8 @@
 #include <tqpixmap.h>
 #include <tqimage.h>
 #include <tqpen.h>
-#include <tqbrush.h>
-#include <tqpalette.h>
+#include <brush.h>
+#include <palette.h>
 #include <tqcolor.h>
 #include <tqlistview.h>
 
@@ -336,10 +336,10 @@ void Area::drawAlt(TQPainter & p)
 {
   double x,y;
 
-  double scalex = p.tqworldMatrix().m11();
-//  double scaley = p.tqworldMatrix().m12();
+  double scalex = p.worldMatrix().m11();
+//  double scaley = p.worldMatrix().m12();
 
-  TQWMatrix oldMatrix = p.tqworldMatrix();
+  TQWMatrix oldMatrix = p.worldMatrix();
 
   p.setWorldMatrix(TQWMatrix(1,oldMatrix.m12(), oldMatrix.m21(), 1, oldMatrix.dx(), oldMatrix.dy() ));
 
@@ -379,10 +379,10 @@ void Area::draw(TQPainter & p)
   {
 		int i=0;
 
-    double scalex = p.tqworldMatrix().m11();
-//    double scaley = p.tqworldMatrix().m12();
+    double scalex = p.worldMatrix().m11();
+//    double scaley = p.worldMatrix().m12();
 
-    TQWMatrix oldMatrix = p.tqworldMatrix();
+    TQWMatrix oldMatrix = p.worldMatrix();
 
     p.setWorldMatrix(TQWMatrix(1,oldMatrix.m12(), oldMatrix.m21(), 1, oldMatrix.dx(), oldMatrix.dy() ));
 
@@ -675,10 +675,10 @@ TQBitmap RectArea::getMask() const
 TQString RectArea::coordsToString() const
 {
 	TQString retStr=TQString("%1,%2,%3,%4")
-					.tqarg(rect().left())
-					.tqarg(rect().top())
-					.tqarg(rect().right())
-					.tqarg(rect().bottom());
+					.arg(rect().left())
+					.arg(rect().top())
+					.arg(rect().right())
+					.arg(rect().bottom());
 
 	return retStr;					
 }
@@ -747,7 +747,7 @@ bool RectArea::setCoords(const TQString & s)
 TQString RectArea::getHTMLCode() const {
 	TQString retStr;
 	retStr+="<area ";
-	retStr+="tqshape=\"rect\" ";
+	retStr+="shape=\"rect\" ";
 	
 	retStr+=getHTMLAttributes();
 	
@@ -834,9 +834,9 @@ TQBitmap CircleArea::getMask() const
 TQString CircleArea::coordsToString() const
 {
 	TQString retStr=TQString("%1,%2,%3")
-					.tqarg(_rect.center().x())
-					.tqarg(_rect.center().y())
-					.tqarg(_rect.width()/2);
+					.arg(_rect.center().x())
+					.arg(_rect.center().y())
+					.arg(_rect.width()/2);
 	
 	return retStr;
 }
@@ -949,7 +949,7 @@ bool CircleArea::setCoords(const TQString & s)
 TQString CircleArea::getHTMLCode() const {
 	TQString retStr;
 	retStr+="<area ";
-	retStr+="tqshape=\"circle\" ";
+	retStr+="shape=\"circle\" ";
 	
 	retStr+=getHTMLAttributes();
 	
@@ -992,9 +992,9 @@ void PolyArea::draw(TQPainter & p)
 
 
  	if (_finished)
-    p.tqdrawPolygon ( *_coords,false,0,_coords->count());
+    p.drawPolygon ( *_coords,false,0,_coords->count());
   else
-    p.tqdrawPolyline ( *_coords,0,_coords->count());
+    p.drawPolyline ( *_coords,0,_coords->count());
 
 /*
  	p.moveTo(_coords->point(0));
@@ -1033,8 +1033,8 @@ TQString PolyArea::coordsToString() const
  	
  	for (uint i=0;i<_coords->count();i++) {
  		retStr.append(TQString("%1,%2,")
- 			.tqarg(_coords->point(i).x())
- 			.tqarg(_coords->point(i).y()));
+ 			.arg(_coords->point(i).x())
+ 			.arg(_coords->point(i).y()));
  	}
  	
  	retStr.remove(retStr.length()-1,1);
@@ -1224,7 +1224,7 @@ bool PolyArea::setCoords(const TQString & s)
 TQString PolyArea::getHTMLCode() const {
 	TQString retStr;
 	retStr+="<area ";
-	retStr+="tqshape=\"poly\" ";
+	retStr+="shape=\"poly\" ";
 
 	retStr+=getHTMLAttributes();
 		
@@ -1283,7 +1283,7 @@ void DefaultArea::draw(TQPainter &)
 TQString DefaultArea::getHTMLCode() const {
 	TQString retStr;
 	retStr+="<area ";
-	retStr+="tqshape=\"default\" ";
+	retStr+="shape=\"default\" ";
 
 	retStr+=getHTMLAttributes();
 		
@@ -1302,7 +1302,7 @@ AreaSelection::AreaSelection()
 {
 	_areas = new AreaList();
 	_name = "Selection";
-	tqinvalidate();
+	invalidate();
 }
 
 AreaSelection::~AreaSelection() {
@@ -1352,7 +1352,7 @@ void AreaSelection::add(Area *a)
   	}
   }
 
-	tqinvalidate();
+	invalidate();
 }
 
 void AreaSelection::remove(Area *a)
@@ -1362,7 +1362,7 @@ void AreaSelection::remove(Area *a)
 		
 	a->setSelected( false );	
 	_areas->remove( a );
-	tqinvalidate();
+	invalidate();
 }
 
 void AreaSelection::reset()
@@ -1375,7 +1375,7 @@ void AreaSelection::reset()
   }
  	
  	_areas->clear();
-	tqinvalidate();
+	invalidate();
 }
 
 bool AreaSelection::contains(const TQPoint & p) const
@@ -1423,7 +1423,7 @@ void AreaSelection::moveSelectionPoint(TQRect* selectionPoint, const TQPoint & p
 		
 	_areas->getFirst()->moveSelectionPoint(selectionPoint,p);		
 
-	tqinvalidate();
+	invalidate();
 }
 
 
@@ -1436,7 +1436,7 @@ void AreaSelection::moveBy(int dx, int dy)
 
 	Area::moveBy( dx, dy );  	
 
-	tqinvalidate();
+	invalidate();
 }
 
 TQString AreaSelection::typeString() const
@@ -1474,7 +1474,7 @@ void AreaSelection::updateSelectionPoints()
 		it.current()->updateSelectionPoints();
   }
 
- 	tqinvalidate();
+ 	invalidate();
 
 }
 
@@ -1525,7 +1525,7 @@ void AreaSelection::setArea(const Area & copy)
 		setAreaSelection(*selection);
 	else {	
     Area::setArea(copy);
-  	tqinvalidate();
+  	invalidate();
   }
 }
 
@@ -1541,14 +1541,14 @@ void AreaSelection::setAreaSelection(const AreaSelection & copy)
    	it.current()->setArea(*it2.current());
 
   Area::setArea(copy);
-	tqinvalidate();
+	invalidate();
 }
 
 void AreaSelection::setAreaList( const AreaList & areas )
 {
 	delete _areas;
 	_areas = new AreaList(areas);
-	tqinvalidate();
+	invalidate();
 }
 
 void AreaSelection::setRect(const TQRect & r)
@@ -1558,7 +1558,7 @@ void AreaSelection::setRect(const TQRect & r)
 		_areas->getFirst()->setRect(r);
 	}
 
-	tqinvalidate();
+	invalidate();
 	_rect=rect();
 	updateSelectionPoints();
 }
@@ -1586,7 +1586,7 @@ int AreaSelection::addCoord(const TQPoint & p)
 	if ( _areas->count()==1 )
 	{
 		return _areas->getFirst()->addCoord(p);
-		tqinvalidate();
+		invalidate();
 	}
 
   return 0;	
@@ -1597,7 +1597,7 @@ void AreaSelection::insertCoord(int pos, const TQPoint & p)
 	if ( _areas->count()==1 )
 	{
 		_areas->getFirst()->insertCoord(pos, p);
-		tqinvalidate();
+		invalidate();
 	}	
 }
 
@@ -1606,7 +1606,7 @@ void AreaSelection::removeCoord(int pos)
 	if ( _areas->count()==1 )
 	{
 		_areas->getFirst()->removeCoord(pos);
-		tqinvalidate();
+		invalidate();
 	}	
 }
 
@@ -1617,7 +1617,7 @@ bool AreaSelection::removeSelectionPoint(TQRect * r)
 	if ( _areas->count()==1 )
 	{
 		result = _areas->getFirst()->removeSelectionPoint(r);
-		tqinvalidate();
+		invalidate();
 	}	
 	
 	return result;
@@ -1639,7 +1639,7 @@ void AreaSelection::moveCoord(int pos,const TQPoint & p)
 	if ( _areas->count()==1 )
 	{
 		_areas->getFirst()->moveCoord(pos,p);
-		tqinvalidate();
+		invalidate();
 	}	
 }
 
@@ -1648,7 +1648,7 @@ void AreaSelection::highlightSelectionPoint(int i)
 	if ( _areas->count()==1 )
 	{
 		_areas->getFirst()->highlightSelectionPoint(i);
-		tqinvalidate();
+		invalidate();
 	}	
 }
 
diff --git a/kimagemapeditor/kimearea.h b/kimagemapeditor/kimearea.h
index 3274a322..0c554754 100644
--- a/kimagemapeditor/kimearea.h
+++ b/kimagemapeditor/kimearea.h
@@ -367,7 +367,7 @@ class AreaSelection : public Area {
     bool allAreasWithin(const TQRect & r) const;
 
 		// makes the cache invalid
-		void tqinvalidate();		
+		void invalidate();		
 	private :
 		
 		AreaList *_areas;			
@@ -382,7 +382,7 @@ class AreaSelection : public Area {
 };
 
 
-inline void AreaSelection::tqinvalidate() {
+inline void AreaSelection::invalidate() {
 	_selectionCacheValid=false;
 	_rectCacheValid=false;
 }
diff --git a/kimagemapeditor/kimecommands.cpp b/kimagemapeditor/kimecommands.cpp
index 817d8b7d..975001d9 100644
--- a/kimagemapeditor/kimecommands.cpp
+++ b/kimagemapeditor/kimecommands.cpp
@@ -30,7 +30,7 @@ KCommand
 #else
 KNamedCommand
 #endif
- (i18n( "Cut %1" ).tqarg( a.typeString() ))
+ (i18n( "Cut %1" ).arg( 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" ).tqarg( a.typeString() ));
+	setName(i18n( "Delete %1" ).arg( a.typeString() ));
 }
 
 PasteCommand::PasteCommand(KImageMapEditor *document, const AreaSelection & a)
@@ -84,7 +84,7 @@ KCommand
 #else
 KNamedCommand
 #endif
- (i18n( "Paste %1" ).tqarg( a.typeString() ))
+ (i18n( "Paste %1" ).arg( a.typeString() ))
 {
 	_document=document;
 	_pasteAreaSelection=new AreaSelection();
@@ -129,7 +129,7 @@ KCommand
 #else
 KNamedCommand
 #endif
-(i18n( "Move %1" ).tqarg( a->typeString() ))
+(i18n( "Move %1" ).arg( a->typeString() ))
 {
 	_document=document;
 	_areaSelection=new AreaSelection();
@@ -155,7 +155,7 @@ void MoveCommand::execute()
   if (!_areaSelection->allAreasWithin(_document->getDrawZone()->getImageRect()))
   	_areaSelection->moveTo( _oldPoint.x(), _oldPoint.y() );
 
-  _document->selected()->tqinvalidate();
+  _document->selected()->invalidate();
 
 
 	_document->slotAreaChanged( tempArea );
@@ -174,7 +174,7 @@ void MoveCommand::unexecute()
 	_areaSelection->moveTo( _oldPoint.x(), _oldPoint.y() );
   _areaSelection->setMoving(false);
 
-  _document->selected()->tqinvalidate();
+  _document->selected()->invalidate();
 
 	_document->slotAreaChanged( tempArea );
 	_document->slotAreaChanged( _areaSelection );
@@ -191,7 +191,7 @@ KCommand
 #else
 KNamedCommand
 #endif
-(i18n( "Resize %1" ).tqarg( a->typeString() ))
+(i18n( "Resize %1" ).arg( a->typeString() ))
 {
 	_areaSelection=new AreaSelection();
 	_areaSelection->setAreaList( a->getAreaList() );
@@ -238,7 +238,7 @@ KCommand
 #else
 KNamedCommand
 #endif
-(i18n( "Add point to %1" ).tqarg( a->typeString() ))
+(i18n( "Add point to %1" ).arg( a->typeString() ))
 {
   if (a->type()!=Area::Polygon)
   {
@@ -287,7 +287,7 @@ KCommand
 #else
 KNamedCommand
 #endif
-(i18n( "Remove point from %1" ).tqarg( a->typeString() ))
+(i18n( "Remove point from %1" ).arg( a->typeString() ))
 {
   if (a->type()!=Area::Polygon)
   {
@@ -340,7 +340,7 @@ KCommand
 #else
 KNamedCommand
 #endif
-(i18n( "Create %1" ).tqarg( area->typeString() ))
+(i18n( "Create %1" ).arg( area->typeString() ))
 {
 	_document=document;
 	_area=area;
diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp
index c2e50c7c..f825d6dc 100644
--- a/kimagemapeditor/kimedialogs.cpp
+++ b/kimagemapeditor/kimedialogs.cpp
@@ -19,7 +19,7 @@
 //#include <tqstring.h>
 #include <tqcheckbox.h>
 #include <tqmultilineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
@@ -69,53 +69,53 @@ CoordsEdit::~CoordsEdit()
 RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a)
   : CoordsEdit(parent,a)
 {
-  TQGridLayout *tqlayout= new TQGridLayout(this,5,2,5,5);
+  TQGridLayout *layout= new TQGridLayout(this,5,2,5,5);
 
   topXSpin = new TQSpinBox(this);
   topXSpin->setMaxValue(INT_MAX);
   topXSpin->setMinValue(0);
   topXSpin->setValue(a->rect().left());
-  tqlayout->addWidget(topXSpin,0,1);
+  layout->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);
-  tqlayout->addWidget(lbl,0,0);
+  layout->addWidget(lbl,0,0);
 
   topYSpin = new TQSpinBox(this);
   topYSpin->setMaxValue(INT_MAX);
   topYSpin->setMinValue(0);
   topYSpin->setValue(a->rect().top());
-  tqlayout->addWidget(topYSpin,1,1);
+  layout->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);
-  tqlayout->addWidget(lbl,1,0);
+  layout->addWidget(lbl,1,0);
 
   widthSpin = new TQSpinBox(this);
   widthSpin->setMaxValue(INT_MAX);
   widthSpin->setMinValue(0);
   widthSpin->setValue(a->rect().width());
-  tqlayout->addWidget(widthSpin,2,1);
+  layout->addWidget(widthSpin,2,1);
   connect( widthSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
 
   lbl= new TQLabel(i18n("&Width:"),this);
   lbl->setBuddy(widthSpin);
-  tqlayout->addWidget(lbl,2,0);
+  layout->addWidget(lbl,2,0);
 
   heightSpin = new TQSpinBox(this);
   heightSpin->setMaxValue(INT_MAX);
   heightSpin->setMinValue(0);
   heightSpin->setValue(a->rect().height());
-  tqlayout->addWidget(heightSpin,3,1);
+  layout->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);
-  tqlayout->addWidget(lbl,3,0);
+  layout->addWidget(lbl,3,0);
 
-  tqlayout->setRowStretch(4,10);
+  layout->setRowStretch(4,10);
 }
 
 void RectCoordsEdit::applyChanges() {
@@ -130,44 +130,44 @@ void RectCoordsEdit::applyChanges() {
 CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a)
   : CoordsEdit(parent,a)
 {
-  TQGridLayout *tqlayout= new TQGridLayout(this,4,2,5,5);
+  TQGridLayout *layout= new TQGridLayout(this,4,2,5,5);
 
   centerXSpin = new TQSpinBox(this);
   centerXSpin->setMaxValue(INT_MAX);
   centerXSpin->setMinValue(0);
   centerXSpin->setValue(a->rect().center().x());
-  tqlayout->addWidget(centerXSpin,0,1);
+  layout->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);
-  tqlayout->addWidget(lbl,0,0);
+  layout->addWidget(lbl,0,0);
 
   centerYSpin = new TQSpinBox(this);
   centerYSpin->setMaxValue(INT_MAX);
   centerYSpin->setMinValue(0);
   centerYSpin->setValue(a->rect().center().y());
-  tqlayout->addWidget(centerYSpin,1,1);
+  layout->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);
-  tqlayout->addWidget(lbl,1,0);
+  layout->addWidget(lbl,1,0);
 
   radiusSpin = new TQSpinBox(this);
   radiusSpin->setMaxValue(INT_MAX);
   radiusSpin->setMinValue(0);
   radiusSpin->setValue(a->rect().width()/2);
-  tqlayout->addWidget(radiusSpin,2,1);
+  layout->addWidget(radiusSpin,2,1);
   connect( radiusSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
 
 
   lbl= new TQLabel(i18n("&Radius:"),this);
   lbl->setBuddy(radiusSpin);
-  tqlayout->addWidget(lbl,2,0);
+  layout->addWidget(lbl,2,0);
 
-  tqlayout->setRowStretch(3,10);
+  layout->setRowStretch(3,10);
 
 }
 
@@ -184,7 +184,7 @@ PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a)
   : CoordsEdit(parent,a)
 {
   if (!a) return;
-  TQVBoxLayout *tqlayout= new TQVBoxLayout(this);
+  TQVBoxLayout *layout= 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);
-  tqlayout->addWidget(coordsTable);
-  tqlayout->setStretchFactor(coordsTable,-1);
+  layout->addWidget(coordsTable);
+  layout->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()));
 
-  tqlayout->addWidget(hbox);
+  layout->addWidget(hbox);
   slotHighlightPoint(1);
 }
 
@@ -277,29 +277,29 @@ void PolyCoordsEdit::applyChanges() {
 SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *parent, Area* a)
   : CoordsEdit(parent,a)
 {
-  TQGridLayout *tqlayout= new TQGridLayout(this,2,2);
+  TQGridLayout *layout= new TQGridLayout(this,2,2);
 
   topXSpin = new TQSpinBox(this);
   topXSpin->setMaxValue(INT_MAX);
   topXSpin->setMinValue(0);
   topXSpin->setValue(a->rect().left());
-  tqlayout->addWidget(topXSpin,0,1);
+  layout->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);
-  tqlayout->addWidget(lbl,0,0);
+  layout->addWidget(lbl,0,0);
 
   topYSpin = new TQSpinBox(this);
   topYSpin->setMaxValue(INT_MAX);
   topYSpin->setMinValue(0);
   topYSpin->setValue(a->rect().top());
-  tqlayout->addWidget(topYSpin,1,1);
+  layout->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);
-  tqlayout->addWidget(lbl,1,0);
+  layout->addWidget(lbl,1,0);
 }
 
 void SelectionCoordsEdit::applyChanges() {
@@ -308,13 +308,13 @@ void SelectionCoordsEdit::applyChanges() {
 
 
 
-TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name)
+TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *layout, int y, const TQString & value, const TQString & name)
 {
   TQLineEdit* edit=new TQLineEdit(value,parent);
-  tqlayout->addWidget(edit,y,2);
+  layout->addWidget(edit,y,2);
   TQLabel* lbl=new TQLabel(name,parent);
   lbl->setBuddy(edit);
-  tqlayout->addWidget(lbl,y,1);
+  layout->addWidget(lbl,y,1);
 
   return edit;
 }
@@ -322,7 +322,7 @@ TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *tqlayout,
 TQWidget* AreaDialog::createGeneralPage()
 {
   TQFrame* page = new TQFrame(this);
-  TQGridLayout* tqlayout = new TQGridLayout(page,5,2,5,5);
+  TQGridLayout* layout = 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());
 
-  tqlayout->addWidget(hbox,0,2);
+  layout->addWidget(hbox,0,2);
   TQLabel *lbl=new TQLabel(i18n( "&HREF:" ),page);
   lbl->setBuddy(hrefEdit);
-  tqlayout->addWidget(lbl,0,1);
+  layout->addWidget(lbl,0,1);
 
-  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:"));
+  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:"));
 
   if (area->type()==Area::Default)
   {
     defaultAreaChk = new TQCheckBox(i18n("Enable default map"),page);
     if (area->finished())
       defaultAreaChk->setChecked(true);
-    tqlayout->addWidget(defaultAreaChk,3,2);
+    layout->addWidget(defaultAreaChk,3,2);
   }
 
 
-  tqlayout->setRowStretch(4,10);
+  layout->setRowStretch(4,10);
 
   return page;
 }
@@ -358,11 +358,11 @@ TQWidget* AreaDialog::createGeneralPage()
 TQWidget* AreaDialog::createCoordsPage()
 {
   TQFrame* page = new TQFrame(this);
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(page);
-  tqlayout->setMargin(5);
+  TQVBoxLayout *layout = new TQVBoxLayout(page);
+  layout->setMargin(5);
 
   coordsEdit = createCoordsEdit(page,area);
-  tqlayout->addWidget(coordsEdit);
+  layout->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* tqlayout = new TQGridLayout(page,8,2,5,5);
+  TQGridLayout* layout = new TQGridLayout(page,8,2,5,5);
 
-  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:"));
+  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:"));
 
-  tqlayout->setRowStretch(7,10);
+  layout->setRowStretch(7,10);
 
 
   return page;
@@ -423,44 +423,44 @@ AreaDialog::AreaDialog(KImageMapEditor* parent,Area * a)
   setCaption(i18n("Area Tag Editor"));
 
   area=a;
-  TQString tqshape="Default";
+  TQString shape="Default";
   areaCopy= a->clone();
   oldArea= new Area();
   oldArea->setRect( a->rect() );
 
   switch (a->type()) {
-    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;
+    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;
     default : break;
   }
 
 
   // To get a margin around everything
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
 
-  tqlayout->setMargin(5);
+  layout->setMargin(5);
 
-  TQLabel *lbl = new TQLabel("<b>"+tqshape+"</b>",this);
+  TQLabel *lbl = new TQLabel("<b>"+shape+"</b>",this);
   lbl->setTextFormat(TQt::RichText);
-  tqlayout->addWidget(lbl);
+  layout->addWidget(lbl);
 
   TQFrame *line = new TQFrame(this);
   line->setFrameStyle(TQFrame::HLine  | TQFrame::Sunken);
   line->setFixedHeight(10);
-  tqlayout->addWidget(line);
+  layout->addWidget(line);
 
   TQTabWidget *tab = new TQTabWidget(this);
 
-  tqlayout->addWidget(tab);
+  layout->addWidget(tab);
 
   tab->addTab(createGeneralPage(),i18n("&General"));
 
   if (a->type()==Area::Default)
   {
-      tqshape=i18n("Default");
+      shape=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);
-  tqlayout->addWidget(line);
+  layout->addWidget(line);
 
-  tqlayout->addWidget(createButtonBar());
+  layout->addWidget(createButtonBar());
 
   setMinimumHeight(360);
   setMinimumWidth(327);
@@ -580,17 +580,17 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_
   TQWidget *page=new TQWidget(this);
   setMainWidget(page);
   setCaption(baseUrl.fileName());
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(page,5,5);
+  TQVBoxLayout *layout = 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));
-  tqlayout->addWidget(lbl);
+  layout->addWidget(lbl);
   TQFrame *line= new TQFrame(page);
   line->setFrameStyle(TQFrame::HLine  | TQFrame::Sunken);
   line->setFixedHeight(10);
-  tqlayout->addWidget(line,0);
+  layout->addWidget(line,0);
 
-  TQGridLayout *gridLayout= new TQGridLayout(tqlayout,2,3,5);
+  TQGridLayout *gridLayout= new TQGridLayout(layout,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->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding));
+//	line->setSizePolicy(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->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding));
+  imagePreview->setSizePolicy(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);
-//	tqlayout->addLayout(gridLayout,1);
+//	layout->addLayout(gridLayout,1);
 
   line= new TQFrame(page);
   line->setFrameStyle(TQFrame::HLine  | TQFrame::Sunken);
   line->setFixedHeight(10);
-  tqlayout->addWidget(line,0);
+  layout->addWidget(line,0);
 
 
   if (maps->isEmpty()) {
@@ -669,8 +669,8 @@ void ImageMapChooseDialog::initImageListTable(TQWidget* parent) {
   TQLabel *lbl= new TQLabel(i18n("&Images"),parent);
   lbl->setBuddy(imageListTable);
 
-  parent->tqlayout()->add(lbl);
-  parent->tqlayout()->add(imageListTable);
+  parent->layout()->add(lbl);
+  parent->layout()->add(imageListTable);
 
   if (images->isEmpty())
     return;
@@ -731,7 +731,7 @@ void ImageMapChooseDialog::slotImageChanged()
   pix2.convertFromImage(pix);
   imagePreview->setPixmap(pix2);
 
-//	imagePreview->tqrepaint();
+//	imagePreview->repaint();
 }
 
 void ImageMapChooseDialog::selectImageWithUsemap(const TQString & usemap) {
@@ -866,8 +866,8 @@ HTMLPreviewDialog::~HTMLPreviewDialog() {
 void HTMLPreviewDialog::show() {
   KDialogBase::show();
   htmlPart->openURL(KURL( tempFile->name() ));
-//  htmlView->tqlayout();
-//  htmlView->tqrepaint();
+//  htmlView->layout();
+//  htmlView->repaint();
   resize(800,600);
 }
 
diff --git a/kimagemapeditor/kimedialogs.h b/kimagemapeditor/kimedialogs.h
index 2f4000a3..f3a245cd 100644
--- a/kimagemapeditor/kimedialogs.h
+++ b/kimagemapeditor/kimedialogs.h
@@ -137,7 +137,7 @@ class AreaDialog : public KDialog {
 		void slotChooseHref();
 		void slotUpdateArea();
 		
-    TQLineEdit* createLineEdit(TQWidget* parent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name);
+    TQLineEdit* createLineEdit(TQWidget* parent, TQGridLayout *layout, int y, const TQString & value, const TQString & name);
 	  TQWidget* createGeneralPage();
 	  TQWidget* createCoordsPage();
 	  TQWidget* createJavascriptPage();
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp
index 70e97757..6b0311a9 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* tqlayout = new TQGridLayout( mainDock );
+//  TQLayout* layout = new TQGridLayout( mainDock );
 
   mainDock->setWidget( w );
   // allow others to dock to the 4 sides
@@ -71,7 +71,7 @@ KimeShell::KimeShell(const char *name )
   //setCentralWidget(part->widget());
 
   if (!initialGeometrySet())
-    resize( TQSize(725, 525).expandedTo(tqminimumSizeHint()));
+    resize( TQSize(725, 525).expandedTo(minimumSizeHint()));
 
   connect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)),
            this, TQT_SLOT(slotSetStatusBarText ( const TQString & )));
diff --git a/klinkstatus/data/styles/results_stylesheet.xsl b/klinkstatus/data/styles/results_stylesheet.xsl
index fac79c2f..d0b0c10d 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>tqStatus</th>
+                            <th>Status</th>
                             <th>Label</th>
                             <th>Referrers</th>
                         </tr>
diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp
index 62150888..3a775cf4 100644
--- a/klinkstatus/src/actionmanager.cpp
+++ b/klinkstatus/src/actionmanager.cpp
@@ -106,7 +106,7 @@ void ActionManager::initPart(KLinkStatusPart* part)
     // *************** Settings menu *********************
 
     (void) new KAction(i18n("Configure KLinkStatus..."), "configure",
-                       0, d->part, TQT_SLOT(slotConfigureKLinktqStatus()),
+                       0, d->part, TQT_SLOT(slotConfigureKLinkStatus()),
                        TQT_TQOBJECT(d->actionCollection), "configure_klinkstatus");
 
     // *************** Help menu *********************
diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp
index bf54a59b..5667735d 100644
--- a/klinkstatus/src/engine/linkchecker.cpp
+++ b/klinkstatus/src/engine/linkchecker.cpp
@@ -24,7 +24,7 @@
 
 #include <tqstring.h>
 #include <tqtimer.h>
-#include <tqtextcodec.h> 
+#include <textcodec.h> 
 #include <tqcstring.h>
 
 #include <kio/netaccess.h>
@@ -43,7 +43,7 @@
 
 int LinkChecker::count_ = 0;
 
-LinkChecker::LinkChecker(LinktqStatus* linkstatus, int time_out,
+LinkChecker::LinkChecker(LinkStatus* linkstatus, int time_out,
                          TQObject *parent, const char *name)
         : TQObject(parent, name), search_manager_(0), 
         linkstatus_(linkstatus), t_job_(0), time_out_(time_out), checker_(0), document_charset_(), 
@@ -69,7 +69,7 @@ void LinkChecker::check()
 {
     Q_ASSERT(!finnished_);
 
-    KURL url(linktqStatus()->absoluteUrl());
+    KURL url(linkStatus()->absoluteUrl());
     Q_ASSERT(url.isValid());
 
     if(url.hasRef()) {
@@ -128,7 +128,7 @@ void LinkChecker::slotTimeOut()
             linkstatus_->setErrorOccurred(true);
             linkstatus_->setChecked(true);
             linkstatus_->setError(i18n("Timeout"));
-            linkstatus_->settqStatus(LinktqStatus::TIMEOUT);
+            linkstatus_->setStatus(LinkStatus::TIMEOUT);
 
             killJob();
             finnish();
@@ -146,9 +146,9 @@ void LinkChecker::slotMimetype (KIO::Job* /*job*/, const TQString &type)
 
     Q_ASSERT(t_job_);
 
-    LinktqStatus* ls = 0;
+    LinkStatus* ls = 0;
 /*    if(redirection_)
-        ls = linktqStatus()->redirection();
+        ls = linkStatus()->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->settqStatus(LinktqStatus::SUCCESSFULL);
+                ls->setStatus(LinkStatus::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->settqStatus(LinktqStatus::SUCCESSFULL);
+                    ls->setStatus(LinkStatus::SUCCESSFULL);
                     
                     killJob();                    
                     finnish();
@@ -206,9 +206,9 @@ void LinkChecker::slotData(KIO::Job* /*job*/, const TQByteArray& data)
     
     Q_ASSERT(t_job_);
     
-    LinktqStatus* ls = 0;
+    LinkStatus* ls = 0;
 /*    if(redirection_)
-        ls = linktqStatus()->redirection();
+        ls = linkStatus()->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_->settqStatus(getHttptqStatus());
+                    linkstatus_->setStatus(getHttpStatus());
                     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->settqStatus(getHttptqStatus());
+                    ls->setStatus(getHttpStatus());
                     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->settqStatus(getHttptqStatus());
+                    ls->setStatus(getHttpStatus());
                     killJob();
                     finnish();
                     return;
@@ -339,9 +339,9 @@ void LinkChecker::slotResult(KIO::Job* /*job*/)
         return;
     }
 
-    LinktqStatus* ls = 0;
+    LinkStatus* ls = 0;
     if(redirection_)
-        ls = linktqStatus()->redirection();
+        ls = linkStatus()->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->settqStatus(LinktqStatus::SUCCESSFULL);
+            ls->setStatus(LinkStatus::SUCCESSFULL);
         }
         else
         {
             ls->setErrorOccurred(true);
             if(job->error() == KIO::ERR_SERVER_TIMEOUT)
-                ls->settqStatus(LinktqStatus::TIMEOUT);
+                ls->setStatus(LinkStatus::TIMEOUT);
             else
-                ls->settqStatus(LinktqStatus::BROKEN);
+                ls->setStatus(LinkStatus::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->settqStatus(LinktqStatus::SUCCESSFULL);
+            ls->setStatus(LinkStatus::SUCCESSFULL);
            }
         else
         {
@@ -402,7 +402,7 @@ void LinkChecker::slotResult(KIO::Job* /*job*/)
             }
             Q_ASSERT(header_checked_);
             
-            ls->settqStatus(getHttptqStatus());
+            ls->setStatus(getHttpStatus());
         }
 
         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_->settqStatus(LinktqStatus::HTTP_REDIRECTION);
+    linkstatus_->setStatus(LinkStatus::HTTP_REDIRECTION);
     linkstatus_->setChecked(true);
     
-    LinktqStatus* ls_red = new LinktqStatus(*linkstatus_);
+    LinkStatus* ls_red = new LinkStatus(*linkstatus_);
     ls_red->setAbsoluteUrl(toUrl);
     ls_red->setRootUrl(linkstatus_->rootUrl());
 
@@ -534,23 +534,23 @@ HttpResponseHeader LinkChecker::getHttpHeader(KIO::Job* /*job*/, bool remember_c
 
 void LinkChecker::checkRef()
 {
-    KURL url(linktqStatus()->absoluteUrl());
+    KURL url(linkStatus()->absoluteUrl());
     Q_ASSERT(url.hasRef());
     
     TQString ref = url.ref();
     if(ref == "" || ref == "top") {
         linkstatus_->setStatusText("OK");
-        linkstatus_->settqStatus(LinktqStatus::SUCCESSFULL);
+        linkstatus_->setStatus(LinkStatus::SUCCESSFULL);
         finnish();
         return;
     }
 
     TQString url_base;
-    LinktqStatus const* ls_parent = 0;
+    LinkStatus const* ls_parent = 0;
     int i_ref = -1;
 
-    if(linktqStatus()->originalUrl().startsWith("#"))
-        ls_parent = linktqStatus()->parent();
+    if(linkStatus()->originalUrl().startsWith("#"))
+        ls_parent = linkStatus()->parent();
 
     else
     {
@@ -560,7 +560,7 @@ void LinkChecker::checkRef()
 
         Q_ASSERT(search_manager_);
 
-        ls_parent = search_manager_->linktqStatus(url_base);
+        ls_parent = search_manager_->linkStatus(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, linktqStatus()->absoluteUrl().ref()))
+    if(hasAnchor(html_part, linkStatus()->absoluteUrl().ref()))
     {
         linkstatus_->setStatusText("OK");
-        linkstatus_->settqStatus(LinktqStatus::SUCCESSFULL);
+        linkstatus_->setStatus(LinkStatus::SUCCESSFULL);
     }
     else
     {
         linkstatus_->setErrorOccurred(true);
         linkstatus_->setError(i18n( "Link destination not found." ));
-        linkstatus_->settqStatus(LinktqStatus::BROKEN);
+        linkstatus_->setStatus(LinkStatus::BROKEN);
     }
 
     finnish();
 }
 
-void LinkChecker::checkRef(LinktqStatus const* linkstatus_parent)
+void LinkChecker::checkRef(LinkStatus const* linkstatus_parent)
 {
     Q_ASSERT(search_manager_);
 
@@ -638,16 +638,16 @@ void LinkChecker::checkRef(LinktqStatus const* linkstatus_parent)
         search_manager_->addHtmlPart(url_string, html_part);
     }
 
-    if(hasAnchor(html_part, linktqStatus()->absoluteUrl().ref()))
+    if(hasAnchor(html_part, linkStatus()->absoluteUrl().ref()))
     {
         linkstatus_->setStatusText("OK");
-        linkstatus_->settqStatus(LinktqStatus::SUCCESSFULL);
+        linkstatus_->setStatus(LinkStatus::SUCCESSFULL);
     }
     else
     {
         linkstatus_->setErrorOccurred(true);
         linkstatus_->setError(i18n( "Link destination not found." ));
-        linkstatus_->settqStatus(LinktqStatus::BROKEN);
+        linkstatus_->setStatus(LinkStatus::BROKEN);
     }
 
     finnish();
@@ -684,20 +684,20 @@ void LinkChecker::killJob()
     aux->kill(true); // quietly   
 }
 
-LinktqStatus::tqStatus LinkChecker::getHttptqStatus() const
+LinkStatus::Status LinkChecker::getHttpStatus() const
 {
     TQString status_code = TQString::number(linkstatus_->httpHeader().statusCode());
     
     if(status_code[0] == '2')
-        return LinktqStatus::SUCCESSFULL;
+        return LinkStatus::SUCCESSFULL;
     else if(status_code[0] == '3')
-        return LinktqStatus::HTTP_REDIRECTION;
+        return LinkStatus::HTTP_REDIRECTION;
     else if(status_code[0] == '4')
-        return LinktqStatus::HTTP_CLIENT_ERROR;
+        return LinkStatus::HTTP_CLIENT_ERROR;
     else if(status_code[0] == '5')
-        return LinktqStatus::HTTP_SERVER_ERROR;
+        return LinkStatus::HTTP_SERVER_ERROR;
     else
-        return LinktqStatus::UNDETERMINED;
+        return LinkStatus::UNDETERMINED;
 }
 
 #include "linkchecker.moc"
diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h
index 7eca50c8..86b01bb3 100644
--- a/klinkstatus/src/engine/linkchecker.h
+++ b/klinkstatus/src/engine/linkchecker.h
@@ -42,7 +42,7 @@ class LinkChecker : public TQObject
     Q_OBJECT
   TQ_OBJECT
 public:
-    LinkChecker(LinktqStatus* linkstatus, int time_out = 50,
+    LinkChecker(LinkStatus* linkstatus, int time_out = 50,
                 TQObject *parent = 0, const char *name = 0);
     ~LinkChecker();
 
@@ -50,13 +50,13 @@ public:
     void check();
     void setSearchManager(SearchManager* search_manager);
 
-    LinktqStatus const* linktqStatus() const;
+    LinkStatus const* linkStatus() const;
 
     static bool hasAnchor(KHTMLPart* html_part, TQString const& anchor);
 
 signals:
 
-    void transactionFinished(const LinktqStatus * linkstatus,
+    void transactionFinished(const LinkStatus * linkstatus,
                              LinkChecker * checker);
     void jobFinnished(LinkChecker * checker);
 
@@ -76,8 +76,8 @@ protected:
 
 private:
     
-    LinktqStatus::tqStatus getHttptqStatus() const;
-    void checkRef(LinktqStatus const* linkstatus_parent);
+    LinkStatus::Status getHttpStatus() const;
+    void checkRef(LinkStatus const* linkstatus_parent);
     void checkRef(KURL const& url);
     void killJob();    
     /**
@@ -91,7 +91,7 @@ private:
 private:
 
     SearchManager* search_manager_;
-    LinktqStatus* const linkstatus_;
+    LinkStatus* const linkstatus_;
     KIO::TransferJob* t_job_;
     int time_out_;
     LinkChecker* checker_;
@@ -120,7 +120,7 @@ private:
     static int count_; // debug attribute that counts how many links were checked
 };
 
-inline LinktqStatus const* LinkChecker::linktqStatus() const
+inline LinkStatus const* LinkChecker::linkStatus() const
 {
     return linkstatus_;
 }
diff --git a/klinkstatus/src/engine/linkfilter.cpp b/klinkstatus/src/engine/linkfilter.cpp
index a626b5f8..27612600 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::tqStatus status)
+LinkMatcher::LinkMatcher(TQString const& text, ResultView::Status status)
     : m_text(text), m_status(status)
 {
 }
@@ -31,7 +31,7 @@ LinkMatcher::~LinkMatcher()
 {
 }
 
-bool LinkMatcher::matches(LinktqStatus const& link ) const
+bool LinkMatcher::matches(LinkStatus const& link ) const
 {
 /*    kdDebug() << link.absoluteUrl().url() << endl;
     kdDebug() << link.label() << endl;
@@ -39,7 +39,7 @@ bool LinkMatcher::matches(LinktqStatus const& link ) const
     kdDebug() << link.label().contains(m_text) << endl;
     */
     return (link.absoluteUrl().url().contains(m_text, false) || link.label().contains(m_text, false)) &&
-            ResultView::displayableWithtqStatus(&link, m_status);
+            ResultView::displayableWithStatus(&link, m_status);
 }
 
 
diff --git a/klinkstatus/src/engine/linkfilter.h b/klinkstatus/src/engine/linkfilter.h
index a47a37c8..0b5af1f6 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::tqStatus status);
+    LinkMatcher(TQString const& text, ResultView::Status status);
     ~LinkMatcher();
 
-    bool matches(LinktqStatus const& link) const;
+    bool matches(LinkStatus const& link) const;
 
     void setText(const TQString& text) { m_text = text; }
     TQString text() const { return m_text; }
 
-    void settqStatus(ResultView::tqStatus status) { m_status = status; }
-    ResultView::tqStatus status() const { return m_status; }
+    void setStatus(ResultView::Status status) { m_status = status; }
+    ResultView::Status status() const { return m_status; }
     
     bool nullFilter() const { return m_text.isEmpty() && m_status == ResultView::none; }
         
 private:
     TQString m_text;
-    ResultView::tqStatus m_status;
+    ResultView::Status m_status;
 };
 
 #endif
diff --git a/klinkstatus/src/engine/linkstatus.cpp b/klinkstatus/src/engine/linkstatus.cpp
index e41bba75..bf5986f5 100644
--- a/klinkstatus/src/engine/linkstatus.cpp
+++ b/klinkstatus/src/engine/linkstatus.cpp
@@ -28,20 +28,20 @@
 #include <tqdom.h>
 
 
-LinktqStatus::~LinktqStatus()
+LinkStatus::~LinkStatus()
 {
     //kdDebug(23100) <<  "|";
 
-    for(uint i = 0; i != tqchildren_nodes_.size(); ++i)
+    for(uint i = 0; i != children_nodes_.size(); ++i)
     {
-        if(tqchildren_nodes_[i])
+        if(children_nodes_[i])
         {
-            delete tqchildren_nodes_[i];
-            tqchildren_nodes_[i] = 0;
+            delete children_nodes_[i];
+            children_nodes_[i] = 0;
         }
     }
 
-    tqchildren_nodes_.clear();
+    children_nodes_.clear();
 
     if(isRedirection())
     {
@@ -53,7 +53,7 @@ LinktqStatus::~LinktqStatus()
     }
 }
 
-void LinktqStatus::reset()
+void LinkStatus::reset()
 {
     depth_ = -1;
     external_domain_depth_ = -1;
@@ -71,16 +71,16 @@ void LinktqStatus::reset()
     http_header_ = HttpResponseHeader();
     error_ = "";
 
-    for(uint i = 0; i != tqchildren_nodes_.size(); ++i)
+    for(uint i = 0; i != children_nodes_.size(); ++i)
     {
-        if(tqchildren_nodes_[i])
+        if(children_nodes_[i])
         {
-            delete tqchildren_nodes_[i];
-            tqchildren_nodes_[i] = 0;
+            delete children_nodes_[i];
+            children_nodes_[i] = 0;
         }
     }
 
-    tqchildren_nodes_.clear();
+    children_nodes_.clear();
 
     if(isRedirection())
     {
@@ -94,27 +94,27 @@ void LinktqStatus::reset()
     base_URI_ = "";
 }
 
-TQString const LinktqStatus::toString() const
+TQString const LinkStatus::toString() const
 {
     TQString aux;
 
     if(!is_root_)
     {
         Q_ASSERT(parent_);
-        aux += i18n( "Parent: %1" ).tqarg( parent()->absoluteUrl().prettyURL() ) + "\n";
+        aux += i18n( "Parent: %1" ).arg( parent()->absoluteUrl().prettyURL() ) + "\n";
     }
     Q_ASSERT(!original_url_.isNull());
 
-    aux += i18n( "URL: %1" ).tqarg( absoluteUrl().prettyURL() ) + "\n";
-    aux += i18n( "Original URL: %1" ).tqarg( originalUrl() ) + "\n";
+    aux += i18n( "URL: %1" ).arg( absoluteUrl().prettyURL() ) + "\n";
+    aux += i18n( "Original URL: %1" ).arg( originalUrl() ) + "\n";
     if(node())
-        aux += i18n( "Node: %1" ).tqarg( node()->content() ) + "\n";
+        aux += i18n( "Node: %1" ).arg( node()->content() ) + "\n";
 
     return aux;
 }
 
 
-LinktqStatus* LinktqStatus::lastRedirection(LinktqStatus* ls)
+LinkStatus* LinkStatus::lastRedirection(LinkStatus* ls)
 {
     if(ls->isRedirection())
         if(ls->redirection())
@@ -125,7 +125,7 @@ LinktqStatus* LinktqStatus::lastRedirection(LinktqStatus* ls)
         return ls;
 }
 
-void LinktqStatus::loadNode()
+void LinkStatus::loadNode()
 {
     Q_ASSERT(node_);
 
@@ -136,32 +136,32 @@ void LinktqStatus::loadNode()
     {
         setErrorOccurred(true);
         setError(i18n( "Malformed" ));
-        settqStatus(LinktqStatus::MALFORMED);
+        setStatus(LinkStatus::MALFORMED);
         kdDebug(23100) <<  "Malformed:" << endl;
         kdDebug(23100) <<  "Node: " << node()->content() << endl;
         //kdDebug(23100) <<  toString() << endl; // probable segfault
     }
 }
 
-bool LinktqStatus::malformed() const // don't inline please (#include "node.h")
+bool LinkStatus::malformed() const // don't inline please (#include "node.h")
 {
     return (malformed_ || node_->malformed());
 }
 
-void LinktqStatus::setChildrenNodes(vector<Node*> const& nodes) // don't inline please (#include "node.h")
+void LinkStatus::setChildrenNodes(vector<Node*> const& nodes) // don't inline please (#include "node.h")
 {
-    tqchildren_nodes_.reserve(nodes.size());
-    tqchildren_nodes_ = nodes;
+    children_nodes_.reserve(nodes.size());
+    children_nodes_ = nodes;
 }
 
-void LinktqStatus::setMalformed(bool flag)
+void LinkStatus::setMalformed(bool flag)
 {
     malformed_ = flag;
     if(flag)
     {
         setErrorOccurred(true);
         setError(i18n( "Malformed" ));
-        settqStatus(LinktqStatus::MALFORMED);
+        setStatus(LinkStatus::MALFORMED);
         kdDebug(23100) <<  "Malformed!" << endl;
         kdDebug(23100) <<  node()->content() << endl;
         //kdDebug(23100) <<  toString() << endl; // probable segfault
@@ -170,11 +170,11 @@ void LinktqStatus::setMalformed(bool flag)
     {
         setErrorOccurred(false);
         setError("");
-        settqStatus(LinktqStatus::UNDETERMINED);
+        setStatus(LinkStatus::UNDETERMINED);
     }
 }
 
-void LinktqStatus::save(TQDomElement& element) const
+void LinkStatus::save(TQDomElement& element) const
 {
     TQDomElement child_element = element.ownerDocument().createElement("link");
 
@@ -186,7 +186,7 @@ void LinktqStatus::save(TQDomElement& element) const
     // <status>
     tmp_1 = element.ownerDocument().createElement("status");
     tmp_1.setAttribute("broken", 
-                       ResultView::displayableWithtqStatus(this, ResultView::bad) ? 
+                       ResultView::displayableWithStatus(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 3880791f..ac49801f 100644
--- a/klinkstatus/src/engine/linkstatus.h
+++ b/klinkstatus/src/engine/linkstatus.h
@@ -43,11 +43,11 @@ using namespace std;
 
 class Node;
 
-class LinktqStatus
+class LinkStatus
 {
 public:
 
-    enum tqStatus {
+    enum Status {
         UNDETERMINED,
         SUCCESSFULL,
         BROKEN,
@@ -59,29 +59,29 @@ public:
         MALFORMED
     };
     
-    LinktqStatus();
-    LinktqStatus(KURL const& absolute_url);
-    LinktqStatus(Node* node, LinktqStatus* parent);
-    ~LinktqStatus();
+    LinkStatus();
+    LinkStatus(KURL const& absolute_url);
+    LinkStatus(Node* node, LinkStatus* parent);
+    ~LinkStatus();
 
     void save(TQDomElement& element) const;
     
     void reset();
     void setRootUrl(KURL const& url);
-    void settqStatus(tqStatus status);
+    void setStatus(Status status);
     void setDepth(uint depth);
-    void setParent(LinktqStatus* parent);
+    void setParent(LinkStatus* parent);
     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 LinktqStatus::tqStatus
+    void setStatusText(TQString const& statusText); // FIXME Legacy. This should be eliminated in favor of LinkStatus::Status
     void setError(TQString const& error);
     void setIsRoot(bool flag);
     void setErrorOccurred(bool houve_error);
     void setIsRedirection(bool e_redirection);
-    void setRedirection(LinktqStatus* redirection);
+    void setRedirection(LinkStatus* 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;
-    tqStatus const& status() const;
+    Status 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
-    LinktqStatus const* parent() const;
+    LinkStatus const* parent() 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 LinktqStatus::tqStatus
+    TQString statusText() const; // FIXME Legacy. This should be eliminated in favor of LinkStatus::Status
     TQString const& error() const;
     bool isRoot() const;
     bool errorOccurred() const;
     bool isRedirection() const;
-    LinktqStatus* redirection() const;
+    LinkStatus* redirection() const;
     Node* node() const;
-    vector<Node*> const& tqchildrenNodes() const;
+    vector<Node*> const& childrenNodes() const;
     TQString const toString() const;
     bool checked() const;
     int externalDomainDepth() const;
@@ -137,7 +137,7 @@ public:
     TreeViewItem* treeViewItem() const;
     TQValueVector<KURL> const& referrers() const;
 
-    static LinktqStatus* lastRedirection(LinktqStatus* ls);
+    static LinkStatus* lastRedirection(LinkStatus* ls);
 
 private:
 
@@ -149,7 +149,7 @@ private:
 private:
 
     KURL root_url_; // The URL which made the search start
-    tqStatus status_;
+    Status 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 LinktqStatus::tqStatus
+    TQString status_text_; // FIXME Legacy. This should be eliminated in favor of LinkStatus::Status
     TQString error_;
     bool is_root_;
     bool error_occurred_;
     bool is_redirection_;
-    vector<Node*> tqchildren_nodes_;
-    LinktqStatus* parent_;
-    LinktqStatus* redirection_;
+    vector<Node*> children_nodes_;
+    LinkStatus* parent_;
+    LinkStatus* 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 f8d6bfd5..4a2e4099 100644
--- a/klinkstatus/src/engine/linkstatus_impl.h
+++ b/klinkstatus/src/engine/linkstatus_impl.h
@@ -18,16 +18,16 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-inline LinktqStatus::LinktqStatus()
-        : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
+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),
         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 LinktqStatus::LinktqStatus(KURL const& absolute_url)
-        : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
+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),
         only_check_header_(true), malformed_(false),
         node_(0), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
@@ -36,8 +36,8 @@ inline LinktqStatus::LinktqStatus(KURL const& absolute_url)
     setAbsoluteUrl(absolute_url);
 }
 
-inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* parent)
-        : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
+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),
         only_check_header_(true), malformed_(false),
         node_(node), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
@@ -50,22 +50,22 @@ inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* parent)
     setRootUrl(parent->rootUrl());
 }
 
-inline void LinktqStatus::setRootUrl(KURL const& url)
+inline void LinkStatus::setRootUrl(KURL const& url)
 {
     root_url_ = url;
 }
 
-inline void LinktqStatus::settqStatus(tqStatus status)
+inline void LinkStatus::setStatus(Status status)
 {
     status_ = status;
 }
 
-inline void LinktqStatus::setDepth(uint depth)
+inline void LinkStatus::setDepth(uint depth)
 {
     depth_ = depth;
 }
 
-inline void LinktqStatus::setParent(LinktqStatus* parent)
+inline void LinkStatus::setParent(LinkStatus* parent)
 {
     Q_ASSERT(parent);
 
@@ -73,105 +73,105 @@ inline void LinktqStatus::setParent(LinktqStatus* parent)
     addReferrer(parent->absoluteUrl());
 }
 
-inline void LinktqStatus::setAbsoluteUrl(KURL const& url_absoluto)
+inline void LinkStatus::setAbsoluteUrl(KURL const& url_absoluto)
 {
     absolute_url_ = url_absoluto;
 }
 
-inline void LinktqStatus::setOriginalUrl(TQString const& url_original)
+inline void LinkStatus::setOriginalUrl(TQString const& url_original)
 {
     original_url_ = url_original;
 }
 
-inline void LinktqStatus::setLabel(TQString const& label)
+inline void LinkStatus::setLabel(TQString const& label)
 {
     label_ = label;
 }
 
-inline void LinktqStatus::setDocHtml(TQString const& doc_html)
+inline void LinkStatus::setDocHtml(TQString const& doc_html)
 {
     Q_ASSERT(!doc_html.isEmpty());
     doc_html_ = doc_html;
 }
 
-inline void LinktqStatus::setHttpHeader(HttpResponseHeader const& cabecalho_http)
+inline void LinkStatus::setHttpHeader(HttpResponseHeader const& cabecalho_http)
 {
     http_header_ = cabecalho_http;
 }
 
-inline void LinktqStatus::setStatusText(TQString const& status)
+inline void LinkStatus::setStatusText(TQString const& status)
 {
     Q_ASSERT(!status.isEmpty());
     status_text_ = status;
 }
 
-inline void LinktqStatus::setError(TQString const& error)
+inline void LinkStatus::setError(TQString const& error)
 {
     Q_ASSERT(!error.isEmpty());
     error_ = error;
 }
 
-inline void LinktqStatus::setErrorOccurred(bool houve_error)
+inline void LinkStatus::setErrorOccurred(bool houve_error)
 {
     error_occurred_ = houve_error;
 }
 
-inline void LinktqStatus::setIsRoot(bool flag)
+inline void LinkStatus::setIsRoot(bool flag)
 {
     is_root_ = flag;
     label_ = i18n("ROOT");
 }
 
-inline void LinktqStatus::setRedirection(LinktqStatus* redirection)
+inline void LinkStatus::setRedirection(LinkStatus* redirection)
 {
     Q_ASSERT(redirection != NULL);
     Q_ASSERT(isRedirection());
     redirection_ = redirection;
 }
 
-inline void LinktqStatus::setIsRedirection(bool e_redirection)
+inline void LinkStatus::setIsRedirection(bool e_redirection)
 {
     is_redirection_ = e_redirection;
 }
 
-inline void LinktqStatus::addChildNode(Node* node)
+inline void LinkStatus::addChildNode(Node* node)
 {
-    tqchildren_nodes_.push_back(node);
+    children_nodes_.push_back(node);
 }
 
-inline void LinktqStatus::reserveMemoryForChildrenNodes(int n)
+inline void LinkStatus::reserveMemoryForChildrenNodes(int n)
 {
     Q_ASSERT(n > 0);
-    tqchildren_nodes_.reserve(n);
+    children_nodes_.reserve(n);
 }
 
-inline void LinktqStatus::setChecked(bool flag)
+inline void LinkStatus::setChecked(bool flag)
 {
     checked_ = flag;
 }
 
-inline void LinktqStatus::setExternalDomainDepth(int p)
+inline void LinkStatus::setExternalDomainDepth(int p)
 {
     Q_ASSERT(p >= -1);
     external_domain_depth_ = p;
 }
 
-inline void LinktqStatus::setOnlyCheckHeader(bool flag)
+inline void LinkStatus::setOnlyCheckHeader(bool flag)
 {
     only_check_header_= flag;
 }
 
-inline void LinktqStatus::setHasBaseURI(bool flag)
+inline void LinkStatus::setHasBaseURI(bool flag)
 {
     has_base_URI_ = flag;
 }
 
-inline void LinktqStatus::setHasHtmlDocTitle(bool flag)
+inline void LinkStatus::setHasHtmlDocTitle(bool flag)
 {
     has_html_doc_title_ = flag;
 }
 
-inline void LinktqStatus::setBaseURI(KURL const& base_url)
+inline void LinkStatus::setBaseURI(KURL const& base_url)
 {
     if(!base_url.isValid())
     {
@@ -186,7 +186,7 @@ inline void LinktqStatus::setBaseURI(KURL const& base_url)
     base_URI_ = base_url;
 }
 
-inline void LinktqStatus::setHtmlDocTitle(TQString const& title)
+inline void LinkStatus::setHtmlDocTitle(TQString const& title)
 {
     if(title.isNull() || title.isEmpty())
     {
@@ -199,34 +199,34 @@ inline void LinktqStatus::setHtmlDocTitle(TQString const& title)
     html_doc_title_ = title;
 }
 
-inline void LinktqStatus::setIgnored(bool flag)
+inline void LinkStatus::setIgnored(bool flag)
 {
     ignored_ = flag;
 }
 
-inline void LinktqStatus::setMimeType(TQString const& mimetype)
+inline void LinkStatus::setMimeType(TQString const& mimetype)
 {
     Q_ASSERT(!mimetype.isNull() && !mimetype.isEmpty());
     mimetype_ = mimetype;
 }
 
-inline void LinktqStatus::setIsErrorPage(bool flag)
+inline void LinkStatus::setIsErrorPage(bool flag)
 {
     is_error_page_ = flag;
 }
 
-inline void LinktqStatus::setIsLocalRestrict(bool flag)
+inline void LinkStatus::setIsLocalRestrict(bool flag)
 {
     is_local_restrict_ = flag;
 }
 
-inline void LinktqStatus::setTreeViewItem(TreeViewItem* tree_view_item)
+inline void LinkStatus::setTreeViewItem(TreeViewItem* tree_view_item)
 {
     Q_ASSERT(tree_view_item);
     tree_view_item_ = tree_view_item;
 }
 
-inline void LinktqStatus::addReferrer(KURL const& url)
+inline void LinkStatus::addReferrer(KURL const& url)
 {
     Q_ASSERT(url.isValid());
 
@@ -236,67 +236,67 @@ inline void LinktqStatus::addReferrer(KURL const& url)
 
 
 
-inline KURL const& LinktqStatus::rootUrl() const
+inline KURL const& LinkStatus::rootUrl() const
 {
     return root_url_;
 }
 
-inline LinktqStatus::tqStatus const& LinktqStatus::status() const
+inline LinkStatus::Status const& LinkStatus::status() const
 {
     return status_;
 }
 
-inline uint LinktqStatus::depth() const
+inline uint LinkStatus::depth() const
 {
     return depth_;
 }
 
-inline bool LinktqStatus::local() const
+inline bool LinkStatus::local() const
 {
     return external_domain_depth_ == -1;
 }
 
-inline bool LinktqStatus::isLocalRestrict() const
+inline bool LinkStatus::isLocalRestrict() const
 {
     return is_local_restrict_;
 }
 
-inline LinktqStatus const* LinktqStatus::parent() const
+inline LinkStatus const* LinkStatus::parent() const
 {
     return parent_;
 }
 
-inline TQString const& LinktqStatus::originalUrl() const
+inline TQString const& LinkStatus::originalUrl() const
 {
     return original_url_;
 }
 
-inline TQString const& LinktqStatus::label() const
+inline TQString const& LinkStatus::label() const
 {
     return label_;
 }
 
-inline KURL const& LinktqStatus::absoluteUrl() const
+inline KURL const& LinkStatus::absoluteUrl() const
 {
     return absolute_url_;
 }
 
-inline TQString const& LinktqStatus::docHtml() const
+inline TQString const& LinkStatus::docHtml() const
 {
     return doc_html_;
 }
 
-inline HttpResponseHeader const& LinktqStatus::httpHeader() const
+inline HttpResponseHeader const& LinkStatus::httpHeader() const
 {
     return http_header_;
 }
 
-inline HttpResponseHeader& LinktqStatus::httpHeader()
+inline HttpResponseHeader& LinkStatus::httpHeader()
 {
     return http_header_;
 }
 
-inline TQString LinktqStatus::statusText() const
+inline TQString LinkStatus::statusText() const
 {
     if(errorOccurred())
         return error();
@@ -314,103 +314,103 @@ inline TQString LinktqStatus::statusText() const
     }
 }
 
-inline TQString const& LinktqStatus::error() const
+inline TQString const& LinkStatus::error() const
 {
     return error_;
 }
 
-inline bool LinktqStatus::isRoot() const
+inline bool LinkStatus::isRoot() const
 {
     return is_root_;
 }
 
-inline bool LinktqStatus::errorOccurred() const
+inline bool LinkStatus::errorOccurred() const
 {
     return error_occurred_;
 }
 
-inline bool LinktqStatus::isRedirection() const
+inline bool LinkStatus::isRedirection() const
 {
     return is_redirection_;
 }
 
-inline LinktqStatus* LinktqStatus::redirection() const
+inline LinkStatus* LinkStatus::redirection() const
 {
     Q_ASSERT(isRedirection());
     
     return redirection_;
 }
 
-inline Node* LinktqStatus::node() const
+inline Node* LinkStatus::node() const
 {
     //Q_ASSERT(node_);
     return node_;
 }
 
-inline vector<Node*> const& LinktqStatus::tqchildrenNodes() const
+inline vector<Node*> const& LinkStatus::childrenNodes() const
 {
-    return tqchildren_nodes_;
+    return children_nodes_;
 }
 
-inline bool LinktqStatus::checked() const
+inline bool LinkStatus::checked() const
 {
     return checked_;
 }
 
-inline int LinktqStatus::externalDomainDepth() const
+inline int LinkStatus::externalDomainDepth() const
 {
     return external_domain_depth_;
 }
 
-inline bool LinktqStatus::onlyCheckHeader() const
+inline bool LinkStatus::onlyCheckHeader() const
 {
     return only_check_header_;
 }
 
-inline bool LinktqStatus::hasBaseURI() const
+inline bool LinkStatus::hasBaseURI() const
 {
     return has_base_URI_;
 }
 
-inline bool LinktqStatus::hasHtmlDocTitle() const
+inline bool LinkStatus::hasHtmlDocTitle() const
 {
     return has_html_doc_title_;
 }
 
-inline KURL const& LinktqStatus::baseURI() const
+inline KURL const& LinkStatus::baseURI() const
 {
     Q_ASSERT(hasBaseURI());
     return base_URI_;
 }
 
-inline TQString const& LinktqStatus::htmlDocTitle() const
+inline TQString const& LinkStatus::htmlDocTitle() const
 {
     Q_ASSERT(has_html_doc_title_);
     return html_doc_title_;
 }
 
-inline bool LinktqStatus::ignored() const
+inline bool LinkStatus::ignored() const
 {
     return ignored_;
 }
 
-inline TQString LinktqStatus::mimeType() const
+inline TQString LinkStatus::mimeType() const
 {
     Q_ASSERT(!mimetype_.isNull());
     return mimetype_;
 }
 
-inline bool LinktqStatus::isErrorPage() const
+inline bool LinkStatus::isErrorPage() const
 {
     return is_error_page_;
 }
 
-inline TreeViewItem* LinktqStatus::treeViewItem() const
+inline TreeViewItem* LinkStatus::treeViewItem() const
 {
     return tree_view_item_;
 }
 
-inline TQValueVector<KURL> const& LinktqStatus::referrers() const
+inline TQValueVector<KURL> const& LinkStatus::referrers() const
 {
     return referrers_;
 }
diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp
index 6ca04b3a..591b3acd 100644
--- a/klinkstatus/src/engine/searchmanager.cpp
+++ b/klinkstatus/src/engine/searchmanager.cpp
@@ -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 LinktqStatus *, LinkChecker *)),
-            this, TQT_SLOT(slotRootChecked(const LinktqStatus *, LinkChecker *)));
+    connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)),
+            this, TQT_SLOT(slotRootChecked(const LinkStatus *, 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 LinktqStatus * link, LinkChecker * checker)
+void SearchManager::slotRootChecked(const LinkStatus * link, LinkChecker * checker)
 {
     kdDebug(23100) <<  "SearchManager::slotRootChecked:" << endl;
     kdDebug(23100) <<  link->absoluteUrl().url() << " -> " << 
-            LinktqStatus::lastRedirection(&root_)->absoluteUrl().url() << endl;
+            LinkStatus::lastRedirection(&root_)->absoluteUrl().url() << endl;
 
     Q_ASSERT(checked_links_ == 0);
     Q_ASSERT(search_results_.size() == 0);
@@ -217,11 +217,11 @@ void SearchManager::slotRootChecked(const LinktqStatus * link, LinkChecker * che
     {
         current_depth_ = 1;
 
-        vector<LinktqStatus*> no = tqchildren(LinktqStatus::lastRedirection(&root_));
+        vector<LinkStatus*> no = children(LinkStatus::lastRedirection(&root_));
 
         emit signalLinksToCheckTotalSteps(no.size());
 
-        vector< vector<LinktqStatus*> > nivel;
+        vector< vector<LinkStatus*> > nivel;
         nivel.push_back(no);
 
         search_results_.push_back(nivel);
@@ -255,14 +255,14 @@ void SearchManager::slotRootChecked(const LinktqStatus * link, LinkChecker * che
     checker = 0;
 }
 
-vector<LinktqStatus*> SearchManager::tqchildren(LinktqStatus* link)
+vector<LinkStatus*> SearchManager::children(LinkStatus* link)
 {
-    vector<LinktqStatus*> tqchildren;
+    vector<LinkStatus*> children;
 
     if(!link || link->absoluteUrl().hasRef())
-        return tqchildren;
+        return children;
 
-    vector<Node*> const& nodes = link->tqchildrenNodes();
+    vector<Node*> const& nodes = link->childrenNodes();
 
     int count = 0;
     for(uint i = 0; i != nodes.size(); ++i)
@@ -278,12 +278,12 @@ vector<LinktqStatus*> SearchManager::tqchildren(LinktqStatus* link)
 
         if( (node->isLink() &&
                 checkable(url, *link) &&
-                !Url::existUrl(url, tqchildren) &&
+                !Url::existUrl(url, children) &&
                 !node->url().isEmpty())
                 ||
                 node->malformed() )
         {
-            LinktqStatus* ls = new LinktqStatus(node, link);
+            LinkStatus* ls = new LinkStatus(node, link);
             ls->setAbsoluteUrl(url);
 
             if(localDomain(ls->absoluteUrl()))
@@ -310,7 +310,7 @@ vector<LinktqStatus*> SearchManager::tqchildren(LinktqStatus* link)
             }
             Q_ASSERT(link->externalDomainDepth() <= external_domain_depth_);
 
-            tqchildren.push_back(ls);
+            children.push_back(ls);
         }
         if(count == 50)
         {
@@ -319,7 +319,7 @@ vector<LinktqStatus*> SearchManager::tqchildren(LinktqStatus* link)
         }
     }
 
-    return tqchildren;
+    return children;
 }
 
 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)
             {
-                LinktqStatus* tmp = search_results_[i][j][l];
+                LinkStatus* 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;
 }
 
-LinktqStatus const* SearchManager::linktqStatus(TQString const& s_url) const
+LinkStatus const* SearchManager::linkStatus(TQString const& s_url) const
 {
     Q_ASSERT(!s_url.isEmpty());
 
@@ -366,7 +366,7 @@ LinktqStatus const* SearchManager::linktqStatus(TQString const& s_url) const
             {
                 ++count;
 
-                LinktqStatus* ls = search_results_[i][j][l];
+                LinkStatus* 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<LinktqStatus*> const& no = nodeToAnalize();
+    vector<LinkStatus*> const& no = nodeToAnalize();
 
     if((uint)current_index_ < no.size())
         checkVectorLinks(no);
@@ -442,7 +442,7 @@ void SearchManager::continueSearch()
     }
 }
 
-vector<LinktqStatus*> const& SearchManager::nodeToAnalize() const
+vector<LinkStatus*> 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<LinktqStatus*> const& SearchManager::nodeToAnalize() const
     return (search_results_[current_depth_ - 1])[current_node_];
 }
 
-void SearchManager::checkVectorLinks(vector<LinktqStatus*> const& links)
+void SearchManager::checkVectorLinks(vector<LinkStatus*> const& links)
 {
     checkLinksSimultaneously(chooseLinks(links));
 }
 
-vector<LinktqStatus*> SearchManager::chooseLinks(vector<LinktqStatus*> const& links)
+vector<LinkStatus*> SearchManager::chooseLinks(vector<LinkStatus*> const& links)
 {
-    vector<LinktqStatus*> escolha;
+    vector<LinkStatus*> escolha;
     for(int i = 0; i != max_simultaneous_connections_; ++i)
     {
         if((uint)current_index_ < links.size())
@@ -466,7 +466,7 @@ vector<LinktqStatus*> SearchManager::chooseLinks(vector<LinktqStatus*> const& li
     return escolha;
 }
 
-void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
+void SearchManager::checkLinksSimultaneously(vector<LinkStatus*> const& links)
 {
     Q_ASSERT(finished_connections_ <= max_simultaneous_connections_);
     finished_connections_ = 0;
@@ -480,7 +480,7 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
 
     for(uint i = 0; i != links.size(); ++i)
     {
-        LinktqStatus* ls(links[i]);
+        LinkStatus* ls(links[i]);
         Q_ASSERT(ls);
 
         TQString protocol = ls->absoluteUrl().protocol();
@@ -491,7 +491,7 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
         if(ls->malformed())
         {
             Q_ASSERT(ls->errorOccurred());
-            Q_ASSERT(ls->status() == LinktqStatus::MALFORMED);
+            Q_ASSERT(ls->status() == LinkStatus::MALFORMED);
 
             ls->setChecked(true);
             slotLinkChecked(ls, 0);
@@ -503,7 +503,7 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
             ls->setIgnored(true);
             ls->setErrorOccurred(true);
             ls->setError(i18n( "Javascript not supported" ));
-            ls->settqStatus(LinktqStatus::NOT_SUPPORTED);
+            ls->setStatus(LinkStatus::NOT_SUPPORTED);
             ls->setChecked(true);
             slotLinkChecked(ls, 0);
         }
@@ -513,8 +513,8 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
                     ++ignored_links_;
                     ls->setIgnored(true);
                     ls->setErrorOccurred(true);
-                    ls->setError(i18n("Protocol %1 not supported").tqarg(protocol));
-                    ls->settqStatus(LinktqStatus::MALFORMED);
+                    ls->setError(i18n("Protocol %1 not supported").arg(protocol));
+                    ls->setStatus(LinkStatus::MALFORMED);
                     ls->setChecked(true);
                     slotLinkChecked(ls, 0);
                 }
@@ -524,8 +524,8 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
             LinkChecker* checker = new LinkChecker(ls, time_out_, this, "link_checker");
             checker->setSearchManager(this);
 
-            connect(checker, TQT_SIGNAL(transactionFinished(const LinktqStatus *, LinkChecker *)),
-                    this, TQT_SLOT(slotLinkChecked(const LinktqStatus *, LinkChecker *)));
+            connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)),
+                    this, TQT_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *)));
             /*
                         connect(checker, TQT_SIGNAL(jobFinnished(LinkChecker *)),
                                 this, TQT_SLOT(slotLinkCheckerFinnished(LinkChecker *)));
@@ -535,11 +535,11 @@ void SearchManager::checkLinksSimultaneously(vector<LinktqStatus*> const& links)
     }
 }
 
-void SearchManager::slotLinkChecked(const LinktqStatus * link, LinkChecker * checker)
+void SearchManager::slotLinkChecked(const LinkStatus * link, LinkChecker * checker)
 {
     kdDebug(23100) <<  "SearchManager::slotLinkChecked:" << endl;
 //     kdDebug(23100) <<  link->absoluteUrl().url() << " -> " << 
-//             LinktqStatus::lastRedirection((const_cast<LinktqStatus*> (link)))->absoluteUrl().url() << endl;
+//             LinkStatus::lastRedirection((const_cast<LinkStatus*> (link)))->absoluteUrl().url() << endl;
 
     Q_ASSERT(link);
     emit signalLinkChecked(link, checker);
@@ -569,8 +569,8 @@ void SearchManager::slotLinkChecked(const LinktqStatus * link, LinkChecker * che
 
 void SearchManager::addLevel()
 {
-    search_results_.push_back(vector< vector <LinktqStatus*> >());
-    vector< vector <LinktqStatus*> >& ultimo_nivel(search_results_[search_results_.size() - 2]);
+    search_results_.push_back(vector< vector <LinkStatus*> >());
+    vector< vector <LinkStatus*> >& 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 <LinktqStatus*> f(tqchildren( LinktqStatus::lastRedirection(((ultimo_nivel[i])[j])) ));
+            vector <LinkStatus*> f(children( LinkStatus::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, LinktqStatus const& link_parent) const
+bool SearchManager::checkable(KURL const& url, LinkStatus const& link_parent) const
 {
     if(existUrl(url, link_parent.absoluteUrl()))
         return false;
@@ -638,7 +638,7 @@ bool SearchManager::checkable(KURL const& url, LinktqStatus const& link_parent)
     return true;
 }
 
-bool SearchManager::checkableByDomain(KURL const& url, LinktqStatus const& link_parent) const
+bool SearchManager::checkableByDomain(KURL const& url, LinkStatus const& link_parent) const
 {
     bool result = false;
     if(localDomain(url))
@@ -781,7 +781,7 @@ bool SearchManager::generalDomain() const
     }
 }
 
-bool SearchManager::onlyCheckHeader(LinktqStatus* ls) const
+bool SearchManager::onlyCheckHeader(LinkStatus* 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->linktqStatus()->checked());
+    //Q_ASSERT(checker->linkStatus()->checked());
 
     delete checker;
     checker = 0;
@@ -891,7 +891,7 @@ void SearchManager::save(TQDomElement& element) const
         {
             for(uint l = 0; l != (search_results_[i])[j].size(); ++l)
             {
-                LinktqStatus* ls = ((search_results_[i])[j])[l];
+                LinkStatus* 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 d2414cfe..39628917 100644
--- a/klinkstatus/src/engine/searchmanager.h
+++ b/klinkstatus/src/engine/searchmanager.h
@@ -95,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;
-    LinktqStatus const* linktqStatus(TQString const& s_url) const;
+    LinkStatus const* linkStatus(TQString const& s_url) const;
     int checkedLinks() const;
     TQTime timeElapsed() const;
     bool checkParentDirs() const;
     bool checkExternalLinks() const;
-    LinktqStatus const* linkStatusRoot() const;
+    LinkStatus const* linkStatusRoot() const;
     int maxSimultaneousConnections() const;
     int timeOut() const;
     
@@ -110,20 +110,20 @@ public:
 private:
 
     void checkRoot();
-    void checkVectorLinks(vector<LinktqStatus*> const& links); // corresponde a um no de um nivel de depth
-    vector<LinktqStatus*> tqchildren(LinktqStatus* link);
+    void checkVectorLinks(vector<LinkStatus*> const& links); // corresponde a um no de um nivel de depth
+    vector<LinkStatus*> children(LinkStatus* link);
     void startSearch();
     void continueSearch();
     void finnish();
     void pause();
-    vector<LinktqStatus*> const& nodeToAnalize() const;
-    vector<LinktqStatus*> chooseLinks(vector<LinktqStatus*> const& links);
-    void checkLinksSimultaneously(vector<LinktqStatus*> const& links);
+    vector<LinkStatus*> const& nodeToAnalize() const;
+    vector<LinkStatus*> chooseLinks(vector<LinkStatus*> const& links);
+    void checkLinksSimultaneously(vector<LinkStatus*> const& links);
     void addLevel();
-    bool checkableByDomain(KURL const& url, LinktqStatus const& link_parent) const;
-    bool checkable(KURL const& url, LinktqStatus const& link_parent) const;
+    bool checkableByDomain(KURL const& url, LinkStatus const& link_parent) const;
+    bool checkable(KURL const& url, LinkStatus const& link_parent) const;
     int maximumCurrentConnections() const;
-    bool onlyCheckHeader(LinktqStatus* ls) const;
+    bool onlyCheckHeader(LinkStatus* ls) const;
 
     /*
       Entende-se por domain vago um domain do tipo www.google.pt ou google.pt, pelo que,
@@ -135,15 +135,15 @@ private:
 
 private slots:
 
-    void slotRootChecked(const LinktqStatus * link, LinkChecker * checker);
-    void slotLinkChecked(const LinktqStatus * link, LinkChecker * checker);
+    void slotRootChecked(const LinkStatus * link, LinkChecker * checker);
+    void slotLinkChecked(const LinkStatus * link, LinkChecker * checker);
     void slotSearchFinished();
     void slotLinkCheckerFinnished(LinkChecker * checker);
 
 signals:
 
-    void signalRootChecked(const LinktqStatus * link, LinkChecker * checker);
-    void signalLinkChecked(const LinktqStatus * link, LinkChecker * checker);
+    void signalRootChecked(const LinkStatus * link, LinkChecker * checker);
+    void signalLinkChecked(const LinkStatus * link, LinkChecker * checker);
     void signalSearchFinished();
     void signalSearchPaused();
     void signalAddingLevelTotalSteps(uint number_of_links);
@@ -155,7 +155,7 @@ private:
 
     int max_simultaneous_connections_;
     SearchMode search_mode_;
-    LinktqStatus root_;
+    LinkStatus root_;
     bool has_document_root_;
     KURL document_root_url_; // in case of non http protocols the document root must be explicitly given
     int depth_;
@@ -185,7 +185,7 @@ private:
     bool check_regular_expressions_;
     uint number_of_level_links_;
     uint number_of_links_to_check_;
-    vector< vector< vector <LinktqStatus*> > > search_results_;
+    vector< vector< vector <LinkStatus*> > > search_results_;
     KHTMLPartMap html_parts_;
 };
 
diff --git a/klinkstatus/src/engine/searchmanager_impl.h b/klinkstatus/src/engine/searchmanager_impl.h
index 947e98ff..736d2c10 100644
--- a/klinkstatus/src/engine/searchmanager_impl.h
+++ b/klinkstatus/src/engine/searchmanager_impl.h
@@ -111,7 +111,7 @@ inline bool SearchManager::checkExternalLinks() const
     return check_external_links_;
 }
 
-inline LinktqStatus const* SearchManager::linkStatusRoot() const
+inline LinkStatus const* SearchManager::linkStatusRoot() const
 {
     return &root_;
 }
diff --git a/klinkstatus/src/klinkstatus.lsm b/klinkstatus/src/klinkstatus.lsm
index 0cc4c0c1..94221faf 100644
--- a/klinkstatus/src/klinkstatus.lsm
+++ b/klinkstatus/src/klinkstatus.lsm
@@ -1,5 +1,5 @@
 Begin3
-Title:          KLinktqStatus -- Some description
+Title:          KLinkStatus -- Some description
 Version:        0.2.1
 Entered-date:   
 Description:    
diff --git a/klinkstatus/src/parser/url.cpp b/klinkstatus/src/parser/url.cpp
index 814acfd2..affc35c9 100644
--- a/klinkstatus/src/parser/url.cpp
+++ b/klinkstatus/src/parser/url.cpp
@@ -45,7 +45,7 @@ Node::LinkType Url::resolveLinkType(TQString const& url)
         return Node::relative;
 }
 
-KURL Url::normalizeUrl(TQString const& string_url, LinktqStatus const& link_parent, TQString const& document_root)
+KURL Url::normalizeUrl(TQString const& string_url, LinkStatus 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<LinktqStatus*> const& v)
+bool Url::existUrl(KURL const& url, vector<LinkStatus*> 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(LinktqStatus const* ls)
+TQString Url::convertToLocal(LinkStatus const* ls)
 {
     KURL url = ls->absoluteUrl();
     KURL base_url = ls->rootUrl();
diff --git a/klinkstatus/src/parser/url.h b/klinkstatus/src/parser/url.h
index 574f4fa5..f90f2b33 100644
--- a/klinkstatus/src/parser/url.h
+++ b/klinkstatus/src/parser/url.h
@@ -32,18 +32,18 @@
 using namespace std;
 
 
-class LinktqStatus;
+class LinkStatus;
 
 namespace Url
 {
 Node::LinkType resolveLinkType(TQString const& url);
-KURL normalizeUrl(TQString const& string_url, LinktqStatus const& link_parent, TQString const& document_root);
+KURL normalizeUrl(TQString const& string_url, LinkStatus const& link_parent, TQString const& document_root);
 KURL normalizeUrl(TQString const& string_url);
 bool validUrl(KURL const& url);
-bool existUrl(KURL const& url, vector<LinktqStatus*> const& v);
+bool existUrl(KURL const& url, vector<LinkStatus*> const& v);
 bool equalHost(TQString const& host1, TQString const& host2, bool restrict = false);
 bool hasProtocol(TQString const& url);
-TQString convertToLocal(LinktqStatus const* ls);
+TQString convertToLocal(LinkStatus const* ls);
 bool localDomain(KURL const& url1, KURL const& url2, bool restrict = true);
 bool parentDir(KURL const& url1, KURL const& url2);
 bool externalLink(KURL const& url1, KURL const& url2, bool restrict = true);
diff --git a/klinkstatus/src/ui/documentrootdialog.cpp b/klinkstatus/src/ui/documentrootdialog.cpp
index b1563285..9a813211 100644
--- a/klinkstatus/src/ui/documentrootdialog.cpp
+++ b/klinkstatus/src/ui/documentrootdialog.cpp
@@ -24,7 +24,7 @@
 #include <kurl.h>
 
 #include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 
diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp
index b19f7764..3318132c 100644
--- a/klinkstatus/src/ui/resultssearchbar.cpp
+++ b/klinkstatus/src/ui/resultssearchbar.cpp
@@ -35,19 +35,19 @@
 #include <tqtimer.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 class ResultsSearchBar::ResultsSearchBarPrivate
 {
 public:
     ResultsSearchBarPrivate()
-    : tqlayout(0), searchLine(0), searchCombo(0), delay(400), m_lastComboIndex(0)
+    : layout(0), searchLine(0), searchCombo(0), delay(400), m_lastComboIndex(0)
     {}
 
     TQString searchText;
     TQTimer timer;
-    TQHBoxLayout* tqlayout;
+    TQHBoxLayout* layout;
     KLineEdit* searchLine;
     KComboBox* searchCombo;
     int delay;
@@ -57,31 +57,31 @@ public:
 ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name)
         : TQWidget(parent, name), d(new ResultsSearchBar::ResultsSearchBarPrivate)
 {
-    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+    setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
     
-    d->tqlayout = new TQHBoxLayout(this);    
-    d->tqlayout->setMargin(2);
-    d->tqlayout->setSpacing(5);
+    d->layout = new TQHBoxLayout(this);    
+    d->layout->setMargin(2);
+    d->layout->setSpacing(5);
     
     TQToolButton* clearButton = new TQToolButton(this);
     clearButton->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
     clearButton->setAutoRaise(true);
-    d->tqlayout->addWidget(clearButton);
+    d->layout->addWidget(clearButton);
 
     TQLabel* searchLabel = new TQLabel(this);
     searchLabel->setText(i18n("S&earch:"));
-    d->tqlayout->addWidget(searchLabel);
+    d->layout->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->tqlayout->addWidget(d->searchLine);
+    d->layout->addWidget(d->searchLine);
 
     TQLabel* statusLabel = new TQLabel(this);
     statusLabel->setText( i18n("Status:") );
-    d->tqlayout->addWidget(statusLabel);
+    d->layout->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->tqlayout->addWidget(d->searchCombo);
+    d->layout->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::slotSettqStatus(int status)
+void ResultsSearchBar::slotSetStatus(int status)
 {
     d->searchCombo->setCurrentItem(status);
 }
@@ -187,19 +187,19 @@ void ResultsSearchBar::slotActivateSearch()
 {
     kdDebug(23100) << "ResultsSearchBar::slotActivateSearch" << endl;
     
-    ResultView::tqStatus status = selectedtqStatus();
+    ResultView::Status status = selectedStatus();
     
     emit signalSearch(LinkMatcher(d->searchLine->text(), status));
 }
 
 LinkMatcher ResultsSearchBar::currentLinkMatcher() const
 {
-    return LinkMatcher(d->searchLine->text(), selectedtqStatus());
+    return LinkMatcher(d->searchLine->text(), selectedStatus());
 }
 
-ResultView::tqStatus ResultsSearchBar::selectedtqStatus() const
+ResultView::Status ResultsSearchBar::selectedStatus() const
 {
-    ResultView::tqStatus status = ResultView::none;
+    ResultView::Status status = ResultView::none;
     
     if(d->searchCombo->currentItem())
     {
diff --git a/klinkstatus/src/ui/resultssearchbar.h b/klinkstatus/src/ui/resultssearchbar.h
index c99b1da1..1c161e99 100644
--- a/klinkstatus/src/ui/resultssearchbar.h
+++ b/klinkstatus/src/ui/resultssearchbar.h
@@ -52,7 +52,7 @@ signals:
 
 public slots:
     void slotClearSearch();
-    void slotSettqStatus(int status);
+    void slotSetStatus(int status);
     void slotSetText(const TQString& text);
 
 private slots:
@@ -63,7 +63,7 @@ private slots:
 
 private:
     
-    ResultView::tqStatus selectedtqStatus() const;
+    ResultView::Status selectedStatus() const;
     
 private:
 
diff --git a/klinkstatus/src/ui/resultview.cpp b/klinkstatus/src/ui/resultview.cpp
index 507d06e3..fdf65099 100644
--- a/klinkstatus/src/ui/resultview.cpp
+++ b/klinkstatus/src/ui/resultview.cpp
@@ -69,31 +69,31 @@ void ResultView::setColumns(TQStringList const& columns)
     number_of_columns_ = columns.size();
 }
 
-bool ResultView::displayableWithtqStatus(LinktqStatus const* ls, tqStatus const& status)
+bool ResultView::displayableWithStatus(LinkStatus const* ls, Status const& status)
 {
     if(status == ResultView::good)
     {
         return 
-                ls->status() == LinktqStatus::SUCCESSFULL ||
-                ls->status() == LinktqStatus::HTTP_REDIRECTION;
+                ls->status() == LinkStatus::SUCCESSFULL ||
+                ls->status() == LinkStatus::HTTP_REDIRECTION;
     }
     else if(status == ResultView::bad)
     {
         return 
-                ls->status() == LinktqStatus::BROKEN ||
-                ls->status() == LinktqStatus::HTTP_CLIENT_ERROR ||
-                ls->status() == LinktqStatus::HTTP_SERVER_ERROR;
+                ls->status() == LinkStatus::BROKEN ||
+                ls->status() == LinkStatus::HTTP_CLIENT_ERROR ||
+                ls->status() == LinkStatus::HTTP_SERVER_ERROR;
     }
     else if(status == ResultView::malformed)
     {
-        return ls->status() == LinktqStatus::MALFORMED;
+        return ls->status() == LinkStatus::MALFORMED;
     }
     else if(status == ResultView::undetermined)
     {
         return 
-                ls->status() == LinktqStatus::UNDETERMINED ||
-                ls->status() == LinktqStatus::TIMEOUT ||
-                ls->status() == LinktqStatus::NOT_SUPPORTED;
+                ls->status() == LinkStatus::UNDETERMINED ||
+                ls->status() == LinkStatus::TIMEOUT ||
+                ls->status() == LinkStatus::NOT_SUPPORTED;
     }
     else
         return true;
@@ -102,8 +102,8 @@ bool ResultView::displayableWithtqStatus(LinktqStatus const* ls, tqStatus const&
 
 // ******************************* ResultViewItem *****************************
 
-ResultViewItem::ResultViewItem(LinktqStatus const* linkstatus, int column_index)
-        : ls_((LinktqStatus*)linkstatus), column_index_(column_index)
+ResultViewItem::ResultViewItem(LinkStatus const* linkstatus, int column_index)
+        : ls_((LinkStatus*)linkstatus), column_index_(column_index)
 {
     Q_ASSERT(ls_);
     Q_ASSERT(column_index_ > 0);
@@ -123,7 +123,7 @@ int ResultViewItem::columnIndex() const
     return column_index_;
 }
 
-LinktqStatus const* ResultViewItem::linktqStatus() const
+LinkStatus const* ResultViewItem::linkStatus() const
 {
     Q_ASSERT(ls_);
     return ls_;
@@ -131,30 +131,30 @@ LinktqStatus const* ResultViewItem::linktqStatus() const
 
 TQColor const& ResultViewItem::textStatusColor() const
 {
-    if(linktqStatus()->errorOccurred())
+    if(linkStatus()->errorOccurred())
     {
-        //kdDebug(23100) <<  "ERROR: " << linkStatus()->error() << ": " << linktqStatus()->absoluteUrl().prettyURL() << endl;
-        if(linktqStatus()->error() == i18n( "Javascript not supported" ))
+        //kdDebug(23100) <<  "ERROR: " << linkStatus()->error() << ": " << linkStatus()->absoluteUrl().prettyURL() << endl;
+        if(linkStatus()->error() == i18n( "Javascript not supported" ))
             return TQt::lightGray;
         else
             return TQt::red;
     }
 
-    else if(linktqStatus()->absoluteUrl().hasRef())
+    else if(linkStatus()->absoluteUrl().hasRef())
         return TQt::blue;
 
-    else if(!linktqStatus()->absoluteUrl().protocol().startsWith("http"))
+    else if(!linkStatus()->absoluteUrl().protocol().startsWith("http"))
         return TQt::darkGreen;
 
     else
     {
-        TQString status_code(TQString::number(linktqStatus()->httpHeader().statusCode()));
+        TQString status_code(TQString::number(linkStatus()->httpHeader().statusCode()));
 
         if(status_code[0] == '0')
         {
             kdWarning(23100) <<  "status code == 0: " << endl;
-            kdWarning(23100) <<  linktqStatus()->toString() << endl;
-            kdWarning(23100) <<  linktqStatus()->httpHeader().toString() << endl;
+            kdWarning(23100) <<  linkStatus()->toString() << endl;
+            kdWarning(23100) <<  linkStatus()->httpHeader().toString() << endl;
         }
         //Q_ASSERT(status_code[0] != '0');
 
diff --git a/klinkstatus/src/ui/resultview.h b/klinkstatus/src/ui/resultview.h
index 842ed68b..44e90390 100644
--- a/klinkstatus/src/ui/resultview.h
+++ b/klinkstatus/src/ui/resultview.h
@@ -27,7 +27,7 @@
 
 class KURL;
 
-class LinktqStatus;
+class LinkStatus;
 class CellToolTip;
 
 
@@ -43,7 +43,7 @@ public:
     static const TQString MARKUP_LABEL;
     static const TQString LINK_LABEL_LABEL;
     
-    enum tqStatus {
+    enum Status {
         none = 0,
         good,
         bad,
@@ -54,14 +54,14 @@ public:
     ResultView();
     virtual ~ResultView();
 
-    //virtual void insertResult(LinktqStatus const* linkstatus) = 0;
+    //virtual void insertResult(LinkStatus const* linkstatus) = 0;
     virtual void clear() = 0;
-    virtual void show(tqStatus const& status) = 0;
+    virtual void show(Status const& status) = 0;
     virtual void showAll() = 0;
     //virtual void ensureCellVisible(int row, int col) = 0;
 
     virtual void setColumns(TQStringList const& columns);
-    static bool displayableWithtqStatus(LinktqStatus const* ls, tqStatus const& status);
+    static bool displayableWithStatus(LinkStatus const* ls, Status const& status);
     
     int numberOfColumns() const { return number_of_columns_; }
     
@@ -105,7 +105,7 @@ private:
 class ResultViewItem
 {
 public:
-    ResultViewItem(LinktqStatus const* linkstatus,
+    ResultViewItem(LinkStatus const* linkstatus,
                    int column_index);
     virtual ~ResultViewItem();
     
@@ -113,7 +113,7 @@ public:
     virtual int columnIndex() const;
 
     virtual TQString toolTip() const = 0;
-    LinktqStatus const* linktqStatus() const;
+    LinkStatus const* linkStatus() const;
 
 protected:
 
@@ -125,7 +125,7 @@ protected:
 
 protected:
 
-    LinktqStatus* ls_;
+    LinkStatus* ls_;
     int column_index_;
     int alignment_;
 };
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index 87831ffc..15f7d631 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -40,7 +40,7 @@
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
 #include <tqstringlist.h>
@@ -154,10 +154,10 @@ void SessionWidget::newSearchManager()
                                         TQT_TQOBJECT(this), "search_manager");
     Q_ASSERT(search_manager_);
 
-    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(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(signalSearchFinished()),
             this, TQT_SLOT(slotSearchFinished()));
     connect(search_manager_, TQT_SIGNAL(signalSearchPaused()),
@@ -356,7 +356,7 @@ bool SessionWidget::validFields()
         return true;
 }
 
-void SessionWidget::slotRootChecked(LinktqStatus const* linkstatus, LinkChecker * anal)
+void SessionWidget::slotRootChecked(LinkStatus const* linkstatus, LinkChecker * anal)
 {
     slotSetTimeElapsed();
     emit signalUpdateTabLabel(search_manager_->linkStatusRoot(), this);
@@ -368,7 +368,7 @@ void SessionWidget::slotRootChecked(LinktqStatus const* linkstatus, LinkChecker
 
     //table_linkstatus->insertResult(linkstatus);
     TreeViewItem* tree_view_item = new TreeViewItem(tree_view, tree_view->lastItem(), linkstatus);
-    LinktqStatus* ls = const_cast<LinktqStatus*> (linkstatus);
+    LinkStatus* ls = const_cast<LinkStatus*> (linkstatus);
     ls->setTreeViewItem(tree_view_item);
 
     if(linkstatus->isRedirection() && linkstatus->redirection())
@@ -378,7 +378,7 @@ void SessionWidget::slotRootChecked(LinktqStatus const* linkstatus, LinkChecker
     ActionManager::getInstance()->action("file_export_html")->setEnabled(!isEmpty());
 }
 
-void SessionWidget::slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker * anal)
+void SessionWidget::slotLinkChecked(LinkStatus const* linkstatus, LinkChecker * anal)
 {
     slotSetTimeElapsed();
 
@@ -416,7 +416,7 @@ void SessionWidget::slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker
             tree_view_item->setVisible(match);
         }
         
-        LinktqStatus* ls = const_cast<LinktqStatus*> (linkstatus);
+        LinkStatus* ls = const_cast<LinkStatus*> (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->linktqStatus()->statusText();
+        TQString status = _item->linkStatus()->statusText();
         textlabel_status->setText(status);
 
-        if(textlabel_status->tqsizeHint().width() > textlabel_status->maximumWidth())
+        if(textlabel_status->sizeHint().width() > textlabel_status->maximumWidth())
             TQToolTip::add(textlabel_status, status);
         else
             TQToolTip::remove(textlabel_status);
diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h
index d171cc37..1c288632 100644
--- a/klinkstatus/src/ui/sessionwidget.h
+++ b/klinkstatus/src/ui/sessionwidget.h
@@ -70,7 +70,7 @@ public:
     bool stopped() const { return stopped_; }
 
 signals:
-    void signalUpdateTabLabel(const LinktqStatus *, SessionWidget*);
+    void signalUpdateTabLabel(const LinkStatus *, SessionWidget*);
     void signalSearchStarted();
     void signalSearchPaused();
     void signalSearchFinnished();
@@ -97,8 +97,8 @@ private slots:
     //virtual void slotSuggestDomain(bool toogle);
 
     void slotEnableCheckButton(const TQString &);
-    void slotRootChecked(LinktqStatus const* linkstatus, LinkChecker * anal);
-    void slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker * anal);
+    void slotRootChecked(LinkStatus const* linkstatus, LinkChecker * anal);
+    void slotLinkChecked(LinkStatus 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 43d6029e..53cdd510 100644
--- a/klinkstatus/src/ui/sessionwidgetbase.ui
+++ b/klinkstatus/src/ui/sessionwidgetbase.ui
@@ -12,7 +12,7 @@
             <height>683</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>300</height>
@@ -41,7 +41,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout15</cstring>
+                        <cstring>layout15</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -49,7 +49,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout14</cstring>
+                                <cstring>layout14</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -57,7 +57,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout13</cstring>
+                                        <cstring>layout13</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -75,13 +75,13 @@
                                                     <verstretch>0</verstretch>
                                                 </sizepolicy>
                                             </property>
-                                            <property name="tqminimumSize">
+                                            <property name="minimumSize">
                                                 <size>
                                                     <width>25</width>
                                                     <height>25</height>
                                                 </size>
                                             </property>
-                                            <property name="tqmaximumSize">
+                                            <property name="maximumSize">
                                                 <size>
                                                     <width>25</width>
                                                     <height>25</height>
@@ -109,7 +109,7 @@
                                             <property name="text">
                                                 <string>URL: </string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>AlignVCenter|AlignLeft</set>
                                             </property>
                                         </widget>
@@ -150,7 +150,7 @@
                                             <property name="sizeType">
                                                 <enum>Maximum</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>16</width>
                                                     <height>20</height>
@@ -161,7 +161,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout10</cstring>
+                                        <cstring>layout10</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -225,7 +225,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>160</width>
                                                     <height>20</height>
@@ -236,7 +236,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout11</cstring>
+                                        <cstring>layout11</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -266,7 +266,7 @@
                                             <property name="sizeType">
                                                 <enum>MinimumExpanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>174</width>
                                                     <height>20</height>
@@ -277,7 +277,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout11</cstring>
+                                        <cstring>layout11</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -306,7 +306,7 @@
                                             <property name="sizeType">
                                                 <enum>Maximum</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>16</width>
                                                     <height>20</height>
@@ -338,7 +338,7 @@
             <property name="name">
                 <cstring>tree_view</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>300</height>
@@ -347,7 +347,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout10</cstring>
+                <cstring>layout10</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -357,7 +357,7 @@
                     <property name="name">
                         <cstring>textlabel_progressbar</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>94</width>
                             <height>0</height>
@@ -385,7 +385,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout11</cstring>
+                <cstring>layout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -403,7 +403,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>470</width>
                             <height>32767</height>
@@ -423,7 +423,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -432,7 +432,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout12_2</cstring>
+                        <cstring>layout12_2</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -475,7 +475,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>80</width>
                                     <height>0</height>
diff --git a/klinkstatus/src/ui/settings/configidentificationdialogui.ui b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
index 8fa3e5d7..87b73fbf 100644
--- a/klinkstatus/src/ui/settings/configidentificationdialogui.ui
+++ b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
@@ -69,7 +69,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>300</width>
                             <height>0</height>
diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui
index 62553ffb..72c420ca 100644
--- a/klinkstatus/src/ui/settings/configsearchdialog.ui
+++ b/klinkstatus/src/ui/settings/configsearchdialog.ui
@@ -39,7 +39,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -184,7 +184,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout21</cstring>
+                        <cstring>layout21</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -211,7 +211,7 @@
                             <property name="sizeType">
                                 <enum>Maximum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -220,7 +220,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout20</cstring>
+                                <cstring>layout20</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp
index 6aef2c97..dd72dd9f 100644
--- a/klinkstatus/src/ui/tablelinkstatus.cpp
+++ b/klinkstatus/src/ui/tablelinkstatus.cpp
@@ -26,7 +26,7 @@
 #include <tqmemarray.h>
 #include <tqtooltip.h>
 #include <tqpixmap.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqpainter.h>
 #include <tqprocess.h>
 
@@ -106,17 +106,17 @@ void TableLinkstatus::setColumns(TQStringList const& columns)
     horizontal_header->adjustHeaderSize();
 }
 
-void TableLinkstatus::insertResult(LinktqStatus const* linkstatus)
+void TableLinkstatus::insertResult(LinkStatus const* linkstatus)
 {
     insereLinha(generateRowOfTableItems(linkstatus));
 }
 
-vector<TableItem*> TableLinkstatus::generateRowOfTableItems(LinktqStatus const* linkstatus)
+vector<TableItem*> TableLinkstatus::generateRowOfTableItems(LinkStatus const* linkstatus)
 {
     vector<TableItem*> items;
     int column = 1;
 
-    TableItem* item1 = new TableItemtqStatus(this, TQTableItem::Never,
+    TableItem* item1 = new TableItemStatus(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]->tqsizeHint().width() > columnWidth(col_url_ - 1))
+    if(items[col_url_ - 1]->sizeHint().width() > columnWidth(col_url_ - 1))
     {
         setColumnStretchable(col_url_ - 1, false);
-        setColumnWidth(col_url_ - 1, items[col_url_ - 1]->tqsizeHint().width());
+        setColumnWidth(col_url_ - 1, items[col_url_ - 1]->sizeHint().width());
     }
 
     ensureCellVisible(row, 0);
@@ -178,14 +178,14 @@ void TableLinkstatus::removeColunas()
     Q_ASSERT(numCols() == 0);
 }
 
-void TableLinkstatus::show(ResultView::tqStatus const& status)
+void TableLinkstatus::show(ResultView::Status const& status)
 {
     for(int i = 0; i != numRows(); ++i)
     {
         int row = i;
         TableItem* _item = myItem(row, col_status_);
 
-        if(!ResultView::displayableWithtqStatus(_item->linktqStatus(), status))
+        if(!ResultView::displayableWithStatus(_item->linkStatus(), 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->tqsizeHint());
+    TQSize size_hint(itm->sizeHint());
     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->linktqStatus()->referrers();
-        loadContextTableMenu(referrers, table_item->linktqStatus()->isRoot());
+        TQValueVector<KURL> referrers = table_item->linkStatus()->referrers();
+        loadContextTableMenu(referrers, table_item->linkStatus()->isRoot());
         context_table_menu_.popup(pos);
     }
 }
@@ -313,7 +313,7 @@ void TableLinkstatus::loadContextTableMenu(TQValueVector<KURL> const& referrers,
 void TableLinkstatus::slotCopyUrlToClipboard() const
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
-    TQString content(_item->linktqStatus()->absoluteUrl().prettyURL());
+    TQString content(_item->linkStatus()->absoluteUrl().prettyURL());
     TQClipboard* cb = kapp->clipboard();
     cb->setText(content);
 }
@@ -321,7 +321,7 @@ void TableLinkstatus::slotCopyUrlToClipboard() const
 void TableLinkstatus::slotCopyParentUrlToClipboard() const
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
-    TQString content(_item->linktqStatus()->parent()->absoluteUrl().prettyURL());
+    TQString content(_item->linkStatus()->parent()->absoluteUrl().prettyURL());
     TQClipboard* cb = kapp->clipboard();
     cb->setText(content);
 }
@@ -336,7 +336,7 @@ void TableLinkstatus::slotCopyCellTextToClipboard() const
 void TableLinkstatus::slotEditReferrersWithQuanta()
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
-    TQValueVector<KURL> referrers = _item->linktqStatus()->referrers();
+    TQValueVector<KURL> referrers = _item->linkStatus()->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->linktqStatus()->referrers();
+    TQValueVector<KURL> referrers = _item->linkStatus()->referrers();
     Q_ASSERT(index >= 0 && (uint)index < referrers.size());
 
     slotEditReferrerWithQuanta(referrers[index]);
@@ -386,7 +386,7 @@ 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>").tqarg(filePath);
+            TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").arg(filePath);
             KMessageBox::error(parentWidget(), message);
         }
     }
@@ -400,7 +400,7 @@ void TableLinkstatus::slotEditReferrerWithQuanta(KURL const& url)
 void TableLinkstatus::slotViewUrlInBrowser()
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
-    KURL url = _item->linktqStatus()->absoluteUrl();
+    KURL url = _item->linkStatus()->absoluteUrl();
 
     if(url.isValid())
     {
@@ -414,13 +414,13 @@ void TableLinkstatus::slotViewParentUrlInBrowser()
 {
     TableItem* _item = myItem(currentRow(), currentColumn());
 
-    if(_item->linktqStatus()->isRoot())
+    if(_item->linkStatus()->isRoot())
     {
         KMessageBox::sorry(this, i18n("ROOT URL."));
     }
     else
     {
-        LinktqStatus const* ls_parent = _item->linktqStatus()->parent();
+        LinkStatus const* ls_parent = _item->linkStatus()->parent();
         Q_ASSERT(ls_parent);
 
         KURL url = ls_parent->absoluteUrl();
@@ -439,11 +439,11 @@ void TableLinkstatus::slotViewParentUrlInBrowser()
 */
 
 TableItem::TableItem(TQTable* table, EditType et,
-                     LinktqStatus const* linkstatus,
-                     int column_index, int tqalignment)
+                     LinkStatus const* linkstatus,
+                     int column_index, int alignment)
         : TQTableItem(table, et, ""), ResultViewItem(linkstatus, column_index),
-        /*ls_((LinktqStatus*)linkstatus),
-        column_index_(column_index),*/ alignment_(tqalignment)
+        /*ls_((LinkStatus*)linkstatus),
+        column_index_(column_index),*/ alignment_(alignment)
 {
     //Q_ASSERT(ls_);
     //Q_ASSERT(column_index_ > 0);
@@ -467,17 +467,17 @@ int TableItem::columnIndex() const
     return ResultViewItem::columnIndex();
 }
 
-void TableItem::tqsetAlignment(int aFlags)
+void TableItem::setAlignment(int aFlags)
 {
     alignment_ = aFlags;
 }
 
-int TableItem::tqalignment() const
+int TableItem::alignment() const
 {
     return alignment_;
 }
 /*
-LinktqStatus const* const TableItem::linktqStatus() const
+LinkStatus const* const TableItem::linkStatus() const
 {
     Q_ASSERT(ls_);
     return ls_;
@@ -485,31 +485,31 @@ LinktqStatus const* const TableItem::linktqStatus() const
 
 TQColor const& TableItem::textStatusColor() const
 {
-    if(linktqStatus()->errorOccurred())
+    if(linkStatus()->errorOccurred())
     {
-        //kdDebug(23100) <<  "ERROR: " << linkStatus()->error() << ": " << linktqStatus()->absoluteUrl().prettyURL() << endl;
-        if(linktqStatus()->error() == i18n( "Javascript not supported" ))
+        //kdDebug(23100) <<  "ERROR: " << linkStatus()->error() << ": " << linkStatus()->absoluteUrl().prettyURL() << endl;
+        if(linkStatus()->error() == i18n( "Javascript not supported" ))
             return TQt::lightGray;
         else
             return TQt::red;
     }
 
-    else if(linktqStatus()->absoluteUrl().hasRef())
+    else if(linkStatus()->absoluteUrl().hasRef())
         return TQt::blue;
 
-    else if(linktqStatus()->absoluteUrl().protocol() != "http" &&
-            linktqStatus()->absoluteUrl().protocol() != "https")
+    else if(linkStatus()->absoluteUrl().protocol() != "http" &&
+            linkStatus()->absoluteUrl().protocol() != "https")
         return TQt::darkGreen;
 
     else
     {
-        TQString status_code(TQString::number(linktqStatus()->httpHeader().statusCode()));
+        TQString status_code(TQString::number(linkStatus()->httpHeader().statusCode()));
 
         if(status_code[0] == '0')
         {
             kdWarning(23100) <<  "status code == 0: " << endl;
-            kdWarning(23100) <<  linktqStatus()->toString() << endl;
-            kdWarning(23100) <<  linktqStatus()->httpHeader().toString() << endl;
+            kdWarning(23100) <<  linkStatus()->toString() << endl;
+            kdWarning(23100) <<  linkStatus()->httpHeader().toString() << endl;
         }
         //Q_ASSERT(status_code[0] != '0');
 
@@ -538,7 +538,7 @@ TQColor const& TableItem::textStatusColor() const
 */
 
 TableItemURL::TableItemURL(TQTable* table, EditType et,
-                           LinktqStatus const* linkstatus, int column_index)
+                           LinkStatus 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(linktqStatus()->node() && linktqStatus()->malformed())
+    if(linkStatus()->node() && linkStatus()->malformed())
     {
-        if(linktqStatus()->node()->url().isEmpty())
-            TQTableItem::setText( linktqStatus()->node()->content().simplifyWhiteSpace() );
+        if(linkStatus()->node()->url().isEmpty())
+            TQTableItem::setText( linkStatus()->node()->content().simplifyWhiteSpace() );
         else
-            TQTableItem::setText( linktqStatus()->node()->url() );
+            TQTableItem::setText( linkStatus()->node()->url() );
     }
     else
     {
-        KURL url = linktqStatus()->absoluteUrl();
-        TQTableItem::setText(::convertToLocal(linktqStatus()));
+        KURL url = linkStatus()->absoluteUrl();
+        TQTableItem::setText(::convertToLocal(linkStatus()));
     }
 }
 
@@ -583,19 +583,19 @@ TQColor const& TableItemURL::textStatusColor() const
 {
     // TODO clean this code
 
-    TQString status_code(TQString::number(linktqStatus()->httpHeader().statusCode()));
+    TQString status_code(TQString::number(linkStatus()->httpHeader().statusCode()));
 
-    if(linktqStatus()->errorOccurred())
+    if(linkStatus()->errorOccurred())
     {
-        if(linktqStatus()->error().contains(i18n( "Timeout" )))
+        if(linkStatus()->error().contains(i18n( "Timeout" )))
             return darkMagenta;
-        else if(linktqStatus()->error().contains(i18n( "not supported" )))
+        else if(linkStatus()->error().contains(i18n( "not supported" )))
             return lightGray;
         else
             return red;
     }
-    else if(linktqStatus()->absoluteUrl().protocol() != "http" &&
-            linktqStatus()->absoluteUrl().protocol() != "https")
+    else if(linkStatus()->absoluteUrl().protocol() != "http" &&
+            linkStatus()->absoluteUrl().protocol() != "https")
         return black;
 
     else if(status_code[0] == '5')
@@ -610,53 +610,53 @@ TQColor const& TableItemURL::textStatusColor() const
 
 /*
 
-********************* TableItemtqStatus ***************************
+********************* TableItemStatus ***************************
 
 */
 
-TableItemtqStatus::TableItemtqStatus(TQTable* table, EditType et,
-                                 LinktqStatus const* linkstatus, int column_index)
+TableItemStatus::TableItemStatus(TQTable* table, EditType et,
+                                 LinkStatus const* linkstatus, int column_index)
         : TableItem(table, et, linkstatus, column_index)
 {
-    tqsetAlignment(TQt::AlignHCenter /*| TQt :: AlignVCenter*/);
+    setAlignment(TQt::AlignHCenter /*| TQt :: AlignVCenter*/);
     setText();
     setPixmap();
 }
 
-void TableItemtqStatus::setText()
+void TableItemStatus::setText()
 {
-    if(linktqStatus()->errorOccurred() ||
-            linktqStatus()->status() == "OK" ||
-            linktqStatus()->status() == "304")
+    if(linkStatus()->errorOccurred() ||
+            linkStatus()->status() == "OK" ||
+            linkStatus()->status() == "304")
     {
         TQTableItem::setText("");
     }
     else
     {
         /*
-                if(linktqStatus()->httpHeader().statusCode() == 0)
+                if(linkStatus()->httpHeader().statusCode() == 0)
                 {
                     kdDebug(23100) <<  "TableItemStatus::setText : statusCode() == 0" << endl;
-                    kdDebug(23100) <<  linktqStatus()->toString() << endl;
-                    kdDebug(23100) <<  linktqStatus()->docHtml() << endl;
+                    kdDebug(23100) <<  linkStatus()->toString() << endl;
+                    kdDebug(23100) <<  linkStatus()->docHtml() << endl;
                 }
         */
-        //Q_ASSERT(linktqStatus()->httpHeader().statusCode() != 0); //<------------------------------------------------------------
-        //TQTableItem::setText( TQString::number(linktqStatus()->httpHeader().statusCode()) );
-        TQTableItem::setText( linktqStatus()->status() );
+        //Q_ASSERT(linkStatus()->httpHeader().statusCode() != 0); //<------------------------------------------------------------
+        //TQTableItem::setText( TQString::number(linkStatus()->httpHeader().statusCode()) );
+        TQTableItem::setText( linkStatus()->status() );
     }
 }
 
-void TableItemtqStatus::setPixmap()
+void TableItemStatus::setPixmap()
 {
-    if(linktqStatus()->errorOccurred())
+    if(linkStatus()->errorOccurred())
     {
 
-        if(linktqStatus()->error().contains(i18n( "Timeout" )))
+        if(linkStatus()->error().contains(i18n( "Timeout" )))
         {
             TQTableItem::setPixmap(SmallIcon("kalarm"));
         }
-        else if(linktqStatus()->error() == i18n( "Malformed" ))
+        else if(linkStatus()->error() == i18n( "Malformed" ))
         {
             TQTableItem::setPixmap(SmallIcon("bug"));
         }
@@ -665,27 +665,27 @@ void TableItemtqStatus::setPixmap()
             TQTableItem::setPixmap(SmallIcon("no"));
         }
     }
-    else if(linktqStatus()->status() == "304")
+    else if(linkStatus()->status() == "304")
         TQTableItem::setPixmap(UserIcon("304"));
 
-    else if(linktqStatus()->status() == "OK")
+    else if(linkStatus()->status() == "OK")
         TQTableItem::setPixmap(SmallIcon("ok"));
 }
 
-TQString TableItemtqStatus::toolTip() const
+TQString TableItemStatus::toolTip() const
 {
-    if(linktqStatus()->errorOccurred() ||
-            linktqStatus()->absoluteUrl().hasRef() ||
-            (linktqStatus()->absoluteUrl().protocol() != "http" &&
-             linktqStatus()->absoluteUrl().protocol() != "https"))
+    if(linkStatus()->errorOccurred() ||
+            linkStatus()->absoluteUrl().hasRef() ||
+            (linkStatus()->absoluteUrl().protocol() != "http" &&
+             linkStatus()->absoluteUrl().protocol() != "https"))
     {
-        return i18n("%1").tqarg(linktqStatus()->status());
+        return i18n("%1").arg(linkStatus()->status());
     }
     else
-        return i18n("%1").tqarg(linktqStatus()->httpHeader().reasonPhrase());
+        return i18n("%1").arg(linkStatus()->httpHeader().reasonPhrase());
 }
 
-void TableItemtqStatus::paint( TQPainter *p, const TQColorGroup &cg,
+void TableItemStatus::paint( TQPainter *p, const TQColorGroup &cg,
                              const TQRect &cr, bool selected )
 {
     p->fillRect( 0, 0, cr.width(), cr.height(),
@@ -716,7 +716,7 @@ void TableItemtqStatus::paint( TQPainter *p, const TQColorGroup &cg,
     else
         p->setPen( m_cg.text() );
     p->drawText( x + 2, 0, w - x - 4, h,
-                 wordWrap() ? (tqalignment() | WordBreak) : tqalignment(), text() );
+                 wordWrap() ? (alignment() | WordBreak) : alignment(), text() );
 }
 
 /*
@@ -726,7 +726,7 @@ void TableItemtqStatus::paint( TQPainter *p, const TQColorGroup &cg,
 */
 
 TableItemNome::TableItemNome(TQTable* table, EditType et,
-                             LinktqStatus const* linkstatus, int column_index)
+                             LinkStatus 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(linktqStatus()->label());
+    TQString label(linkStatus()->label());
     if(!label.isNull())
         TQTableItem::setText(label.simplifyWhiteSpace());
 }
diff --git a/klinkstatus/src/ui/tablelinkstatus.h b/klinkstatus/src/ui/tablelinkstatus.h
index d3113ee0..6f601508 100644
--- a/klinkstatus/src/ui/tablelinkstatus.h
+++ b/klinkstatus/src/ui/tablelinkstatus.h
@@ -58,12 +58,12 @@ public:
     virtual void setColumns(TQStringList const& columns);
 
     /* Insere uma nova entrada no fim da tabela */
-    virtual void insertResult(LinktqStatus const* linkstatus);
+    virtual void insertResult(LinkStatus const* linkstatus);
 
 
     virtual void clear();
     void removeColunas();
-    virtual void show(ResultView::tqStatus const& status);
+    virtual void show(ResultView::Status const& status);
     virtual void showAll();
 
 
@@ -90,7 +90,7 @@ private slots:
 
 private:
 
-    vector<TableItem*> generateRowOfTableItems(LinktqStatus const* linkstatus);
+    vector<TableItem*> generateRowOfTableItems(LinkStatus const* linkstatus);
     void insereLinha(vector<TableItem*> items);
 
 private:
@@ -110,18 +110,18 @@ class TableItem: public TQTableItem, public ResultViewItem
 public:
 
     TableItem(TQTable* table, EditType et,
-              LinktqStatus const* linkstatus,
-              int column_index, int tqalignment = TQt::AlignLeft);
+              LinkStatus const* linkstatus,
+              int column_index, int alignment = TQt::AlignLeft);
     virtual ~TableItem();
 
     virtual void setColumnIndex(int i);
     virtual int columnIndex() const;
 
-    void tqsetAlignment(int aFlags);
-    virtual int tqalignment() const;
+    void setAlignment(int aFlags);
+    virtual int alignment() const;
 
     virtual TQString toolTip() const = 0;
-    //LinktqStatus const* const linktqStatus() const;
+    //LinkStatus const* const linkStatus() const;
 
 protected:
 
@@ -133,7 +133,7 @@ protected:
 
 private:
 
-    //LinktqStatus* ls_;
+    //LinkStatus* ls_;
     //int column_index_;
     int alignment_;
 };
@@ -144,7 +144,7 @@ class TableItemURL: public TableItem
 public:
 
     TableItemURL(TQTable* table, EditType et,
-                 LinktqStatus const* linkstatus, int column_index = 3);
+                 LinkStatus const* linkstatus, int column_index = 3);
     //virtual ~TableItemURL(){};
 
     virtual TQString toolTip() const;
@@ -158,13 +158,13 @@ protected:
 };
 
 
-class TableItemtqStatus: public TableItem
+class TableItemStatus: public TableItem
 {
 public:
 
-    TableItemtqStatus(TQTable* table, EditType et,
-                    LinktqStatus const* linkstatus, int column_index = 1);
-    //virtual ~TableItemtqStatus(){};
+    TableItemStatus(TQTable* table, EditType et,
+                    LinkStatus const* linkstatus, int column_index = 1);
+    //virtual ~TableItemStatus(){};
 
     virtual TQString toolTip() const;
 
@@ -181,7 +181,7 @@ class TableItemNome: public TableItem
 public:
 
     TableItemNome(TQTable* table, EditType et,
-                  LinktqStatus const* linkstatus, int column_index = 2);
+                  LinkStatus 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 7502d58b..bc7f1492 100644
--- a/klinkstatus/src/ui/tabwidgetsession.cpp
+++ b/klinkstatus/src/ui/tabwidgetsession.cpp
@@ -117,8 +117,8 @@ SessionWidget* TabWidgetSession::newSession()
 {
     // TODO: settings: number of connections, timeout
     SessionWidget* session_widget = newSessionWidget();
-    connect(session_widget, TQT_SIGNAL(signalUpdateTabLabel(const LinktqStatus *, SessionWidget*)),
-            this, TQT_SLOT(updateTabLabel(const LinktqStatus *, SessionWidget*)));
+    connect(session_widget, TQT_SIGNAL(signalUpdateTabLabel(const LinkStatus *, SessionWidget*)),
+            this, TQT_SLOT(updateTabLabel(const LinkStatus *, 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(LinktqStatus const* linkstatus, SessionWidget* page)
+void TabWidgetSession::updateTabLabel(LinkStatus 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 4c83ba49..c98adb0a 100644
--- a/klinkstatus/src/ui/tabwidgetsession.h
+++ b/klinkstatus/src/ui/tabwidgetsession.h
@@ -27,7 +27,7 @@
 class TQToolButton;
 
 class SessionWidget;
-class LinktqStatus;
+class LinkStatus;
 
 
 /**
@@ -59,7 +59,7 @@ public slots:
     SessionWidget* newSession();
     SessionWidget* newSession(KURL const& url);
     void closeSession();
-    void updateTabLabel(LinktqStatus const* linkstatus, SessionWidget*);
+    void updateTabLabel(LinkStatus const* linkstatus, SessionWidget*);
     void slotLoadSettings();
     
     void slotHideSearchPanel();
diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp
index 21bcdf02..8bc51471 100644
--- a/klinkstatus/src/ui/treeview.cpp
+++ b/klinkstatus/src/ui/treeview.cpp
@@ -30,7 +30,7 @@
 
 #include <tqvaluevector.h>
 #include <tqheader.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include "treeview.h"
 #include "../global.h"
@@ -114,16 +114,16 @@ void TreeView::removeColunas()
     clear();
 }
 
-void TreeView::show(ResultView::tqStatus const& status)
+void TreeView::show(ResultView::Status const& status)
 {
     TQListViewItemIterator it(static_cast<KListView*> (this));
     while(it.current())
     {
         TreeViewItem* item = myItem(it.current());
-        if(!ResultView::displayableWithtqStatus(item->linktqStatus(), status))
+        if(!ResultView::displayableWithStatus(item->linkStatus(), status))
         {
             item->setVisible(false);
-            //kdDebug(23100) << "Hide: " << item->linktqStatus()->absoluteUrl().url() << endl;
+            //kdDebug(23100) << "Hide: " << item->linkStatus()->absoluteUrl().url() << endl;
         }
         else
         {
@@ -135,7 +135,7 @@ void TreeView::show(ResultView::tqStatus const& status)
                 TreeViewItem* parent = myItem(item->parent());
                 while(parent)
                 {
-                    kdDebug(23100) << "Show: " << parent->linktqStatus()->absoluteUrl().url() << endl;
+                    kdDebug(23100) << "Show: " << parent->linkStatus()->absoluteUrl().url() << endl;
 
                     parent->setVisible(true);
                     //parent->setEnabled(false);
@@ -159,7 +159,7 @@ void TreeView::show(LinkMatcher link_matcher)
     while(it.current())
     {
         TreeViewItem* item = myItem(it.current());
-        bool match = link_matcher.matches(*(item->linktqStatus()));
+        bool match = link_matcher.matches(*(item->linkStatus()));
         
         if(tree_display_)
             item->setEnabled(match);
@@ -199,7 +199,7 @@ void TreeView::resizeEvent(TQResizeEvent *e)
 {
     KListView::resizeEvent(e);
     resetColumns();
-    clipper()->tqrepaint();
+    clipper()->repaint();
 }
 
 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->linktqStatus()->referrers();
-        loadContextTableMenu(referrers, tree_item->linktqStatus()->isRoot());
+        TQValueVector<KURL> referrers = tree_item->linkStatus()->referrers();
+        loadContextTableMenu(referrers, tree_item->linkStatus()->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->linktqStatus()->absoluteUrl().prettyURL());
-    TQClipboard* cb = kapp->tqclipboard();
+    TQString content(_item->linkStatus()->absoluteUrl().prettyURL());
+    TQClipboard* cb = kapp->clipboard();
     cb->setText(content);
 }
 
 void TreeView::slotCopyParentUrlToClipboard() const
 {
     TreeViewItem* _item = myItem(currentItem());
-    TQString content(_item->linktqStatus()->parent()->absoluteUrl().prettyURL());
-    TQClipboard* cb = kapp->tqclipboard();
+    TQString content(_item->linkStatus()->parent()->absoluteUrl().prettyURL());
+    TQClipboard* cb = kapp->clipboard();
     cb->setText(content);
 }
 
@@ -235,14 +235,14 @@ void TreeView::slotCopyCellTextToClipboard() const
 {
     TreeViewItem* _item = myItem(currentItem());
     TQString cell_text(_item->text(current_column_));
-    TQClipboard* cb = kapp->tqclipboard();
+    TQClipboard* cb = kapp->clipboard();
     cb->setText(cell_text);
 }
 
 void TreeView::slotEditReferrersWithQuanta()
 {
     TreeViewItem* _item = myItem(currentItem());
-    TQValueVector<KURL> referrers = _item->linktqStatus()->referrers();
+    TQValueVector<KURL> referrers = _item->linkStatus()->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->linktqStatus()->referrers();
+    TQValueVector<KURL> referrers = _item->linkStatus()->referrers();
     Q_ASSERT(index >= 0 && (uint)index < referrers.size());
 
     slotEditReferrerWithQuanta(referrers[index]);
@@ -292,7 +292,7 @@ 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>").tqarg(filePath);
+            TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").arg(filePath);
             KMessageBox::error(parentWidget(), message);
         }
     }
@@ -306,7 +306,7 @@ void TreeView::slotEditReferrerWithQuanta(KURL const& url)
 void TreeView::slotViewUrlInBrowser()
 {
     TreeViewItem* _item = myItem(currentItem());
-    KURL url = _item->linktqStatus()->absoluteUrl();
+    KURL url = _item->linkStatus()->absoluteUrl();
 
     if(url.isValid())
     {
@@ -320,13 +320,13 @@ void TreeView::slotViewParentUrlInBrowser()
 {
     TreeViewItem* _item = myItem(currentItem());
  
-    if(_item->linktqStatus()->isRoot())
+    if(_item->linkStatus()->isRoot())
     {
         KMessageBox::sorry(this, i18n("ROOT URL."));
     }
     else
     {
-        LinktqStatus const* ls_parent = _item->linktqStatus()->parent();
+        LinkStatus const* ls_parent = _item->linkStatus()->parent();
         Q_ASSERT(ls_parent);
 
         KURL url = ls_parent->absoluteUrl();
@@ -393,7 +393,7 @@ TreeViewItem* TreeView::myItem(TQListViewItem* item) const
 /* ******************************* TreeViewItem ******************************* */
 
 TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after,
-                           LinktqStatus const* linkstatus)
+                           LinkStatus const* linkstatus)
         : KListViewItem(parent, after),
         last_child_(0), root_(parent)
 {
@@ -401,7 +401,7 @@ TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after,
 }
 
 TreeViewItem::TreeViewItem(TreeView* root, TQListViewItem* listview_item, TQListViewItem* after,
-                           LinktqStatus const* linkstatus)
+                           LinkStatus 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(LinktqStatus const* linkstatus)
+void TreeViewItem::init(LinkStatus const* linkstatus)
 {
     setOpen(true);
 
@@ -450,15 +450,15 @@ TQString TreeViewItem::key(int column, bool) const
     switch(column)
     {
     case 1: // status column
-        return linktqStatus()->statusText();
+        return linkStatus()->statusText();
     }
 
     return text(column);
 }
 
-LinktqStatus const* TreeViewItem::linktqStatus() const
+LinkStatus const* TreeViewItem::linkStatus() const
 {
-    return column_items_[0].linktqStatus();
+    return column_items_[0].linkStatus();
 }
 
 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, LinktqStatus const* linkstatus, int column_index)
+TreeColumnViewItem::TreeColumnViewItem(TreeView* root, LinkStatus 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_;
 }
 
-LinktqStatus const* TreeColumnViewItem::linktqStatus() const
+LinkStatus const* TreeColumnViewItem::linkStatus() const
 {
     Q_ASSERT(ls_);
     return ls_;
@@ -511,23 +511,23 @@ TQColor const& TreeColumnViewItem::textStatusColor() const
 {
     if(columnIndex() == root_->urlColumnIndex() || columnIndex() == root_->statusColumnIndex())
     {
-        if(linktqStatus()->status() == LinktqStatus::BROKEN)
+        if(linkStatus()->status() == LinkStatus::BROKEN)
             return TQt::red;
-        else if(linktqStatus()->status() == LinktqStatus::HTTP_CLIENT_ERROR)
+        else if(linkStatus()->status() == LinkStatus::HTTP_CLIENT_ERROR)
             return TQt::red;
-        else if(linktqStatus()->status() == LinktqStatus::HTTP_REDIRECTION)
+        else if(linkStatus()->status() == LinkStatus::HTTP_REDIRECTION)
             return TQt::black;
-        else if(linktqStatus()->status() == LinktqStatus::HTTP_SERVER_ERROR)
+        else if(linkStatus()->status() == LinkStatus::HTTP_SERVER_ERROR)
             return TQt::darkMagenta;
-        else if(linktqStatus()->status() == LinktqStatus::MALFORMED)
+        else if(linkStatus()->status() == LinkStatus::MALFORMED)
             return TQt::red;
-        else if(linktqStatus()->status() == LinktqStatus::NOT_SUPPORTED)
+        else if(linkStatus()->status() == LinkStatus::NOT_SUPPORTED)
             return TQt::lightGray;
-        else if(linktqStatus()->status() == LinktqStatus::SUCCESSFULL)
+        else if(linkStatus()->status() == LinkStatus::SUCCESSFULL)
             return TQt::black;
-        else if(linktqStatus()->status() == LinktqStatus::TIMEOUT)
+        else if(linkStatus()->status() == LinkStatus::TIMEOUT)
             return TQt::darkMagenta;
-        else if(linktqStatus()->status() == LinktqStatus::UNDETERMINED)
+        else if(linkStatus()->status() == LinkStatus::UNDETERMINED)
             return TQt::blue;
         
         return TQt::red;
@@ -544,17 +544,17 @@ TQString TreeColumnViewItem::text(int column) const
     
     if(column == root_->urlColumnIndex())
     {
-        if(linktqStatus()->node() && linktqStatus()->malformed())
+        if(linkStatus()->node() && linkStatus()->malformed())
         {
-            if(linktqStatus()->node()->url().isEmpty())
-                return linktqStatus()->node()->content().simplifyWhiteSpace();
+            if(linkStatus()->node()->url().isEmpty())
+                return linkStatus()->node()->content().simplifyWhiteSpace();
             else
-                return linktqStatus()->node()->url();
+                return linkStatus()->node()->url();
         }
         else
         {
-            KURL url = linktqStatus()->absoluteUrl();
-            return Url::convertToLocal(linktqStatus());
+            KURL url = linkStatus()->absoluteUrl();
+            return Url::convertToLocal(linkStatus());
         }        
     }
     else if(column == root_->statusColumnIndex())
@@ -563,7 +563,7 @@ TQString TreeColumnViewItem::text(int column) const
     }
     else if(column == root_->labelColumnIndex())
     {
-        TQString label(linktqStatus()->label());
+        TQString label(linkStatus()->label());
         if(!label.isNull())
             return label.simplifyWhiteSpace();
     }
@@ -577,28 +577,28 @@ TQPixmap TreeColumnViewItem::pixmap(int column) const
 
     if(column == root_->statusColumnIndex())
     {
-        if(linktqStatus()->status() == LinktqStatus::BROKEN)
+        if(linkStatus()->status() == LinkStatus::BROKEN)
             return SmallIcon("no");
-        else if(linktqStatus()->status() == LinktqStatus::HTTP_CLIENT_ERROR)
+        else if(linkStatus()->status() == LinkStatus::HTTP_CLIENT_ERROR)
             return SmallIcon("no");
-        else if(linktqStatus()->status() == LinktqStatus::HTTP_REDIRECTION) 
+        else if(linkStatus()->status() == LinkStatus::HTTP_REDIRECTION) 
         {
-            if(linktqStatus()->statusText() == "304")
+            if(linkStatus()->statusText() == "304")
                 return UserIcon("304");
             else
                 return SmallIcon("redo");
         }
-        else if(linktqStatus()->status() == LinktqStatus::HTTP_SERVER_ERROR)
+        else if(linkStatus()->status() == LinkStatus::HTTP_SERVER_ERROR)
             return SmallIcon("no");
-        else if(linktqStatus()->status() == LinktqStatus::MALFORMED)
+        else if(linkStatus()->status() == LinkStatus::MALFORMED)
             return SmallIcon("editdelete");
-        else if(linktqStatus()->status() == LinktqStatus::NOT_SUPPORTED)
+        else if(linkStatus()->status() == LinkStatus::NOT_SUPPORTED)
             return SmallIcon("help");
-        else if(linktqStatus()->status() == LinktqStatus::SUCCESSFULL)
+        else if(linkStatus()->status() == LinkStatus::SUCCESSFULL)
             return SmallIcon("ok");
-        else if(linktqStatus()->status() == LinktqStatus::TIMEOUT)
+        else if(linkStatus()->status() == LinkStatus::TIMEOUT)
             return SmallIcon("history_clear");
-        else if(linktqStatus()->status() == LinktqStatus::UNDETERMINED)
+        else if(linkStatus()->status() == LinkStatus::UNDETERMINED)
             return SmallIcon("help");
     }
     
diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h
index 6b48cc63..8735a595 100644
--- a/klinkstatus/src/ui/treeview.h
+++ b/klinkstatus/src/ui/treeview.h
@@ -38,7 +38,7 @@ public:
     virtual void setColumns(TQStringList const& columns);
     virtual void clear();
     void removeColunas();
-    virtual void show(ResultView::tqStatus const& status);
+    virtual void show(ResultView::Status const& status);
     void show(LinkMatcher link_matcher);
     virtual void showAll();
     
@@ -92,22 +92,22 @@ class TreeViewItem: public KListViewItem
 public:
 
     TreeViewItem(TreeView* parent, TQListViewItem* after,
-                 LinktqStatus const* linkstatus);
+                 LinkStatus const* linkstatus);
     TreeViewItem(TreeView* root, TQListViewItem* parent_item, TQListViewItem* after,
-                 LinktqStatus const* linkstatus);
+                 LinkStatus const* linkstatus);
     virtual ~TreeViewItem();
 
     void setLastChild(TQListViewItem* last_child);
     TQListViewItem* lastChild() const;
     
     TQString key(int column, bool) const;
-    LinktqStatus const* linktqStatus() const;
+    LinkStatus const* linkStatus() const;
 
 protected:
     virtual void paintCell(TQPainter * p, const TQColorGroup & cg, int column, int width, int align);
 
 private:
-    void init(LinktqStatus const* linkstatus);
+    void init(LinkStatus const* linkstatus);
 
 private:
     TQValueVector<TreeColumnViewItem> column_items_;
@@ -124,19 +124,19 @@ public:
     TreeColumnViewItem()
     {}
     ;
-    TreeColumnViewItem(TreeView* root, LinktqStatus const* linkstatus, int column_index);
+    TreeColumnViewItem(TreeView* root, LinkStatus const* linkstatus, int column_index);
     ~TreeColumnViewItem();
 
     //void setColumnIndex(int i);
     int columnIndex() const;
-    LinktqStatus const* linktqStatus() const;
+    LinkStatus const* linkStatus() const;
     TQColor const& textStatusColor() const;
     TQString text(int column) const;
     TQPixmap pixmap(int column) const;
 
 private:
     TreeView* root_;
-    LinktqStatus const* ls_;
+    LinkStatus const* ls_;
     int column_index_;
 };
 
diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp
index 4a04834b..31db321e 100644
--- a/klinkstatus/src/utils/xsl.cpp
+++ b/klinkstatus/src/utils/xsl.cpp
@@ -35,7 +35,7 @@
 
 #include <tqregexp.h>
 #include <tqsignal.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqthread.h>
 #include <tqevent.h>
 #include <tqmutex.h>
@@ -141,7 +141,7 @@ TQString KopeteXSLThread::xsltTransform( const TQString &xmlString, xsltStyleshe
     {
         if ( styleSheet )
         {
-            static TQCString appPath( TQString::tqfromLatin1("\"%1\"").tqarg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::tqfromLatin1("styles/data") ).front() ).utf8() );
+            static TQCString appPath( TQString::fromLatin1("\"%1\"").arg( KApplication::kApplication()->dirs()->findDirs("appdata", TQString::fromLatin1("styles/data") ).front() ).utf8() );
 
             static const char* params[3] = {
                 "appdata",
@@ -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>" ).tqarg( errorMsg );
+        resultString = i18n( "<div><b>KLinkStatus encountered the following error while parsing a message:</b><br />%1</div>" ).arg( errorMsg );
     }
 
     #ifdef RAWXSL
@@ -235,7 +235,7 @@ void XSLT::setXSLT( const TQString &_document )
     //  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::tqfromLatin1( "<kopete-i18n>(.*)</kopete-i18n>" ) );
+    TQRegExp elementMatch( TQString::fromLatin1( "<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::tqfromLatin1( "TIME" ) )
+            if ( *it == TQString::fromLatin1( "TIME" ) )
             {
-                trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@time\"/>" );
+                trans += TQString::fromLatin1( "<xsl:value-of select=\"@time\"/>" );
             }
-            else if ( *it == TQString::tqfromLatin1( "TIMESTAMP" ) )
+            else if ( *it == TQString::fromLatin1( "TIMESTAMP" ) )
             {
-                trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@timestamp\"/>" );
+                trans += TQString::fromLatin1( "<xsl:value-of select=\"@timestamp\"/>" );
             }
-            else if ( *it == TQString::tqfromLatin1( "FORMATTEDTIMESTAMP" ) )
+            else if ( *it == TQString::fromLatin1( "FORMATTEDTIMESTAMP" ) )
             {
-                trans += TQString::tqfromLatin1( "<xsl:value-of select=\"@formattedTimestamp\"/>" );
+                trans += TQString::fromLatin1( "<xsl:value-of select=\"@formattedTimestamp\"/>" );
             }
-            else if ( *it == TQString::tqfromLatin1( "FROM_CONTACT_DISPLAYNAME" ) )
+            else if ( *it == TQString::fromLatin1( "FROM_CONTACT_DISPLAYNAME" ) )
             {
-                trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+                trans += TQString::fromLatin1( "<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::tqfromLatin1( "TO_CONTACT_DISPLAYNAME" ) )
+            else if ( *it == TQString::fromLatin1( "TO_CONTACT_DISPLAYNAME" ) )
             {
-                trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+                trans += TQString::fromLatin1( "<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::tqfromLatin1( "FROM_METACONTACT_DISPLAYNAME" ) )
+            else if ( *it == TQString::fromLatin1( "FROM_METACONTACT_DISPLAYNAME" ) )
             {
-                trans += TQString::tqfromLatin1( "<span>"
+                trans += TQString::fromLatin1( "<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::tqfromLatin1( "TO_METACONTACT_DISPLAYNAME" ) )
+            else if ( *it == TQString::fromLatin1( "TO_METACONTACT_DISPLAYNAME" ) )
             {
-                trans += TQString::tqfromLatin1( "<span>"
+                trans += TQString::fromLatin1( "<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::tqfromLatin1( "FROM_CONTACT_ID" ) )
+            else if ( *it == TQString::fromLatin1( "FROM_CONTACT_ID" ) )
             {
-                trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+                trans += TQString::fromLatin1( "<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::tqfromLatin1( "TO_CONTACT_ID" ) )
+            else if ( *it == TQString::fromLatin1( "TO_CONTACT_ID" ) )
             {
-                trans += TQString::tqfromLatin1( "<span><xsl:attribute name=\"title\">"
+                trans += TQString::fromLatin1( "<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::tqfromLatin1( "BODY" ) )
+            else if ( *it == TQString::fromLatin1( "BODY" ) )
             {
-                trans += TQString::tqfromLatin1( "<xsl:value-of disable-output-escaping=\"yes\" select=\"body\"/>" );
+                trans += TQString::fromLatin1( "<xsl:value-of disable-output-escaping=\"yes\" select=\"body\"/>" );
             }
             else
             {
@@ -387,7 +387,7 @@ void XSLT::setXSLT( const TQString &_document )
             }
 
             if( !flags.isEmpty() )
-                setProperty("flags", flags.join( TQString::tqfromLatin1("|") ) );
+                setProperty("flags", flags.join( TQString::fromLatin1("|") ) );
         }
         else
         {
diff --git a/kommander/Kommander-TODO.kno b/kommander/Kommander-TODO.kno
index 52ab92a5..9f5f352c 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 tqlayout</li>
+<ul type="disc"><li>better layout</li>
 <li>replace list of widgets with tree of widgets</li>
 <li>replace widget class with widget pixmap in combos</li>
-<li>redesign tqlayout</li>
+<li>redesign layout</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 tqlayout-handling commands (center selected widgets horizontally/vertically, fit to window width/height)</li>
+<li>add more layout-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>
@@ -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 tqlayout is applied. Goes back to normal if the dialog is reloaded.</li>
+<li>toolbox editing is ugly after group layout is applied. Goes back to normal if the dialog is reloaded.</li>
 <div></div></ul>
 </body></html>
 
diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp
index 7207da73..0eac8348 100644
--- a/kommander/editor/actiondnd.cpp
+++ b/kommander/editor/actiondnd.cpp
@@ -23,7 +23,7 @@
 #include <tqbitmap.h>
 #include <tqdragobject.h>
 #include <kinputdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmainwindow.h>
 #include <tqmenudata.h>
 #include <tqmessagebox.h>
@@ -81,7 +81,7 @@ QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolB
     setOrientation( o );
     setBackgroundMode( parent->backgroundMode() );
     setBackgroundOrigin( ParentOrigin );
-    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+    setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 }
 
 void QDesignerToolBarSeparator::setOrientation( Qt::Orientation o )
@@ -94,9 +94,9 @@ void QDesignerToolBarSeparator::styleChange( TQStyle& )
     setOrientation( orient );
 }
 
-TQSize QDesignerToolBarSeparator::tqsizeHint() const
+TQSize QDesignerToolBarSeparator::sizeHint() const
 {
-    int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
+    int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
 				      this );
     if ( orient ==Qt::Horizontal )
 	return TQSize( extent, 0 );
@@ -113,7 +113,7 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
 	flags |= TQStyle::Style_Horizontal;
 
     tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
-			   tqcolorGroup(), flags );
+			   colorGroup(), flags );
 }
 
 
@@ -294,7 +294,7 @@ void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e )
     menu.insertItem( i18n("Delete Toolbar" ), 1 );
     int res = menu.exec( e->globalPos() );
     if ( res != -1 ) {
-	RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n("Delete Toolbar '%1'" ).tqarg( name() ),
+	RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n("Delete Toolbar '%1'" ).arg( name() ),
 							      formWindow, 0, this );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
@@ -360,7 +360,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *
 	int index = actionList.find( a );
 	RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand(
 	    i18n("Delete Action '%1' From Toolbar '%2'" ).
-	    tqarg( a->name() ).tqarg( caption() ),
+	    arg( a->name() ).arg( caption() ),
 	    formWindow, a, this, index );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
@@ -380,7 +380,7 @@ 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'" ).tqarg( name() ),
+	RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n("Delete Toolbar '%1'" ).arg( name() ),
 							      formWindow, 0, this );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
@@ -420,7 +420,7 @@ void QDesignerToolBar::removeWidget( TQWidget *w )
     int index = actionList.find( a );
     RemoveActionFromToolBarCommand *cmd =
 	new RemoveActionFromToolBarCommand( i18n("Delete Action '%1' From Toolbar '%2'" ).
-					    tqarg( a->name() ).tqarg( caption() ),
+					    arg( a->name() ).arg( caption() ),
 					    formWindow, a, this, index );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
@@ -443,7 +443,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
     int index = actionList.find( a );
     RemoveActionFromToolBarCommand *cmd =
 	new RemoveActionFromToolBarCommand( i18n("Delete Action '%1' From Toolbar '%2'" ).
-					    tqarg( a->name() ).tqarg( caption() ),
+					    arg( a->name() ).arg( caption() ),
 					    formWindow, a, this, index );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
@@ -462,7 +462,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
     }
     if ( !drag->drag() ) {
 	AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n("Add Action '%1' to Toolbar '%2'" ).
-									tqarg( a->name() ).tqarg( caption() ),
+									arg( a->name() ).arg( caption() ),
 									formWindow, a, this, index );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
@@ -511,11 +511,11 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
 	return;
     TQString s;
     if ( e->provides( "application/x-designer-actiongroup" ) )
-	s = TQString( e->tqencodedData( "application/x-designer-actiongroup" ) );
+	s = TQString( e->encodedData( "application/x-designer-actiongroup" ) );
     else if ( e->provides( "application/x-designer-separator" ) )
-	s = TQString( e->tqencodedData( "application/x-designer-separator" ) );
+	s = TQString( e->encodedData( "application/x-designer-separator" ) );
     else
-	s = TQString( e->tqencodedData( "application/x-designer-actions" ) );
+	s = TQString( e->encodedData( "application/x-designer-actions" ) );
 
     indicator->hide();
     TQAction *a = 0;
@@ -543,7 +543,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
     }
 
     AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n("Add Action '%1' to Toolbar '%2'" ).
-								    tqarg( a->name() ).tqarg( caption() ),
+								    arg( a->name() ).arg( caption() ),
 								    formWindow, a, this, index );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
@@ -671,7 +671,7 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p )
     if ( !insertAnchor )
 	index = 0;
     AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n("Add Widget '%1' to Toolbar '%2'" ).
-								    tqarg( w->name() ).tqarg( caption() ),
+								    arg( w->name() ).arg( caption() ),
 								    formWindow, a, this, index );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
@@ -739,16 +739,16 @@ void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e )
     int res = menu.exec( e->globalPos() );
     if ( res == 1 ) {
 	TQMenuItem *item = findItem( idAt( itm ) );
-	RemoveMenuCommand *cmd = new RemoveMenuCommand( i18n("Delete Menu '%1'" ).tqarg( item->text() ),
+	RemoveMenuCommand *cmd = new RemoveMenuCommand( i18n("Delete Menu '%1'" ).arg( item->text() ),
 							formWindow,
 							(TQMainWindow*)parentWidget(), this,
 							(QDesignerPopupMenu*)item->popup(),
 							idAt( itm ), itm, item->text() );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
-	// #### need to do a proper tqinvalidate and re-tqlayout
-	parentWidget()->tqlayout()->tqinvalidate();
-	parentWidget()->tqlayout()->activate();
+	// #### need to do a proper invalidate and re-layout
+	parentWidget()->layout()->invalidate();
+	parentWidget()->layout()->activate();
     } else if ( res == 2 ) {
 	bool ok;
 	TQString old = text( idAt( itm ) );
@@ -756,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'" ).tqarg( old ).tqarg( txt ),
+		i18n("Rename Menu '%1' to '%2'" ).arg( old ).arg( txt ),
 		formWindow, this, idAt( itm ), old, txt );
 	    formWindow->commandHistory()->addCommand( cmd );
 	    cmd->execute();
@@ -873,14 +873,14 @@ void QDesignerMenuBar::dropEvent( TQDropEvent *e )
     if ( !e->provides( "application/x-designer-menuitem" ) )
 	return;
     e->accept();
-    TQString s( e->tqencodedData( "application/x-designer-menuitem" ) );
+    TQString s( e->encodedData( "application/x-designer-menuitem" ) );
     TQString s1 = s.left( s.find( "/" ) );
     TQString s2 = s.mid( s.find( "/" ) + 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'" ).tqarg( txt ), formWindow,
+    MoveMenuCommand *cmd = new MoveMenuCommand( i18n("Move Menu '%1'" ).arg( txt ), formWindow,
 						this, (QDesignerPopupMenu*)popup, oldPos, insertAt, txt );
     // do not execute, we did the work already
     formWindow->commandHistory()->addCommand( cmd );
@@ -895,7 +895,7 @@ TQPoint QDesignerMenuBar::calcIndicatorPos( const TQPoint &pos )
     int w = frameWidth();
     insertAt = count();
     for ( int i = 0; i < (int)count(); ++i ) {
-	TQRect r = tqitemRect( i );
+	TQRect r = itemRect( i );
 	if ( pos.x() < w + r.width() / 2 ) {
 	    insertAt = i;
 	    break;
@@ -1030,7 +1030,7 @@ void QDesignerPopupMenu::createPopupMenu()
 	    return;
 	RemoveActionFromPopupCommand *cmd = new RemoveActionFromPopupCommand(
 									     i18n("Delete Action '%1' From Popup Menu '%2'" ).
-									     tqarg( a->name() ).tqarg( caption() ),
+									     arg( a->name() ).arg( caption() ),
 									     formWindow, a, this, itm );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
@@ -1069,7 +1069,7 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e )
     if ( !a )
 	return;
     RemoveActionFromPopupCommand *cmd = new RemoveActionFromPopupCommand( i18n("Delete Action '%1' From Popup Menu '%2'" ).
-									  tqarg( a->name() ).tqarg( caption() ),
+									  arg( a->name() ).arg( caption() ),
 									  formWindow, a, this, itm );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
@@ -1082,7 +1082,7 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e )
     drag->setPixmap( a->iconSet().pixmap() );
     if ( !drag->drag() ) {
 	AddActionToPopupCommand *cmd = new AddActionToPopupCommand( i18n("Add Action '%1' to Popup Menu '%2'" ).
-								    tqarg( a->name() ).tqarg( name() ),
+								    arg( a->name() ).arg( name() ),
 								    formWindow, a, this, itm );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
@@ -1142,15 +1142,15 @@ void QDesignerPopupMenu::dropEvent( TQDropEvent *e )
     TQPoint p = pos();
     TQAction *a = 0;
     if ( e->provides( "application/x-designer-actiongroup" ) ) {
-	TQString s( e->tqencodedData( "application/x-designer-actiongroup" ) );
+	TQString s( e->encodedData( "application/x-designer-actiongroup" ) );
 	a = (QDesignerActionGroup*)s.toLong();
     } else {
 	TQString s;
 	if ( e->provides( "application/x-designer-separator" ) ) {
-	    s = TQString( e->tqencodedData( "application/x-designer-separator" ) );
+	    s = TQString( e->encodedData( "application/x-designer-separator" ) );
 	    a = (QSeparatorAction*)s.toLong();
 	} else {
-	    s = TQString( e->tqencodedData( "application/x-designer-actions" ) );
+	    s = TQString( e->encodedData( "application/x-designer-actions" ) );
 	    a = (QDesignerAction*)s.toLong();
 	}
     }
@@ -1164,7 +1164,7 @@ void QDesignerPopupMenu::dropEvent( TQDropEvent *e )
     }
 
     AddActionToPopupCommand *cmd = new AddActionToPopupCommand( i18n("Add Action '%1' to Popup Menu '%2'" ).
-								tqarg( a->name() ).tqarg( name() ),
+								arg( a->name() ).arg( name() ),
 								formWindow, a, this, insertAt );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
diff --git a/kommander/editor/actiondnd.h b/kommander/editor/actiondnd.h
index a47992cd..74df7292 100644
--- a/kommander/editor/actiondnd.h
+++ b/kommander/editor/actiondnd.h
@@ -108,7 +108,7 @@ class QDesignerToolBarSeparator : public TQWidget
 public:
     QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 );
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
     Qt::Orientation orientation() const { return orient; }
 public slots:
    void setOrientation( Qt::Orientation );
diff --git a/kommander/editor/actioneditor.ui b/kommander/editor/actioneditor.ui
index 056b46cf..5d13edc7 100644
--- a/kommander/editor/actioneditor.ui
+++ b/kommander/editor/actioneditor.ui
@@ -105,7 +105,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kommander/editor/assoctexteditor.ui b/kommander/editor/assoctexteditor.ui
index d3565506..9fa637c3 100644
--- a/kommander/editor/assoctexteditor.ui
+++ b/kommander/editor/assoctexteditor.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -114,7 +114,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -152,7 +152,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>150</width>
                             <height>0</height>
@@ -169,7 +169,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index 1298db05..8498b96f 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -90,9 +90,9 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
     }
 
   doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(a_parent), "KTextEditor::Document");
-  TQGridLayout *tqlayout = new TQGridLayout(editorFrame, 1, 1);
+  TQGridLayout *layout = new TQGridLayout(editorFrame, 1, 1);
   view = doc->createView(editorFrame);
-  tqlayout->addWidget(view, 1,1);
+  layout->addWidget(view, 1,1);
   partManager->addPart(doc, true);
 
   //trick to import all the KatePart actions into the dialog
@@ -268,7 +268,7 @@ void AssocTextEditor::save() const
 
   if (atw->associatedText() != associatedText())
   {
-    TQString text = i18n("Set the \'text association\' of \'%1\'").tqarg(m_widget->name());
+    TQString text = i18n("Set the \'text association\' of \'%1\'").arg(m_widget->name());
     SetPropertyCommand *cmd  = new SetPropertyCommand(text, m_formWindow,
         TQT_TQOBJECT(m_widget), m_propertyEditor, "associations", atw->associatedText(),
         associatedText(), TQString(), TQString(), false);
@@ -278,7 +278,7 @@ void AssocTextEditor::save() const
   }
   if (atw->populationText() != populationText())
   {
-    TQString text = i18n("Set the \'population text\' of \'%1\'").tqarg(m_widget->name());
+    TQString text = i18n("Set the \'population text\' of \'%1\'").arg(m_widget->name());
     SetPropertyCommand *cmd  = new SetPropertyCommand(text, m_formWindow, TQT_TQOBJECT(m_widget),
         m_propertyEditor, "populationText", atw->populationText(),
         populationText(), TQString(), TQString(), false);
@@ -314,7 +314,7 @@ 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()->tqmetaObject();
+    TQMetaObject *metaObj = it.current()->metaObject();
     if(metaObj)
     {
       int id = metaObj->findProperty("KommanderWidget", 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").tqarg( fileName ) );
+    KMessageBox::error( this, i18n("<qt>Cannot open file<br><b>%1</b></qt").arg( fileName ) );
     return;
   }
   TQTextStream insertStream(&insertFile);
@@ -456,7 +456,7 @@ TQString AssocTextEditor::widgetToString(TQWidget* widget, bool formatted)
    if (!widget)
      return TQString();
    else if (formatted)
-     return TQString("%1 (%2)").tqarg(widget->name()).tqarg(widget->className());
+     return TQString("%1 (%2)").arg(widget->name()).arg(widget->className());
    else
      return widget->name();
 }
diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui
index fc9887c9..64970e5a 100644
--- a/kommander/editor/choosewidget.ui
+++ b/kommander/editor/choosewidget.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -40,7 +40,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -88,7 +88,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -104,7 +104,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp
index c9a6642d..c5b1bbb7 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)").tqarg(w->name()).tqarg(w->className()));
+  item = new TQListViewItem(widgetView, TQString("%1 (%2)").arg(w->name()).arg(w->className()));
   item->setOpen(true);
   
   p_widgets.push(w);
@@ -68,7 +68,7 @@ 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)").tqarg((*it)->name()).tqarg((*it)->className()));
+        newItem = new TQListViewItem(item, TQString("%1 (%2)").arg((*it)->name()).arg((*it)->className()));
       if (!(*it)->childrenListObject().isEmpty()) {
           p_widgets.push((TQWidget*)(*it));
           p_items.push(newItem);
@@ -103,7 +103,7 @@ void ChooseWidget::textChanged(const TQString& text)
 bool ChooseWidget::isKommanderWidget(TQObject* w)
 {
   bool pExists = false;
-  TQMetaObject *metaObj = w->tqmetaObject();
+  TQMetaObject *metaObj = w->metaObject();
   if (metaObj)
   {
     int id = metaObj->findProperty("KommanderWidget", true);
diff --git a/kommander/editor/choosewidgetimpl.h b/kommander/editor/choosewidgetimpl.h
index 24e902ad..dec3fbd3 100644
--- a/kommander/editor/choosewidgetimpl.h
+++ b/kommander/editor/choosewidgetimpl.h
@@ -26,7 +26,7 @@ class ChooseWidget : public ChooseWidgetBase
 public:
   ChooseWidget(TQWidget*, const char* = 0, bool=true);
   ~ChooseWidget();
-  // Put current widget and all of its tqchildren in a tree
+  // Put current widget and all of its children in a tree
   void setWidget(TQWidget *);
   // Return current widget
   TQString selection();
diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp
index c1b8db31..41ea2b23 100644
--- a/kommander/editor/command.cpp
+++ b/kommander/editor/command.cpp
@@ -36,7 +36,7 @@
 #include <tqwidget.h>
 #include <tqmetaobject.h>
 #include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmessagebox.h>
 #include <tqlistbox.h>
 #include <tqiconview.h>
@@ -253,19 +253,19 @@ void ResizeCommand::unexecute()
 
 InsertCommand::InsertCommand( const TQString &n, FormWindow *fw,
 			      TQWidget *w, const TQRect &g )
-    : Command( n, fw ), widget( w ), tqgeometry( g )
+    : Command( n, fw ), widget( w ), geometry( g )
 {
 }
 
 void InsertCommand::execute()
 {
-    if ( tqgeometry.size() == TQSize( 0, 0 ) ) {
-	widget->move( tqgeometry.topLeft() );
+    if ( geometry.size() == TQSize( 0, 0 ) ) {
+	widget->move( geometry.topLeft() );
 	widget->adjustSize();
     } else {
-	TQSize s = tqgeometry.size().expandedTo( widget->tqminimumSize() );
-	s = s.expandedTo( widget->tqminimumSizeHint() );
-	TQRect r( tqgeometry.topLeft(), s );
+	TQSize s = geometry.size().expandedTo( widget->minimumSize() );
+	s = s.expandedTo( widget->minimumSizeHint() );
+	TQRect r( geometry.topLeft(), s );
 	widget->setGeometry( r );
     }
     widget->show();
@@ -461,7 +461,7 @@ bool SetPropertyCommand::canMerge( Command *c )
 {
     SetPropertyCommand *cmd = (SetPropertyCommand*)c;
     const TQMetaProperty *p =
-	widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, true ), true );
+	widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true );
     if ( !p ) {
 	if ( propName == "toolTip" || propName == "whatsThis" )
 	    return true;
@@ -532,26 +532,26 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	editor->propertyList()->setCurrentProperty( propName );
 
     const TQMetaProperty *p =
-	widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, true ), true );
+	widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true );
     if ( !p ) {
 	if ( propName == "hAlign" ) {
-	    p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", true ), true );
-	    int align = widget->property( "tqalignment" ).toInt();
+	    p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true );
+	    int align = widget->property( "alignment" ).toInt();
 	    align &= ~( AlignHorizontal_Mask );
 	    align |= p->keyToValue( currentItemText );
-	    widget->setProperty( "tqalignment", TQVariant( align ) );
+	    widget->setProperty( "alignment", TQVariant( align ) );
 	} else if ( propName == "vAlign" ) {
-	    p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", true ), true );
-	    int align = widget->property( "tqalignment" ).toInt();
+	    p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true );
+	    int align = widget->property( "alignment" ).toInt();
 	    align &= ~( AlignVertical_Mask );
 	    align |= p->keyToValue( currentItemText );
-	    widget->setProperty( "tqalignment", TQVariant( align ) );
+	    widget->setProperty( "alignment", TQVariant( align ) );
 	} else if ( propName == "wordwrap" ) {
-	    int align = widget->property( "tqalignment" ).toInt();
+	    int align = widget->property( "alignment" ).toInt();
 	    align &= ~WordBreak;
 	    if ( v.toBool() )
 		align |= WordBreak;
-	    widget->setProperty( "tqalignment", TQVariant( align ) );
+	    widget->setProperty( "alignment", TQVariant( align ) );
 	} else if ( propName == "layoutSpacing" ) {
 	    MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() );
 	} else if ( propName == "layoutMargin" ) {
@@ -630,21 +630,21 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
 						  TQWidget *parent, TQWidget *layoutBase,
 						  const TQWidgetList &wl )
-    : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase )
+    : Command( n, fw ), layout( wl, parent, fw, layoutBase )
 {
 }
 
 void LayoutHorizontalCommand::execute()
 {
     formWindow()->clearSelection( false );
-    tqlayout.doLayout();
+    layout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutHorizontalCommand::unexecute()
 {
     formWindow()->clearSelection( false );
-    tqlayout.undoLayout();
+    layout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
@@ -653,21 +653,21 @@ void LayoutHorizontalCommand::unexecute()
 LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
 							    TQWidget *parent, TQWidget *layoutBase,
 							    const TQWidgetList &wl )
-    : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, true, true )
+    : Command( n, fw ), layout( wl, parent, fw, layoutBase, true, true )
 {
 }
 
 void LayoutHorizontalSplitCommand::execute()
 {
     formWindow()->clearSelection( false );
-    tqlayout.doLayout();
+    layout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutHorizontalSplitCommand::unexecute()
 {
     formWindow()->clearSelection( false );
-    tqlayout.undoLayout();
+    layout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
@@ -676,21 +676,21 @@ void LayoutHorizontalSplitCommand::unexecute()
 LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw,
 					      TQWidget *parent, TQWidget *layoutBase,
 					      const TQWidgetList &wl )
-    : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase )
+    : Command( n, fw ), layout( wl, parent, fw, layoutBase )
 {
 }
 
 void LayoutVerticalCommand::execute()
 {
     formWindow()->clearSelection( false );
-    tqlayout.doLayout();
+    layout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutVerticalCommand::unexecute()
 {
     formWindow()->clearSelection( false );
-    tqlayout.undoLayout();
+    layout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
@@ -699,21 +699,21 @@ void LayoutVerticalCommand::unexecute()
 LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
 							TQWidget *parent, TQWidget *layoutBase,
 							const TQWidgetList &wl )
-    : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, true, true )
+    : Command( n, fw ), layout( wl, parent, fw, layoutBase, true, true )
 {
 }
 
 void LayoutVerticalSplitCommand::execute()
 {
     formWindow()->clearSelection( false );
-    tqlayout.doLayout();
+    layout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutVerticalSplitCommand::unexecute()
 {
     formWindow()->clearSelection( false );
-    tqlayout.undoLayout();
+    layout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
@@ -722,21 +722,21 @@ void LayoutVerticalSplitCommand::unexecute()
 LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw,
 				      TQWidget *parent, TQWidget *layoutBase,
 				      const TQWidgetList &wl, int xres, int yres )
-    : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
+    : Command( n, fw ), layout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
 {
 }
 
 void LayoutGridCommand::execute()
 {
     formWindow()->clearSelection( false );
-    tqlayout.doLayout();
+    layout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutGridCommand::unexecute()
 {
     formWindow()->clearSelection( false );
-    tqlayout.undoLayout();
+    layout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
@@ -749,21 +749,21 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw,
     WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase );
     spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) );
     margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) );
-    tqlayout = 0;
+    layout = 0;
     if ( lay == WidgetFactory::HBox )
-	tqlayout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
+	layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
     else if ( lay == WidgetFactory::VBox )
-	tqlayout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
+	layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
     else if ( lay == WidgetFactory::Grid )
-	tqlayout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), false );
+	layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), false );
 }
 
 void BreakLayoutCommand::execute()
 {
-    if ( !tqlayout )
+    if ( !layout )
 	return;
     formWindow()->clearSelection( false );
-    tqlayout->breakLayout();
+    layout->breakLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
 	w->resize( TQMAX( 16, w->width() ), TQMAX( 16, w->height() ) );
@@ -771,10 +771,10 @@ void BreakLayoutCommand::execute()
 
 void BreakLayoutCommand::unexecute()
 {
-    if ( !tqlayout )
+    if ( !layout )
 	return;
     formWindow()->clearSelection( false );
-    tqlayout->doLayout();
+    layout->doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
     MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing );
     MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin );
diff --git a/kommander/editor/command.h b/kommander/editor/command.h
index 4d1a3aa5..398e733d 100644
--- a/kommander/editor/command.h
+++ b/kommander/editor/command.h
@@ -181,7 +181,7 @@ public:
 
 private:
     TQWidget *widget;
-    TQRect tqgeometry;
+    TQRect geometry;
 
 };
 
@@ -263,7 +263,7 @@ public:
     Type type() const { return LayoutHorizontal; }
 
 private:
-    HorizontalLayout tqlayout;
+    HorizontalLayout layout;
 
 };
 
@@ -279,7 +279,7 @@ public:
     Type type() const { return LayoutHorizontalSplitter; }
 
 private:
-    HorizontalLayout tqlayout;
+    HorizontalLayout layout;
 
 };
 
@@ -295,7 +295,7 @@ public:
     Type type() const { return LayoutVertical; }
 
 private:
-    VerticalLayout tqlayout;
+    VerticalLayout layout;
 
 };
 
@@ -311,7 +311,7 @@ public:
     Type type() const { return LayoutVerticalSplitter; }
 
 private:
-    VerticalLayout tqlayout;
+    VerticalLayout layout;
 
 };
 
@@ -327,7 +327,7 @@ public:
     Type type() const { return LayoutGrid; }
 
 private:
-    GridLayout tqlayout;
+    GridLayout layout;
 
 };
 
@@ -342,7 +342,7 @@ public:
     Type type() const { return BreakLayout; }
 
 private:
-    Layout *tqlayout;
+    Layout *layout;
     int spacing;
     int margin;
     TQWidget *lb;
diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui
index 63d59f49..1fc5c679 100644
--- a/kommander/editor/connectioneditor.ui
+++ b/kommander/editor/connectioneditor.ui
@@ -129,7 +129,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -203,7 +203,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -239,7 +239,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>71</width>
                             <height>21</height>
@@ -293,7 +293,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>230</width>
                             <height>20</height>
@@ -304,7 +304,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -331,7 +331,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>231</width>
                             <height>20</height>
@@ -368,7 +368,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>211</width>
                             <height>20</height>
diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp
index 4613380b..0719716f 100644
--- a/kommander/editor/connectioneditorimpl.cpp
+++ b/kommander/editor/connectioneditorimpl.cpp
@@ -44,14 +44,14 @@ static const char *const ignore_slots[] = {
   "update()",
   "update(int,int,int,int)",
   "update(const TQRect&)",
-  "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&)",
+  "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&)",
   //"show()",
   //"hide()",
   "iconify()",
@@ -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'").tqarg(m_sender->name()).
+  TQString n = i18n("Connect/Disconnect the signals and slots of '%1' and '%2'").arg(m_sender->name()).
       arg(m_receiver->name());
   TQValueList <MetaDataBase::Connection>::Iterator cit;
   if (!m_oldConnections.isEmpty())
@@ -274,7 +274,7 @@ void ConnectionEditor::senderChanged(const TQString& s)
   if (!p_object)
     return;
   m_sender = p_object;
-  TQStrList p_sigs = m_sender->tqmetaObject()->signalNames(true);
+  TQStrList p_sigs = m_sender->metaObject()->signalNames(true);
   signalBox->clear();
   for (TQStrListIterator it(p_sigs); it.current(); ++it)
     if (!isSignalIgnored(it.current()) && !signalBox->findItem(it.current(), TQt::ExactMatch))
@@ -293,11 +293,11 @@ void ConnectionEditor::receiverChanged(const TQString& s)
   if (!p_object)
     return;
   m_receiver = p_object;
-  int n = m_receiver->tqmetaObject()->numSlots(true);
+  int n = m_receiver->metaObject()->numSlots(true);
   slotBox->clear();
   for (int i = 0; i < n; ++i)
   {
-    const TQMetaData* md = m_receiver->tqmetaObject()->slot(i, true);
+    const TQMetaData* md = m_receiver->metaObject()->slot(i, true);
     if (!isSlotIgnored(md) && !slotBox->findItem(md->tqt_mo_ci_name, TQt::ExactMatch))
       slotBox->insertItem(md->tqt_mo_ci_name);
   }
diff --git a/kommander/editor/createtemplate.ui b/kommander/editor/createtemplate.ui
index f97acfc6..263d71c1 100644
--- a/kommander/editor/createtemplate.ui
+++ b/kommander/editor/createtemplate.ui
@@ -25,7 +25,7 @@
         <cstring>CreateTemplate</cstring>
     </property>
     <property stdset="1">
-        <name>tqgeometry</name>
+        <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -124,7 +124,7 @@
                         <enum>Expanding</enum>
                     </property>
                     <property>
-                        <name>tqsizeHint</name>
+                        <name>sizeHint</name>
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -196,7 +196,7 @@
                 <enum>Expanding</enum>
             </property>
             <property>
-                <name>tqsizeHint</name>
+                <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kommander/editor/filechooser.cpp b/kommander/editor/filechooser.cpp
index 39b3d9ca..d5a68f7f 100644
--- a/kommander/editor/filechooser.cpp
+++ b/kommander/editor/filechooser.cpp
@@ -2,23 +2,23 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <kfiledialog.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 FileChooser::FileChooser( TQWidget *parent, const char *name )
     : TQWidget( parent, name ), md( File )
 {
-    TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
-    tqlayout->setMargin( 0 );
+    TQHBoxLayout *layout = new TQHBoxLayout( this );
+    layout->setMargin( 0 );
 
     lineEdit = new TQLineEdit( this, "filechooser_lineedit" );
-    tqlayout->addWidget( lineEdit );
+    layout->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( " ... " ) );
-    tqlayout->addWidget( button );
+    layout->addWidget( button );
 
     connect( button, TQT_SIGNAL( clicked() ),
 	     this, TQT_SLOT( chooseFile() ) );
diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp
index 493df215..fbb64d48 100644
--- a/kommander/editor/formfile.cpp
+++ b/kommander/editor/formfile.cpp
@@ -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?").tqarg(filename), TQString(), i18n("Try Another"), i18n("Do Not Try")) == KMessageBox::Yes)
+        "Do you want to use another file name?").arg(filename), TQString(), i18n("Try Another"), i18n("Do Not Try")) == KMessageBox::Yes)
       return saveAs();
     else 
       return false;
   }
-  MainWindow::self->statusBar()->message(i18n("'%1' saved.").tqarg(filename), 3000);
+  MainWindow::self->statusBar()->message(i18n("'%1' saved.").arg(filename), 3000);
   ::chmod(filename.local8Bit(), S_IRWXU);
   setModified(false);
   return true;
@@ -139,7 +139,7 @@ bool FormFile::saveAs()
   while (!saved) {
     TQString fn = KFileDialog::getSaveFileName(TQString(),
       i18n("*.kmdr|Kommander Files"), MainWindow::self,
-      i18n("Save Form '%1' As").tqarg(formWindow()->name()));
+      i18n("Save Form '%1' As").arg(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?").tqarg(filename), i18n("Save File?"), KStdGuiItem::save(), KStdGuiItem::discard())) {
+  "Do you want to save it?").arg(filename), i18n("Save File?"), KStdGuiItem::save(), KStdGuiItem::discard())) {
     case KMessageBox::Yes:
       if (!save())
         return false;
diff --git a/kommander/editor/formsettings.ui b/kommander/editor/formsettings.ui
index 02ff5699..e6f7fc15 100644
--- a/kommander/editor/formsettings.ui
+++ b/kommander/editor/formsettings.ui
@@ -74,7 +74,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -212,7 +212,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>130</height>
diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp
index 8dd01453..f5f57dbb 100644
--- a/kommander/editor/formwindow.cpp
+++ b/kommander/editor/formwindow.cpp
@@ -24,12 +24,12 @@
 #include <tqevent.h>
 #include <tqfeatures.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmap.h>
 #include <tqmetaobject.h>
 #include <tqobjectlist.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpen.h>
 #include <tqpixmapcache.h>
 #include <tqpopupmenu.h>
@@ -54,7 +54,7 @@
 #include "sizehandle.h"
 #include "metadatabase.h"
 #include "resource.h"
-#include "tqlayout.h"
+#include "layout.h"
 #include "connectioneditorimpl.h"
 #include "widgetdatabase.h"
 #include "pixmapchooser.h"
@@ -212,7 +212,7 @@ void FormWindow::paintGrid(TQWidget *w, TQPaintEvent *e)
   grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y());
   if(!TQPixmapCache::find(grid_name, grid)) {
     grid = TQPixmap(350 + (350 % mainWindow()->grid().x()), 350 + (350 % mainWindow()->grid().y()));
-    grid.fill(tqcolorGroup().color(TQColorGroup::Foreground));
+    grid.fill(colorGroup().color(TQColorGroup::Foreground));
     TQBitmap mask(grid.width(), grid.height());
     mask.fill(color0);
     TQPainter p(&mask);
@@ -267,7 +267,7 @@ TQPoint FormWindow::gridPoint(const TQPoint &p)
 void FormWindow::drawSizePreview(const TQPoint &pos, const TQString& text)
 {
   unclippedPainter->save();
-  unclippedPainter->setPen(TQPen(tqcolorGroup().foreground(), 1 ));
+  unclippedPainter->setPen(TQPen(colorGroup().foreground(), 1 ));
   unclippedPainter->setRasterOp(CopyROP);
   if (!sizePreviewPixmap.isNull())
     unclippedPainter->drawPixmap(sizePreviewPos, sizePreviewPixmap);
@@ -320,15 +320,15 @@ void FormWindow::insertWidget()
           "properties as well as signals and slots to integrate custom widgets into "
           "<i>TQt Designer</i>, and provide a pixmap which will be used to represent "
           "the widget on the form.</p>")
-          .tqarg(WidgetDatabase::toolTip(id)));
-    TQToolTip::add(w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip(id)));
+          .arg(WidgetDatabase::toolTip(id)));
+    TQToolTip::add(w, i18n("A %1 (custom widget)").arg(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>").tqarg(tt).tqarg(wt));
+        TQWhatsThis::add(w, i18n("<b>A %1</b><p>%2</p>").arg(tt).arg(wt));
   }
 
   TQString s = w->name();
@@ -345,8 +345,8 @@ void FormWindow::insertWidget()
   r = TQRect(p, r.size());
   if (useSizeHint)
   {
-    r.setWidth(w->tqsizeHint().width());
-    r.setHeight(w->tqsizeHint().height());
+    r.setWidth(w->sizeHint().width());
+    r.setHeight(w->sizeHint().height());
   }
 
   if (r.width() < 2 * grid().x())
@@ -387,13 +387,13 @@ void FormWindow::insertWidget()
     else
       setCursorToAll(CrossCursor, w);
 
-    InsertCommand *cmd = new InsertCommand(i18n("Insert %1").tqarg(w->name()), this, w, r);
+    InsertCommand *cmd = new InsertCommand(i18n("Insert %1").arg(w->name()), this, w, r);
 
     TQPtrList<Command> commands;
     commands.append(mv);
     commands.append(cmd);
 
-    MacroCommand *mc = new MacroCommand(i18n("Insert %1").tqarg(w->name()), this, commands);
+    MacroCommand *mc = new MacroCommand(i18n("Insert %1").arg(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").tqarg(w->name()), this, w, r);
+    InsertCommand *cmd = new InsertCommand(i18n("Insert %1").arg(w->name()), this, w, r);
     commandHistory()->addCommand(cmd);
     cmd->execute();
   }
@@ -428,15 +428,15 @@ void FormWindow::insertWidget(TQWidget *w, bool checkName)
             "properties as well as signals and slots to integrate custom widgets into "
             "<i>TQt Designer</i>, and provide a pixmap which will be used to represent "
             "the widget on the form.</p>")
-            .tqarg(WidgetDatabase::toolTip(id)));
-    TQToolTip::add(w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip(id)));
+            .arg(WidgetDatabase::toolTip(id)));
+    TQToolTip::add(w, i18n("A %1 (custom widget)").arg(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>").tqarg(tt).tqarg(wt));
+      TQWhatsThis::add(w, i18n("<b>A %1</b><p>%2</p>").arg(tt).arg(wt));
   }
 
   restoreCursors(w, this);
@@ -502,7 +502,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
     case POINTER_TOOL:
         if (!isMainContainer(TQT_TQOBJECT(w)) && qstrcmp(w->name(), "central widget") != 0)
         { // press on a child widget
-            // if the clicked widget is not in a tqlayout, raise it
+            // if the clicked widget is not in a layout, raise it
           if (!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout)
             w->raise();
           if ((e->state() & ControlButton))
@@ -520,7 +520,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
                 clearSelection(false);
             else
             { // ...widget selected
-              // only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!),
+              // only if widget has a layout (it is a layout meta widget or a laid out container!),
               // unselect its childs
               if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout)
               {
@@ -556,7 +556,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
             w = w->parentWidget();
 
           if (e->button() == Qt::LeftButton)
-          { // left button: store original tqgeometry and more as the widget might start moving
+          { // left button: store original geometry and more as the widget might start moving
             widgetPressed = true;
             widgetGeom = TQRect(w->pos(), w->size());
             oldPressPos = w->mapFromGlobal(e->globalPos());
@@ -594,7 +594,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
         if (e->button() != Qt::LeftButton)
           break;
         saveBackground();
-        mainWindow()->statusBar()->message(i18n("Connect '%1' with...").tqarg(w->name()));
+        mainWindow()->statusBar()->message(i18n("Connect '%1' with...").arg(w->name()));
         connectStartPos = mapFromGlobal(e->globalPos());
         currentConnectPos = mapFromGlobal(e->globalPos());
         connectSender = TQT_TQOBJECT(designerWidget(TQT_TQOBJECT(w)));
@@ -753,7 +753,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
               targetContainer = wa;
               hadOwnPalette = wa->ownPalette();
               restorePalette = wa->palette();
-              wa->setPaletteBackgroundColor(wa->tqcolorGroup().midlight());
+              wa->setPaletteBackgroundColor(wa->colorGroup().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").tqarg(w->pos().x()).tqarg(w->pos().y()));
+          sizePreviewLabel->setText(TQString("%1/%2").arg(w->pos().x()).arg(w->pos().y()));
           sizePreviewLabel->adjustSize();
           TQRect lg(mapFromGlobal(e->globalPos()) + TQPoint(16, 16), sizePreviewLabel->size());
           checkPreviewGeometry(lg);
@@ -803,7 +803,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
     if (newReceiver && (isMainContainer(TQT_TQOBJECT(newReceiver))
         || insertedWidgets.find(newReceiver)) && !isCentralWidget(TQT_TQOBJECT(newReceiver)))
       connectReceiver = connectableObject(TQT_TQOBJECT(newReceiver), TQT_TQOBJECT(connectReceiver));
-    mainWindow()->statusBar()->message(i18n("Connect '%1' to '%2'").tqarg(connectSender->name()).
+    mainWindow()->statusBar()->message(i18n("Connect '%1' to '%2'").arg(connectSender->name()).
         arg(connectReceiver->name()));
     tqApp->processEvents();
     if (drawRecRect)
@@ -861,17 +861,17 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
         if (wa == ((TQWidget *) it.key())->parentWidget())
           goto make_move_command;
 
-        // break tqlayout if necessary
+        // break layout if necessary
         if (WidgetFactory::layoutType(wa) != WidgetFactory::NoLayout)
         {
           if (KMessageBox::questionYesNo(mainWindow(),
                   i18n("You tried to insert a widget into the "
-                      "tqlayout Container Widget '%1'.\n"
+                      "layout Container Widget '%1'.\n"
                       "This is not possible. "
-                      "In order to insert the widget, the tqlayout of '%1'\n"
+                      "In order to insert the widget, the layout of '%1'\n"
                       "must first be broken.\n"
-                      "Break the tqlayout or cancel the operation?").
-                  tqarg(wa->name()).tqarg(wa->name()), i18n("Inserting Widget"),
+                      "Break the layout or cancel the operation?").
+                  arg(wa->name()).arg(wa->name()), i18n("Inserting Widget"),
                   i18n("&Break Layout"), KStdGuiItem::cancel()) == KMessageBox::No)
             goto make_move_command; // cancel
           breakLayout(wa);
@@ -955,11 +955,11 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
       {
         if (KMessageBox::questionYesNo(mainWindow(),
                 i18n("You tried to insert a widget into the "
-                    "tqlayout Container Widget '%1'.\n"
+                    "layout Container Widget '%1'.\n"
                     "This is not possible. "
-                    "In order to insert the widget, the tqlayout of '%1'\n"
+                    "In order to insert the widget, the layout of '%1'\n"
                     "must first be broken.\n"
-                    "Break the tqlayout or cancel the operation?").
+                    "Break the layout or cancel the operation?").
                 arg(insertParent->name()).
                 arg(insertParent->name()), i18n("Inserting Widget"),
                 i18n("&Break Layout"), KStdGuiItem::cancel()) == KMessageBox::Yes)
@@ -1239,7 +1239,7 @@ void FormWindow::continueRectDraw(const TQPoint & p, const TQPoint & global, TQW
   if (currRect == r)
   {
     TQString t("%1/%2");
-    t = t.tqarg(r.width() - 1).tqarg(r.height() - 1);
+    t = t.arg(r.width() - 1).arg(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.tqarg(r.width() - 1).tqarg(r.height() - 1);
+      t = t.arg(r.width() - 1).arg(r.height() - 1);
       drawSizePreview(pos, t);
     }
     unclippedPainter->setClipRegion(TQRegion(rect()).subtract(TQRect(sizePreviewPos,
@@ -1431,13 +1431,13 @@ void FormWindow::editAdjustSize()
   TQWidgetList widgets = selectedWidgets();
   if (widgets.isEmpty())
   {
-    TQRect oldr = tqgeometry();
+    TQRect oldr = geometry();
     mainContainer()->adjustSize();
     resize(mainContainer()->size());
     // check whether our own size constraint hit us
     if (size() != mainContainer()->size())
       mainContainer()->resize(size());
-    TQRect nr = tqgeometry();
+    TQRect nr = geometry();
     if (oldr != nr)
     {
       ResizeCommand *cmd = new ResizeCommand(i18n("Adjust Size"), this, this, oldr, nr);
@@ -1450,9 +1450,9 @@ void FormWindow::editAdjustSize()
     if (w->parentWidget()
         && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout)
       continue;
-    TQRect oldr = w->tqgeometry();
+    TQRect oldr = w->geometry();
     w->adjustSize();
-    TQRect nr = w->tqgeometry();
+    TQRect nr = w->geometry();
     if (oldr != nr)
       commands.append(new ResizeCommand(i18n("Adjust Size"), this, w, oldr, nr));
   }
@@ -1820,11 +1820,11 @@ void FormWindow::checkAccels()
       {
         TQWidget *w = (TQWidget *) o;
         const TQMetaProperty *text =
-            w->tqmetaObject()->property(w->tqmetaObject()->findProperty("text", true), true);
+            w->metaObject()->property(w->metaObject()->findProperty("text", true), true);
         const TQMetaProperty *title =
-            w->tqmetaObject()->property(w->tqmetaObject()->findProperty("title", true), true);
+            w->metaObject()->property(w->metaObject()->findProperty("title", true), true);
         const TQMetaProperty *pageTitle =
-            w->tqmetaObject()->property(w->tqmetaObject()->findProperty("pageTitle", true), true);
+            w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true);
         if (text)
           find_accel(w->property("text").toString(), accels, w);
         if (title)
@@ -1844,7 +1844,7 @@ void FormWindow::checkAccels()
     {
       ok = false;
       if (KMessageBox::questionYesNo(mainWindow(),
-              i18n("Accelerator '%1' is used %2 times.").tqarg(it.key().upper()).tqarg((*it).count()),
+              i18n("Accelerator '%1' is used %2 times.").arg(it.key().upper()).arg((*it).count()),
               i18n("Check Accelerators"), i18n("&Select"), KStdGuiItem::cancel()) == KMessageBox::Yes)
       {
         clearSelection(false);
@@ -2502,7 +2502,7 @@ void FormWindow::setMainContainer(TQWidget *w)
   delete mContainer;
   mContainer = w;
   insertedWidgets.insert(mContainer, mContainer);
-  delete tqlayout();
+  delete layout();
   TQHBoxLayout *l = new TQHBoxLayout(this);
   l->addWidget(w);
   if (resetPropertyWidget)
diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui
index ca35e191..5930b06b 100644
--- a/kommander/editor/functions.ui
+++ b/kommander/editor/functions.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="2">
             <property name="name">
-                <cstring>tqlayout7_2</cstring>
+                <cstring>layout7_2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -42,7 +42,7 @@
                     <property name="name">
                         <cstring>descriptionText</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
@@ -53,7 +53,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -82,7 +82,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>150</width>
                             <height>0</height>
@@ -119,7 +119,7 @@
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>250</width>
                     <height>0</height>
@@ -158,7 +158,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -177,7 +177,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>32</height>
@@ -213,7 +213,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>tqlayout11</cstring>
+                        <cstring>layout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -265,7 +265,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="5" column="0">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -312,7 +312,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="7" column="0">
                     <property name="name">
-                        <cstring>tqlayout13</cstring>
+                        <cstring>layout13</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -364,7 +364,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="9" column="0">
                     <property name="name">
-                        <cstring>tqlayout14</cstring>
+                        <cstring>layout14</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -408,7 +408,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="11" column="0">
                     <property name="name">
-                        <cstring>tqlayout15</cstring>
+                        <cstring>layout15</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -452,7 +452,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="13" column="0">
                     <property name="name">
-                        <cstring>tqlayout16</cstring>
+                        <cstring>layout16</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -514,7 +514,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -530,7 +530,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>100</width>
                             <height>20</height>
@@ -578,7 +578,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>100</width>
                             <height>20</height>
@@ -589,7 +589,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout12</cstring>
+                <cstring>layout12</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -597,7 +597,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout11</cstring>
+                        <cstring>layout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -607,7 +607,7 @@
                             <property name="name">
                                 <cstring>clearButton</cstring>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>20</height>
diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp
index a898c49d..478d9d9c 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").tqarg(prefix).tqarg(functionListBox->currentText()).tqarg(params());
+    return TQString("%1%2%3").arg(prefix).arg(functionListBox->currentText()).arg(params());
   else if (groupComboBox->currentItem() == m_DCOP || groupComboBox->currentItem() == m_Slots)
-    return TQString("%1%2.%3%4").tqarg(prefix).tqarg(widgetComboBox->currentText().section(' ', 0, 0))
-        .tqarg(functionListBox->currentText().left(functionListBox->currentText().find('('))).tqarg(params());
+    return TQString("%1%2.%3%4").arg(prefix).arg(widgetComboBox->currentText().section(' ', 0, 0))
+        .arg(functionListBox->currentText().left(functionListBox->currentText().find('('))).arg(params());
   else 
-    return TQString("%1%2%3%4").tqarg(prefix).tqarg(function)
-        .tqarg(functionListBox->currentText()).tqarg(params());
+    return TQString("%1%2%3%4").arg(prefix).arg(function)
+        .arg(functionListBox->currentText()).arg(params());
 }
 
 void FunctionsDialog::groupChanged(int index)
@@ -147,7 +147,7 @@ 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()->tqmetaObject()->slotNames(true));
+    TQStringList pFunctions = TQStringList::fromStrList(a_atw->object()->metaObject()->slotNames(true));
     for (uint i=0; i<pFunctions.count(); i++)
     {
       TQString slot = pFunctions[i];
@@ -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 TQt/KDE class, most probably <i>%1</i>.").tqarg(o->tqmetaObject()->tqsuperClassName() ? TQString(o->tqmetaObject()->tqsuperClassName()) : 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>.").arg(o->metaObject()->superClassName() ? TQString(o->metaObject()->superClassName()) : 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>")
-      .tqarg(slotName).tqarg(slotHelp).tqarg(slot).tqarg(""));
+      .arg(slotName).arg(slotHelp).arg(slot).arg(""));
   } 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>")
-      .tqarg(functionListBox->currentText()).tqarg(m_function.description())
-      .tqarg(m_function.prototype(pflags)).tqarg(defArgs));
+      .arg(functionListBox->currentText()).arg(m_function.description())
+      .arg(m_function.prototype(pflags)).arg(defArgs));
   
   }
   showParameters();
@@ -262,7 +262,7 @@ void FunctionsDialog::showParameters()
       if (i < argsCount)
       {
         type = slotArgs[i].remove(TQRegExp("\\*|\\&|const\\s"));
-        labels[i]->setText(TQString("%1:").tqarg(type));
+        labels[i]->setText(TQString("%1:").arg(type));
       }
       quotes[i]->setChecked(true);
       quotes[i]->setShown(false);
@@ -303,7 +303,7 @@ void FunctionsDialog::showParameters()
     {
       labels[i]->setShown(i < argsCount);
       if (i < argsCount)
-        labels[i]->setText(TQString("%1:").tqarg(m_function.argumentName(i)));
+        labels[i]->setText(TQString("%1:").arg(m_function.argumentName(i)));
       quotes[i]->setChecked(true);
       quotes[i]->setShown(false);
       if (m_function.argumentType(i) == "bool")
@@ -383,7 +383,7 @@ TQString FunctionsDialog::params()
   }
   TQString a_param = pars.join(", ");
   if (params)
-    return TQString("(%1)").tqarg(a_param);
+    return TQString("(%1)").arg(a_param);
   else
     return a_param;
 }
diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp
index 9ec77020..55383e7a 100644
--- a/kommander/editor/hierarchyview.cpp
+++ b/kommander/editor/hierarchyview.cpp
@@ -29,7 +29,7 @@
 #include "propertyeditor.h"
 #include "listeditor.h"
 
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqobjectlist.h>
 #include <tqheader.h>
 #include <tqpopupmenu.h>
@@ -413,7 +413,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
     if ( !parent )
   item->setPixmap( 0, PixmapChooser::loadPixmap( "form.xpm", PixmapChooser::Mini ) );
     else if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING) )
-  item->setPixmap( 0, PixmapChooser::loadPixmap( "tqlayout.xpm", PixmapChooser::Small ) );
+  item->setPixmap( 0, PixmapChooser::loadPixmap( "layout.xpm", PixmapChooser::Small ) );
     else
   item->setPixmap( 0, WidgetDatabase::iconSet( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( o ) ) ).
        pixmap( TQIconSet::Small, TQIconSet::Normal ) );
@@ -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" ).tqarg( tw->name() ), formWindow,
+  AddTabPageCommand *cmd = new AddTabPageCommand( i18n("Add Page to %1" ).arg( 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" ).tqarg( wiz->name() ), formWindow,
+  AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).arg( wiz->name() ), formWindow,
                     wiz, "Page" );
   formWindow->commandHistory()->addCommand( cmd );
   cmd->execute();
@@ -539,7 +539,7 @@ void HierarchyList::removeTabPage()
   if ( tw->currentPage() ) {
       QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw;
       DeleteTabPageCommand *cmd = new DeleteTabPageCommand( i18n("Delete Page %1 of %2" ).
-                  tqarg( dtw->pageTitle() ).tqarg( tw->name() ),
+                  arg( dtw->pageTitle() ).arg( tw->name() ),
                   formWindow, tw, tw->currentPage() );
       formWindow->commandHistory()->addCommand( cmd );
       cmd->execute();
@@ -549,7 +549,7 @@ void HierarchyList::removeTabPage()
   if ( wiz->currentPage() ) {
       QDesignerWizard *dw = (QDesignerWizard*)wiz;
       DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n("Delete Page %1 of %2" ).
-                  tqarg( dw->pageTitle() ).tqarg( wiz->name() ),
+                  arg( dw->pageTitle() ).arg( wiz->name() ),
                   formWindow, wiz,
                   wiz->indexOf( wiz->currentPage() ), true );
       formWindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/iconvieweditor.ui b/kommander/editor/iconvieweditor.ui
index 26d1aa8b..90d70c4a 100644
--- a/kommander/editor/iconvieweditor.ui
+++ b/kommander/editor/iconvieweditor.ui
@@ -124,7 +124,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -171,7 +171,7 @@
                             <property name="name">
                                 <cstring>itemText</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -221,7 +221,7 @@
                                     <property name="name">
                                         <cstring>itemDeletePixmap</cstring>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>30</width>
                                             <height>22</height>
@@ -244,7 +244,7 @@
                                     <property name="name">
                                         <cstring>itemChoosePixmap</cstring>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>30</width>
                                             <height>22</height>
@@ -301,7 +301,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kommander/editor/iconvieweditorimpl.cpp b/kommander/editor/iconvieweditorimpl.cpp
index 911f6ec8..7ca5b989 100644
--- a/kommander/editor/iconvieweditorimpl.cpp
+++ b/kommander/editor/iconvieweditorimpl.cpp
@@ -121,7 +121,7 @@ void IconViewEditor::applyClicked()
 	items.append( item );
     }
 
-    PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n("Edit Items of '%1'" ).tqarg( iconview->name() ),
+    PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n("Edit Items of '%1'" ).arg( iconview->name() ),
 								formwindow, iconview, items );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/kommander-new.xml b/kommander/editor/kommander-new.xml
index c6c11f9d..114a84ef 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>tqchildren</item>
+      <item>children</item>
       <item>columnCount</item>
       <item>count</item>
       <item>currentColumn</item>
@@ -33,7 +33,7 @@
       <item>currentRow</item>
       <item>execute</item> 
       <item>findItem</item>
-      <item>tqgeometry</item>
+      <item>geometry</item>
       <item>global</item>
       <item>hasFocus</item>
       <item>insertColumn</item>
diff --git a/kommander/editor/kommander.xml b/kommander/editor/kommander.xml
index a2716484..ee10455b 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>tqchildren</item>
+      <item>children</item>
       <item>count</item>
       <item>currentColumn</item>
       <item>currentItem</item>
       <item>currentRow</item>
       <item>execute</item> 
       <item>findItem</item>
-      <item>tqgeometry</item>
+      <item>geometry</item>
       <item>global</item>
       <item>hasFocus</item>
       <item>insertColumn</item>
@@ -341,8 +341,8 @@
       <item> true </item>
       <item> umount </item>
       <item> uname </item>
-      <item> tqunicode_start </item>
-      <item> tqunicode_stop </item>
+      <item> unicode_start </item>
+      <item> unicode_stop </item>
       <item> unlink </item>
       <item> utmpdump </item>
       <item> uuidgen </item>
diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp
index dca00c38..5ba769db 100644
--- a/kommander/editor/layout.cpp
+++ b/kommander/editor/layout.cpp
@@ -19,7 +19,7 @@
 **********************************************************************/
 
 #include "formwindow.h"
-#include "tqlayout.h"
+#include "layout.h"
 #include "widgetdatabase.h"
 #include "widgetfactory.h"
 
@@ -36,7 +36,7 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> &
 }
 
 /*!
-  \class Layout tqlayout.h
+  \class Layout layout.h
   \brief Baseclass for layouting widgets in the Designer
 
   Classes derived from this abstract base class are used for layouting
@@ -59,7 +59,7 @@ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *l
     widgets.setAutoDelete( false );
     layoutBase = lb;
     if ( !doSetup && layoutBase )
-	oldGeometry = layoutBase->tqgeometry();
+	oldGeometry = layoutBase->geometry();
 }
 
 /*!  The widget list we got in the constructor might contain too much
@@ -77,7 +77,7 @@ void Layout::setup()
     TQWidget *w = 0;
 
     // Go through all widgets of the list we got. As we can only
-    // tqlayout widgets which have the same parent, we first do some
+    // layout widgets which have the same parent, we first do some
     // sorting which means create a list for each parent containing
     // its child here. After that we keep working on the list of
     // childs which has the most entries.
@@ -112,7 +112,7 @@ 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 tqlayout a container,
+    // best list has only one entry and we do not layout a container,
     // we leave here.
     if ( !lastList || ( lastList->count() < 2 &&
 			( !layoutBase ||
@@ -125,11 +125,11 @@ void Layout::setup()
     }
 
     // Now we have a new and clean widget list, which makes sense
-    // to tqlayout
+    // to layout
     widgets = *lastList;
     // Also use the only correct parent later, so store it
     parent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() );
-    // Now calculate the position where the tqlayout-meta-widget should
+    // Now calculate the position where the layout-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
@@ -141,7 +141,7 @@ void Layout::setup()
 	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 tqlayout. Else saving + loading will give different results
+	// the layout. Else saving + loading will give different results
 	w->raise();
     }
 }
@@ -174,7 +174,7 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent )
     return true;
 }
 
-void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
+void Layout::finishLayout( bool needMove, TQLayout *layout )
 {
     if ( needMove )
 	layoutBase->move( startPoint );
@@ -185,7 +185,7 @@ void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
 	layoutBase->setGeometry( oldGeometry );
     oldGeometry = g;
     layoutBase->show();
-    tqlayout->activate();
+    layout->activate();
     formWindow->insertWidget( layoutBase );
     formWindow->selectWidget( TQT_TQOBJECT(layoutBase) );
     TQString n = layoutBase->name();
@@ -228,7 +228,7 @@ void Layout::breakLayout()
     if ( !widgets.isEmpty() ) {
 	TQWidget *w;
 	for ( w = widgets.first(); w; w = widgets.next() )
-	    rects.insert( w, w->tqgeometry() );
+	    rects.insert( w, w->geometry() );
     }
     WidgetFactory::deleteLayout( layoutBase );
     bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
@@ -303,16 +303,16 @@ void HorizontalLayout::doLayout()
     if ( !prepareLayout( needMove, needReparent ) )
 	return;
 
-    TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
+    TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
 	    w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
 	if ( !useSplitter ) {
 	    if ( qstrcmp( w->className(), "Spacer" ) == 0 )
-		tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
+		layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
 	    else
-		tqlayout->addWidget( w );
+		layout->addWidget( w );
 	    if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
 		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
@@ -322,7 +322,7 @@ void HorizontalLayout::doLayout()
     if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
 	( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
 
-    finishLayout( needMove, tqlayout );
+    finishLayout( needMove, layout );
 }
 
 
@@ -367,16 +367,16 @@ void VerticalLayout::doLayout()
     if ( !prepareLayout( needMove, needReparent ) )
 	return;
 
-    TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
+    TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
 	    w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
 	if ( !useSplitter ) {
 	    if ( qstrcmp( w->className(), "Spacer" ) == 0 )
-		tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
+		layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
 	    else
-		tqlayout->addWidget( w );
+		layout->addWidget( w );
 	    if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
 		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
@@ -386,7 +386,7 @@ void VerticalLayout::doLayout()
     if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
 	( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
 
-    finishLayout( needMove, tqlayout );
+    finishLayout( needMove, layout );
 }
 
 
@@ -733,7 +733,7 @@ void GridLayout::doLayout()
     if ( !prepareLayout( needMove, needReparent ) )
 	return;
 
-    QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
+    QDesignerGridLayout *layout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
 
     if ( !grid )
 	buildGrid();
@@ -745,18 +745,18 @@ void GridLayout::doLayout()
 	    if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
 		w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
 	    if ( rs * cs == 1 ) {
-		tqlayout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->tqalignment() : 0 );
+		layout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 );
 	    } else {
-		tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->tqalignment() : 0 );
+		layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 );
 	    }
 	    if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
 		( (TQLayoutWidget*)w )->updateSizePolicy();
 	    w->show();
 	} else {
-	    qWarning("ooops, widget '%s' does not fit in tqlayout", w->name() );
+	    qWarning("ooops, widget '%s' does not fit in layout", w->name() );
 	}
     }
-    finishLayout( needMove, tqlayout );
+    finishLayout( needMove, layout );
 }
 
 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->tqgeometry() );
+	br = br.unite( w->geometry() );
 
     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->tqgeometry() );
+		    TQRect intersect = cr.intersect( w->geometry() );
 		    if ( intersect.size().width() > resolution.width()/2 &&
 			 intersect.size().height() > resolution.height()/2 ) {
 			grid->setCell( r, c, w );
@@ -874,30 +874,30 @@ void Spacer::setSizeType( SizeType t )
 	sizeP = TQSizePolicy( TQSizePolicy::Minimum, (TQSizePolicy::SizeType)t );
     else
 	sizeP = TQSizePolicy( (TQSizePolicy::SizeType)t, TQSizePolicy::Minimum );
-    tqsetSizePolicy( sizeP );
+    setSizePolicy( sizeP );
 }
 
 
 Spacer::SizeType Spacer::sizeType() const
 {
     if ( orient ==Qt::Vertical )
-	return (SizeType)tqsizePolicy().verData();
-    return (SizeType)tqsizePolicy().horData();
+	return (SizeType)sizePolicy().verData();
+    return (SizeType)sizePolicy().horData();
 }
 
-int Spacer::tqalignment() const
+int Spacer::alignment() const
 {
     if ( orient ==Qt::Vertical )
 	return AlignHCenter;
     return AlignVCenter;
 }
 
-TQSize Spacer::tqminimumSize() const
+TQSize Spacer::minimumSize() const
 {
     return TQSize( 20, 20 );
 }
 
-TQSize Spacer::tqsizeHint() const
+TQSize Spacer::sizeHint() const
 {
     TQSize s = sh.expandedTo( TQSize(0,0) );
     if ( sizeType() == Expanding )
@@ -913,7 +913,7 @@ void Spacer::setSizeHint( const TQSize &s )
 {
     sh = s;
     if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
-	resize( tqsizeHint() );
+	resize( sizeHint() );
     updateGeometry();
 }
 
diff --git a/kommander/editor/layout.h b/kommander/editor/layout.h
index 14104bf7..88472958 100644
--- a/kommander/editor/layout.h
+++ b/kommander/editor/layout.h
@@ -25,7 +25,7 @@
 #include <tqmap.h>
 #include <tqguardedptr.h>
 #include <tqobject.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidgetlist.h>
 
 class FormWindow;
@@ -44,7 +44,7 @@ public:
     virtual void undoLayout();
     virtual void breakLayout();
     virtual bool prepareLayout( bool &needMove, bool &needReparent );
-    virtual void finishLayout( bool needMove, TQLayout *tqlayout );
+    virtual void finishLayout( bool needMove, TQLayout *layout );
 
 protected:
     TQWidgetList widgets;
@@ -118,8 +118,8 @@ class Spacer : public TQWidget
     TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
     Q_ENUMS( SizeType )
     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 )
+    TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
+    TQ_OVERRIDE( TQRect geometry DESIGNABLE false )
 
 private:
     enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize,
@@ -135,11 +135,11 @@ public:
 
     Spacer( TQWidget *parent, const char *name );
 
-    TQSize tqminimumSize() const;
-    TQSize tqsizeHint() const;
+    TQSize minimumSize() const;
+    TQSize sizeHint() const;
     void setSizeType( SizeType t );
     SizeType sizeType() const;
-    int tqalignment() const;
+    int alignment() const;
     Qt::Orientation orientation() const;
     void setOrientation( Qt::Orientation o );
     void setInteraciveMode( bool b ) { interactive = b; };
diff --git a/kommander/editor/listboxeditor.ui b/kommander/editor/listboxeditor.ui
index fc03fa8f..506e4e1f 100644
--- a/kommander/editor/listboxeditor.ui
+++ b/kommander/editor/listboxeditor.ui
@@ -85,7 +85,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -190,7 +190,7 @@
                     <property name="name">
                         <cstring>itemDeletePixmap</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>30</width>
                             <height>22</height>
@@ -213,7 +213,7 @@
                     <property name="name">
                         <cstring>itemChoosePixmap</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>30</width>
                             <height>22</height>
@@ -244,7 +244,7 @@
                     <property name="name">
                         <cstring>itemText</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -297,7 +297,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kommander/editor/listboxeditorimpl.cpp b/kommander/editor/listboxeditorimpl.cpp
index b9ec7fee..22c07cea 100644
--- a/kommander/editor/listboxeditorimpl.cpp
+++ b/kommander/editor/listboxeditorimpl.cpp
@@ -131,7 +131,7 @@ void ListBoxEditor::applyClicked()
 	items.append( item );
     }
 
-    PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n("Edit Items of '%1'" ).tqarg( listbox->name() ),
+    PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n("Edit Items of '%1'" ).arg( listbox->name() ),
 							      formwindow, listbox, items );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/listeditor.ui b/kommander/editor/listeditor.ui
index 4d5b5957..f754e6c1 100644
--- a/kommander/editor/listeditor.ui
+++ b/kommander/editor/listeditor.ui
@@ -89,7 +89,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kommander/editor/listvieweditor.ui b/kommander/editor/listvieweditor.ui
index 2ec9e9ba..ada4fa01 100644
--- a/kommander/editor/listvieweditor.ui
+++ b/kommander/editor/listvieweditor.ui
@@ -134,7 +134,7 @@
                                 <property name="name">
                                     <cstring>itemText</cstring>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -195,7 +195,7 @@
                                         <property name="name">
                                             <cstring>itemDeletePixmap</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -218,7 +218,7 @@
                                         <property name="name">
                                             <cstring>itemChoosePixmap</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -284,7 +284,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -418,7 +418,7 @@
                                 <property name="name">
                                     <cstring>colDeletePixmap</cstring>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -441,7 +441,7 @@
                                 <property name="name">
                                     <cstring>colChoosePixmap</cstring>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -472,7 +472,7 @@
                                 <property name="name">
                                     <cstring>colText</cstring>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -589,7 +589,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -634,7 +634,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kommander/editor/listvieweditorimpl.cpp b/kommander/editor/listvieweditorimpl.cpp
index d7baba57..c07e8334 100644
--- a/kommander/editor/listvieweditorimpl.cpp
+++ b/kommander/editor/listvieweditorimpl.cpp
@@ -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'" ).tqarg( listview->name() ),
+    PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n("Edit Items and Columns of '%1'" ).arg( listview->name() ),
 								formwindow, listview, itemsPreview );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 22969a3b..67d1e311 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -48,7 +48,7 @@
 
 #include <tqaccel.h>
 #include <tqbuffer.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqdir.h>
 #include <tqfeatures.h>
 #include <tqfile.h>
@@ -368,7 +368,7 @@ int MainWindow::currentTool() const
 {
   if (!actionCurrentTool)
     return POINTER_TOOL;
-  return TQString::tqfromLatin1(actionCurrentTool->name()).toInt();
+  return TQString::fromLatin1(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>").tqarg(backupName));
+      KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(backupName));
     }
     form->formFile()->setFileName(fileName);  
     form->formFile()->setModified(modified); 
@@ -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>").tqarg(m_backupName));
+    KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").arg(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>").tqarg(m_fileName + ".backup"));
+      KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup"));
     }
     ::chmod(m_fileName.local8Bit(), S_IRWXU);
     KProcess* process = new KProcess;
     process->setUseShell(true);
-    (*process) << "kmdr-executor" << TQString("\"%1\"").tqarg(form->formFile()->fileName());
+    (*process) << "kmdr-executor" << TQString("\"%1\"").arg(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,
@@ -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>").tqarg(m_backupName));
+    KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").arg(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>").tqarg(m_fileName + ".backup"));
+      KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup"));
     }
     ::chmod(m_fileName.local8Bit(), S_IRWXU);
     KProcess* process = new KProcess;
     process->setUseShell(true);
-    (*process) << "kommander" << TQString("\"%1\"").tqarg(form->formFile()->fileName());
+    (*process) << "kommander" << TQString("\"%1\"").arg(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,
@@ -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 tqlayout "
+        "<p>Use the various tools to add widgets or to change the layout "
             "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>"
@@ -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").tqarg(undoCmd));
+        actionEditUndo->setText(i18n("&Undo: %1").arg(undoCmd));
     else
         actionEditUndo->setText(i18n("&Undo: Not Available"));
     if (!redoCmd.isEmpty())
-        actionEditRedo->setText(i18n("&Redo: %1").tqarg(redoCmd));
+        actionEditRedo->setText(i18n("&Redo: %1").arg(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->tqmetaObject()->property(w->tqmetaObject()->findProperty("text", true), true);
+    const TQMetaProperty* text = w->metaObject()->property(w->metaObject()->findProperty("text", true), true);
     if (text && qstrcmp(text->type(), TQSTRING_OBJECT_NAME_STRING) != 0)
         text = 0;
-    const TQMetaProperty* title = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("title", true), true);
+    const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true);
     if (title && qstrcmp(title->type(), TQSTRING_OBJECT_NAME_STRING) != 0)
         title = 0;
     const TQMetaProperty* pagetitle =
-        w->tqmetaObject()->property(w->tqmetaObject()->findProperty("pageTitle", true), true);
+        w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true);
     if (pagetitle && qstrcmp(pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0)
         pagetitle = 0;
     const TQMetaProperty* pixmap =
-        w->tqmetaObject()->property(w->tqmetaObject()->findProperty("pixmap", true), true);
+        w->metaObject()->property(w->metaObject()->findProperty("pixmap", true), true);
     if (pixmap && qstrcmp(pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0)
         pixmap = 0;
 
@@ -1153,7 +1153,7 @@ 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'").tqarg(w->name()));
+            TQString pn(i18n("Set the 'text' of '%1'").arg(w->name()));
             SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
                                                               "text", w->property("text"),
                                                               text, TQString(), TQString());
@@ -1165,7 +1165,7 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg
         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'").tqarg(w->name()));
+            TQString pn(i18n("Set the 'title' of '%1'").arg(w->name()));
             SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
                                                               "title", w->property("title"),
                                                               title, TQString(), TQString());
@@ -1177,7 +1177,7 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg
         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'").tqarg(w->name()));
+            TQString pn(i18n("Set the 'pageTitle' of '%1'").arg(w->name()));
             SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
                                                               "pageTitle", w->property("pageTitle"),
                                                               text, TQString(), TQString());
@@ -1189,7 +1189,7 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg
         TQPixmap oldPix = TQVariant(w->property("pixmap")).toPixmap();
         TQPixmap pix = qChoosePixmap(this, formWindow(), oldPix);
         if (!pix.isNull()) {
-            TQString pn(i18n("Set the 'pixmap' of '%1'").tqarg(w->name()));
+            TQString pn(i18n("Set the 'pixmap' of '%1'").arg(w->name()));
             SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
                                                               "pixmap", w->property("pixmap"),
                                                               pix, TQString(), TQString());
@@ -1214,7 +1214,7 @@ 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").tqarg(tw->name()), formWindow(),
+            AddTabPageCommand *cmd = new AddTabPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(),
                                                             tw, "Tab");
             formWindow()->commandHistory()->addCommand(cmd);
             cmd->execute();
@@ -1222,7 +1222,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
             if (tw->currentPage()) {
                 QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw;
                 DeleteTabPageCommand *cmd = new DeleteTabPageCommand(i18n("Delete Page %1 of %2").
-                                                                      tqarg(dtw->pageTitle()).tqarg(tw->name()),
+                                                                      arg(dtw->pageTitle()).arg(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").tqarg(tw->name()), formWindow(),
+            AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(),
                                                             tw, "Page");
             formWindow()->commandHistory()->addCommand(cmd);
             cmd->execute();
@@ -1240,7 +1240,7 @@ 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").
-                                                                      tqarg(dtw->pageTitle()).tqarg(tw->name()),
+                                                                      arg(dtw->pageTitle()).arg(tw->name()),
                                                                       formWindow(), tw, tw->currentItem());
                 formWindow()->commandHistory()->addCommand(cmd);
                 cmd->execute();
@@ -1267,7 +1267,7 @@ 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").tqarg(wiz->name()), formWindow(),
+            AddWizardPageCommand *cmd = new AddWizardPageCommand(i18n("Add Page to %1").arg(wiz->name()), formWindow(),
                                                                   wiz, "Page");
             formWindow()->commandHistory()->addCommand(cmd);
             cmd->execute();
@@ -1275,7 +1275,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
             if (wiz->currentPage()) {
               QDesignerWizard *dw = (QDesignerWizard*)wiz;
                 DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand(i18n("Delete Page %1 of %2").
-                                                                            tqarg(dw->pageTitle()).tqarg(wiz->name()),
+                                                                            arg(dw->pageTitle()).arg(wiz->name()),
                                                                             formWindow(), wiz, wiz->indexOf(wiz->currentPage()));
                 formWindow()->commandHistory()->addCommand(cmd);
                 cmd->execute();
@@ -1290,7 +1290,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
             QDesignerWizard *dw = (QDesignerWizard*)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").tqarg(dw->pageTitle()).tqarg(wiz->name()));
+                TQString pn(i18n("Rename page %1 of %2").arg(dw->pageTitle()).arg(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'").tqarg(formWindow()->name()), formWindow(), mw);
+            AddToolBarCommand *cmd = new AddToolBarCommand(i18n("Add Toolbar to '%1'").arg(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'").tqarg(formWindow()->name()), formWindow(), mw);
+            AddMenuCommand *cmd = new AddMenuCommand(i18n("Add Menu to '%1'").arg(formWindow()->name()), formWindow(), mw);
             formWindow()->commandHistory()->addCommand(cmd);
             cmd->execute();
         }
@@ -1621,14 +1621,14 @@ ActionEditor *MainWindow::actioneditor() const
 bool MainWindow::openEditor(TQWidget* w, FormWindow*)
 {
     if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) {
-        statusBar()->message(i18n("Edit %1...").tqarg(w->className()));
+        statusBar()->message(i18n("Edit %1...").arg(w->className()));
         WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))), this, w, formWindow());
         statusBar()->clear();
         return true;
     }
 
-    const TQMetaProperty* text = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("text", true), true);
-    const TQMetaProperty* title = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("title", true), 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);
     if (text && text->designable(w)) {
         bool ok = false;
         TQString text;
@@ -1639,7 +1639,7 @@ 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'").tqarg(w->name()));
+            TQString pn(i18n("Set the 'text' of '%2'").arg(w->name()));
             SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
                                                               "text", w->property("text"),
                                                               text, TQString(), TQString());
@@ -1654,7 +1654,7 @@ 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'").tqarg(w->name()));
+            TQString pn(i18n("Set the 'title' of '%2'").arg(w->name()));
             SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
                                                               "title", w->property("title"),
                                                               text, TQString(), TQString());
@@ -1756,7 +1756,7 @@ void MainWindow::checkTempFiles()
 void MainWindow::showDialogHelp()
 {
     TQWidget *w = (TQWidget*)sender();
-    w = w->tqtopLevelWidget();
+    w = w->topLevelWidget();
 
     TQString link = "designer-manual-12.html#";
 
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index 8f18cd6a..e3f5b592 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -24,7 +24,7 @@
 #endif // QT_NO_SQL
 
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqfileinfo.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
@@ -170,7 +170,7 @@ void MainWindow::setupEditActions()
 
   KToolBar *tb = new KToolBar(this, "Edit");
   tb->setFullSize(false);
-  TQWhatsThis::add(tb, i18n("<b>The Edit toolbar</b>%1").tqarg(toolbarHelp));
+  TQWhatsThis::add(tb, i18n("<b>The Edit toolbar</b>%1").arg(toolbarHelp));
   addToolBar(tb, i18n("Edit"));
   actionEditUndo->plug(tb);
   actionEditRedo->plug(tb);
@@ -207,13 +207,13 @@ void MainWindow::setupLayoutActions()
   actionEditAdjustSize->setWhatsThis(whatsThisFrom("Layout|Adjust Size"));
   actionEditAdjustSize->setEnabled(false);
 
-  actionEditHLayout = new KAction(i18n("Lay OutQt::Horizontally"), createIconSet("edithtqlayout.xpm"),
+  actionEditHLayout = new KAction(i18n("Lay OutQt::Horizontally"), createIconSet("edithlayout.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 OutQt::Horizontally"));
   actionEditHLayout->setEnabled(false);
 
-  actionEditVLayout = new KAction(i18n("Lay OutQt::Vertically"), createIconSet("editvtqlayout.xpm"),
+  actionEditVLayout = new KAction(i18n("Lay OutQt::Vertically"), createIconSet("editvlayout.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 OutQt::Vertically"));
@@ -241,7 +241,7 @@ void MainWindow::setupLayoutActions()
 
   actionEditBreakLayout = new KAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"),
                                       CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout");
-  actionEditBreakLayout->setToolTip(i18n("Breaks the selected tqlayout"));
+  actionEditBreakLayout->setToolTip(i18n("Breaks the selected layout"));
   actionEditBreakLayout->setWhatsThis(whatsThisFrom("Layout|Break Layout"));
 
   int id = WidgetDatabase::idFromClassName("Spacer");
@@ -249,13 +249,13 @@ void MainWindow::setupLayoutActions()
                                        actionCollection(), TQString::number(id).latin1());
   a->setExclusiveGroup("tool");
   a->setText(i18n("Add ") + WidgetDatabase::className(id));
-  a->setToolTip(i18n("Insert a %1").tqarg(WidgetDatabase::toolTip(id)));
+  a->setToolTip(i18n("Insert a %1").arg(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.").tqarg(WidgetDatabase::toolTip(id)).
-      tqarg(WidgetDatabase::whatsThis(id)).tqarg(WidgetDatabase::toolTip(id)));
+      "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").tqarg(toolbarHelp));
+  TQWhatsThis::add(layoutToolBar, i18n("<b>The Layout toolbar</b>%1").arg(toolbarHelp));
   actionEditAdjustSize->plug(layoutToolBar);
   layoutToolBar->addSeparator();
   actionEditHLayout->plug(layoutToolBar);
@@ -306,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").tqarg(toolbarHelp));
+  TQWhatsThis::add(tb, i18n("<b>The Tools toolbar</b>%1").arg(toolbarHelp));
 
   addToolBar(tb, i18n("Tools"), TQMainWindow::DockTop, true);
   actionPointerTool->plug(tb);
@@ -330,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").tqarg(grp).tqarg(toolbarHelp).
-          tqarg(i18n(" Click on a button to insert a single widget, "
-              "or double click to insert multiple %1.")).tqarg(grp));
+      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));
     } else
     {
-      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));
+      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));
     }
     addToolBar(tb, grp);
     TQPopupMenu *menu = new TQPopupMenu(this, grp.latin1());
@@ -363,11 +363,11 @@ void MainWindow::setupToolActions()
       a->setToolTip(ttip);
       if (!WidgetDatabase::isWhatsThisLoaded())
         WidgetDatabase::loadWhatsThis(documentationPath());
-      a->setToolTip(i18n("Insert a %1").tqarg(WidgetDatabase::className(i)));
+      a->setToolTip(i18n("Insert a %1").arg(WidgetDatabase::className(i)));
 
-      TQString whats = i18n("<b>A %1</b>").tqarg(WidgetDatabase::className(i));
+      TQString whats = i18n("<b>A %1</b>").arg(WidgetDatabase::className(i));
       if (!WidgetDatabase::whatsThis(i).isEmpty())
-        whats += TQString("<p>%1</p>").tqarg(WidgetDatabase::whatsThis(i));
+        whats += TQString("<p>%1</p>").arg(WidgetDatabase::whatsThis(i));
       a->setWhatsThis(whats + i18n("<p>Double click on this tool to keep it selected.</p>"));
 
       if (grp != "KDE")
@@ -409,7 +409,7 @@ void MainWindow::setupFileActions()
   fileTb = new KToolBar(this, "File");
   fileTb->setFullSize(false);
 
-  TQWhatsThis::add(fileTb, i18n("<b>The File toolbar</b>%1").tqarg(toolbarHelp));
+  TQWhatsThis::add(fileTb, i18n("<b>The File toolbar</b>%1").arg(toolbarHelp));
   addToolBar(fileTb, i18n("File"));
   fileMenu = new TQPopupMenu(this, "File");
   menuBar()->insertItem(i18n("&File"), fileMenu);
@@ -560,7 +560,7 @@ void MainWindow::setupWindowActions()
     j++;
     TQString itemText;
     if (j < 10)
-      itemText = TQString("&%1 ").tqarg(j);
+      itemText = TQString("&%1 ").arg(j);
     if (w->inherits("FormWindow"))
       itemText += w->name();
     else
@@ -671,7 +671,7 @@ FormWindow *MainWindow::openFormWindow(const TQString &filename, bool validFileN
   }
   if (!makeNew)
   {
-    statusBar()->message(i18n("Reading file '%1'...").tqarg(filename));
+    statusBar()->message(i18n("Reading file '%1'...").arg(filename));
     if (TQFile::exists(filename))
     {
       TQApplication::setOverrideCursor(WaitCursor);
@@ -684,14 +684,14 @@ FormWindow *MainWindow::openFormWindow(const TQString &filename, bool validFileN
       TQApplication::restoreOverrideCursor();
       if (b)
       {
-        statusBar()->message(i18n("Loaded file '%1'").tqarg(filename), 3000);
+        statusBar()->message(i18n("Loaded file '%1'").arg(filename), 3000);
       } else
       {
  	emit removedFormFile(ff);
 	ff->close();
         delete ff;
-        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"));
+        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"));
       }
       return (FormWindow *) resource.widget();
     } else
@@ -845,7 +845,7 @@ void MainWindow::createNewTemplate()
   ts << "    <cstring>" << cn << "Form</cstring>" << endl;
   ts << "</property>" << endl;
   ts << "<property stdset=\"1\">" << endl;
-  ts << "    <name>tqgeometry</name>" << endl;
+  ts << "    <name>geometry</name>" << endl;
   ts << "    <rect>" << endl;
   ts << "        <width>300</width>" << endl;
   ts << "        <height>400</height>" << endl;
@@ -907,7 +907,7 @@ void MainWindow::editPaste()
   } else
   {
     KMessageBox::information(this, i18n("Cannot paste widgets. Designer could not find a container\n"
-            "to paste into which does not contain a tqlayout. Break the tqlayout\n"
+            "to paste into which does not contain a layout. Break the layout\n"
             "of the container you want to paste into and select this container\n"
                 "and then paste again."), i18n("Paste Error"));
   }
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index 0968eafd..d294be84 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -24,9 +24,9 @@
 #include <kpopupmenu.h>
 #include <kprocess.h>
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 MessageLog::MessageLog(TQWidget* parent, const char* name) : TQTabWidget(parent, name)
 {
@@ -108,12 +108,12 @@ void MessageLog::clearContent()
 void MessageLog::copyLine()
 {
   if (m_lists[currentPageIndex()]->count())
-    kapp->tqclipboard()->setText(m_lists[currentPageIndex()]->currentText(), TQClipboard::Clipboard);
+    kapp->clipboard()->setText(m_lists[currentPageIndex()]->currentText(), TQClipboard::Clipboard);
 }
 
 void MessageLog::copyContent()
 {
-  kapp->tqclipboard()->setText(content(), TQClipboard::Clipboard);
+  kapp->clipboard()->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>")
-          .tqarg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel)
+          .arg(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>")
-        .tqarg(url.url()));
+        .arg(url.url()));
     return;
   }
   TQTextStream textfile(&file);
diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp
index 839160da..93a998d0 100644
--- a/kommander/editor/metadatabase.cpp
+++ b/kommander/editor/metadatabase.cpp
@@ -26,7 +26,7 @@
 
 #include <tqapplication.h>
 #include <tqobject.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqptrdict.h>
 #include <tqobjectlist.h>
 #include <tqstrlist.h>
@@ -38,7 +38,7 @@
 #include <tqdatetime.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <stdlib.h>
 
@@ -147,14 +147,14 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo
     if ( doUpdate &&
          ( property == "hAlign" || property == "vAlign" || property == "wordwrap" ) ) {
         doUpdate = false;
-        setPropertyChanged( o, "tqalignment", changed ||
+        setPropertyChanged( o, "alignment", changed ||
                             isPropertyChanged( o, "hAlign" ) ||
                             isPropertyChanged( o, "vAlign" ) ||
                             isPropertyChanged( o, "wordwrap" ) );
         doUpdate = true;
     }
 
-    if ( doUpdate && property == "tqalignment" ) {
+    if ( doUpdate && property == "alignment" ) {
         doUpdate = false;
         setPropertyChanged( o, "hAlign", changed );
         setPropertyChanged( o, "vAlign", changed );
@@ -269,10 +269,10 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
     }
 
     r->spacing = spacing;
-    TQLayout * tqlayout = 0;
-    WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
-    if ( tqlayout )
-        tqlayout->setSpacing( spacing );
+    TQLayout * layout = 0;
+    WidgetFactory::layoutType( (TQWidget*)o, layout );
+    if ( layout )
+        layout->setSpacing( spacing );
 }
 
 int MetaDataBase::spacing( TQObject *o )
@@ -305,12 +305,12 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
     }
 
     r->margin = margin;
-    TQLayout * tqlayout = 0;
-    WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
+    TQLayout * layout = 0;
+    WidgetFactory::layoutType( (TQWidget*)o, layout );
     if ( margin < 1 )
         margin = 1;
-    if ( tqlayout )
-        tqlayout->setMargin( margin );
+    if ( layout )
+        layout->setMargin( margin );
 }
 
 int MetaDataBase::margin( TQObject *o )
@@ -465,12 +465,12 @@ void MetaDataBase::doConnections( TQObject *o )
             delete l;
         }
         TQString s = "2""%1";
-        s = s.tqarg( conn.signal.data() );
+        s = s.arg( conn.signal.data() );
         TQString s2 = "1""%1";
-        s2 = s2.tqarg( conn.slot.data() );
+        s2 = s2.arg( conn.slot.data() );
 
-        TQStrList signalList = sender->tqmetaObject()->signalNames( true );
-        TQStrList slotList = receiver->tqmetaObject()->slotNames( true );
+        TQStrList signalList = sender->metaObject()->signalNames( true );
+        TQStrList slotList = receiver->metaObject()->slotNames( true );
 
         // avoid warnings
         if ( signalList.find( conn.signal ) == -1 ||
@@ -647,13 +647,13 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
     }
 
     if ( !onlyCustom ) {
-        TQStrList slotList = o->tqmetaObject()->slotNames( true );
+        TQStrList slotList = o->metaObject()->slotNames( true );
         if ( slotList.find( slot ) != -1 )
             return true;
 
         if ( o->inherits( "FormWindow" ) ) {
             o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
-            slotList = o->tqmetaObject()->slotNames( true );
+            slotList = o->metaObject()->slotNames( true );
             if ( slotList.find( slot ) != -1 )
                 return true;
         }
@@ -934,7 +934,7 @@ MetaDataBase::CustomWidget::CustomWidget()
     className = "MyCustomWidget";
     includeFile = "mywidget.h";
     includePolicy = Local;
-    tqsizeHint = TQSize( -1, -1 );
+    sizeHint = 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;
-    tqsizeHint = w.tqsizeHint;
+    sizeHint = w.sizeHint;
     if ( w.pixmap )
         pixmap = new TQPixmap( *w.pixmap );
     else
@@ -991,7 +991,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
     className = w.className;
     includeFile = w.includeFile;
     includePolicy = w.includePolicy;
-    tqsizeHint = w.tqsizeHint;
+    sizeHint = w.sizeHint;
     if ( w.pixmap )
         pixmap = new TQPixmap( *w.pixmap );
     else
@@ -1006,7 +1006,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
 
 bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
 {
-    TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( true );
+    TQStrList sigList = TQWidget::staticMetaObject()->signalNames( true );
     if ( sigList.find( signal ) != -1 )
         return true;
     for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) {
@@ -1018,7 +1018,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
 
 bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
 {
-    TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( true );
+    TQStrList slotList = TQWidget::staticMetaObject()->slotNames( true );
     if ( slotList.find( normalizeSlot( slot ) ) != -1 )
         return true;
 
@@ -1031,7 +1031,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
 
 bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const
 {
-    TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( true );
+    TQStrList propList = TQWidget::staticMetaObject()->propertyNames( true );
     if ( propList.find( prop ) != -1 )
         return true;
 
diff --git a/kommander/editor/metadatabase.h b/kommander/editor/metadatabase.h
index 5251e793..11254f0b 100644
--- a/kommander/editor/metadatabase.h
+++ b/kommander/editor/metadatabase.h
@@ -92,7 +92,7 @@ public:
 	TQString className;
 	TQString includeFile;
 	IncludePolicy includePolicy;
-	TQSize tqsizeHint;
+	TQSize sizeHint;
 	TQSizePolicy sizePolicy;
 	TQPixmap *pixmap;
 	TQValueList<TQCString> lstSignals;
diff --git a/kommander/editor/multilineeditor.ui b/kommander/editor/multilineeditor.ui
index 47ce1172..e08dd943 100644
--- a/kommander/editor/multilineeditor.ui
+++ b/kommander/editor/multilineeditor.ui
@@ -25,7 +25,7 @@
         <cstring>MultiLineEditorBase</cstring>
     </property>
     <property stdset="1">
-        <name>tqgeometry</name>
+        <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -128,7 +128,7 @@
                         <enum>Expanding</enum>
                     </property>
                     <property>
-                        <name>tqsizeHint</name>
+                        <name>sizeHint</name>
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp
index 074a8471..5a9c4f1b 100644
--- a/kommander/editor/multilineeditorimpl.cpp
+++ b/kommander/editor/multilineeditorimpl.cpp
@@ -34,7 +34,7 @@ MultiLineEditor::MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWi
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     mlined = (TQMultiLineEdit*)editWidget;
     // #### complete list of properties here
-    preview->tqsetAlignment( mlined->tqalignment() );
+    preview->setAlignment( mlined->alignment() );
     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'" ).tqarg( mlined->name() ),
+    PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n("Set Text of '%1'" ).arg( mlined->name() ),
 									  formwindow, mlined, preview->text() );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/newform.ui b/kommander/editor/newform.ui
index fe2f5e42..860c1190 100644
--- a/kommander/editor/newform.ui
+++ b/kommander/editor/newform.ui
@@ -85,7 +85,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -155,7 +155,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp
index 9644f2bf..abf2c2f7 100644
--- a/kommander/editor/newformimpl.cpp
+++ b/kommander/editor/newformimpl.cpp
@@ -121,7 +121,7 @@ void CustomFormItem::insert()
     if (!resource.load(ff))
     {
       TQMessageBox::information(MainWindow::self, i18n("Load Template"),
-          i18n("Could not load form description from template '%1'").tqarg(filename));
+          i18n("Could not load form description from template '%1'").arg(filename));
       delete ff;
       return;
     }
diff --git a/kommander/editor/paletteeditor.ui b/kommander/editor/paletteeditor.ui
index eeead240..cadcb3f5 100644
--- a/kommander/editor/paletteeditor.ui
+++ b/kommander/editor/paletteeditor.ui
@@ -67,7 +67,7 @@
             <property name="title">
                 <string>Build Palette</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignAuto</set>
             </property>
             <hbox>
@@ -92,7 +92,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>50</width>
                             <height>0</height>
@@ -110,7 +110,7 @@
                     <property name="text">
                         <string>&amp;3D effects:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -154,7 +154,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>50</width>
                             <height>0</height>
@@ -172,7 +172,7 @@
                     <property name="text">
                         <string>Back&amp;ground:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -214,7 +214,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -353,7 +353,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kommander/editor/paletteeditoradvanced.ui b/kommander/editor/paletteeditoradvanced.ui
index 001a39f3..78fcb222 100644
--- a/kommander/editor/paletteeditoradvanced.ui
+++ b/kommander/editor/paletteeditoradvanced.ui
@@ -262,7 +262,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -325,7 +325,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -477,7 +477,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -496,7 +496,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -573,7 +573,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kommander/editor/paletteeditoradvancedimpl.cpp b/kommander/editor/paletteeditoradvancedimpl.cpp
index e5480379..e7880b19 100644
--- a/kommander/editor/paletteeditoradvancedimpl.cpp
+++ b/kommander/editor/paletteeditoradvancedimpl.cpp
@@ -244,15 +244,15 @@ void PaletteEditorAdvanced::onCentral( int item )
     case 0:
     default:
 	c = editPalette.active().color( centralFromItem(item) );
-	p = editPalette.active().tqbrush( centralFromItem(item) ).pixmap();
+	p = editPalette.active().brush( centralFromItem(item) ).pixmap();
 	break;
     case 1:
 	c = editPalette.inactive().color( centralFromItem(item) );
-	p = editPalette.inactive().tqbrush( centralFromItem(item) ).pixmap();
+	p = editPalette.inactive().brush( centralFromItem(item) ).pixmap();
 	break;
     case 2:
 	c =  editPalette.disabled().color( centralFromItem(item) );
-	p = editPalette.disabled().tqbrush( centralFromItem(item) ).pixmap();
+	p = editPalette.disabled().brush( 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().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
+	pm = editPalette.active().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
 	break;
     case 1:
 	central = editPalette.inactive().color( centralFromItem( comboCentral->currentItem() ) );
 	effect = editPalette.inactive().color( effectFromItem( comboEffect->currentItem() ) );
-	pm = editPalette.inactive().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
+	pm = editPalette.inactive().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
 	break;
     case 2:
 	central = editPalette.disabled().color( centralFromItem( comboCentral->currentItem() ) );
 	effect = editPalette.disabled().color( effectFromItem( comboEffect->currentItem() ) );
-	pm = editPalette.disabled().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
+	pm = editPalette.disabled().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
 	break;
     }
 
diff --git a/kommander/editor/parser.cpp b/kommander/editor/parser.cpp
index fa264796..85446fa0 100644
--- a/kommander/editor/parser.cpp
+++ b/kommander/editor/parser.cpp
@@ -62,5 +62,5 @@ TQString Parser::cleanArgs( const TQString &func )
     }	
     res += ")";
 
-    return TQString::tqfromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) );
+    return TQString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) );
 }
diff --git a/kommander/editor/pics/images.h b/kommander/editor/pics/images.h
index 57997088..8a7bd3a2 100644
--- a/kommander/editor/pics/images.h
+++ b/kommander/editor/pics/images.h
@@ -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/tqlayout.xpm" },
+    { 3179, small_layout_xpm_data, "small/layout.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,11 +10877,11 @@ 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/edithtqlayout.png" },
+    { 706, small_edithlayout_png_data, "small/edithlayout.png" },
     { 809, small_edithlayoutsplit_png_data, "small/edithlayoutsplit.png" },
     { 902, small_editpaste_png_data, "small/editpaste.png" },
     { 690, small_editslots_png_data, "small/editslots.png" },
-    { 289, small_editvlayout_png_data, "small/editvtqlayout.png" },
+    { 289, small_editvlayout_png_data, "small/editvlayout.png" },
     { 355, small_editvlayoutsplit_png_data, "small/editvlayoutsplit.png" },
     { 1408, small_exec_png_data, "small/exec.png" },
     { 313, small_filenew_png_data, "small/filenew.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/tqlayout.xpm" },
+    { 931, small_disabled_layout_xpm_data, "small/disabled/layout.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,10 +10933,10 @@ 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/edithtqlayout.png" },
+    { 601, small_disabled_edithlayout_png_data, "small/disabled/edithlayout.png" },
     { 754, small_disabled_edithlayoutsplit_png_data, "small/disabled/edithlayoutsplit.png" },
     { 901, small_disabled_editpaste_png_data, "small/disabled/editpaste.png" },
-    { 617, small_disabled_editvlayout_png_data, "small/disabled/editvtqlayout.png" },
+    { 617, small_disabled_editvlayout_png_data, "small/disabled/editvlayout.png" },
     { 752, small_disabled_editvlayoutsplit_png_data, "small/disabled/editvlayoutsplit.png" },
     { 587, small_disabled_filesave_png_data, "small/disabled/filesave.png" },
     { 531, small_disabled_redo_png_data, "small/disabled/redo.png" },
diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp
index e536242a..a2f8356c 100644
--- a/kommander/editor/pixmapchooser.cpp
+++ b/kommander/editor/pixmapchooser.cpp
@@ -886,12 +886,12 @@ void PixmapView::setPixmap( const TQPixmap &pix )
 {
     pixmap = pix;
     resizeContents( pixmap.size().width(), pixmap.size().height() );
-    viewport()->tqrepaint( false );
+    viewport()->repaint( false );
 }
 
 void PixmapView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch )
 {
-    p->fillRect( cx, cy, cw, ch, tqcolorGroup().brush( TQColorGroup::Base ) );
+    p->fillRect( cx, cy, cw, ch, colorGroup().brush( TQColorGroup::Base ) );
     p->drawPixmap( 0, 0, pixmap );
 }
 
diff --git a/kommander/editor/pixmapfunction.ui b/kommander/editor/pixmapfunction.ui
index cb34cbcc..e93a94b5 100644
--- a/kommander/editor/pixmapfunction.ui
+++ b/kommander/editor/pixmapfunction.ui
@@ -25,7 +25,7 @@
         <cstring>PixmapFunction</cstring>
     </property>
     <property stdset="1">
-        <name>tqgeometry</name>
+        <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -810,7 +810,7 @@
                 <enum>Expanding</enum>
             </property>
             <property>
-                <name>tqsizeHint</name>
+                <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -861,7 +861,7 @@
                         <enum>Expanding</enum>
                     </property>
                     <property>
-                        <name>tqsizeHint</name>
+                        <name>sizeHint</name>
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kommander/editor/preferences.ui b/kommander/editor/preferences.ui
index 63ac1bb3..2cb673ed 100644
--- a/kommander/editor/preferences.ui
+++ b/kommander/editor/preferences.ui
@@ -317,7 +317,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -528,7 +528,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kommander/editor/previewframe.cpp b/kommander/editor/previewframe.cpp
index b3afb58b..b54d6347 100644
--- a/kommander/editor/previewframe.cpp
+++ b/kommander/editor/previewframe.cpp
@@ -31,7 +31,7 @@ PreviewFrame::PreviewFrame( TQWidget *parent, const char *name )
     setLineWidth(1);
 
     PreviewWorkspace * w = new PreviewWorkspace( this );
-    w->setEraseColor(tqcolorGroup().dark());
+    w->setEraseColor(colorGroup().dark());
     previewWidget = new PreviewWidget( w );
     previewWidget->move( 10, 10 );
 }
diff --git a/kommander/editor/previewwidget.ui b/kommander/editor/previewwidget.ui
index 6c93d75d..33601c58 100644
--- a/kommander/editor/previewwidget.ui
+++ b/kommander/editor/previewwidget.ui
@@ -234,7 +234,7 @@
                             <property name="name">
                                 <cstring>textView</cstring>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>50</height>
@@ -263,7 +263,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index 50938a89..0007a415 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -41,7 +41,7 @@
 #include <limits.h>
 
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqapplication.h>
 #include <tqheader.h>
 #include <tqlineedit.h>
@@ -59,7 +59,7 @@
 #include <tqcolor.h>
 #include <kcolordialog.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsizepolicy.h>
 #include <tqbitmap.h>
 #include <tqtooltip.h>
@@ -105,7 +105,7 @@ static TQStringList getFontList()
 	fontDataBase = new TQFontDatabase;
 	qAddPostRoutine( cleanupFontDatabase );
     }
-    return fontDataBase->tqfamilies();
+    return fontDataBase->families();
 }
 
 
@@ -317,9 +317,9 @@ void PropertyItem::setOpen( bool b )
     open = b;
 
     if ( !open ) {
-	tqchildren.setAutoDelete( true );
-	tqchildren.clear();
-	tqchildren.setAutoDelete( false );
+	children.setAutoDelete( true );
+	children.clear();
+	children.setAutoDelete( false );
 	tqApp->processEvents();
 	listview->updateEditorSize();
 	return;
@@ -375,7 +375,7 @@ void PropertyItem::setChanged( bool b, bool updateDb )
     if ( changed == b )
 	return;
     changed = b;
-    tqrepaint();
+    repaint();
     if ( updateDb )
 	MetaDataBase::setPropertyChanged( listview->propertyEditor()->widget(), name(), changed );
     updateResetButtonState();
@@ -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->tqsizeHint().width() );
-    hbox->tqlayout()->tqsetAlignment( TQt::AlignRight );
+    resetButton->setFixedWidth( resetButton->sizeHint().width() );
+    hbox->layout()->setAlignment( 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->tqitemRect( this );
+    TQRect r = listview->itemRect( this );
     if ( !r.size().isValid() ) {
 	listview->ensureItemVisible( this );
 #if defined(TQ_WS_WIN)
 	listview->repaintContents( false );
 #endif
-	r = listview->tqitemRect( this );
+	r = listview->itemRect( this );
     }
     r.setX( listview->header()->sectionPos( 1 ) );
     r.setWidth( listview->header()->sectionSize( 1 ) - 1 );
@@ -439,7 +439,7 @@ 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->tqsizeHint().width() + 10, r.height() );
+    resetButton->parentWidget()->resize( resetButton->sizeHint().width() + 10, r.height() );
     listview->moveChild( resetButton->parentWidget(), 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 )
 {
-    tqchildren.append( i );
+    children.append( i );
 }
 
 int PropertyItem::childCount() const
 {
-    return tqchildren.count();
+    return children.count();
 }
 
 PropertyItem *PropertyItem::child( int i ) const
 {
     // ARRRRRRRRG
-    return ( (PropertyItem*)this )->tqchildren.at( i );
+    return ( (PropertyItem*)this )->children.at( i );
 }
 
 /*!  If the contents of the item is not displayable with a text, but
@@ -537,10 +537,10 @@ TQString PropertyItem::currentItemFromObject() const
 
 void PropertyItem::setFocus( TQWidget *w )
 {
-    if ( !tqApp->tqfocusWidget() ||
+    if ( !tqApp->focusWidget() ||
 	 listview->propertyEditor()->formWindow() &&
-	 ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->tqfocusWidget()) ) &&
-	   !tqApp->tqfocusWidget()->inherits( "Editor" ) ) )
+	 ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) &&
+	   !tqApp->focusWidget()->inherits( "Editor" ) ) )
 	w->setFocus();
 }
 
@@ -1540,8 +1540,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr
     box = new TQHBox( listview->viewport() );
     box->hide();
     pixPrev = new TQLabel( box );
-    pixPrev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
-    pixPrev->setBackgroundColor( pixPrev->tqcolorGroup().color( TQColorGroup::Base ) );
+    pixPrev->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
+    pixPrev->setBackgroundColor( pixPrev->colorGroup().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 );
-    tqrepaint();
+    repaint();
 }
 
 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->tqworldMatrix().dx() + r.x()),
-				       (int)(p->tqworldMatrix().dy() + r.y()) ),
+	p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
+				       (int)(p->worldMatrix().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 tqchildren )
-    : PropertyItem( l, after, prop, propName ), withChildren( tqchildren )
+				      const TQString &propName, bool children )
+    : PropertyItem( l, after, prop, propName ), withChildren( children )
 {
     box = new TQHBox( listview->viewport() );
     box->hide();
@@ -2112,7 +2112,7 @@ void PropertySizePolicyItem::setValue( const TQVariant &v )
 	return;
 
     TQString s = TQString( "%1/%2/%2/%2" );
-    s = s.tqarg( size_type_to_string( v.toSizePolicy().horData() ) ).
+    s = s.arg( 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 );
-    tqrepaint();
+    repaint();
 }
 
 void PropertyPaletteItem::getPalette()
@@ -2198,7 +2198,7 @@ void PropertyPaletteItem::getPalette()
 	w = ( (TQScrollView*)w )->viewport();
     TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(),
 #if defined(TQT_NON_COMMERCIAL)
-					      w->backgroundMode(), listview->tqtopLevelWidget(),
+					      w->backgroundMode(), listview->topLevelWidget(),
 #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->tqworldMatrix().dx() + r.x()),
-				   (int)(p->tqworldMatrix().dy() + r.y()) ),
+    p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
+				   (int)(p->worldMatrix().dy() + r.y()) ),
 			   r.size() ) );
     TQRect r2( r );
     r2.setX( r2.x() + 2 );
@@ -2325,7 +2325,7 @@ void PropertyCursorItem::showEditor()
     PropertyItem::showEditor();
     if ( !comb ) {
 	combo()->blockSignals( true );
-	combo()->setCurrentItem( (int)value().toCursor().tqshape() );
+	combo()->setCurrentItem( (int)value().toCursor().shape() );
 	combo()->blockSignals( false );
     }
     placeEditor( combo() );
@@ -2348,7 +2348,7 @@ void PropertyCursorItem::setValue( const TQVariant &v )
 	return;
 
     combo()->blockSignals( true );
-    combo()->setCurrentItem( (int)v.toCursor().tqshape() );
+    combo()->setCurrentItem( (int)v.toCursor().shape() );
     combo()->blockSignals( false );
     setText( 1, combo()->currentText() );
     PropertyItem::setValue( v );
@@ -2522,7 +2522,7 @@ void PropertyList::setupProperties()
     if ( !editor->widget() )
 	return;
     bool allProperties = !editor->widget()->inherits( "Spacer" );
-    TQStrList lst = editor->widget()->tqmetaObject()->propertyNames( allProperties );
+    TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties );
     PropertyItem *item = 0;
     TQMap<TQString, bool> unique;
     TQObject *w = editor->widget();
@@ -2533,11 +2533,11 @@ void PropertyList::setupProperties()
 	WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
     for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
 	const TQMetaProperty* p =
-	    editor->widget()->tqmetaObject()->
-	    property( editor->widget()->tqmetaObject()->findProperty( it.current(), allProperties), allProperties );
+	    editor->widget()->metaObject()->
+	    property( editor->widget()->metaObject()->findProperty( it.current(), allProperties), allProperties );
 	if ( !p )
 	    continue;
-	if ( unique.contains( TQString::tqfromLatin1( it.current() ) ) )
+	if ( unique.contains( TQString::fromLatin1( it.current() ) ) )
 	    continue;
 	if ( editor->widget()->inherits( "QDesignerToolBar" ) || editor->widget()->inherits( "QDesignerMenuBar" ) ) {
 	    if ( qstrcmp( p->name(), "minimumHeight" ) == 0 )
@@ -2552,12 +2552,12 @@ void PropertyList::setupProperties()
 		continue;
 	    if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
 		continue;
-	    if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
+	    if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
 		continue;
-	    if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
+	    if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
 		continue;
 	}
-	unique.insert( TQString::tqfromLatin1( it.current() ), true );
+	unique.insert( TQString::fromLatin1( it.current() ), true );
 	if ( editor->widget()->isWidgetType() &&
 	     editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)editor->widget()) ) ) {
 	    if ( qstrcmp( p->name(), "geometry" ) == 0 )
@@ -2588,9 +2588,9 @@ void PropertyList::setupProperties()
 		    continue;
 		if ( qstrcmp( p->name(), "geometry" ) == 0 )
 		    continue;
-		if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
+		if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
 		    continue;
-		if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
+		if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
 		    continue;
 		if ( qstrcmp( p->name(), "enabled" ) == 0 )
 		    continue;
@@ -2642,7 +2642,7 @@ void PropertyList::setupProperties()
 
 	if ( p->designable(w) ) {
 	    if ( p->isSetType() ) {
-		if ( TQString( p->name() ) == "tqalignment" ) {
+		if ( TQString( p->name() ) == "alignment" ) {
 		    TQStringList lst;
 		    lst << p->valueToKey( AlignAuto )
 			<< p->valueToKey( AlignLeft )
@@ -2672,7 +2672,7 @@ void PropertyList::setupProperties()
 			    item->setChanged( true, false );
 		    }
 		} else {
-		    qWarning( "Sets except 'tqalignment' not supported yet.... %s.", p->name() );
+		    qWarning( "Sets except 'alignment' not supported yet.... %s.", p->name() );
 		}
 	    } else if ( p->isEnumType() ) {
 		TQStrList l = p->enumKeys();
@@ -2882,7 +2882,7 @@ void PropertyList::valueChanged( PropertyItem *i )
 {
     if ( !editor->widget() )
 	return;
-    TQString pn( i18n("Set '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) );
+    TQString pn( i18n("Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) );
     SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(),
 						      editor->widget(), editor,
 						      i->name(), WidgetFactory::property( editor->widget(), i->name() ),
@@ -3061,25 +3061,25 @@ static void clearAlignList( TQStrList &l )
 void PropertyList::setPropertyValue( PropertyItem *i )
 {
     const TQMetaProperty *p =
-	editor->widget()->tqmetaObject()->
-	property( editor->widget()->tqmetaObject()->findProperty( i->name(), true), true );
+	editor->widget()->metaObject()->
+	property( editor->widget()->metaObject()->findProperty( i->name(), true), true );
     if ( !p ) {
 	if ( i->name() == "hAlign" ) {
-	    int align = editor->widget()->property( "tqalignment" ).toInt();
-	    p = editor->widget()->tqmetaObject()->
-		property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", true ), true );
+	    int align = editor->widget()->property( "alignment" ).toInt();
+	    p = editor->widget()->metaObject()->
+		property( editor->widget()->metaObject()->findProperty( "alignment", 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( "tqalignment" ).toInt();
-	    p = editor->widget()->tqmetaObject()->
-		property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", true ), true );
+	    int align = editor->widget()->property( "alignment" ).toInt();
+	    p = editor->widget()->metaObject()->
+		property( editor->widget()->metaObject()->findProperty( "alignment", true ), true );
 	    align &= ~AlignHorizontal_Mask;
 	    ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() );
 	} else if ( i->name() == "wordwrap" ) {
-	    int align = editor->widget()->property( "tqalignment" ).toInt();
+	    int align = editor->widget()->property( "alignment" ).toInt();
 	    if ( align & WordBreak )
 		i->setValue( TQVariant( true, 0 ) );
 	    else
@@ -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'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) );
+    TQString pn( i18n("Reset '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) );
     SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(),
 						      editor->widget(), editor,
 						      i->name(), i->value(),
@@ -3229,7 +3229,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
     if ( ( (PropertyItem*)i )->propertyParent() )
 	i = ( (PropertyItem*)i )->propertyParent();
 
-    const TQMetaObject *mo = editor->widget()->tqmetaObject();
+    const TQMetaObject *mo = editor->widget()->metaObject();
     TQString prop = ( (PropertyItem*)i )->name();
     while ( mo ) {
 	TQString s;
@@ -3238,10 +3238,10 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
 	if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) {
 	    return *it;
 	}
-	mo = mo->tqsuperClass();
+	mo = mo->superClass();
     }
 
-    return i18n("<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).tqarg( prop );
+    return i18n("<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).arg( prop );
 }
 
 void PropertyList::readPropertyDocs()
@@ -3327,7 +3327,7 @@ void EventList::setup()
 #endif
 	}
     } else {
-	TQStrList sigs = editor->widget()->tqmetaObject()->signalNames( true );
+	TQStrList sigs = editor->widget()->metaObject()->signalNames( true );
 	sigs.remove( "destroyed()" );
 	TQStrListIterator it( sigs );
 	while ( it.current() ) {
@@ -3588,7 +3588,7 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw )
 
     wid = w;
     formwindow = fw;
-    setCaption( i18n("Property Editor (%1)" ).tqarg( formwindow->name() ) );
+    setCaption( i18n("Property Editor (%1)" ).arg( formwindow->name() ) );
     listview->viewport()->setUpdatesEnabled( false );
     listview->setUpdatesEnabled( false );
     clear();
@@ -3674,21 +3674,21 @@ TQString PropertyEditor::classOfCurrentProperty() const
 	return TQString();
     TQObject *o = wid;
     TQString curr = currentProperty();
-    TQMetaObject *mo = o->tqmetaObject();
+    TQMetaObject *mo = o->metaObject();
     while ( mo ) {
 	TQStrList props = mo->propertyNames( false );
 	if ( props.find( curr.latin1() ) != -1 )
 	    return mo->className();
-	mo = mo->tqsuperClass();
+	mo = mo->superClass();
     }
     return TQString();
 }
 
-TQMetaObject* PropertyEditor::tqmetaObjectOfCurrentProperty() const
+TQMetaObject* PropertyEditor::metaObjectOfCurrentProperty() const
 {
     if ( !wid )
 	return 0;
-    return wid->tqmetaObject();
+    return wid->metaObject();
 }
 
 void PropertyEditor::resetFocus()
diff --git a/kommander/editor/propertyeditor.h b/kommander/editor/propertyeditor.h
index 61d4e4dc..d0eb517b 100644
--- a/kommander/editor/propertyeditor.h
+++ b/kommander/editor/propertyeditor.h
@@ -118,7 +118,7 @@ private:
     bool open, changed;
     PropertyItem *property;
     TQString propertyName;
-    TQPtrList<PropertyItem> tqchildren;
+    TQPtrList<PropertyItem> children;
     TQColor backColor;
     TQPushButton *resetButton;
 
@@ -340,7 +340,7 @@ class PropertyColorItem : public TQObject,
 
 public:
     PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
-		       const TQString &propName, bool tqchildren );
+		       const TQString &propName, bool children );
     ~PropertyColorItem();
 
     virtual void createChildren();
@@ -590,7 +590,7 @@ public:
 
     TQString currentProperty() const;
     TQString classOfCurrentProperty() const;
-    TQMetaObject* tqmetaObjectOfCurrentProperty() const;
+    TQMetaObject* metaObjectOfCurrentProperty() const;
 
     void resetFocus();
 
diff --git a/kommander/editor/qcompletionedit.cpp b/kommander/editor/qcompletionedit.cpp
index 78523a95..6a7cb2a9 100644
--- a/kommander/editor/qcompletionedit.cpp
+++ b/kommander/editor/qcompletionedit.cpp
@@ -62,8 +62,8 @@ void QCompletionEdit::placeListBox()
 	return;
     }
 
-    popup->resize( TQMAX( listbox->tqsizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
-		   listbox->tqsizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
+    popup->resize( TQMAX( listbox->sizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
+		   listbox->sizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
 
     TQPoint p( mapToGlobal( TQPoint( 0, 0 ) ) );
     if ( p.y() + height() + popup->height() <= TQApplication::desktop()->height() )
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index 93f6cc9b..81824fc6 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -27,7 +27,7 @@
 #include "tqdom.h"
 #include "widgetdatabase.h"
 #include "widgetfactory.h"
-#include "tqlayout.h"
+#include "layout.h"
 #include "domtool.h"
 #include "command.h"
 #include "pixmapchooser.h"
@@ -43,7 +43,7 @@
 
 #include <tqfeatures.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqobject.h>
 #include <tqwidget.h>
 #include <tqobjectlist.h>
@@ -52,7 +52,7 @@
 #include <tqtabwidget.h>
 #include <tqapplication.h>
 #include <tqbuffer.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqlistbox.h>
@@ -64,7 +64,7 @@
 #include <tqiconview.h>
 #include <tqlabel.h>
 #include <tqwizard.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqregexp.h>
 #include <zlib.h>
 #include <tqdatetime.h>
@@ -401,13 +401,13 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
 
     if ( formwindow ) {
 	formwindow->killAccels( TQT_TQOBJECT(formwindow) );
-	if ( formwindow->tqlayout() )
-	    formwindow->tqlayout()->activate();
+	if ( formwindow->layout() )
+	    formwindow->layout()->activate();
 	if ( hadGeometry )
-	    formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize().
-							       expandedTo( formwindow->tqminimumSizeHint() ) ) );
+	    formwindow->resize( formwindow->size().expandedTo( formwindow->minimumSize().
+							       expandedTo( formwindow->minimumSizeHint() ) ) );
 	else
-	    formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) );
+	    formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) );
     }
 
     return true;
@@ -931,17 +931,17 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
 {
     const TQObjectList l = obj->childrenListObject();
     if ( l.isEmpty() )
-	return; // no tqchildren to save
+	return; // no children to save
 
     TQString closeTag;
-    // 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;
+    // 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 ( !obj->inherits( TQSPLITTER_OBJECT_NAME_STRING ) &&
 	 WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) &&
 	 obj->isWidgetType() &&
-	 WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) {
-	WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, tqlayout );
+	 WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) {
+	WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, layout );
 	switch ( lay ) {
 	case WidgetFactory::HBox:
 	    closeTag = makeIndent( indent ) + "</hbox>";
@@ -957,15 +957,15 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
 	    closeTag = makeIndent( indent ) + "</grid>";
 	    ts << makeIndent( indent ) << "<grid>" << endl;
 	    ++indent;
-	    grid = (QDesignerGridLayout*) tqlayout;
+	    grid = (QDesignerGridLayout*) layout;
 	    break;
 	default:
 	    break;
 	}
 
-	// save properties of tqlayout
+	// save properties of layout
 	if ( lay != WidgetFactory::NoLayout )
-	    saveObjectProperties( TQT_TQOBJECT(tqlayout), ts, indent );
+	    saveObjectProperties( TQT_TQOBJECT(layout), ts, indent );
 
     }
 
@@ -984,8 +984,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
     changed = MetaDataBase::changedProperties( w );
     if ( w->isWidgetType() ) {
 	if ( w->inherits( "Spacer" ) ) {
-	    if ( !changed.contains( "tqsizeHint" ) )
-		changed << "tqsizeHint";
+	    if ( !changed.contains( "sizeHint" ) )
+		changed << "sizeHint";
 	    if ( !changed.contains( "geometry" ) )
 		changed << "geometry";
 	}
@@ -1006,15 +1006,15 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
     bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() &&
 		    WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
 
-    TQStrList lst = w->tqmetaObject()->propertyNames( !w->inherits( "Spacer" ) );
+    TQStrList lst = w->metaObject()->propertyNames( !w->inherits( "Spacer" ) );
     for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
-	if ( changed.find( TQString::tqfromLatin1( it.current() ) ) == changed.end() )
+	if ( changed.find( TQString::fromLatin1( it.current() ) ) == changed.end() )
 	    continue;
-	if ( saved.find( TQString::tqfromLatin1( it.current() ) ) != saved.end() )
+	if ( saved.find( TQString::fromLatin1( it.current() ) ) != saved.end() )
 	    continue;
-	saved << TQString::tqfromLatin1( it.current() );
-	const TQMetaProperty* p = w->tqmetaObject()->
-				 property( w->tqmetaObject()->findProperty( it.current(), true ), true );
+	saved << TQString::fromLatin1( it.current() );
+	const TQMetaProperty* p = w->metaObject()->
+				 property( w->metaObject()->findProperty( 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 &&
@@ -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->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, true ), true );
+    const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true );
     TQStrList l( p->valueToKeys( w->property( name ).toInt() ) );
     TQString v;
     for ( uint i = 0; i < l.count(); ++i ) {
@@ -1079,7 +1079,7 @@ 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->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, true ), true );
+    const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true );
     ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl;
 }
 
@@ -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().tqshape() << "</cursor>" << endl;
+	ts << makeIndent( indent ) << "<cursor>" << value.toCursor().shape() << "</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.tqbrush( (TQColorGroup::ColorRole)r ).pixmap();
+	TQPixmap* pm = cg.brush( (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* tqlayout )
+TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout )
 {
     lastItem = 0;
     TQDomElement n = e.firstChild().toElement();
@@ -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 ( tqlayout ) {
-	    switch ( WidgetFactory::layoutType( tqlayout ) ) {
+	if ( layout ) {
+	    switch ( WidgetFactory::layoutType( layout ) ) {
 	    case WidgetFactory::HBox:
-		( (TQHBoxLayout*)tqlayout )->addWidget( w );
+		( (TQHBoxLayout*)layout )->addWidget( w );
 		break;
 	    case WidgetFactory::VBox:
-		( (TQVBoxLayout*)tqlayout )->addWidget( w );
+		( (TQVBoxLayout*)layout )->addWidget( w );
 		break;
 	    case WidgetFactory::Grid:
-		( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1,
+		( (QDesignerGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1,
 								      col, col + colspan - 1 );
 		break;
 	    default:
@@ -1365,7 +1365,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 
 	if ( !toplevel )
 	    toplevel = w;
-	tqlayout = 0;
+	layout = 0;
 
 	if ( w && formwindow ) {
 	    if ( !parent || ( !parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) )
@@ -1379,22 +1379,22 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 
     while ( !n.isNull() ) {
 	if ( n.tagName() == "spacer" ) {
-	    createSpacer( n, w, tqlayout, Qt::Horizontal );
+	    createSpacer( n, w, layout, Qt::Horizontal );
 	} else if ( n.tagName() == "widget" ) {
-	    createObject( n, w, tqlayout );
+	    createObject( n, w, layout );
 	} else if ( n.tagName() == "hbox" ) {
-	    tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::HBox );
-	    obj = TQT_TQOBJECT(tqlayout);
+	    layout = WidgetFactory::createLayout( w, layout, WidgetFactory::HBox );
+	    obj = TQT_TQOBJECT(layout);
 	    n = n.firstChild().toElement();
 	    continue;
 	} else if ( n.tagName() == "grid" ) {
-	    tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::Grid );
-	    obj = TQT_TQOBJECT(tqlayout);
+	    layout = WidgetFactory::createLayout( w, layout, WidgetFactory::Grid );
+	    obj = TQT_TQOBJECT(layout);
 	    n = n.firstChild().toElement();
 	    continue;
 	} else if ( n.tagName() == "vbox" ) {
-	    tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::VBox );
-	    obj = TQT_TQOBJECT(tqlayout);
+	    layout = WidgetFactory::createLayout( w, layout, WidgetFactory::VBox );
+	    obj = TQT_TQOBJECT(layout);
 	    n = n.firstChild().toElement();
 	    continue;
 	} else if ( n.tagName() == "property" && obj ) {
@@ -1605,7 +1605,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt
     }
 }
 
-TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o )
+TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o )
 {
     TQDomElement n = e.firstChild().toElement();
     int row = e.attribute( "row" ).toInt();
@@ -1629,12 +1629,12 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
     spacer->setInteraciveMode( true );
     if ( formwindow )
 	formwindow->insertWidget( spacer, pasting );
-    if ( tqlayout ) {
-	if ( tqlayout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
-	    ( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->tqalignment() );
+    if ( layout ) {
+	if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
+	    ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() );
 	else
-	    ( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1,
-								  spacer->tqalignment() );
+	    ( (QDesignerGridLayout*)layout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1,
+								  spacer->alignment() );
     }
     return spacer;
 }
@@ -1644,7 +1644,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
 */
 void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e )
 {
-    const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, true ), true );
+    const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true );
 
     if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING )  ) {// no layouts in metadatabase... (RS)
 	if ( obj->inherits( "CustomWidget" ) ) {
@@ -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->tqsizeHint.width() << "</width>" << endl;
-	ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
+	ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl;
+	ts << makeIndent( indent ) << "<height>" << w->sizeHint.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->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() );
+			    w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() );
 			else if ( n3.tagName() == "height" )
-			    w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() );
+			    w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() );
 			n3 = n3.nextSibling().toElement();
 		    }
 		} else if ( n2.tagName() == "sizepolicy" ) {
diff --git a/kommander/editor/resource.h b/kommander/editor/resource.h
index e35bd6b2..56081f85 100644
--- a/kommander/editor/resource.h
+++ b/kommander/editor/resource.h
@@ -22,7 +22,7 @@
 #define RESOURCE_H
 
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqvariant.h>
 #include <tqvaluelist.h>
 #include <tqimage.h>
@@ -103,8 +103,8 @@ private:
 //    void saveFormCode();
 #endif
 
-    TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout = 0 );
-    TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o );
+    TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 );
+    TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, 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);
diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp
index 72f7c38c..7b0d4a97 100644
--- a/kommander/editor/sizehandle.cpp
+++ b/kommander/editor/sizehandle.cpp
@@ -208,7 +208,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
     sel->updateGeometry();
     oldPressPos += ( p - pos() );
 
-    formWindow->sizePreview()->setText( TQString( "%1/%2" ).tqarg( widget->width() ).tqarg( widget->height() ) );
+    formWindow->sizePreview()->setText( TQString( "%1/%2" ).arg( widget->width() ).arg( widget->height() ) );
     formWindow->sizePreview()->adjustSize();
     TQRect lg( formWindow->mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ),
 	      formWindow->sizePreview()->size() );
@@ -226,19 +226,19 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e )
 	return;
 
     formWindow->sizePreview()->hide();
-    if ( geom != widget->tqgeometry() )
+    if ( geom != widget->geometry() )
 	formWindow->commandHistory()->addCommand( new ResizeCommand( i18n("Resize" ),
 								     formWindow,
 								     widget, origGeom,
-								     widget->tqgeometry() ) );
+								     widget->geometry() ) );
     formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) );
 }
 
 void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height )
 {
-    int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
+    int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
     minw = TQMAX( minw, 2 * formWindow->grid().x() );
-    int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() );
+    int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
     minh = TQMAX( minh, 2 * formWindow->grid().y() );
     if ( TQMAX( minw, width ) > w->maximumWidth() ||
 	 TQMAX( minh, height ) > w->maximumHeight() )
@@ -252,9 +252,9 @@ void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int heigh
 
 void SizeHandle::tryResize( TQWidget *w, int width, int height )
 {
-    int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
+    int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
     minw = TQMAX( minw, 16 );
-    int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() );
+    int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
     minh = TQMAX( minh, 16 );
     w->resize( TQMAX( minw, width ), TQMAX( minh, height ) );
 }
diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp
index 37a28911..b807c0f1 100644
--- a/kommander/editor/styledbutton.cpp
+++ b/kommander/editor/styledbutton.cpp
@@ -23,7 +23,7 @@
 #include "formwindow.h"
 #include "pixmapchooser.h"
 #include <kcolordialog.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
 #include <tqimage.h>
@@ -35,7 +35,7 @@
 StyledButton::StyledButton(TQWidget* parent, const char* name)
     : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( false )
 {
-    setMinimumSize( tqminimumSizeHint() );
+    setMinimumSize( minimumSizeHint() );
     setAcceptDrops( true );
 
     connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor()));
@@ -48,7 +48,7 @@ StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name
 {
     col = b.color();
     pix = b.pixmap();
-    setMinimumSize( tqminimumSizeHint() );
+    setMinimumSize( minimumSizeHint() );
 }
 
 StyledButton::~StyledButton()
@@ -111,12 +111,12 @@ void StyledButton::setScale( bool on )
     scalePixmap();
 }
 
-TQSize StyledButton::tqsizeHint() const
+TQSize StyledButton::sizeHint() const
 {
     return TQSize( 50, 25 );
 }
 
-TQSize StyledButton::tqminimumSizeHint() const
+TQSize StyledButton::minimumSizeHint() const
 {
     return TQSize( 50, 25 );
 }
@@ -145,25 +145,25 @@ void StyledButton::resizeEvent( TQResizeEvent* e )
 
 void StyledButton::drawButton( TQPainter *paint )
 {
-    tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), tqcolorGroup(),
+    tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(),
 			  isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised);
     drawButtonLabel(paint);
 
     if (hasFocus())
 	tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, paint,
 			      tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, this),
-			      tqcolorGroup(), TQStyle::Style_Default);
+			      colorGroup(), TQStyle::Style_Default);
 }
 
 void StyledButton::drawButtonLabel( TQPainter *paint )
 {
     TQColor pen = isEnabled() ?
-		 hasFocus() ? tqpalette().active().buttonText() : tqpalette().inactive().buttonText()
-		 : tqpalette().disabled().buttonText();
+		 hasFocus() ? palette().active().buttonText() : palette().inactive().buttonText()
+		 : palette().disabled().buttonText();
     paint->setPen( pen );
 
     if(!isEnabled()) {
-	paint->setBrush( TQBrush( tqcolorGroup().button() ) );
+	paint->setBrush( TQBrush( colorGroup().button() ) );
     }
     else if ( edit == PixmapEditor && spix ) {
 	paint->setBrush( TQBrush( col, *spix ) );
@@ -178,7 +178,7 @@ void StyledButton::onEditor()
 {
     switch (edit) {
     case ColorEditor: {
-        TQColor c = tqpalette().active().background();
+        TQColor c = palette().active().background();
 	if ( KColorDialog::getColor( c, this ) == TQDialog::Accepted ) {
 	    setColor( c );
 	    emit changed();
diff --git a/kommander/editor/styledbutton.h b/kommander/editor/styledbutton.h
index 883c95ad..3a8c2691 100644
--- a/kommander/editor/styledbutton.h
+++ b/kommander/editor/styledbutton.h
@@ -59,8 +59,8 @@ public:
     void setScale( bool );
     bool scale() const;
 
-    TQSize tqsizeHint() const;
-    TQSize tqminimumSizeHint() const;
+    TQSize sizeHint() const;
+    TQSize minimumSizeHint() const;
 
     void setFormWindow( FormWindow *fw ) { formWindow = fw; }
 
diff --git a/kommander/editor/tableeditor.ui b/kommander/editor/tableeditor.ui
index b3331a98..8d503842 100644
--- a/kommander/editor/tableeditor.ui
+++ b/kommander/editor/tableeditor.ui
@@ -87,7 +87,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -172,7 +172,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -194,7 +194,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -299,7 +299,7 @@
                                         <property name="name">
                                             <cstring>buttonDeleteColPixmap</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -322,7 +322,7 @@
                                         <property name="name">
                                             <cstring>buttonChooseColPixmap</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -425,7 +425,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -481,7 +481,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -566,7 +566,7 @@
                                         <property name="name">
                                             <cstring>buttonDeleteRowPixmap</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -589,7 +589,7 @@
                                         <property name="name">
                                             <cstring>buttonChooseRowPixmap</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp
index 5fc56f41..f54094b3 100644
--- a/kommander/editor/tableeditorimpl.cpp
+++ b/kommander/editor/tableeditorimpl.cpp
@@ -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' " ).tqarg( editTable->name() ),
+    PopulateTableCommand *cmd = new PopulateTableCommand( i18n("Edit Rows and Columns of '%1' " ).arg( editTable->name() ),
 							  formWindow, editTable, rows, cols );
     cmd->execute();
     formWindow->commandHistory()->addCommand( cmd );
diff --git a/kommander/editor/templates/Configuration_Dialog.ui b/kommander/editor/templates/Configuration_Dialog.ui
index 8d792741..cdfbdfd4 100644
--- a/kommander/editor/templates/Configuration_Dialog.ui
+++ b/kommander/editor/templates/Configuration_Dialog.ui
@@ -102,7 +102,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui b/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui
index 6278ab75..51669089 100644
--- a/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui
+++ b/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui
@@ -61,7 +61,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>20</width>
                         <height>20</height>
diff --git a/kommander/editor/templates/Dialog_with_Buttons_(Right).ui b/kommander/editor/templates/Dialog_with_Buttons_(Right).ui
index 2158eabd..938590f3 100644
--- a/kommander/editor/templates/Dialog_with_Buttons_(Right).ui
+++ b/kommander/editor/templates/Dialog_with_Buttons_(Right).ui
@@ -86,7 +86,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>20</width>
                         <height>20</height>
diff --git a/kommander/editor/templates/Tab_Dialog.ui b/kommander/editor/templates/Tab_Dialog.ui
index c85b3e8f..64df4236 100644
--- a/kommander/editor/templates/Tab_Dialog.ui
+++ b/kommander/editor/templates/Tab_Dialog.ui
@@ -84,7 +84,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp
index 37c9672d..7ebd4a02 100644
--- a/kommander/editor/widgetdatabase.cpp
+++ b/kommander/editor/widgetdatabase.cpp
@@ -32,7 +32,7 @@
 #include <tqstrlist.h>
 #include <tqdict.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqcleanuphandler.h>
 
 #include <tqfeatures.h>
@@ -833,7 +833,7 @@ bool WidgetDatabase::isForm( int id )
     return r->isForm;
 }
 
-/*!  Returns whether the widget registered as \a id can have tqchildren.
+/*!  Returns whether the widget registered as \a id can have children.
 */
 
 bool WidgetDatabase::isContainer( int id )
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index 9f619c79..d04d75d9 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -29,7 +29,7 @@
 #include "mainwindow.h"
 #include "formwindow.h"
 #include "pixmapchooser.h"
-#include "tqlayout.h"
+#include "layout.h"
 #include "listboxeditorimpl.h"
 #include "listvieweditorimpl.h"
 #include "iconvieweditorimpl.h"
@@ -56,9 +56,9 @@
 #include <tqlineedit.h>
 #include <tqspinbox.h>
 #include <tqmultilineedit.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidgetstack.h>
 #include <tqcombobox.h>
 #include <tqtabbar.h>
@@ -69,8 +69,8 @@
 #include <tqslider.h>
 #include <tqdial.h>
 #include <tqprogressbar.h>
-#include <tqtextview.h>
-#include <tqtextbrowser.h>
+#include <textview.h>
+#include <textbrowser.h>
 #include <tqframe.h>
 #include <tqmetaobject.h>
 #include <tqwizard.h>
@@ -399,7 +399,7 @@ TQMap< int, TQStringList > *changedProperties = 0;
 void WidgetFactory::saveDefaultProperties( TQWidget *w, int id )
 {
     TQMap< TQString, TQVariant> propMap;
-    TQStrList lst = w->tqmetaObject()->propertyNames( true );
+    TQStrList lst = w->metaObject()->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 )
@@ -668,11 +668,11 @@ TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, boo
   return w;
 }
 
-/*!  Creates a tqlayout on the widget \a widget of the type \a type
+/*!  Creates a layout 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 *tqlayout, LayoutType type )
+TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, LayoutType type )
 {
     int spacing = MainWindow::self->currentLayoutDefaultSpacing();
     int margin = 0;
@@ -682,74 +682,74 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
 	   widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) )
 	margin = MainWindow::self->currentLayoutDefaultMargin();
 
-    if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
+    if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
 	widget = ((TQTabWidget*)widget)->currentPage();
 
-    if ( !tqlayout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
+    if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
     widget = ((TQToolBox*)widget)->currentItem();
 
-    if ( !tqlayout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
+    if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
 	widget = ((TQWizard*)widget)->currentPage();
 
-    if ( !tqlayout && widget && widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
+    if ( !layout && widget && widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
 	widget = ((TQMainWindow*)widget)->centralWidget();
 
-    if ( !tqlayout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
+    if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
 	widget = ((TQWidgetStack*)widget)->visibleWidget();
 
     MetaDataBase::addEntry( TQT_TQOBJECT(widget) );
 
-    if ( !tqlayout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
+    if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
 	TQGroupBox *gb = (TQGroupBox*)widget;
 	gb->setColumnLayout( 0, Qt::Vertical );
-	gb->tqlayout()->setMargin( 0 );
-	gb->tqlayout()->setSpacing( 0 );
+	gb->layout()->setMargin( 0 );
+	gb->layout()->setSpacing( 0 );
 	TQLayout *l;
 	switch ( type ) {
 	case HBox:
-	    l = new TQHBoxLayout( gb->tqlayout() );
+	    l = new TQHBoxLayout( gb->layout() );
 	    MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin );
 	    MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing );
-	    l->tqsetAlignment( AlignTop );
+	    l->setAlignment( AlignTop );
 	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 	    return l;
 	case VBox:
-	    l = new TQVBoxLayout( gb->tqlayout(), spacing );
+	    l = new TQVBoxLayout( gb->layout(), spacing );
 	    MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin );
 	    MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing );
-	    l->tqsetAlignment( AlignTop );
+	    l->setAlignment( AlignTop );
 	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 	    return l;
 	case Grid:
-	    l = new QDesignerGridLayout( gb->tqlayout() );
+	    l = new QDesignerGridLayout( gb->layout() );
 	    MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin );
 	    MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing );
-	    l->tqsetAlignment( AlignTop );
+	    l->setAlignment( AlignTop );
 	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 	    return l;
 	default:
 	    return 0;
 	}
     } else {
-	if ( tqlayout ) {
+	if ( layout ) {
 	    TQLayout *l;
 	    switch ( type ) {
 	    case HBox:
-		l = new TQHBoxLayout( tqlayout );
+		l = new TQHBoxLayout( layout );
 		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		l->setSpacing( spacing );
 		l->setMargin( margin );
 		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		return l;
 	    case VBox:
-		l = new TQVBoxLayout( tqlayout );
+		l = new TQVBoxLayout( layout );
 		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		l->setSpacing( spacing );
 		l->setMargin( margin );
 		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		return l;
 	    case Grid: {
-		l = new QDesignerGridLayout( tqlayout );
+		l = new QDesignerGridLayout( layout );
 		MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 		l->setSpacing( spacing );
 		l->setMargin( margin );
@@ -819,7 +819,7 @@ void WidgetFactory::deleteLayout( TQWidget *widget )
 	widget = ((TQMainWindow*)widget)->centralWidget();
     if ( widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
 	widget = ((TQWidgetStack*)widget)->visibleWidget();
-    delete widget->tqlayout();
+    delete widget->layout();
 }
 
 /*!  Factory functions for creating a widget of the type \a className
@@ -838,7 +838,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
     if (init)
     {
       b = new QDesignerPushButton(parent, name);
-      b->setText(TQString::tqfromLatin1(name));
+      b->setText(TQString::fromLatin1(name));
     } else
     {
       b = new QDesignerPushButton(parent, name);
@@ -860,7 +860,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
     if (init)
     {
       QDesignerCheckBox *cb = new QDesignerCheckBox(parent, name);
-      cb->setText(TQString::tqfromLatin1(name));
+      cb->setText(TQString::fromLatin1(name));
       return cb;
     }
     return new QDesignerCheckBox(parent, name);
@@ -869,19 +869,19 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
     if (init)
     {
       QDesignerRadioButton *rb = new QDesignerRadioButton(parent, name);
-      rb->setText(TQString::tqfromLatin1(name));
+      rb->setText(TQString::fromLatin1(name));
       return rb;
     }
     return new QDesignerRadioButton(parent, name);
   } else if (className == TQGROUPBOX_OBJECT_NAME_STRING)
   {
     if (init)
-      return new TQGroupBox(TQString::tqfromLatin1(name), parent, name);
+      return new TQGroupBox(TQString::fromLatin1(name), parent, name);
     return new TQGroupBox(parent, name);
   } else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING)
   {
     if (init)
-      return new TQButtonGroup(TQString::tqfromLatin1(name), parent, name);
+      return new TQButtonGroup(TQString::fromLatin1(name), parent, name);
     return new TQButtonGroup(parent, name);
   } else if (className == TQICONVIEW_OBJECT_NAME_STRING)
   {
@@ -950,7 +950,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
     QDesignerLabel *l = new QDesignerLabel(parent, name);
     if (init)
     {
-      l->setText(TQString::tqfromLatin1(name));
+      l->setText(TQString::fromLatin1(name));
       MetaDataBase::addEntry(TQT_TQOBJECT(l));
       MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "text", true);
     }
@@ -1257,14 +1257,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 
 
 
-/*!  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.
+/*!  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.
 */
 
-WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tqlayout )
+WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&layout )
 {
-    tqlayout = 0;
+    layout = 0;
 
     if ( w && w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
 	w = ((TQTabWidget*)w)->currentPage();
@@ -1280,9 +1280,9 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql
     if ( w && w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
 	return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox;
 
-    if ( !w || !w->tqlayout() )
+    if ( !w || !w->layout() )
 	return NoLayout;
-    TQLayout *lay = w->tqlayout();
+    TQLayout *lay = w->layout();
 
     if ( w->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
 	TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING );
@@ -1290,7 +1290,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql
 	    lay = (TQLayout*)l->first();
 	delete l;
     }
-    tqlayout = lay;
+    layout = lay;
 
     if ( lay->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
 	return HBox;
@@ -1304,13 +1304,13 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql
 /*!
   \overload
 */
-WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *tqlayout )
+WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout )
 {
-    if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
+    if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
 	return HBox;
-    else if ( tqlayout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
+    else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
 	return VBox;
-    else if ( tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+    else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
 	return Grid;
     return NoLayout;
 }
@@ -1325,9 +1325,9 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w )
 }
 
 
-TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout )
+TQWidget *WidgetFactory::layoutParent( TQLayout *layout )
 {
-    TQObject *o = TQT_TQOBJECT(tqlayout);
+    TQObject *o = TQT_TQOBJECT(layout);
     while ( o ) {
 	if ( o->isWidgetType() )
 	    return (TQWidget*)o;
@@ -1336,7 +1336,7 @@ TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout )
     return 0;
 }
 
-/*!  Returns the widget into which tqchildren should be inserted when \a
+/*!  Returns the widget into which children 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
@@ -1668,7 +1668,7 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName )
 
 bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName )
 {
-    const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->
+    const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->
 							findProperty( propName, true ), true );
     if (!p )
 	return false;
@@ -1678,10 +1678,10 @@ bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName )
 TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
 {
     if ( propName == "wordwrap" ) {
-	int v = defaultValue( w, "tqalignment" ).toInt();
+	int v = defaultValue( w, "alignment" ).toInt();
 	return TQVariant( ( v & WordBreak ) == WordBreak, 0 );
     } else if ( propName == "toolTip" || propName == "whatsThis" ) {
-	return TQVariant( TQString::tqfromLatin1( "" ) );
+	return TQVariant( TQString::fromLatin1( "" ) );
     } else if ( w->inherits( "CustomWidget" ) ) {
 	return TQVariant();
     } else if ( propName == "frameworkCode" ) {
@@ -1701,10 +1701,10 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
 
 TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName )
 {
-    const TQMetaProperty *p = w->tqmetaObject()->
-			     property( w->tqmetaObject()->findProperty( propName, true ), true );
+    const TQMetaProperty *p = w->metaObject()->
+			     property( w->metaObject()->findProperty( propName, true ), true );
     if ( !p ) {
-	int v = defaultValue( w, "tqalignment" ).toInt();
+	int v = defaultValue( w, "alignment" ).toInt();
 	if ( propName == "hAlign" ) {
 	    if ( ( v & AlignAuto ) == AlignAuto )
 		return "AlignAuto";
@@ -1751,7 +1751,7 @@ void QDesignerLabel::updateBuddy()
     if ( myBuddy.isEmpty() )
 	return;
 
-    TQObjectList *l = tqtopLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, false, true );
+    TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, false, true );
     if ( !l || !l->first() ) {
 	delete l;
 	return;
@@ -1793,14 +1793,14 @@ bool TQLayoutWidget::event( TQEvent *e )
 
 /*
   This function must be called on TQLayoutWidget creation and whenever
-  the TQLayoutWidget's parent tqlayout changes (e.g., from a TQHBoxLayout
+  the TQLayoutWidget's parent layout changes (e.g., from a TQHBoxLayout
   to a TQVBoxLayout), because of the (illogical) way layouting works.
 */
 void TQLayoutWidget::updateSizePolicy()
 {
     TQObjectList clo = childrenListObject();
     if ( clo.isEmpty() || clo.count() == 0 ) {
-	sp = TQWidget::tqsizePolicy();
+	sp = TQWidget::sizePolicy();
 	return;
     }
 
@@ -1817,14 +1817,14 @@ void TQLayoutWidget::updateSizePolicy()
     int ht = (int) TQSizePolicy::Preferred;
     int vt = (int) TQSizePolicy::Preferred;
 
-    if ( tqlayout() ) {
+    if ( layout() ) {
 	/*
-	  parentLayout is set to the parent tqlayout if there is one and if it is
+	  parentLayout is set to the parent layout if there is one and if it is
 	  top level, in which case layouting is illogical.
 	*/
 	TQLayout *parentLayout = 0;
 	if ( parent() && parent()->isWidgetType() ) {
-	    parentLayout = ((TQWidget *)parent())->tqlayout();
+	    parentLayout = ((TQWidget *)parent())->layout();
 	    if ( parentLayout && parentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) )
 		parentLayout = 0;
 	}
@@ -1832,7 +1832,7 @@ void TQLayoutWidget::updateSizePolicy()
 	TQObjectListIt it( childrenListObject() );
 	TQObject *o;
 
-	if ( tqlayout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) {
+	if ( layout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) {
 	    if ( parentLayout && parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
 		vt = TQSizePolicy::Minimum;
 	    else
@@ -1844,16 +1844,16 @@ void TQLayoutWidget::updateSizePolicy()
 		    continue;
 		TQWidget *w = (TQWidget*)o;
 
-		if ( !w->tqsizePolicy().mayGrowHorizontally() )
+		if ( !w->sizePolicy().mayGrowHorizontally() )
 		    ht &= ~TQSizePolicy::Minimum;
-		if ( !w->tqsizePolicy().mayShrinkHorizontally() )
+		if ( !w->sizePolicy().mayShrinkHorizontally() )
 		    ht &= ~TQSizePolicy::Maximum;
-		if ( w->tqsizePolicy().mayGrowVertically() )
+		if ( w->sizePolicy().mayGrowVertically() )
 		    vt |= TQSizePolicy::Minimum;
-		if ( w->tqsizePolicy().mayShrinkVertically() )
+		if ( w->sizePolicy().mayShrinkVertically() )
 		    vt |= TQSizePolicy::Maximum;
 	    }
-	} else if ( tqlayout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) {
+	} else if ( layout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) {
 	    if ( parentLayout && parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
 		ht = TQSizePolicy::Minimum;
 	    else
@@ -1865,16 +1865,16 @@ void TQLayoutWidget::updateSizePolicy()
 		    continue;
 		TQWidget *w = (TQWidget*)o;
 
-		if ( w->tqsizePolicy().mayGrowHorizontally() )
+		if ( w->sizePolicy().mayGrowHorizontally() )
 		    ht |= TQSizePolicy::Minimum;
-		if ( w->tqsizePolicy().mayShrinkHorizontally() )
+		if ( w->sizePolicy().mayShrinkHorizontally() )
 		    ht |= TQSizePolicy::Maximum;
-		if ( !w->tqsizePolicy().mayGrowVertically() )
+		if ( !w->sizePolicy().mayGrowVertically() )
 		    vt &= ~TQSizePolicy::Minimum;
-		if ( !w->tqsizePolicy().mayShrinkVertically() )
+		if ( !w->sizePolicy().mayShrinkVertically() )
 		    vt &= ~TQSizePolicy::Maximum;
 	    }
-	} else if ( tqlayout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
+	} else if ( layout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
 	    ht = TQSizePolicy::Fixed;
 	    vt = TQSizePolicy::Fixed;
 	    if ( parentLayout ) {
@@ -1890,29 +1890,29 @@ void TQLayoutWidget::updateSizePolicy()
 		    continue;
 		TQWidget *w = (TQWidget*)o;
 
-		if ( w->tqsizePolicy().mayGrowHorizontally() )
+		if ( w->sizePolicy().mayGrowHorizontally() )
 		    ht |= TQSizePolicy::Minimum;
-		if ( w->tqsizePolicy().mayShrinkHorizontally() )
+		if ( w->sizePolicy().mayShrinkHorizontally() )
 		    ht |= TQSizePolicy::Maximum;
-		if ( w->tqsizePolicy().mayGrowVertically() )
+		if ( w->sizePolicy().mayGrowVertically() )
 		    vt |= TQSizePolicy::Minimum;
-		if ( w->tqsizePolicy().mayShrinkVertically() )
+		if ( w->sizePolicy().mayShrinkVertically() )
 		    vt |= TQSizePolicy::Maximum;
 	    }
 	}
 #ifdef USE_QT4
-	if ( tqlayout()->expandingDirections() & TQSizePolicy::Horizontally )
+	if ( layout()->expanding() & TQSizePolicy::Horizontally )
 	    ht = TQSizePolicy::Expanding;
-	if ( tqlayout()->expandingDirections() & TQSizePolicy::Vertically )
+	if ( layout()->expanding() & TQSizePolicy::Vertically )
 	    vt = TQSizePolicy::Expanding;
 #else // USE_QT4
-	if ( tqlayout()->expanding() & TQSizePolicy::Horizontally )
+	if ( layout()->expanding() & TQSizePolicy::Horizontally )
 	    ht = TQSizePolicy::Expanding;
-	if ( tqlayout()->expanding() & TQSizePolicy::Vertically )
+	if ( layout()->expanding() & TQSizePolicy::Vertically )
 	    vt = TQSizePolicy::Expanding;
 #endif // USE_QT4
 
-	tqlayout()->tqinvalidate();
+	layout()->invalidate();
     }
 
     sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt );
@@ -1925,7 +1925,7 @@ void CustomWidget::paintEvent( TQPaintEvent *e )
 	( (FormWindow*)parentWidget() )->paintGrid( this, e );
     } else {
 	TQPainter p( this );
-	p.fillRect( rect(), tqcolorGroup().dark() );
+	p.fillRect( rect(), colorGroup().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 9ebce67c..90e88235 100644
--- a/kommander/editor/widgetfactory.h
+++ b/kommander/editor/widgetfactory.h
@@ -72,13 +72,13 @@ public:
 
     static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE,
 			    const TQRect *rect = 0, Qt::Orientation orient = Qt::Horizontal );
-    static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type );
+    static TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type );
     static void deleteLayout( TQWidget *widget );
 
     static LayoutType layoutType( TQWidget *w );
-    static LayoutType layoutType( TQWidget *w, TQLayout *&tqlayout );
-    static LayoutType layoutType( TQLayout *tqlayout );
-    static TQWidget *layoutParent( TQLayout *tqlayout );
+    static LayoutType layoutType( TQWidget *w, TQLayout *&layout );
+    static LayoutType layoutType( TQLayout *layout );
+    static TQWidget *layoutParent( TQLayout *layout );
 
     static TQWidget* containerOfWidget( TQWidget *w );
     static TQWidget* widgetOfContainer( TQWidget *w );
@@ -230,7 +230,7 @@ class TQLayoutWidget : public TQWidget
   TQ_OBJECT
 
 public:
-    TQLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::tqsizePolicy() ) {}
+    TQLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::sizePolicy() ) {}
 
     TQSizePolicy sizePolicy() const;
     void updateSizePolicy();
@@ -252,16 +252,16 @@ public:
     CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw )
 	: TQWidget( parent, name ), cusw( cw ) {
 	    alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" );
-	    tqsetSizePolicy( cw->sizePolicy );
+	    setSizePolicy( cw->sizePolicy );
 	    if ( !alwaysExpand )
 		setBackgroundMode( PaletteDark );
     }
 
-    TQSize tqsizeHint() const {
-	TQSize sh = cusw->tqsizeHint;
+    TQSize sizeHint() const {
+	TQSize sh = cusw->sizeHint;
 	if ( sh.isValid() )
 	    return sh;
-	return TQWidget::tqsizeHint();
+	return TQWidget::sizeHint();
     }
 
     TQString realClassName() { return cusw->className; }
diff --git a/kommander/editor/wizardeditor.ui b/kommander/editor/wizardeditor.ui
index 31c64505..2f5c16e4 100644
--- a/kommander/editor/wizardeditor.ui
+++ b/kommander/editor/wizardeditor.ui
@@ -108,7 +108,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -176,7 +176,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kommander/editor/wizardeditorimpl.cpp b/kommander/editor/wizardeditorimpl.cpp
index 56ff0028..129760d1 100644
--- a/kommander/editor/wizardeditorimpl.cpp
+++ b/kommander/editor/wizardeditorimpl.cpp
@@ -109,7 +109,7 @@ void WizardEditor::addClicked()
     listBox->insertItem( i18n( "Page" ), index );
 
     // schedule add command
-    AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).tqarg( wizard->name() ),
+    AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).arg( 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" )
-								.tqarg( listBox->text( index ) ).tqarg( wizard->name() ),
+								.arg( listBox->text( index ) ).arg( 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" ).tqarg( index1 ).tqarg( index2 )
-							     .tqarg( wizard->name() ), formwindow, wizard, index1, index2);
+    SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n("Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 )
+							     .arg( 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" ).tqarg( index1 ).tqarg( index2 )
-							     .tqarg( wizard->name() ), formwindow, wizard, index2, index1);
+    SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n("Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 )
+							     .arg( 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" ).tqarg( listBox->text( index ) ).tqarg( wizard->name() ) );
+	TQString pn( i18n("Rename page %1 of %2" ).arg( listBox->text( index ) ).arg( wizard->name() ) );
 	RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formwindow, wizard, index, text );
 	commands.append( cmd );
 	listBox->changeItem( text, index );
diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp
index 99fcf474..576709a5 100644
--- a/kommander/editor/workspace.cpp
+++ b/kommander/editor/workspace.cpp
@@ -42,7 +42,7 @@
 #include <tqobjectlist.h>
 #include <tqworkspace.h>
 #include <tqpopupmenu.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include "qcompletionedit.h"
 
 #include <kurldrag.h>
@@ -485,9 +485,9 @@ void Workspace::update( FormFile* ff )
 {
     TQListViewItem* i = findItem( ff );
     if ( i ) {
-  i->tqrepaint();
+  i->repaint();
   if ( (i = i->firstChild()) )
-      i->tqrepaint();
+      i->repaint();
     }
 }
 
diff --git a/kommander/examples/current/a1.kmdr b/kommander/examples/current/a1.kmdr
index bf11dc78..3b81701d 100755
--- a/kommander/examples/current/a1.kmdr
+++ b/kommander/examples/current/a1.kmdr
@@ -145,7 +145,7 @@ debug("pid="+pid)</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>46</width>
                             <height>0</height>
@@ -209,7 +209,7 @@ StatusBar8.setText("Returned: "+b)</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>60</width>
                             <height>0</height>
diff --git a/kommander/examples/current/b1.kmdr b/kommander/examples/current/b1.kmdr
index aac4943d..09725243 100755
--- a/kommander/examples/current/b1.kmdr
+++ b/kommander/examples/current/b1.kmdr
@@ -82,7 +82,7 @@ endif
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>111</width>
                     <height>0</height>
@@ -104,7 +104,7 @@ endif
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>50</width>
                     <height>0</height>
diff --git a/kommander/examples/current/kpartpart.kmdr b/kommander/examples/current/kpartpart.kmdr
index 26e4171c..d6e83b95 100755
--- a/kommander/examples/current/kpartpart.kmdr
+++ b/kommander/examples/current/kpartpart.kmdr
@@ -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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>75</width>
                             <height>0</height>
@@ -156,7 +156,7 @@ endif
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>0</height>
diff --git a/kommander/examples/current/passvariables.kmdr b/kommander/examples/current/passvariables.kmdr
index e984f567..3228edc0 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="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -101,7 +101,7 @@ LineEdit6.setText(ret)</string>
             <property name="text">
                 <string>Pass back</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -140,7 +140,7 @@ endif</string>
             <property name="text">
                 <string>Pass back</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -151,7 +151,7 @@ endif</string>
             <property name="text">
                 <string>Set with @</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -162,7 +162,7 @@ endif</string>
             <property name="text">
                 <string>Return</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -178,7 +178,7 @@ endif</string>
             <property name="text">
                 <string>Return</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -272,7 +272,7 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>108</width>
                     <height>0</height>
@@ -303,7 +303,7 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>71</width>
                             <height>0</height>
diff --git a/kommander/examples/current/tableselect.kmdr b/kommander/examples/current/tableselect.kmdr
index 6a7f0a7a..e084eb89 100755
--- a/kommander/examples/current/tableselect.kmdr
+++ b/kommander/examples/current/tableselect.kmdr
@@ -348,7 +348,7 @@ TextBrowser1.setText(result)
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>24</width>
                     <height>24</height>
@@ -407,7 +407,7 @@ end
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>24</width>
                     <height>24</height>
diff --git a/kommander/examples/old/execprogram.kmdr b/kommander/examples/old/execprogram.kmdr
index 252b80d9..ea7e9dad 100644
--- a/kommander/examples/old/execprogram.kmdr
+++ b/kommander/examples/old/execprogram.kmdr
@@ -59,7 +59,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -89,7 +89,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
diff --git a/kommander/examples/old/resize.kmdr b/kommander/examples/old/resize.kmdr
index 828d45f2..92f9806b 100644
--- a/kommander/examples/old/resize.kmdr
+++ b/kommander/examples/old/resize.kmdr
@@ -143,7 +143,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>141</width>
                             <height>0</height>
@@ -176,7 +176,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>251</width>
                             <height>0</height>
diff --git a/kommander/examples/old/selectedwidgettext.kmdr b/kommander/examples/old/selectedwidgettext.kmdr
index 01f3023c..ddb6d0ba 100644
--- a/kommander/examples/old/selectedwidgettext.kmdr
+++ b/kommander/examples/old/selectedwidgettext.kmdr
@@ -90,7 +90,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>0</width>
                             <height>30</height>
diff --git a/kommander/examples/old/settings.kmdr b/kommander/examples/old/settings.kmdr
index e299bced..b7037ea9 100644
--- a/kommander/examples/old/settings.kmdr
+++ b/kommander/examples/old/settings.kmdr
@@ -182,7 +182,7 @@ Items")
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -215,7 +215,7 @@ Items")
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
diff --git a/kommander/examples/old/tar.kmdr b/kommander/examples/old/tar.kmdr
index b374200a..128f324d 100644
--- a/kommander/examples/old/tar.kmdr
+++ b/kommander/examples/old/tar.kmdr
@@ -281,7 +281,7 @@
                                     <property name="sizeType">
                                         <enum>Fixed</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>30</width>
                                             <height>16</height>
@@ -414,7 +414,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>103</width>
                             <height>0</height>
@@ -439,7 +439,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>104</width>
                             <height>0</height>
@@ -464,7 +464,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>103</width>
                             <height>0</height>
diff --git a/kommander/examples/old/tidy.kmdr b/kommander/examples/old/tidy.kmdr
index 53623c53..785b9dcf 100644
--- a/kommander/examples/old/tidy.kmdr
+++ b/kommander/examples/old/tidy.kmdr
@@ -1091,7 +1091,7 @@ fi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>131</width>
                     <height>0</height>
@@ -1108,7 +1108,7 @@ fi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>121</width>
                     <height>0</height>
diff --git a/kommander/examples/old/widgetgenerator.kmdr b/kommander/examples/old/widgetgenerator.kmdr
index f9551a9d..97267a62 100644
--- a/kommander/examples/old/widgetgenerator.kmdr
+++ b/kommander/examples/old/widgetgenerator.kmdr
@@ -49,7 +49,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -265,7 +265,7 @@ echo "$cppContent" &gt; @directory/$classNameLower.cpp</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
diff --git a/kommander/examples/tutorial/append.kmdr b/kommander/examples/tutorial/append.kmdr
index c5fcb41f..d9c07451 100644
--- a/kommander/examples/tutorial/append.kmdr
+++ b/kommander/examples/tutorial/append.kmdr
@@ -64,7 +64,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
diff --git a/kommander/examples/tutorial/arrays.kmdr b/kommander/examples/tutorial/arrays.kmdr
index 4b9e9968..d0ae1d5e 100644
--- a/kommander/examples/tutorial/arrays.kmdr
+++ b/kommander/examples/tutorial/arrays.kmdr
@@ -117,7 +117,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -181,7 +181,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
diff --git a/kommander/examples/tutorial/calc.kmdr b/kommander/examples/tutorial/calc.kmdr
index 2f17439e..cfe7233f 100644
--- a/kommander/examples/tutorial/calc.kmdr
+++ b/kommander/examples/tutorial/calc.kmdr
@@ -66,13 +66,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>250</width>
                             <height>32767</height>
@@ -91,7 +91,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>250</width>
                             <height>32767</height>
@@ -170,7 +170,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -209,7 +209,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -233,7 +233,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>0</width>
                             <height>91</height>
@@ -250,7 +250,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>0</width>
                             <height>91</height>
diff --git a/kommander/examples/tutorial/cmdline.kmdr b/kommander/examples/tutorial/cmdline.kmdr
index fa140832..0db801d2 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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>149</width>
                     <height>0</height>
@@ -95,7 +95,7 @@ fi</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>148</width>
                     <height>0</height>
diff --git a/kommander/examples/tutorial/dcop.kmdr b/kommander/examples/tutorial/dcop.kmdr
index a39dcf24..a4fe69fc 100644
--- a/kommander/examples/tutorial/dcop.kmdr
+++ b/kommander/examples/tutorial/dcop.kmdr
@@ -59,7 +59,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
diff --git a/kommander/examples/tutorial/initialize.kmdr b/kommander/examples/tutorial/initialize.kmdr
index 62e74b93..9dde0bfc 100644
--- a/kommander/examples/tutorial/initialize.kmdr
+++ b/kommander/examples/tutorial/initialize.kmdr
@@ -59,7 +59,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE"
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
diff --git a/kommander/examples/tutorial/picview.kmdr b/kommander/examples/tutorial/picview.kmdr
index 2c51a869..c01a10e9 100644
--- a/kommander/examples/tutorial/picview.kmdr
+++ b/kommander/examples/tutorial/picview.kmdr
@@ -78,13 +78,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>200</width>
                             <height>32767</height>
diff --git a/kommander/examples/tutorial/progressbar.kmdr b/kommander/examples/tutorial/progressbar.kmdr
index e5ffe4d6..8365d0f0 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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>191</width>
                     <height>0</height>
@@ -123,7 +123,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>191</width>
                     <height>0</height>
diff --git a/kommander/examples/tutorial/settings.kmdr b/kommander/examples/tutorial/settings.kmdr
index 24fb90e5..f4aaa0b1 100644
--- a/kommander/examples/tutorial/settings.kmdr
+++ b/kommander/examples/tutorial/settings.kmdr
@@ -93,7 +93,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -104,7 +104,7 @@
                     <property name="name">
                         <cstring>ExecButton1</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>60</width>
                             <height>0</height>
@@ -129,7 +129,7 @@
                     <property name="name">
                         <cstring>CloseButton1</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>60</width>
                             <height>0</height>
@@ -154,7 +154,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
diff --git a/kommander/examples/tutorial/slots.kmdr b/kommander/examples/tutorial/slots.kmdr
index 46d0a6b1..6bbf7d5f 100644
--- a/kommander/examples/tutorial/slots.kmdr
+++ b/kommander/examples/tutorial/slots.kmdr
@@ -129,7 +129,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -171,7 +171,7 @@ fi
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
diff --git a/kommander/examples/tutorial/strings.kmdr b/kommander/examples/tutorial/strings.kmdr
index 15cfe615..0b4af608 100644
--- a/kommander/examples/tutorial/strings.kmdr
+++ b/kommander/examples/tutorial/strings.kmdr
@@ -145,7 +145,7 @@ fi
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -178,7 +178,7 @@ fi
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
diff --git a/kommander/examples/tutorial/table.kmdr b/kommander/examples/tutorial/table.kmdr
index 0c79cb66..ff8982d4 100644
--- a/kommander/examples/tutorial/table.kmdr
+++ b/kommander/examples/tutorial/table.kmdr
@@ -161,7 +161,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>0</width>
                         <height>30</height>
diff --git a/kommander/examples/tutorial/widgets.kmdr b/kommander/examples/tutorial/widgets.kmdr
index 3cdd5e1c..5f283e49 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.tqchildren(true))</string>
+                    <string>@WidgetList.setText(@Form1.children(true))</string>
                 </stringlist>
             </property>
         </widget>
diff --git a/kommander/executor/dcopkommanderif.h b/kommander/executor/dcopkommanderif.h
index 3158fa6e..1ba67cbb 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 tqchildren(const TQString& parent, bool recursive) = 0;
+virtual TQStringList children(const TQString& parent, 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 f568e9e7..cb95b8b7 100644
--- a/kommander/executor/instance.cpp
+++ b/kommander/executor/instance.cpp
@@ -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").tqarg(++i), *it);
+    m_textInstance->setGlobal(TQString("_ARG%1").arg(++i), *it);
   m_textInstance->setGlobal("_ARGS", stdArgs.join(" "));
   m_textInstance->setGlobal("_ARGCOUNT", TQString::number(stdArgs.count()));
 }
@@ -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>").tqarg(fname.path()));
+      "exist.</qt>").arg(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>").tqarg(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>").arg(fname.pathOrURL()), TQString(), i18n("Run Nevertheless")) == KMessageBox::Cancel)
        return false;
   }
   return true;
@@ -431,7 +431,7 @@ TQString Instance::type(const TQString& widget)
   return TQString();
 }
 
-TQStringList Instance::tqchildren(const TQString& parent, bool recursive)
+TQStringList Instance::children(const TQString& parent, bool recursive)
 {
   TQStringList matching;
   TQObject* child = stringToWidget(parent);
diff --git a/kommander/executor/instance.h b/kommander/executor/instance.h
index 6a0f1b7c..deed56d2 100644
--- a/kommander/executor/instance.h
+++ b/kommander/executor/instance.h
@@ -90,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 tqchildren(const TQString& parent, bool recursive);
+  virtual TQStringList children(const TQString& parent, 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);
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp
index 0247a814..9058513a 100644
--- a/kommander/factory/kommanderfactory.cpp
+++ b/kommander/factory/kommanderfactory.cpp
@@ -36,7 +36,7 @@
 #endif
 #include <tqdom.h>
 #include <tqdir.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmetaobject.h>
 #include "domtool.h"
 #include <tqapplication.h>
@@ -79,13 +79,13 @@
 #include <tqwizard.h>
 #include <tqlcdnumber.h>
 #include <tqprogressbar.h>
-#include <tqtextview.h>
-#include <tqtextbrowser.h>
+#include <textview.h>
+#include <textbrowser.h>
 #include <tqdial.h>
 #include <tqslider.h>
 #include <tqframe.h>
 #include <tqwidgetstack.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqscrollbar.h>
 #include <tqmainwindow.h>
 #include <tqsplitter.h>
@@ -497,7 +497,7 @@ FeatureList KommanderFactory::featureList()
     //iterate through widgetPlugins, appending KommanderPlugin::widgets() to features
 }
 
-TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg )
+TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg )
 {
     lastItem = 0;
     TQDomElement n = e.firstChild().toElement();
@@ -515,10 +515,10 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
     if ( colspan < 1 )
 	colspan = 1;
     if ( !className.isEmpty() ) {
-	if ( !tqlayout && className  == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
+	if ( !layout && className  == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
 	    className = TQWIDGET_OBJECT_NAME_STRING;
-	if ( tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
-	    // hide tqlayout widgets
+	if ( layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
+	    // hide layout widgets
 	    w = parent;
 	} else {
 	    obj = TQT_TQOBJECT(KommanderFactory::createWidget( className, parent, 0 ));
@@ -531,16 +531,16 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
 		toplevel = w;
 	    if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
 		w = ( (TQMainWindow*)w )->centralWidget();
-	    if ( tqlayout ) {
-		switch( layoutType( tqlayout ) ) {
+	    if ( layout ) {
+		switch( layoutType( layout ) ) {
 		case HBox:
-		    ( (TQHBoxLayout*)tqlayout )->addWidget( w );
+		    ( (TQHBoxLayout*)layout )->addWidget( w );
 		    break;
 		case VBox:
-		    ( (TQVBoxLayout*)tqlayout )->addWidget( w );
+		    ( (TQVBoxLayout*)layout )->addWidget( w );
 		    break;
 		case Grid:
-		    ( (TQGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1,
+		    ( (TQGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1,
 								  col, col + colspan - 1 );
 		    break;
 		default:
@@ -548,7 +548,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
 		}
 	    }
 
-	    tqlayout = 0;
+	    layout = 0;
 	}
     }
     if (className == "Dialog")
@@ -556,43 +556,43 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
 
     while ( !n.isNull() ) {
 	if ( n.tagName() == "spacer" ) {
-	    createSpacer( n, tqlayout );
+	    createSpacer( n, layout );
 	} else if ( n.tagName() == "widget" ) {
 	    TQMap< TQString, TQString> *oldDbControls = dbControls;
-	    createWidgetInternal( n, w, tqlayout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
+	    createWidgetInternal( n, w, layout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
 	    dbControls = oldDbControls;
 	} else if ( n.tagName() == "hbox" ) {
-	    TQLayout *parentLayout = tqlayout;
-	    if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		tqlayout = createLayout( 0, 0, KommanderFactory::HBox );
+	    TQLayout *parentLayout = layout;
+	    if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		layout = createLayout( 0, 0, KommanderFactory::HBox );
 	    else
-		tqlayout = createLayout( w, tqlayout, KommanderFactory::HBox );
-	    obj = TQT_TQOBJECT(tqlayout);
+		layout = createLayout( w, layout, KommanderFactory::HBox );
+	    obj = TQT_TQOBJECT(layout);
 	    n = n.firstChild().toElement();
 	    if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 );
+		( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 );
 	    continue;
 	} else if ( n.tagName() == "grid" ) {
-	    TQLayout *parentLayout = tqlayout;
-	    if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		tqlayout = createLayout( 0, 0, KommanderFactory::Grid );
+	    TQLayout *parentLayout = layout;
+	    if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		layout = createLayout( 0, 0, KommanderFactory::Grid );
 	    else
-		tqlayout = createLayout( w, tqlayout, KommanderFactory::Grid );
-	    obj = TQT_TQOBJECT(tqlayout);
+		layout = createLayout( w, layout, KommanderFactory::Grid );
+	    obj = TQT_TQOBJECT(layout);
 	    n = n.firstChild().toElement();
 	    if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 );
+		( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 );
 	    continue;
 	} else if ( n.tagName() == "vbox" ) {
-	    TQLayout *parentLayout = tqlayout;
-	    if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		tqlayout = createLayout( 0, 0, KommanderFactory::VBox );
+	    TQLayout *parentLayout = layout;
+	    if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		layout = createLayout( 0, 0, KommanderFactory::VBox );
 	    else
-		tqlayout = createLayout( w, tqlayout, KommanderFactory::VBox );
-	    obj = TQT_TQOBJECT(tqlayout);
+		layout = createLayout( w, layout, KommanderFactory::VBox );
+	    obj = TQT_TQOBJECT(layout);
 	    n = n.firstChild().toElement();
 	    if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 );
+		( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 );
 	    continue;
 	} else if ( n.tagName() == "property" && obj ) {
 	    setProperty( obj, n.attribute( "name" ), n.firstChild().toElement() );
@@ -622,60 +622,60 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
     return w;
 }
 
-TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout*  tqlayout, LayoutType type )
+TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout*  layout, LayoutType type )
 {
     int spacing = defSpacing;
     int margin = defMargin;
 
-    if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
+    if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
 	widget = ((TQTabWidget*)widget)->currentPage();
-    if ( !tqlayout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
+    if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
     widget = ((TQToolBox*)widget)->currentItem();
 
-    if ( !tqlayout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
+    if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
 	widget = ((TQWizard*)widget)->currentPage();
 
-    if ( !tqlayout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
+    if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
 	widget = ((TQWidgetStack*)widget)->visibleWidget();
 
-    if ( !tqlayout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
+    if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
 	TQGroupBox *gb = (TQGroupBox*)widget;
 	gb->setColumnLayout( 0, Qt::Vertical );
-	gb->tqlayout()->setMargin( 0 );
-	gb->tqlayout()->setSpacing( 0 );
+	gb->layout()->setMargin( 0 );
+	gb->layout()->setSpacing( 0 );
 	TQLayout *l;
 	switch ( type ) {
 	case HBox:
-	    l = new TQHBoxLayout( gb->tqlayout() );
-	    l->tqsetAlignment( TQt::AlignTop );
+	    l = new TQHBoxLayout( gb->layout() );
+	    l->setAlignment( TQt::AlignTop );
 	    return l;
 	case VBox:
-	    l = new TQVBoxLayout( gb->tqlayout(), spacing );
-	    l->tqsetAlignment( TQt::AlignTop );
+	    l = new TQVBoxLayout( gb->layout(), spacing );
+	    l->setAlignment( TQt::AlignTop );
 	    return l;
 	case Grid:
-	    l = new TQGridLayout( gb->tqlayout() );
-	    l->tqsetAlignment( TQt::AlignTop );
+	    l = new TQGridLayout( gb->layout() );
+	    l->setAlignment( TQt::AlignTop );
 	    return l;
 	default:
 	    return 0;
 	}
     } else {
-	if ( tqlayout ) {
+	if ( layout ) {
 	    TQLayout *l;
 	    switch ( type ) {
 	    case HBox:
-		l = new TQHBoxLayout( tqlayout );
+		l = new TQHBoxLayout( layout );
 		l->setSpacing( spacing );
 		l->setMargin( margin );
 		return l;
 	    case VBox:
-		l = new TQVBoxLayout( tqlayout );
+		l = new TQVBoxLayout( layout );
 		l->setSpacing( spacing );
 		l->setMargin( margin );
 		return l;
 	    case Grid: {
-		l = new TQGridLayout( tqlayout );
+		l = new TQGridLayout( layout );
 		l->setSpacing( spacing );
 		l->setMargin( margin );
 		return l;
@@ -715,20 +715,20 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout*  tqlayout,
     }
 }
 
-KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *tqlayout ) const
+KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *layout ) const
 {
-    if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
+    if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
 	return HBox;
-    else if ( tqlayout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
+    else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
 	return VBox;
-    else if ( tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+    else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
 	return Grid;
     return NoLayout;
 }
 
 void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const TQDomElement &e )
 {
-    const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, true ), true );
+    const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true );
 
     TQVariant defVariant;
     if ( e.tagName() == "font" ) {
@@ -840,7 +840,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T
     obj->setProperty( prop, v );
 }
 
-void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
+void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
 {
     TQDomElement n = e.firstChild().toElement();
     int row = e.attribute( "row" ).toInt();
@@ -872,7 +872,7 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
 		    sizeType = TQSizePolicy::MinimumExpanding;
 		else if ( n.firstChild().firstChild().toText().data() == "Expanding" )
 		    sizeType = TQSizePolicy::Expanding;
-	    } else if ( prop == "tqsizeHint" ) {
+	    } else if ( prop == "sizeHint" ) {
 		w = n.firstChild().firstChild().firstChild().toText().data().toInt();
 		h = n.firstChild().firstChild().nextSibling().firstChild().toText().data().toInt();
 	    }
@@ -886,11 +886,11 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
 	colspan = 1;
     TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum,
 					 orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum );
-    if ( tqlayout ) {
-	if ( tqlayout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
-	    ( (TQBoxLayout*)tqlayout )->addItem( item );
+    if ( layout ) {
+	if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
+	    ( (TQBoxLayout*)layout )->addItem( item );
 	else
-	    ( (TQGridLayout*)tqlayout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1,
+	    ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1,
 						    orient == Qt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter );
     }
 }
@@ -1093,16 +1093,16 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
 
 	    if ( lang == "C++" ) {
 		TQString s = "2""%1";
-		s = s.tqarg( conn.signal.data() );
+		s = s.arg( conn.signal.data() );
 		TQString s2 = "1""%1";
-		s2 = s2.tqarg( conn.slot.data() );
+		s2 = s2.arg( conn.slot.data() );
 
-		TQStrList signalList = sender->tqmetaObject()->signalNames( true );
-		TQStrList slotList = receiver->tqmetaObject()->slotNames( true );
+		TQStrList signalList = sender->metaObject()->signalNames( true );
+		TQStrList slotList = receiver->metaObject()->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 && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel) && connector ) {
-		    slotList = connector->tqmetaObject()->slotNames( true );
+		    slotList = connector->metaObject()->slotNames( true );
 		    receiver = connector;
 		}
 
diff --git a/kommander/factory/kommanderfactory.h b/kommander/factory/kommanderfactory.h
index 9b38ae9e..609d0a73 100644
--- a/kommander/factory/kommanderfactory.h
+++ b/kommander/factory/kommanderfactory.h
@@ -74,11 +74,11 @@ 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* tqlayout, const TQString &classNameArg );
-    TQLayout *createLayout( TQWidget *widget, TQLayout*  tqlayout, LayoutType type );
+    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;
     void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e );
-    void createSpacer( const TQDomElement &e, TQLayout *tqlayout );
+    void createSpacer( const TQDomElement &e, TQLayout *layout );
     TQImage loadFromCollection( const TQString &name );
     TQPixmap loadPixmap( const TQDomElement &e );
     TQColorGroup loadColorGroup( const TQDomElement &e );
diff --git a/kommander/kmdrtools/dcoptool-oldparser.kmdr b/kommander/kmdrtools/dcoptool-oldparser.kmdr
index 21a13ae7..f4d758ca 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)
-tqchildren(QString,bool)
+children(QString,bool)
 clear(QString)
 count(QString)
 currentColumn(QString)
@@ -382,7 +382,7 @@ args(QString,QString,QString,QString)")
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>80</width>
                         <height>0</height>
@@ -443,7 +443,7 @@ args(QString,QString,QString,QString)")
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>120</width>
                         <height>0</height>
@@ -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 tqchildren kmdr-executor-32730 1
+@# dcop kmdr-executor-32730 KommanderIf children kmdr-executor-32730 1
 @wname.clear
-@setGlobal(items,@dcop(@global(pdlg), KommanderIf, "tqchildren(QString,bool)", @global(pdlg), 1 ))
+@setGlobal(items,@dcop(@global(pdlg), KommanderIf, "children(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="tqsizeHint">
+                <property name="sizeHint">
                     <size>
                         <width>111</width>
                         <height>0</height>
@@ -789,13 +789,13 @@ fi
   @setGlobal(PARM4,"")
   @setGlobal(short,checked)
   @setGlobal(DESC,"Returns 1 for checked boxes, 0 for unchecked.")
-@case(DCOP::tqchildren(QString,bool))
+@case(DCOP::children(QString,bool))
   @setGlobal(enWidget,1)
   @setGlobal(PARM1,"recursive")
   @setGlobal(PARM2,"")
   @setGlobal(PARM3,"")
   @setGlobal(PARM4,"")
-  @setGlobal(short,tqchildren)
+  @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.")
 @case(DCOP::clear(QString))
   @setGlobal(enWidget,1)
@@ -1820,7 +1820,7 @@ fi
 associatedText(QString)
 cellText(QString,int,int)
 checked(QString)
-tqchildren(QString,bool)
+children(QString,bool)
 clear(QString)
 count(QString)
 currentColumn(QString)
diff --git a/kommander/kmdrtools/examples.kmdr b/kommander/kmdrtools/examples.kmdr
index e0fbe1f2..b5a5f5d7 100755
--- a/kommander/kmdrtools/examples.kmdr
+++ b/kommander/kmdrtools/examples.kmdr
@@ -99,7 +99,7 @@ end
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>71</width>
                             <height>0</height>
@@ -134,7 +134,7 @@ endif</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>71</width>
                             <height>0</height>
diff --git a/kommander/part/kommander_part.cpp b/kommander/part/kommander_part.cpp
index dd42e82b..6e6c7907 100644
--- a/kommander/part/kommander_part.cpp
+++ b/kommander/part/kommander_part.cpp
@@ -20,7 +20,7 @@
 #include <kparts/genericfactory.h>
 
 #include <tqpoint.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 
 #include "instance.h"
diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp
index ae79ca68..41ea61b4 100644
--- a/kommander/plugin/specialinformation.cpp
+++ b/kommander/plugin/specialinformation.cpp
@@ -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").tqarg(m_types[i]).tqarg(m_args[i]));
+      params.append(TQString("%1 %2").arg(m_types[i]).arg(m_args[i]));
     else
       params.append(m_types[i]);
   if (!params.count())
     return m_function;
   else if (prototypeFlags & NoSpaces)
-    return TQString("%1(%2)").tqarg(m_function).tqarg(params.join(","));
+    return TQString("%1(%2)").arg(m_function).arg(params.join(","));
   else
-    return TQString("%1(%2)").tqarg(m_function).tqarg(params.join(", "));
+    return TQString("%1(%2)").arg(m_function).arg(params.join(", "));
 }
 
 TQString SpecialFunction::argumentName(uint i) const
@@ -291,7 +291,7 @@ 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::tqchildren, "tqchildren(TQString widget, bool recursive)",
+  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::clear, "clear(TQString widget)",
          i18n("Removes all content from the widget."), 1);
@@ -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::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::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::hasFocus, "hasFocus(TQString widget)", 
      i18n("Returns true if the widget has focus."), 1);
   insertInternal(DCOP::getBackgroundColor, "getBackgroundColor(TQString widget)", 
diff --git a/kommander/plugin/specials.h b/kommander/plugin/specials.h
index ec809161..40ff162e 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, tqchildren, columnCount, count, currentColumn,
+  enum {addUniqueItem, associatedText, cancel, cellText, clear, checked, children, 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, tqgeometry, hasFocus, isModified};
+    setVisible, text, type, setCellWidget, cellWidget, setEditable, geometry, hasFocus, isModified};
 }
 
 namespace Kommander
 {
   enum {widgetText, selectedWidgetText, null, pid, dcopid, parentPid, 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}; //, tqfocusWidget};
+  switchBlock, execBegin, forBlock, forEachBlock, ifBlock, comment, createWidget, connect, disconnect, widgetExists, exit, Break, Continue, Return, execBackground, switchInternal}; //, focusWidget};
 }
 
 namespace Array
diff --git a/kommander/pluginmanager/main.cpp b/kommander/pluginmanager/main.cpp
index 7de3eb27..b1dbe8dd 100644
--- a/kommander/pluginmanager/main.cpp
+++ b/kommander/pluginmanager/main.cpp
@@ -77,12 +77,12 @@ 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'").tqarg((*it).data()).local8Bit().data();
+        cerr << i18n("Error adding plugin '%1'").arg((*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'").tqarg((*it).data()).local8Bit().data();
+        cerr << i18n("Error removing plugin '%1'").arg((*it).data()).local8Bit().data();
     
     if (args->isSet("list"))
     {
diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp
index 6148296b..94d365f5 100644
--- a/kommander/pluginmanager/mainwindow.cpp
+++ b/kommander/pluginmanager/mainwindow.cpp
@@ -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>").tqarg(plugin);
+    TQString errMsg = i18n("<qt>Unable to load Kommander plugin<br><b>%1</b></qt>").arg(plugin);
     KMessageBox::error(this, errMsg, i18n("Cannot add plugin"));
   }
   else
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index 8886acab..eeff0d63 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -27,7 +27,7 @@
 #include <stdlib.h> 
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstringlist.h>
 #include <tqmetaobject.h>
 
@@ -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().tqarg(params[1].toString());
+    return params[0].toString().arg(params[1].toString());
   else if (params.count() == 3)
-    return params[0].toString().tqarg(params[1].toString()).tqarg(params[2].toString());
+    return params[0].toString().arg(params[1].toString()).arg(params[2].toString());
   else 
-    return params[0].toString().tqarg(params[1].toString()).tqarg(params[2].toString()).tqarg(params[3].toString());
+    return params[0].toString().arg(params[1].toString()).arg(params[2].toString()).arg(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->tqmetaObject()->slotNames(true);
+  TQStrList slotSignatures = object->metaObject()->slotNames(true);
   TQStringList slotNames = TQStringList::fromStrList(slotSignatures);
   int slotNum = -1;
   uint i = 0;
@@ -361,7 +361,7 @@ static ParseNode f_dcop(Parser*, const ParameterList& params)
     else 
       byteDataStream << params[i++].toString();
   }
-  function.append(TQString("(%1)").tqarg(items.join(",")));
+  function.append(TQString("(%1)").arg(items.join(",")));
   TQCString replyType, byteReply;
   DCOPClient* cl = KApplication::dcopClient();
   if (!cl || !cl->call(appId, object, function.latin1(),
@@ -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.").tqarg(replyType.data()).latin1());
+     qDebug("%s", TQString("DCOP return type %1 is not yet implemented.").arg(replyType.data()).latin1());
   }
 
   return ParseNode();
@@ -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")
-    .tqarg(pFileName).tqarg(a_params).tqarg(getpid()).tqarg(getpid());
+    .arg(pFileName).arg(a_params).arg(getpid()).arg(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").tqarg(*it).tqarg((*itval).toString());
+    array += TQString("%1\t%2\n").arg(*it).arg((*itval).toString());
     ++it;
     ++itval;
   }
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index 701b5e01..6a2ce197 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -19,7 +19,7 @@
 
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
  
 #include <dcopclient.h>
 #include <kapplication.h>
@@ -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").tqarg(var),
+    TQString block = substituteVariable(s.mid(start, f - start), TQString("%1_count").arg(var),
       TQString::number(loop.count()));
-    TQString varidx = TQString("%1_index").tqarg(var);
+    TQString varidx = TQString("%1_index").arg(var);
     for (uint i=0; i<loop.count(); i++)
       output += evalAssociatedText(substituteVariable(substituteVariable(block, varidx, TQString::number(i+1)),
         var, loop[i]));
@@ -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").tqarg(it.key()).tqarg(it.data().toString());
+        arraystring += TQString("%1\t%2\n").arg(it.key()).arg(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.").tqarg(identifier));
+    printError(i18n("Unknown widget: @%1.").arg(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.").tqarg(pWidget->widgetName())
-        .tqarg(pWidget->widgetName()));
+    printError(i18n("Infinite loop: @%1 called inside @%2.").arg(pWidget->widgetName())
+        .arg(pWidget->widgetName()));
     return TQString();
   }
   else if (!pWidget->hasAssociatedText())
   {
-    printError(i18n("Script for @%1 is empty.").tqarg(pWidget->widgetName()));
+    printError(i18n("Script for @%1 is empty.").arg(pWidget->widgetName()));
     return TQString();
   }
   return pWidget->evalAssociatedText();
diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp
index d0f9e885..182f7faf 100644
--- a/kommander/widget/kommanderwidget.cpp
+++ b/kommander/widget/kommanderwidget.cpp
@@ -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").tqarg(p.errorLine()+1).tqarg(p.errorMessage()));
+      printError(i18n("Line %1: %2.\n").arg(p.errorLine()+1).arg(p.errorMessage()));
     return TQString();
   }
   /* Old macro-only parser is implemented below  */
@@ -241,7 +241,7 @@ TQString KommanderWidget::evalAssociatedText(const TQString& a_text)
     }
     else
     {
-      printError(i18n("Unknown special: \'%1\'.").tqarg(identifier));
+      printError(i18n("Unknown special: \'%1\'.").arg(identifier));
       return TQString();
     }
   }
@@ -271,13 +271,13 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query)
   }
   if (!ok)
   {
-    printError(i18n("Unmatched parenthesis in DCOP call \'%1\'.").tqarg(a_query[2]));
+    printError(i18n("Unmatched parenthesis in DCOP call \'%1\'.").arg(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\'.").tqarg(a_query[2]));
+    printError(i18n("Incorrect arguments in DCOP call \'%1\'.").arg(a_query[2]));
     return TQString();
   }
 
@@ -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.").tqarg(replyType.data()));
+    printError(i18n("DCOP return type %1 is not yet implemented.").arg(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")
-    .tqarg(pFileName).tqarg(a_params).tqarg(getpid()).tqarg(getpid());
+    .arg(pFileName).arg(a_params).arg(getpid()).arg(getpid());
   return execCommand(cmd);
 }
 
@@ -405,8 +405,8 @@ 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>").tqarg(TQString(m_thisObject->name()))
-                    .tqarg(a_error), TQStringList(), TQString(), 0, 0))
+                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))
     {
       case KDialogBase::No:
         showErrors = false;
@@ -424,7 +424,7 @@ void KommanderWidget::printError(const TQString& a_error) const
   }
   else 
   {
-    kdError() << i18n("Error in widget %1:\n  %2\n").tqarg(m_thisObject->name()).tqarg(a_error);
+    kdError() << i18n("Error in widget %1:\n  %2\n").arg(m_thisObject->name()).arg(a_error);
   }
 }
 
@@ -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\'.").tqarg(function));
+    printError(i18n("Unmatched parenthesis after \'%1\'.").arg(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\'.").tqarg(function));
+    printError(i18n("Unmatched quotes in argument of \'%1\'.").arg(function));
   else if (gname == -1)
-    printError(i18n("Unknown function group: \'%1\'.").tqarg(group));
+    printError(i18n("Unknown function group: \'%1\'.").arg(group));
   else if (fname == -1 && !extraArg)
-    printError(i18n("Unknown function: \'%1\' in group '%2'.").tqarg(function).tqarg(group));
+    printError(i18n("Unknown function: \'%1\' in group '%2'.").arg(function).arg(group));
   else if (fname == -1 && extraArg)
-    printError(i18n("Unknown widget function: \'%1\'.").tqarg(function));
+    printError(i18n("Unknown widget function: \'%1\'.").arg(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")
-        .tqarg(function).tqarg(args.count() + extraArg).tqarg(SpecialInformation::minArg(gname, fname))
-        .tqarg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames)));
+        .arg(function).arg(args.count() + extraArg).arg(SpecialInformation::minArg(gname, fname))
+        .arg(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")
-      .tqarg(function).tqarg(args.count() + extraArg).tqarg(SpecialInformation::maxArg(gname, fname))
-      .tqarg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames)));
+      .arg(function).arg(args.count() + extraArg).arg(SpecialInformation::maxArg(gname, fname))
+      .arg(SpecialInformation::prototype(gname, fname, SpecialFunction::ShowArgumentNames)));
   else 
     success = true;
   ok = success;
@@ -627,7 +627,7 @@ int KommanderWidget::parseBlockBoundary(const TQString& s, int from, const TQStr
 
 TQString KommanderWidget::substituteVariable(TQString text, TQString variable, TQString value) const
 {
-  TQString var = TQString("@%1").tqarg(variable);
+  TQString var = TQString("@%1").arg(variable);
   TQString newtext;
   int newpos, pos = 0;
   while (true)
@@ -692,7 +692,7 @@ TQString KommanderWidget::handleDCOP(const int function, const TQStringList& arg
       break;
     case DCOP::type:
       return current->className();
-    case DCOP::tqchildren:
+    case DCOP::children:
     {
       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::tqchildren || f == DCOP::type;
+  return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::children || f == DCOP::type;
 }
 
 bool KommanderWidget::isCommonFunction(int f)
 {
-  return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::tqchildren || f == DCOP::type;
+  return f == DCOP::setEnabled || f == DCOP::setVisible || f == DCOP::children || f == DCOP::type;
 }
 
 ParserData* KommanderWidget::internalParserData() const
@@ -732,7 +732,7 @@ TQString KommanderWidget::fileName()
 TQString KommanderWidget::widgetName() const
 {
   if (m_thisObject)
-    return TQString::tqfromLatin1(m_thisObject->name());
+    return TQString::fromLatin1(m_thisObject->name());
   else
     return TQString();
 }
diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp
index 90d2caf0..111612b5 100644
--- a/kommander/widget/myprocess.cpp
+++ b/kommander/widget/myprocess.cpp
@@ -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>").tqarg(shellName));
+    m_atw->printError(i18n("<qt>Failed to start shell process<br><b>%1</b></qt>").arg(shellName));
     return TQString();
   }
   mProcess->writeStdin(m_input, m_input.length());
diff --git a/kommander/widget/parser.cpp b/kommander/widget/parser.cpp
index 848507bb..09841908 100644
--- a/kommander/widget/parser.cpp
+++ b/kommander/widget/parser.cpp
@@ -113,7 +113,7 @@ bool Parser::setString(const TQString& s)
     else                          // Bad character
     {
       insertNode(s.mid(start, 1), lines);
-      setError(i18n("Invalid character: '%1'").tqarg(s[start]), m_parts.count()-1);
+      setError(i18n("Invalid character: '%1'").arg(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").tqarg(p.variableName()).tqarg(variable(p.variableName()).toString()));
+        setError(i18n("'%1' (%2) is not a widget").arg(p.variableName()).arg(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").tqarg(p.variableName()));
+       setError(i18n("'%1' is not a function").arg(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").tqarg(name).tqarg(i18n("too few parameters")), pos);
+    setError(i18n("in function '%1': %2").arg(name).arg(i18n("too few parameters")), pos);
   else if (f.maxArgs() < params.count())
-    setError(i18n("in function '%1': %2").tqarg(name).tqarg(i18n("too many parameters")), pos);
+    setError(i18n("in function '%1': %2").arg(name).arg(i18n("too many parameters")), pos);
   else if (mode == Execute)
   {
     ParseNode p = f.execute(this, params);
     if (!p.isValid())
     {
-      setError(i18n("in function '%1': %2").tqarg(name).tqarg(p.errorMessage()), pos);
+      setError(i18n("in function '%1': %2").arg(name).arg(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").tqarg(widget).tqarg(var).tqarg(p.errorMessage()), pos);
+      setError(i18n("in widget function '%1.%2': %3").arg(widget).arg(var).arg(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").tqarg(var));
+      setError(i18n("'%1' is not a widget").arg(var));
   }
   else if (tryKeyword(LeftParenthesis, CheckOnly))
-    setError(i18n("'%1' is not a function").tqarg(var));
+    setError(i18n("'%1' is not a function").arg(var));
   else 
-    setError(i18n("Unexpected symbol after variable '%1'").tqarg(var));
+    setError(i18n("Unexpected symbol after variable '%1'").arg(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").tqarg(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").arg(m_data->keywordToString(k)));
     else
-     setError(i18n("Expected '%1'").tqarg(m_data->keywordToString(k)));
+     setError(i18n("Expected '%1'").arg(m_data->keywordToString(k)));
   }
   return false;
 }
diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index 097d0d22..341bb5a4 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-#include <tqtextstream.h>
+#include <textstream.h>
 
 enum Functions {
   FirstFunction = 159,
diff --git a/kommander/widgets/buttongroup.cpp b/kommander/widgets/buttongroup.cpp
index e0c8b6ed..a110889a 100644
--- a/kommander/widgets/buttongroup.cpp
+++ b/kommander/widgets/buttongroup.cpp
@@ -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::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
+  return f == DCOP::text || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
 }
     
 
@@ -133,7 +133,7 @@ TQString ButtonGroup::handleDCOP(int function, const TQStringList& args)
     case BG_selectedId:
       return TQString::number(this->selectedId() );
       break;
-    case DCOP::tqgeometry:
+    case DCOP::geometry:
     {
       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.cpp b/kommander/widgets/checkbox.cpp
index 696a9b2b..61ab0aff 100644
--- a/kommander/widgets/checkbox.cpp
+++ b/kommander/widgets/checkbox.cpp
@@ -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::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::geometry || 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::tqgeometry:
+    case DCOP::geometry:
     {
       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.cpp b/kommander/widgets/combobox.cpp
index 844220c1..d33a5147 100644
--- a/kommander/widgets/combobox.cpp
+++ b/kommander/widgets/combobox.cpp
@@ -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::tqgeometry || 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::geometry || 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::tqgeometry:
+    case DCOP::geometry:
     {
       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.cpp b/kommander/widgets/datepicker.cpp
index ffaebcae..40b29de6 100644
--- a/kommander/widgets/datepicker.cpp
+++ b/kommander/widgets/datepicker.cpp
@@ -101,7 +101,7 @@ void DatePicker::contextMenuEvent( TQContextMenuEvent * e )
 
 bool DatePicker::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::tqgeometry || f == DCOP::hasFocus ;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || 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::tqgeometry:
+    case DCOP::geometry:
     {
       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/dialog.cpp b/kommander/widgets/dialog.cpp
index 15dd7e30..21a3f7c1 100644
--- a/kommander/widgets/dialog.cpp
+++ b/kommander/widgets/dialog.cpp
@@ -34,7 +34,7 @@
 
 enum Functions {
   FirstFunction = 185,
-  D_tqfocusWidget,
+  D_focusWidget,
   D_waitCursor,
   D_restoreCursor,
   LastFunction
@@ -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_tqfocusWidget, "tqfocusWidget(TQString widget)",  i18n("The name of the widget having focus"), 1);
+  KommanderPlugin::registerFunction(D_focusWidget, "focusWidget(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);
 }
@@ -193,7 +193,7 @@ void Dialog::contextMenuEvent( TQContextMenuEvent * e )
 
 bool Dialog::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::tqgeometry || (f > FirstFunction && f < LastFunction);
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || (f > FirstFunction && f < LastFunction);
 }
 
 TQString Dialog::handleDCOP(int function, const TQStringList& args)
@@ -204,11 +204,11 @@ TQString Dialog::handleDCOP(int function, const TQStringList& args)
     case DCOP::setText:
       setWidgetText(args[0]);
       break;
-    case DCOP::tqgeometry:
+    case DCOP::geometry:
       return TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       break;
-    case D_tqfocusWidget:
-      return tqfocusWidget()->name();
+    case D_focusWidget:
+      return focusWidget()->name();
       break;
     case D_waitCursor:
       TQApplication::setOverrideCursor(TQCursor(TQt::WaitCursor));
diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp
index 549b9678..3d6df7c3 100644
--- a/kommander/widgets/execbutton.cpp
+++ b/kommander/widgets/execbutton.cpp
@@ -113,7 +113,7 @@ void ExecButton::setWidgetText(const TQString& a_text)
 void ExecButton::startProcess()
 {
   TQString at = evalAssociatedText().stripWhiteSpace();
-  bool enabledtqStatus = isEnabled();
+  bool enabledStatus = isEnabled();
   if (m_blockGUI != None)
     setEnabled(false);
   if (m_blockGUI == GUI)
@@ -128,7 +128,7 @@ void ExecButton::startProcess()
     if (writeStdout())
       cout << m_output << flush;
   }
-  setEnabled(enabledtqStatus);
+  setEnabled(enabledStatus);
 }
 
 
@@ -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::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction);
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::execute || f == DCOP::geometry || 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::tqallWidgets();
+      TQWidgetList  *list = TQApplication::allWidgets();
       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::tqgeometry:
+    case DCOP::geometry:
     {
       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/fileselector.cpp b/kommander/widgets/fileselector.cpp
index 51afa92a..a1f08ec5 100644
--- a/kommander/widgets/fileselector.cpp
+++ b/kommander/widgets/fileselector.cpp
@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 #include <tqstringlist.h>
 #include <tqevent.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsizepolicy.h>
 
 /* OTHER INCLUDES */
@@ -50,9 +50,9 @@ FileSelector::FileSelector(TQWidget * a_parent, const char *a_name)
   m_boxLayout->addWidget(m_lineEdit);
   m_boxLayout->addWidget(m_selectButton);
 
-  tqsetSizePolicy(m_lineEdit->sizePolicy());
-  m_lineEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
-  m_selectButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+  setSizePolicy(m_lineEdit->sizePolicy());
+  m_lineEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+  m_selectButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 
   connect(m_selectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(makeSelection()));
 
diff --git a/kommander/widgets/groupbox.cpp b/kommander/widgets/groupbox.cpp
index aef8042d..7d4f43e8 100644
--- a/kommander/widgets/groupbox.cpp
+++ b/kommander/widgets/groupbox.cpp
@@ -108,7 +108,7 @@ void GroupBox::contextMenuEvent( TQContextMenuEvent * e )
 
 bool GroupBox::isFunctionSupported(int f)
 {
-  return f == DCOP::text || f == DCOP::setText || f == DCOP::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || 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::tqgeometry:
+    case DCOP::geometry:
     {
       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.cpp b/kommander/widgets/label.cpp
index 6c6eb787..2f4b0dea 100644
--- a/kommander/widgets/label.cpp
+++ b/kommander/widgets/label.cpp
@@ -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::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::geometry || 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::tqgeometry:
+    case DCOP::geometry:
     {
       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.cpp b/kommander/widgets/lineedit.cpp
index 07a852b7..991f64b0 100644
--- a/kommander/widgets/lineedit.cpp
+++ b/kommander/widgets/lineedit.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 /* QT INCLUDES */
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqevent.h>
 
 /* OTHER INCLUDES */
@@ -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::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction) ;
+    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) ;
 }
 
 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::tqgeometry:
+    case DCOP::geometry:
     {
       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 80c5e8b9..784c9d9b 100644
--- a/kommander/widgets/lineedit.h
+++ b/kommander/widgets/lineedit.h
@@ -21,7 +21,7 @@
 #include <klineedit.h>
 
 /* QT INCLUDES */
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqstringlist.h>
 #include <tqstring.h>
 
diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp
index 8612dea2..5f9fdf02 100644
--- a/kommander/widgets/listbox.cpp
+++ b/kommander/widgets/listbox.cpp
@@ -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::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+      f == DCOP::findItem || f == DCOP::setPixmap || f == DCOP::count || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
 }
 
 void ListBox::contextMenuEvent( TQContextMenuEvent * e )
@@ -197,7 +197,7 @@ TQString ListBox::handleDCOP(int function, const TQStringList& args)
         strings += item(i)->text();
       return strings.join("\n");
     }
-    case DCOP::tqgeometry:
+    case DCOP::geometry:
     {
       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.cpp b/kommander/widgets/pixmaplabel.cpp
index 4bac254e..4ccf921b 100644
--- a/kommander/widgets/pixmaplabel.cpp
+++ b/kommander/widgets/pixmaplabel.cpp
@@ -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::tqgeometry;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::geometry;
 }
 
 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::tqgeometry:
+    case DCOP::geometry:
     {
       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.cpp b/kommander/widgets/popupmenu.cpp
index ab52aac6..65bbdc7a 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -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)").tqarg(widget).tqarg(id)); 
+  KommanderWidget::evalAssociatedText(TQString("#!kommander\n%1.execute(%2)").arg(widget).arg(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::tqgeometry;
+  return f == DCOP::clear || f == DCOP::execute || f == DCOP::item || (f >= INSERTMENUITEM && f <= LAST_FUNCTION) || f == DCOP::count || f == DCOP::geometry;
 }
 
 TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
@@ -229,7 +229,7 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args)
     case DCOP::count:
       return TQString::number(m_menu->count());
       break;
-    case DCOP::tqgeometry:
+    case DCOP::geometry:
     {
       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/progressbar.cpp b/kommander/widgets/progressbar.cpp
index f78ce62c..8d2a51e2 100644
--- a/kommander/widgets/progressbar.cpp
+++ b/kommander/widgets/progressbar.cpp
@@ -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::tqgeometry || (f > FirstFunction && f < LastFunction);
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::setMaximum || f == DCOP::geometry || (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::tqgeometry:
+    case DCOP::geometry:
     {
       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->tqsetPalette( p, TRUE );
+      this->setPalette( 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->tqsetPalette( p, TRUE );
+      this->setPalette( p, TRUE );
       break;
     }
     default:
diff --git a/kommander/widgets/radiobutton.cpp b/kommander/widgets/radiobutton.cpp
index 317263e4..d6306c80 100644
--- a/kommander/widgets/radiobutton.cpp
+++ b/kommander/widgets/radiobutton.cpp
@@ -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::tqgeometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::setChecked || f == DCOP::checked || f == DCOP::geometry || 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::tqgeometry:
+    case DCOP::geometry:
     {
       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/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp
index 5c6c530c..04014c17 100644
--- a/kommander/widgets/richtexteditor.cpp
+++ b/kommander/widgets/richtexteditor.cpp
@@ -17,12 +17,12 @@
 #include <klocale.h>
 
 /* QT INCLUDES */
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqevent.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqframe.h>
 #include <tqwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtoolbutton.h>
 #include <tqpixmap.h>
 #include <tqhbuttongroup.h>
@@ -61,11 +61,11 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name)
 	m_textedit = new TQTextEdit(this, "editor");
 	m_textedit->setTextFormat(RichText);
 
-	// tqlayout the widgets
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
-	tqlayout->addWidget(m_toolbar);
-	tqlayout->addWidget(m_textedit);
-	tqlayout->setSpacing(1);
+	// layout the widgets
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
+	layout->addWidget(m_toolbar);
+	layout->addWidget(m_textedit);
+	layout->setSpacing(1);
 
 	// setup buttons
 	TQHBoxLayout *tbLayout = new TQHBoxLayout(m_toolbar);
@@ -182,11 +182,11 @@ void RichTextEditor::textAlign(int a_id)
 {
   TQToolButton *b = (TQToolButton *)m_alignGroup->find(a_id);
   if(b == m_buttonTextLeft)
-    m_textedit->tqsetAlignment(TQt::AlignLeft);
+    m_textedit->setAlignment(TQt::AlignLeft);
   else if(b == m_buttonTextCenter)
-    m_textedit->tqsetAlignment(TQt::AlignCenter);
+    m_textedit->setAlignment(TQt::AlignCenter);
   else if(b == m_buttonTextRight)
-    m_textedit->tqsetAlignment(TQt::AlignRight);
+    m_textedit->setAlignment(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_tqalignment)
+void RichTextEditor::alignmentChanged(int a_alignment)
 {
-  if((a_tqalignment == AlignAuto) || (a_tqalignment & AlignLeft)) 
+  if((a_alignment == AlignAuto) || (a_alignment & AlignLeft)) 
     m_buttonTextLeft->setOn(true);
-  else if(a_tqalignment & AlignHCenter) 
+  else if(a_alignment & AlignHCenter) 
     m_buttonTextCenter->setOn(true);
-  else if(a_tqalignment & AlignRight) 
+  else if(a_alignment & AlignRight) 
     m_buttonTextRight->setOn(true);
 }
 
diff --git a/kommander/widgets/spinboxint.cpp b/kommander/widgets/spinboxint.cpp
index cc264f34..72991376 100644
--- a/kommander/widgets/spinboxint.cpp
+++ b/kommander/widgets/spinboxint.cpp
@@ -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::tqgeometry|| f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor;
+  return f == DCOP::text || f == DCOP::setText || f == DCOP::setMaximum  || f == DCOP::geometry|| 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::tqgeometry:
+    case DCOP::geometry:
     {
       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.cpp b/kommander/widgets/table.cpp
index 7d974994..862bb17a 100644
--- a/kommander/widgets/table.cpp
+++ b/kommander/widgets/table.cpp
@@ -114,7 +114,7 @@ void Table::setWidgetText(const TQString&)
 TQString Table::selectedArea()
 {
   TQTableSelection sel = selection(currentSelection());
-  return TQString("%1,%2,%3,%4").tqarg(sel.topRow()).tqarg(sel.leftCol()).tqarg(sel.bottomRow()).tqarg(sel.rightCol());
+  return TQString("%1,%2,%3,%4").arg(sel.topRow()).arg(sel.leftCol()).arg(sel.bottomRow()).arg(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::tqgeometry || 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::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor  || (f >= FirstFunction && f <= LastFunction);
 }
 
 void Table::setCellWidget(int row, int col, const TQString & _widgetName)
@@ -354,7 +354,7 @@ TQString Table::handleDCOP(int function, const TQStringList& args)
         return "No row at index "+args[0];
       break;
     }
-    case DCOP::tqgeometry:
+    case DCOP::geometry:
     {
       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.cpp b/kommander/widgets/textedit.cpp
index 2c210696..78c00c08 100644
--- a/kommander/widgets/textedit.cpp
+++ b/kommander/widgets/textedit.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 /* QT INCLUDES */
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqstringlist.h>
 #include <tqevent.h>
@@ -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::tqgeometry || 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::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction);
 }
 
 TQString TextEdit::handleDCOP(int function, const TQStringList& args)
@@ -210,7 +210,7 @@ TQString TextEdit::handleDCOP(int function, const TQStringList& args)
     case TE_VAnormalScript:
       TQTextEdit::setVerticalAlignment(AlignNormal);
       break;
-    case DCOP::tqgeometry:
+    case DCOP::geometry:
     {
       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.cpp b/kommander/widgets/toolbox.cpp
index a3249bd0..c2d37ff4 100644
--- a/kommander/widgets/toolbox.cpp
+++ b/kommander/widgets/toolbox.cpp
@@ -121,7 +121,7 @@ void ToolBox::contextMenuEvent( TQContextMenuEvent * e )
 
 bool ToolBox::isFunctionSupported(int f)
 {
-  return f == DCOP::count || f == DCOP::tqgeometry || (f >= FIRST_FUNCTION && f <=  LAST_FUNCTION) ;
+  return f == DCOP::count || f == DCOP::geometry || (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::tqgeometry:
+    case DCOP::geometry:
     {
       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.cpp b/kommander/widgets/treewidget.cpp
index c77d4b8e..914d6b7c 100644
--- a/kommander/widgets/treewidget.cpp
+++ b/kommander/widgets/treewidget.cpp
@@ -208,8 +208,8 @@ TQString TreeWidget::itemsText()
     if (path.isEmpty())
       items.append(itemText(it.current()));
     else 
-      items.append(TQString("%1%2%3").tqarg(path).tqarg(m_pathSeparator)
-        .tqarg(itemText(it.current())));
+      items.append(TQString("%1%2%3").arg(path).arg(m_pathSeparator)
+        .arg(itemText(it.current())));
     ++it;
   }
   return items.join("\n");
@@ -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::tqgeometry || 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::geometry || 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").tqarg(itemToIndexSafe(it.current())));
+          selection.append(TQString("%1\n").arg(itemToIndexSafe(it.current())));
         }
         ++it;
       }
@@ -494,7 +494,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
     case TW_childCount:
       return TQString::number(childCount());
       break;
-    case DCOP::tqgeometry:
+    case DCOP::geometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;
diff --git a/kommander/working/plugintemplate/widget.cpp b/kommander/working/plugintemplate/widget.cpp
index 0b768911..28cb5e6a 100644
--- a/kommander/working/plugintemplate/widget.cpp
+++ b/kommander/working/plugintemplate/widget.cpp
@@ -31,7 +31,7 @@ enum Functions {
     setPixmap(KGlobal::iconLoader()->loadIcon("%{APPNAMELC}", KIcon::NoGroup, KIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
-    tqsetAlignment(TQt::AlignCenter);
+    setAlignment(TQt::AlignCenter);
   }
   else
     setHidden(true);
diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp
index d7298591..deeea465 100644
--- a/kxsldbg/kxsldbg.cpp
+++ b/kxsldbg/kxsldbg.cpp
@@ -29,7 +29,7 @@ KXsldbg::KXsldbg()
 
     // and a status bar
     statusBar()->show();
-    statusBar()->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
+    statusBar()->setSizePolicy(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
@@ -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").tqarg(file).tqarg(lineNumber).tqarg(columnNumber));
+    statusBar()->message( i18n("File: %1  Line: %2  Col: %3").arg(file).arg(lineNumber).arg(columnNumber));
 }
 
 void KXsldbg::newDebuggerPosition(const TQString &file, int lineNumber)
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
index becbd1bc..3a6a13cf 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
@@ -14,7 +14,7 @@
 #include <kate/view.h> 
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../kxsldbg.h"
 #include <kaction.h>
@@ -41,7 +41,7 @@
 
 #include <tqmime.h>
 #include <tqdragobject.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqaction.h>
@@ -50,8 +50,8 @@
 #include <tqtoolbar.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
-#include <tqtextstream.h>
-#include <tqtextbrowser.h>
+#include <textstream.h>
+#include <textbrowser.h>
 #include <tqmessagebox.h>
 #include <tqlineedit.h>
 #include <tqdockwindow.h>
@@ -389,7 +389,7 @@ void KXsldbgPart::lookupSystemID( TQString systemID)
    }
   if ( ok && !systemID.isEmpty() ){
       // user entered something and pressed ok
-	TQString msg(TQString("system %1").tqarg(systemID));  // noTr
+	TQString msg(TQString("system %1").arg(systemID));  // noTr
 	debugger->fakeInput(msg, true);
   }
 
@@ -419,7 +419,7 @@ void KXsldbgPart::lookupPublicID(TQString publicID)
    }
    if ( ok && !publicID.isEmpty()){
      // user entered something and pressed ok
-	TQString msg(TQString("public %1").tqarg(publicID));  // noTr
+	TQString msg(TQString("public %1").arg(publicID));  // noTr
 	debugger->fakeInput(msg, true);
   }
 }
@@ -774,7 +774,7 @@ void  KXsldbgPart::deleteBreakPoint(int lineNumber)
 void KXsldbgPart::slotSearch()
 {
   if ((newSearch != 0L)  && checkDebugger() ) {
-    TQString msg(TQString("search \"%1\"").tqarg(newSearch->text()));  // noTr
+    TQString msg(TQString("search \"%1\"").arg(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").tqarg(URI),
+        i18n("SystemID or PublicID has been resolved to\n.%1").arg(URI),
 	TQMessageBox::Ok);
   }
 }
diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/qtnotifier2.cpp
index 98c4ea95..0db9d1f0 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 (::getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED){
+    if (::getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED){
       return 1;
     }
 
     /* clear the input ready flag as quickly as possible*/
-     if ( ::getInputtqStatus() == XSLDBG_MSG_READ_INPUT)
+     if ( ::getInputStatus() == XSLDBG_MSG_READ_INPUT)
      	  ::setInputReady(0);
 
      /* state of the thread */
@@ -45,7 +45,7 @@ int qtNotifyXsldbgApp(XsldbgMessageEnum type, const void *data)
        }
      }
 
-    if (::getThreadtqStatus() == XSLDBG_MSG_THREAD_STOP)
+    if (::getThreadStatus() == 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/xsldbgevent.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp
index a47e4aae..0b44f6d2 100644
--- a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp
+++ b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgevent.cpp
@@ -21,7 +21,7 @@
 #include <tqtimer.h>
 #include <tqfile.h>
 #include <kurl.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <libxslt/xsltInternals.h>
 
diff --git a/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp b/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
index 1f997919..4fe2e02c 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);
-    setThreadtqStatus(XSLDBG_MSG_THREAD_INIT);
+    setThreadStatus(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 (getThreadtqStatus() != XSLDBG_MSG_THREAD_INIT)
+	if (getThreadStatus() != 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 (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN){
+      if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN){
         fprintf(stderr, "Created thread\n");
 	result++;
       }else
@@ -117,13 +117,13 @@ void
 xsldbgThreadFree(void)
 {
   fprintf(stderr, "xsldbgThreadFree()\n");
-    if (getThreadtqStatus() != XSLDBG_MSG_THREAD_DEAD)
+    if (getThreadStatus() != XSLDBG_MSG_THREAD_DEAD)
     {
       int counter;
       fprintf(stderr, "Killing xsldbg thread\n");
-      setThreadtqStatus(XSLDBG_MSG_THREAD_STOP);
+      setThreadStatus(XSLDBG_MSG_THREAD_STOP);
       for (counter = 0; counter < 11; counter++){
-	if (getThreadtqStatus() == XSLDBG_MSG_THREAD_DEAD)
+	if (getThreadStatus() == 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) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN))
+    if (!text || (getInputReady() == 1) || (getThreadStatus() != 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 (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN)
+  if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN)
     {
 #ifdef HAVE_READLINE
       xmlChar *line_read;
@@ -209,20 +209,20 @@ qtXslDbgShellReadline(xmlChar * prompt)
     }
   else{
 
-    setInputtqStatus(XSLDBG_MSG_AWAITING_INPUT);
+    setInputStatus(XSLDBG_MSG_AWAITING_INPUT);
     notifyXsldbgApp(XSLDBG_MSG_AWAITING_INPUT, NULL);
 
     while (getInputReady() == 0){
       usleep(10000);
       /* have we been told to die */
-      if (getThreadtqStatus() ==  XSLDBG_MSG_THREAD_STOP){
+      if (getThreadStatus() ==  XSLDBG_MSG_THREAD_STOP){
 	fprintf(stderr, "About to stop thread\n");
 	xslDebugStatus = DEBUG_TQUIT;
 	return NULL;
       }
     }
 
-    setInputtqStatus(XSLDBG_MSG_READ_INPUT);
+    setInputStatus(XSLDBG_MSG_READ_INPUT);
     inputReadBuff =  getFakeInput();
     if(inputReadBuff){
       notifyXsldbgApp(XSLDBG_MSG_READ_INPUT, inputReadBuff);
@@ -283,7 +283,7 @@ xsldbgThreadMain(void *)
  // char *defaultArgv[2];
  // int i;
 
-  if (getThreadtqStatus() != XSLDBG_MSG_THREAD_INIT){
+  if (getThreadStatus() != 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 */
   }
@@ -302,8 +302,8 @@ xsldbgThreadMain(void *)
   }
 */
     xsldbgSetThreadCleanupFunc(xsldbgThreadCleanupTQt);
-    setThreadtqStatus(XSLDBG_MSG_THREAD_RUN);
-    setInputtqStatus(XSLDBG_MSG_AWAITING_INPUT);
+    setThreadStatus(XSLDBG_MSG_THREAD_RUN);
+    setInputStatus(XSLDBG_MSG_AWAITING_INPUT);
     fprintf(stderr, "Starting thread\n");
 
     /* call the "main of xsldbg" found in debugXSL.c */
@@ -316,8 +316,8 @@ xsldbgThreadMain(void *)
   }
 */
 
-    setThreadtqStatus(XSLDBG_MSG_THREAD_DEAD);
-    setInputtqStatus(XSLDBG_MSG_PROCESSING_INPUT);
+    setThreadStatus(XSLDBG_MSG_THREAD_DEAD);
+    setInputStatus(XSLDBG_MSG_PROCESSING_INPUT);
     notifyXsldbgApp(XSLDBG_MSG_THREAD_DEAD, NULL);
     return NULL;
 }
@@ -330,12 +330,12 @@ void
 xsldbgThreadCleanupTQt(void)
 {
     fprintf(stderr, "Thread has finished\n");
-    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN)
+    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN)
       {
 	xsldbgThreadFree();
       }
-    /* its safe to modify threadtqStatus as the thread is now dead */
-    setThreadtqStatus(XSLDBG_MSG_THREAD_DEAD);
+    /* its safe to modify threadStatus as the thread is now dead */
+    setThreadStatus(XSLDBG_MSG_THREAD_DEAD);
 }
 
 
@@ -346,7 +346,7 @@ xsldbgThreadStdoutReader(void *data)
   if (!stdoutIO)
     return data;
 
-  while (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN){
+  while (getThreadStatus() == 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 1e403aa6..270ce82d 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 *breaktqStatus;
+    const char *breakStatus;
 
 
     if (!breakPtr)
@@ -634,11 +634,11 @@ breakPointPrint(breakPointPtr breakPtr)
     }
     
 
-    breaktqStatus = breakStatusText[breakPtr->flags & BREAKPOINT_ENABLED];
+    breakStatus = breakStatusText[breakPtr->flags & BREAKPOINT_ENABLED];
     if (breakPtr->url)
-	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));
+	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));
     else
-	xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\"").tqarg(breakPtr->id).tqarg(i18n(breaktqStatus)).tqarg(xsldbgText(breakTemplate)).tqarg(xsldbgText(breakMode)));
+	xsldbgGenericErrorFunc(i18n("Breakpoint %1 %2 for template: \"%3\" mode: \"%4\"").arg(breakPtr->id).arg(i18n(breakStatus)).arg(xsldbgText(breakTemplate)).arg(xsldbgText(breakMode)));
     return ++result;
 }
 
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/breakpoint_cmds.cpp
index a301aa8a..a757c143 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 getThreadtqStatus() */
+#include "xsldbgthread.h"       /* for getThreadStatus() */
 #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").tqarg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1.\n").arg(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").tqarg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(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").tqarg((char*)arg));
+            xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a number of frames.\n").arg((char*)arg));
 	    noOfFrames = -1;
         }
     } else {
@@ -126,7 +126,7 @@ xslDbgShellFrameBreak(xmlChar * arg, int stepup)
     }
 
     if (!result)
-        xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(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").tqarg(xsldbgUrl(*url)).tqarg(*lineNo));
+                        xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").arg(xsldbgUrl(*url)).arg(*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").tqarg(xsldbgUrl(*url)));
+            xsldbgGenericErrorFunc(i18n("Error: Unable to find a stylesheet file whose name contains %1.\n").arg(xsldbgUrl(*url)));
 	    if (lineNo){
-	      xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").tqarg(xsldbgUrl(*url)).tqarg(*lineNo));
+	      xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").arg(xsldbgUrl(*url)).arg(*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").tqarg(xsldbgUrl(*url)).tqarg(*lineNo));
+             xsldbgGenericErrorFunc(i18n("Warning: Breakpoint for file \"%1\" at line %2 does not seem to be valid.\n").arg(xsldbgUrl(*url)).arg(*lineNo));
 	  } else{
-             xsldbgGenericErrorFunc(i18n("Error: Unable to find a data file whose name contains %1.\n").tqarg(xsldbgUrl(*url)));
+             xsldbgGenericErrorFunc(i18n("Error: Unable to find a data file whose name contains %1.\n").arg(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").tqarg(i18n(errorPrompt)));
+	    xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(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").tqarg((char*)opts[1]));
-		    xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg((char*)opts[1]));
+		    xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(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").tqarg("break"));
+                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("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").tqarg("break"));
+	  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").arg("break"));
 	  return 0;
 	}
 
@@ -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").tqarg(searchPtr->id));
+					xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").arg(searchPtr->id));
 					validatedBreakPoints++;
 				    }
 				}
 			    }
 			}else{
 			    if (xsldbgValidateBreakpoints != BREAKPOINTS_BEING_VALIDATED){
-				xsldbgGenericErrorFunc(i18n("Warning: Breakpoint exits for file \"%1\" at line %2.\n").tqarg(xsldbgUrl(tempUrl)).tqarg(templateLineNo));
+				xsldbgGenericErrorFunc(i18n("Warning: Breakpoint exits for file \"%1\" at line %2.\n").arg(xsldbgUrl(tempUrl)).arg(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").tqarg(xsldbgUrl(url)).tqarg(lineNo));
+            xsldbgGenericErrorFunc(i18n("Error: Failed to add breakpoint for file \"%1\" at line %2.\n").arg(xsldbgUrl(url)).arg(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").tqarg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(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").tqarg((char*)opts[1]));
+                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg((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").tqarg(xsldbgUrl(url)).tqarg(lineNo));
+                            xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").arg(xsldbgUrl(url)).arg(lineNo));
                         }else{
                             result = 1;
 			}
@@ -719,7 +719,7 @@ xslDbgShellDelete(xmlChar * arg)
                     }
                 }
             } else{
-		xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").tqarg("delete"));
+		xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").arg("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").tqarg(breakPointId));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint %1.\n").arg(breakPointId));
             }
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").tqarg(breakPointId));
+            xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").arg(breakPointId));
         }
     } else {
         breakPtr = findBreakPointByName(arg);
         if (breakPtr) {
             result = breakPointDelete(breakPtr);
             if (!result) {
-                xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint at template %1.\n").tqarg(xsldbgText(arg)));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to delete breakpoint at template %1.\n").arg(xsldbgText(arg)));
             }
         } else{
-            xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").tqarg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").arg(xsldbgText(arg)));
 	}
     }
     if (!result) 
-	xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(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").tqarg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(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").tqarg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(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").tqarg((char*)opts[1]));
+                    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg((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").tqarg(xsldbgUrl(url)).tqarg(lineNo));
+                            xsldbgGenericErrorFunc(i18n("Error: Breakpoint does not exist for file \"%1\" at line %2.\n").arg(xsldbgUrl(url)).arg(lineNo));
 			}
                         xmlFree(url);
                     }
                 }
             } else
-                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").tqarg("enable"));
+                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for command %1.\n").arg("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").tqarg(breakPointId));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to enable/disable breakpoint %1.\n").arg(breakPointId));
             }
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").tqarg(breakPointId));
+            xsldbgGenericErrorFunc(i18n("Error: Breakpoint %1 does not exist.\n").arg(breakPointId));
         }
     } else {
         breakPtr = findBreakPointByName(arg);
         if (breakPtr) {
             result = breakPointEnable(breakPtr, enableType);
         } else
-            xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").tqarg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("Error: Breakpoint at template \"%1\" does not exist.\n").arg(xsldbgText(arg)));
     }
 
     if (!result)
-	xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+	xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
     return result;
 }
 
@@ -893,7 +893,7 @@ xslDbgShellPrintBreakPoint(void *payload, void *data,
     Q_UNUSED(name);
 
     if (payload) {
-        if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+        if (getThreadStatus() == 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").tqarg(breakPtr->id).tqarg(result).tqarg(copy->flags).tqarg(breakPtr->flags));
+	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));
     }
 
     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").tqarg(breakPtr->id));
+		    xsldbgGenericErrorFunc(i18n("Information: Breakpoint validation has caused breakpoint %1 to be re-created.\n").arg(breakPtr->id));
 		}
 	    }
 	    if (!result){
-		xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").tqarg(copy->id));
+		xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").arg(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").tqarg(copy->id));
+	xsldbgGenericErrorFunc(i18n("Warning: Validation of breakpoint %1 failed.\n").arg(copy->id));
     }
     return result;
 }
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp b/kxsldbg/kxsldbgpart/libxsldbg/debugXSL.cpp
index 54790e2c..3ce95b0c 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").tqarg(xsldbgText(&arg[offset])));
+                        xsldbgGenericErrorFunc(i18n("Error: The XSLT template named \"%1\" was not found.\n").arg(xsldbgText(&arg[offset])));
                         return result;
                     } else {
-                        xsldbgGenericErrorFunc(i18n(" template: \"%1\"\n").tqarg(xsldbgText(&arg[offset])));
+                        xsldbgGenericErrorFunc(i18n(" template: \"%1\"\n").arg(xsldbgText(&arg[offset])));
                         ctxt->node = templateNode;
                         result = 1;
                         return result;
@@ -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").tqarg("cd"));
+                    xsldbgGenericErrorFunc(i18n("Error: Unknown arguments to the command %1.\n").arg("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").tqarg("cd"));
+                xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to the command %1.\n").arg("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 (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+                            if (getThreadStatus() == 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 tqchildren.", list->nodesetval->nodeNr).tqarg(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 children.", list->nodesetval->nodeNr).arg(xsldbgText(arg)) + TQString("\n"));
                     } else {
-                        xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is an empty Node Set.\n").tqarg(xsldbgText(arg)));
+                        xsldbgGenericErrorFunc(i18n("Warning: XPath %1 is an empty Node Set.\n").arg(xsldbgText(arg)));
                     }
                     break;
 
@@ -614,7 +614,7 @@ xslDbgCd(xsltTransformContextPtr styleCtxt, xmlShellCtxtPtr ctxt,
             }
             xmlXPathFreeObject(list);
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: XPath %1 was not found.\n").tqarg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("Error: XPath %1 was not found.\n").arg(xsldbgText(arg)));
         }
         if (ctxt->pctxt)
           ctxt->pctxt->node = NULL;
@@ -640,7 +640,7 @@ xslDbgPrintCallStack(const xmlChar * arg)
     callPointPtr callPointItem;
 
     if (arg == NULL) {
-        if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+        if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
             notifyListStart(XSLDBG_MSG_CALLSTACK_CHANGED);
             /* we send the oldest frame stack first */
             for (depth = 1; depth <= callStackGetDepth(); depth++) {
@@ -669,12 +669,12 @@ xslDbgPrintCallStack(const xmlChar * arg)
 			    if (rootNameTemp && rootModeTemp){
 			      if (rootCopy->match)
 			        /* display information about the current XSLT template */
-                                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").tqarg(depth).tqarg(xsldbgText(rootCopy->match)).tqarg(xsldbgText(rootModeTemp)));
+                                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").arg(depth).arg(xsldbgText(rootCopy->match)).arg(xsldbgText(rootModeTemp)));
 			      else
 			        /* display information about the current XSLT template */
-                                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").tqarg(depth).tqarg(xsldbgText(rootNameTemp)).tqarg(xsldbgText(rootModeTemp)));
+                                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").arg(depth).arg(xsldbgText(rootNameTemp)).arg(xsldbgText(rootModeTemp)));
 			      /* display where we are in the source/document file */	
-			      xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(curUrl)).tqarg(curLine));
+			      xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(curUrl)).arg(curLine));
 			    }else{
 			      xsldbgGenericErrorFunc(i18n("Error: Out of memory.\n"));
 			      result = 0;
@@ -689,9 +689,9 @@ xslDbgPrintCallStack(const xmlChar * arg)
 			    }
                         } else if (curUrl) {
 			    /* display information about the current XSLT template */
-                            xsldbgGenericErrorFunc(i18n("#%1 template: \"LIBXSLT_DEFAULT\" mode: \"\"").tqarg(depth));
+                            xsldbgGenericErrorFunc(i18n("#%1 template: \"LIBXSLT_DEFAULT\" mode: \"\"").arg(depth));
 			    /* display where we are in the source/document file */	
-                            xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(curUrl)).tqarg(curLine));
+                            xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(curUrl)).arg(curLine));
                         }
                         if (curUrl)
                             xmlFree(curUrl);
@@ -703,10 +703,10 @@ xslDbgPrintCallStack(const xmlChar * arg)
 					 callPointItem->info->modeName);
 		    if (nameTemp && modeTemp){
 		      /* display information about the current XSLT template */
-		      xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").tqarg(depth - 1).tqarg(xsldbgText(nameTemp)).tqarg(xsldbgText(modeTemp)));
+		      xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\" mode: \"%3\"").arg(depth - 1).arg(xsldbgText(nameTemp)).arg(xsldbgText(modeTemp)));
 		      if (callPointItem->info->url)
 			/* display where we are in the source/document file */	
-                        xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").tqarg(xsldbgUrl(callPointItem->info->url)).tqarg(callPointItem->lineNo));
+                        xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(callPointItem->info->url)).arg(callPointItem->lineNo));
 		      else
                         xsldbgGenericErrorFunc("\n");
 		    }else{
@@ -740,7 +740,7 @@ xslDbgPrintCallStack(const xmlChar * arg)
         long templateDepth = atol((char *) arg);
 
 
-        if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+        if (getThreadStatus() == 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\"").tqarg(templateDepth).tqarg(xsldbgText(callPointItem->info->templateName)));
+                xsldbgGenericErrorFunc(i18n("#%1 template: \"%2\"").arg(templateDepth).arg(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").tqarg(xsldbgUrl(callPointItem->info->url)).tqarg(callPointItem->lineNo));
+                    xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2\n").arg(xsldbgUrl(callPointItem->info->url)).arg(callPointItem->lineNo));
                 else
                     xsldbgGenericErrorFunc("\n");
             } else {
@@ -1105,7 +1105,7 @@ debugXSLBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root,
 	  if (terminalIO == NULL) {
 
             if (root->match){
-                xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(root->match)).tqarg(xsldbgText(modeTemp)));
+                xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(root->match)).arg(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").tqarg(xsldbgText(nameTemp)).tqarg(xsldbgText(modeTemp)));
+                xsldbgGenericErrorFunc(i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(nameTemp)).arg(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").tqarg(xsldbgText(root->match)).tqarg(xsldbgText(modeTemp));
+		  message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(root->match)).arg(xsldbgText(modeTemp));
                 else
-		  message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").tqarg(xsldbgText(nameTemp)).tqarg(xsldbgText(modeTemp));
+		  message = i18n("\nReached template: \"%1\" mode: \"%2\"\n").arg(xsldbgText(nameTemp)).arg(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 ((getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED) ||
+    if ((getThreadStatus() == 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").tqarg(xsldbgUrl(breakUri)).tqarg(xmlGetLineNo(ctxt->node));
+		messageTxt = i18n("Breakpoint for file \"%1\" at line %2.\n").arg(xsldbgUrl(breakUri)).arg(xmlGetLineNo(ctxt->node));
             else
-                messageTxt = i18n("Breakpoint at text node in file \"%1\".\n").tqarg(xsldbgUrl(breakUri));
+                messageTxt = i18n("Breakpoint at text node in file \"%1\".\n").arg(xsldbgUrl(breakUri));
             if (baseUri != NULL) {
                 xmlFree(baseUri);
                 baseUri = NULL;
@@ -1347,7 +1347,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
     }
 
     while (!exitShell && (xslDebugStatus != DEBUG_TQUIT)) {
-        if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
+        if (getThreadStatus() != XSLDBG_MSG_THREAD_RUN) {
             if (ctxt->node == (xmlNodePtr) ctxt->doc)
                 snprintf((char *) prompt, DEBUG_BUFFER_SIZE - 1,
                          "(xsldbg) %s > ", "/");
@@ -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 (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
+                if (getThreadStatus() != 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 (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+                if (getThreadStatus() == 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").tqarg(xsldbgUrl(tempBaseName)).tqarg(xmlGetLineNo(ctxt->node)));
+		    xsldbgGenericErrorFunc(i18n(" in file \"%1\" at line %2").arg(xsldbgUrl(tempBaseName)).arg(xmlGetLineNo(ctxt->node)));
 		    xmlFree(tempBaseName);
 		    cmdResult = 1;
 		  }
@@ -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").tqarg("system"));
+		  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("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").tqarg("public"));
+		  xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("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").tqarg("validate"));
+                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").arg("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").tqarg("write"));
+                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").arg("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").tqarg("free"));
+                xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled.\n").arg("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").tqarg(xsldbgText(arg)));
+                    xsldbgGenericErrorFunc(i18n("Opening terminal %1.\n").arg(xsldbgText(arg)));
                     cmdResult = 1;
                 } else
                     cmdResult = 0;
@@ -2009,11 +2009,11 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
 		    bindtextdomain("tdewebdev/xsldbg", LOCALE_PREFIX);
 		    cmdResult = 1;
 		}else{
-		    xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("lang"));
+		    xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("lang"));
 		    cmdResult = 0;
 		}
 #else
-	        xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled\n").tqarg("lang"));
+	        xsldbgGenericErrorFunc(i18n("Warning: The %1 command is disabled\n").arg("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").tqarg("showmatch")); 
+	        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("showmatch")); 
 	     }
            break;
  
@@ -2077,7 +2077,7 @@ shellPrompt(xmlNodePtr source, xmlNodePtr doc, xmlChar * filename,
                 break;
 
             default:
-                xsldbgGenericErrorFunc(i18n("Error: Unknown command %1. Try help.\n").tqarg(xsldbgText(command)));
+                xsldbgGenericErrorFunc(i18n("Error: Unknown command %1. Try help.\n").arg(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").tqarg(xsldbgUrl(ctxt->node->doc->URL)).tqarg(xmlGetLineNo(ctxt->node)));
+                    xsldbgGenericErrorFunc(i18n("Breakpoint for file \"%1\" at line %2.\n").arg(xsldbgUrl(ctxt->node->doc->URL)).arg(xmlGetLineNo(ctxt->node)));
                 else
-                    xsldbgGenericErrorFunc(i18n("Breakpoint at text node in file \"%1\".\n").tqarg(xsldbgUrl(ctxt->node->doc->URL)));
+                    xsldbgGenericErrorFunc(i18n("Breakpoint at text node in file \"%1\".\n").arg(xsldbgUrl(ctxt->node->doc->URL)));
             }
         }
 
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/file_cmds.cpp
index a58d0168..10abbaf7 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 (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+        if (getThreadStatus() == 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 ").tqarg(xsldbgText(entInfo->SystemID)));
+                    xsldbgGenericErrorFunc(i18n("Entity %1 ").arg(xsldbgText(entInfo->SystemID)));
                     if (entInfo->PublicID)
 			xsldbgGenericErrorFunc(xsldbgText(entInfo->PublicID));
 		    xsldbgGenericErrorFunc("\n");
@@ -111,22 +111,22 @@ xslDbgSystem(const xmlChar * arg)
     }
 
     name = xmlCatalogResolveSystem(arg);
-    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadStatus() == 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").tqarg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg)));
         }
     } else {
         if (name) {
-            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" maps to: \"%2\"\n").tqarg(xsldbgText(arg)).tqarg(xsldbgText(name)));
+            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" maps to: \"%2\"\n").arg(xsldbgText(arg)).arg(xsldbgText(name)));
             xmlFree(name);
             result = 1;
         } else {
-            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("SystemID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg)));
         }
     }
 
@@ -158,22 +158,22 @@ xslDbgPublic(const xmlChar * arg)
     }
 
     name = xmlCatalogResolvePublic(arg);
-    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadStatus() == 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").tqarg(xsldbgText(arg)));
+	    xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").arg(xsldbgText(arg)));
         }
     } else {
         if (name) {
-            xsldbgGenericErrorFunc(i18n("PublicID \"%1\" maps to: \"%2\"\n").tqarg(xsldbgText(arg)).tqarg(xsldbgText(name)));
+            xsldbgGenericErrorFunc(i18n("PublicID \"%1\" maps to: \"%2\"\n").arg(xsldbgText(arg)).arg(xsldbgText(name)));
             xmlFree(name);
             result = 1;
         } else {
-	    xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").tqarg(xsldbgText(arg)));
+	    xsldbgGenericErrorFunc(i18n("PublicID \"%1\" was not found in current catalog.\n").arg(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").tqarg("encoding"));
+        xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("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").tqarg("output"));
+	xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("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").tqarg("output"));
+	   xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("output"));
       }
     }
    } else {
-    xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("output"));
+    xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("output"));
   }
 
   return result;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp
index e803b1a4..73d3713b 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").tqarg(xsldbgText(termName)));
+                    xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").arg(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").tqarg(xsldbgText(device)));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to open terminal %1.\n").arg(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").tqarg(xsldbgText(path)));
+        xsldbgGenericErrorFunc(i18n("Error: The file name \"%1\" is too long.\n").arg(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").tqarg(xsldbgText(path)));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to change to directory %1.\n").arg(xsldbgText(path)));
     } else {
 	if (xslDebugStatus != DEBUG_NONE)
-	    xsldbgGenericErrorFunc(i18n("Changed to directory %1.\n").tqarg(xsldbgText(path)));
+	    xsldbgGenericErrorFunc(i18n("Changed to directory %1.\n").arg(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").tqarg(xsldbgText(path)));
+                    xsldbgGenericErrorFunc(i18n("Setting XML Data file name to %1.\n").arg(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").tqarg(xsldbgText(path)));
+                    xsldbgGenericErrorFunc(i18n("Setting stylesheet file name to %1.\n").arg(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").tqarg(xsldbgText(stylePathName)));
+                        xsldbgGenericErrorFunc(i18n("Setting stylesheet base path to %1.\n").arg(xsldbgText(stylePathName)));
                     }
                 } else {
                     const char cwd[4] = { '.', PATHCHAR, '\0' };
@@ -1176,12 +1176,12 @@ filesSetEncoding(const char *encoding)
             if (!result) {
                 xmlCharEncCloseFunc(stdoutEncoding);
                 stdoutEncoding = NULL;
-                xsldbgGenericErrorFunc(i18n("Unable to initialize encoding %1.").tqarg(xsldbgText(encoding)));
+                xsldbgGenericErrorFunc(i18n("Unable to initialize encoding %1.").arg(xsldbgText(encoding)));
             } else
                 optionsSetStringOption(OPTIONS_ENCODING,
                                        (xmlChar *) encoding);
         } else {
-            xsldbgGenericErrorFunc(i18n("Invalid encoding %1.\n").tqarg(xsldbgText(encoding)));
+            xsldbgGenericErrorFunc(i18n("Invalid encoding %1.\n").arg(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").tqarg(xsldbgText(uri)));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to convert %1 to local file name.\n").arg(xsldbgText(uri)));
     }
 
 
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
index 340e9869..a4a583c7 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
@@ -87,7 +87,7 @@ helpTop(const xmlChar * args)
 		 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").tqarg(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").arg(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 67dbcbe8..a3fffd41 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 getThreadtqStatus */
+#include "xsldbgthread.h"       /* for getThreadStatus */
 #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").tqarg(xsldbgText(arg)));
+            xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(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").tqarg(xsldbgText(encoding)));
+            xsldbgGenericErrorFunc(i18n("Information: Temporarily setting document's encoding to UTF-8. Previously was %1.\n").arg(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").tqarg(xsldbgText(fileName)));
+	   xsldbgGenericErrorFunc(i18n("Error: Unable to save temporary results to %1.\n").arg(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").tqarg(xsldbgText(xPath)));
+	      xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(xsldbgText(xPath)));
 	    }
 	    break;
 			     
@@ -268,7 +268,7 @@ printXPathObject(xmlXPathObjectPtr item, xmlChar* xPath){
 	    fprintf(file,"\n");	    
 
 	  } /* inner switch statement  */
-	  if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+	  if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
 	    fclose(file);
 	    file = NULL;
 	    /* send the data to application */
@@ -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").tqarg(xsldbgText(arg)));
+        xsldbgGenericErrorFunc(i18n("Error: XPath %1 results in an empty Node Set.\n").arg(xsldbgText(arg)));
     }
     ctxt->pctxt->node = NULL;
     return result;
@@ -403,7 +403,7 @@ xslDbgShellPrintNames(void *payload,
 {
     Q_UNUSED(payload);
     Q_UNUSED(data);
-    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadStatus() == 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").tqarg(xsldbgText(fullQualifiedName)));
+	    xsldbgGenericErrorFunc(i18n(" Global %1\n").arg(xsldbgText(fullQualifiedName)));
         }else{
 	      if (item->computed == 1){
 	         xsldbgGenericErrorFunc(i18n(" Global "));
 		 printXPathObject(item->value, fullQualifiedName);
 	      }else if (item->tree){
-	         xsldbgGenericErrorFunc(i18n(" Global = %1\n").tqarg(xsldbgText(fullQualifiedName)));
+	         xsldbgGenericErrorFunc(i18n(" Global = %1\n").arg(xsldbgText(fullQualifiedName)));
 		 xslDbgCatToFile(item->tree, stderr);
 	      }else if (item->select){
-	         xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(xsldbgText(item->select)));
+	         xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(xsldbgText(item->select)));
 	      }else{
 		/* can't find a value give only a variable name an error message */
-		xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(i18n("Warning: No value assigned to variable.\n")));
+		xsldbgGenericErrorFunc(i18n(" Global = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(i18n("Warning: No value assigned to variable.\n")));
 	      }
 	    xsltGenericError(xsltGenericErrorContext, "\n\032\032\n");
         }
@@ -496,7 +496,7 @@ xslDbgShellPrintVariable(xsltTransformContextPtr styleCtxt, xmlChar * arg,
         /* list variables of type requested */
         if (type == DEBUG_GLOBAL_VAR) {
             if (styleCtxt->globalVars) {
-                if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+                if (getThreadStatus() == 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 (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
+                if (getThreadStatus() != 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 (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+		if (getThreadStatus() == 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").tqarg(xsldbgText(fullQualifiedName)));
+						    xsldbgGenericErrorFunc(i18n(" Local %1").arg(xsldbgText(fullQualifiedName)));
 					    }else{
 						    if (item->computed == 1){
 							    xsldbgGenericErrorFunc(i18n(" Local "));
 							    printXPathObject(item->value, fullQualifiedName);
 						    }else if (item->tree){
-							    xsldbgGenericErrorFunc(i18n(" Local = %1\n").tqarg(xsldbgText(fullQualifiedName)));
+							    xsldbgGenericErrorFunc(i18n(" Local = %1\n").arg(xsldbgText(fullQualifiedName)));
 							    xslDbgCatToFile(item->tree, stderr);
 						    }else if (item->select){
-							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(xsldbgText(item->select)));
+							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(xsldbgText(item->select)));
 						    }else{
 							    /* can't find a value give only a variable name and an error */
-							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").tqarg(xsldbgText(fullQualifiedName)).tqarg(i18n("Warning: No value assigned to variable.\n")));
+							    xsldbgGenericErrorFunc(i18n(" Local = %1\n%2").arg(xsldbgText(fullQualifiedName)).arg(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 (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
+                if (getThreadStatus() != 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 05ca9a4c..0bc54364 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").tqarg(xsldbgText(opts[1])));
+			 xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as an option value.\n").arg(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").tqarg(xsldbgText(opts[1])));
+			 xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as an option value.\n").arg(xsldbgText(opts[1])));
 		    }
 		} else 
-                xsldbgGenericErrorFunc(i18n("Error: Unknown option name %1.\n").tqarg(xsldbgText(opts[0])));
+                xsldbgGenericErrorFunc(i18n("Error: Unknown option name %1.\n").arg(xsldbgText(opts[0])));
             }
         } else {
-            xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("setoption"));
+            xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("setoption"));
         }
     } else {
-	xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").tqarg("setoption"));
+	xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("setoption"));
     }
 
     return result;
@@ -137,13 +137,13 @@ xslDbgShellOptions(void)
     const xmlChar *optionName, *optionValue;
 
     /* Print out the integer options and thier values */
-    if (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadStatus() != 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").tqarg(xsldbgText(optionName)).tqarg(optionsGetIntOption(OptionTypeEnum(optionIndex))));
+                xsldbgGenericErrorFunc(i18n("Option %1 = %2\n").arg(xsldbgText(optionName)).arg(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").tqarg(xsldbgText(optionName)).tqarg((char*)optionValue));
+                    xsldbgGenericErrorFunc(i18n("Option %1 = \"%2\"\n").arg(xsldbgText(optionName)).arg((char*)optionValue));
                 } else {
-                    xsldbgGenericErrorFunc(i18n("Option %1 = \"\"\n").tqarg(xsldbgText(optionName)));
+                    xsldbgGenericErrorFunc(i18n("Option %1 = \"\"\n").arg(xsldbgText(optionName)));
 
                 }
             }
@@ -234,7 +234,7 @@ xslDbgShellOptions(void)
 	counter++){
     watchExpression = (xmlChar*)arrayListGet(optionsGetWatchList(), counter);
     if (watchExpression){
-      xsldbgGenericErrorFunc(i18n(" WatchExpression %1 ").tqarg(counter + 1));
+      xsldbgGenericErrorFunc(i18n(" WatchExpression %1 ").arg(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").tqarg(xsldbgText(arg)));
+      xsldbgGenericErrorFunc(i18n("Error: Unable to add watch expression \"%1\". It already has been added or it cannot be watched.\n").arg(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").tqarg(xsldbgText(arg)));
+      xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a watchID.\n").arg(xsldbgText(arg)));
       return result;
     } else {
       result = optionsRemoveWatch(watchID);
       if (!result)
-	xsldbgGenericErrorFunc(i18n("Error: Watch expression %1 does not exist.\n").tqarg(watchID));
+	xsldbgGenericErrorFunc(i18n("Error: Watch expression %1 does not exist.\n").arg(watchID));
     }
   }
   return result;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
index d2d51fe5..97195108 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
@@ -112,7 +112,7 @@ 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").tqarg(localDoc[id]).tqarg(*lang).tqarg("xsldbg").tqarg(fname));
+            search.append(TQString("%1%2/%3/%4").arg(localDoc[id]).arg(*lang).arg("xsldbg").arg(fname));
     }
 
     // try to locate the file
@@ -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").tqarg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
+	     xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
 	}else{
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
-	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("setoption"));
+	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("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").tqarg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
+	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid boolean/integer option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
 	}else{
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
-	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("options"));
+	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("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").tqarg(xsldbgText(optionNames[type - OPTIONS_LAST_OPTIONID])));
+	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").arg(xsldbgText(optionNames[type - OPTIONS_LAST_OPTIONID])));
 	}else{
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
-	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("setoption"));
+	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("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").tqarg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
+	    xsldbgGenericErrorFunc(i18n("Error: Option %1 is not a valid string xsldbg option.\n").arg(xsldbgText(optionNames[type - OPTIONS_FIRST_OPTIONID])));
 	}else{
 #ifdef WITH_XSLDBG_DEBUG_PROCESS
-	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").tqarg("options"));
+	    xsldbgGenericErrorFunc(TQString("Error: Invalid arguments for the command %1.\n").arg("options"));
 #endif
 	}
     }
@@ -508,7 +508,7 @@ optionsPrintParam(int paramId)
                                         paramId);
 
     if (paramItem && paramItem->name && paramItem->value) {
-        xsldbgGenericErrorFunc(i18n(" Parameter %1 %2=\"%3\"\n").tqarg(paramId).tqarg(xsldbgText(paramItem->name)).tqarg(xsldbgText(paramItem->value)));
+        xsldbgGenericErrorFunc(i18n(" Parameter %1 %2=\"%3\"\n").arg(paramId).arg(xsldbgText(paramItem->name)).arg(xsldbgText(paramItem->value)));
         result = 1;
     }
     return result;
@@ -530,7 +530,7 @@ optionsPrintParamList(void)
     int paramIndex = 0;
     int itemCount = arrayListCount(optionsGetParamItemList());
 
-    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadStatus() == 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 16e1ccf6..dac5bb0f 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").tqarg("chdir"));
+        xsldbgGenericErrorFunc(i18n("Error: Missing arguments for the command %1.\n").arg("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").tqarg(xsldbgText(name)));
+        xsldbgGenericErrorFunc(i18n("Error: No command processor available for shell command \"%1\".\n").arg(xsldbgText(name)));
     } else {
         int return_code;
 
         if (verbose)
-            xsldbgGenericErrorFunc(i18n("Information: Starting shell command \"%1\".\n").tqarg(xsldbgText(name)));
+            xsldbgGenericErrorFunc(i18n("Information: Starting shell command \"%1\".\n").arg(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").tqarg(return_code));
+                xsldbgGenericErrorFunc(i18n("Error: Unable to run command. System error %1.\n").arg(return_code));
         }
     }
     return result;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/param_cmds.cpp
index 52563725..befa330d 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").tqarg("addparam"));
+        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("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").tqarg("addparam"));
+	    xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("addparam"));
 	}
     }
     if (!result)
-        xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(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").tqarg("delparam"));
+	xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("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").tqarg(xsldbgText(opts[0])));
+		    xsldbgGenericErrorFunc(i18n("Error: Unable to parse %1 as a line number.\n").arg(xsldbgText(opts[0])));
 		} else {
 		    result =
 			arrayListDelete(optionsGetParamItemList(), paramId);
 		    if (!result)
-			xsldbgGenericErrorFunc(i18n("Error: Unable to find parameter %1.\n").tqarg(paramId));
+			xsldbgGenericErrorFunc(i18n("Error: Unable to find parameter %1.\n").arg(paramId));
 		}
 	    } else {
-		xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").tqarg("delparam"));
+		xsldbgGenericErrorFunc(i18n("Error: Invalid arguments for the command %1.\n").arg("delparam"));
 	    }
 	} else {
 	    /* Delete all parameters */
@@ -121,7 +121,7 @@ xslDbgShellDelParam(xmlChar * arg)
 	}
     }
     if (!result)
-        xsldbgGenericErrorFunc(TQString("Error: %1\n").tqarg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(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 (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadStatus() == 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").tqarg(i18n(errorPrompt)));
+        xsldbgGenericErrorFunc(TQString("Error: %1\n").arg(i18n(errorPrompt)));
         xsldbgGenericErrorFunc("\n");
     }
     return result;
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search.cpp b/kxsldbg/kxsldbgpart/libxsldbg/search.cpp
index dabf1d7e..68fcd7e1 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").tqarg(xsldbgText(searchInput)));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to write search Database to file %1. Try setting the \"searchresultspath\" option to a writable path.\n").arg(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").tqarg(xsldbgText(searchInput)).tqarg(xsldbgText(searchXSL)).tqarg(xsldbgText(searchOutput)));
+        xsldbgGenericErrorFunc(i18n("Information: Transformed %1 using %2 and saved to %3.\n").arg(xsldbgText(searchInput)).arg(xsldbgText(searchXSL)).arg(xsldbgText(searchOutput)));
     } else {
-        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").tqarg("search"));
+        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("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").tqarg(xsldbgText(name)));
+        xsldbgGenericErrorFunc(i18n("Error: XSLT template named \"%1\" was not found.\n").arg(xsldbgText(name)));
     return result;
 }
 
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/search_cmds.cpp
index d4bf51b1..1dc65190 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").tqarg((const char*)XSLDBG_DOCS_DIR_VARIABLE));
+        xsldbgGenericErrorFunc(i18n("Error: Required environment variable %1 not set to the directory of xsldbg documentation.\n").arg((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 1f0a3663..bd4e297b 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 getThreadtqStatus */
+#include "xsldbgthread.h"       /* for getThreadStatus */
 
 static int printCounter;        /* Dangerous name think of a better one */
 
@@ -127,14 +127,14 @@ printTemplateHelper(xsltTemplatePtr templ, int verbose,
 	} else {
 	  xmlChar *modeTemp = NULL;
 	  *count = *count + 1;
-	  if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+	  if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
 	    notifyListQueue(templ);
 	  } else {
 	    modeTemp = fullTQName(templ->modeURI, templ->mode);
 	    if (verbose)
-	      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)));
+	      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)));
 	    else
-	       xsldbgGenericErrorFunc(TQString("\"%s\" ").tqarg(xsldbgText(name)));
+	       xsldbgGenericErrorFunc(TQString("\"%s\" ").arg(xsldbgText(name)));
 	    if (modeTemp)
 	      xmlFree(modeTemp);
 	  }
@@ -196,7 +196,7 @@ xslDbgShellPrintTemplateNames(xsltTransformContextPtr styleCtxt,
             curStyle = NULL;
     }
 
-    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadStatus() == 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 (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN)
+        if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN)
             notifyListQueue(payload);
         else
 	    /* display the URL of stylesheet  */
-	    xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").tqarg(xsldbgUrl(style->doc->URL)));
+	    xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").arg(xsldbgUrl(style->doc->URL)));
         printCounter++;
     }
 }
@@ -283,11 +283,11 @@ xslDbgShellPrintStylesheetsHelper2(void *payload,
     xmlNodePtr node = (xmlNodePtr) payload;
 
     if (node && node->doc && node->doc->URL) {
-        if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN)
+        if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN)
             notifyListQueue(payload);
         else
 	    /* display the URL of stylesheet  */
-	     xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").tqarg(xsldbgUrl(node->doc->URL)));
+	     xsldbgGenericErrorFunc(i18n(" Stylesheet %1\n").arg(xsldbgUrl(node->doc->URL)));
         printCounter++;
     }
 }
@@ -307,7 +307,7 @@ xslDbgShellPrintStyleSheets(xmlChar * arg)
 {
     Q_UNUSED(arg);
     printCounter = 0;
-    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadStatus() == 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 bfce530e..3893be67 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").tqarg("walk"));
+        xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("walk"));
         xsldbgGenericErrorFunc(i18n("Warning: Assuming normal speed.\n"));
         speed = WALKSPEED_NORMAL;
     }
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp
index 90987949..a3a4df53 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/variable_cmds.cpp
@@ -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").tqarg(xsldbgText(name)));
+                    xsldbgGenericErrorFunc(i18n("Error: Variable %1 was not found.\n").arg(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").tqarg("set"));
+            xsldbgGenericErrorFunc(i18n("Error: Invalid arguments to command %1.\n").arg("set"));
     }
     return result;
 }
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
index 241d9730..1b1a6407 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 getThreadtqStatus */
+#include "xsldbgthread.h"       /* for getThreadStatus */
 #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").tqarg(message).tqarg(msec));
+    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").arg(message).arg(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").tqarg(message).tqarg(msec));
+    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n").arg(message).arg(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).tqarg(msec));
+    xsldbgGenericErrorFunc(i18n("%1 took %2 ms to complete.\n"),arg(message).arg(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.").tqarg((const char*)optionsGetStringOption(OPTIONS_DATA_FILE_NAME)));
+            endTimer(i18n("XInclude processing %1.").arg((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) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN)
+                      NULL) || (getThreadStatus() != 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").tqarg(filesTempFileName(1)));
+		     xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").arg(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) || (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN)
+			    NULL) || (getThreadStatus() != 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").tqarg(filesTempFileName(1)));
+			 xsldbgGenericErrorFunc(i18n("Error: Unable to write temporary results to %1.\n").arg(filesTempFileName(1)));
 			xmlDebugDumpDocument(stdout, res);
 		    }
 
@@ -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").tqarg(xsldbgText(cur->method)));
+			xsldbgGenericErrorFunc(i18n("Warning: Unsupported, non-standard output method %1.\n").arg(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").tqarg(xsldbgText(optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)))); 
+	xsldbgGenericErrorFunc(i18n("Error: Unable to save results of transformation to file %1.\n").arg(xsldbgText(optionsGetStringOption(OPTIONS_OUTPUT_FILE_NAME)))); 
 }
 
 int
@@ -532,7 +532,7 @@ xsldbgMain(int argc, char **argv)
     xmlDocPtr doc;
     
     KCmdLineArgs *args = 0;
-    if (getThreadtqStatus() == XSLDBG_MSG_THREAD_NOTUSED)
+    if (getThreadStatus() == XSLDBG_MSG_THREAD_NOTUSED)
 	args = KCmdLineArgs::parsedArgs();
 
     errorFile = stderr;
@@ -619,7 +619,7 @@ xsldbgMain(int argc, char **argv)
 	}
     }
    
-    if (getThreadtqStatus() != XSLDBG_MSG_THREAD_NOTUSED){
+    if (getThreadStatus() != XSLDBG_MSG_THREAD_NOTUSED){
 	result = optionsSetIntOption(OPTIONS_SHELL, 1);
     }
     /* copy the volitile options over to xsldbg */
@@ -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").tqarg(param.data()));
+		xsldbgGenericErrorFunc(i18n("Error: Argument \"%1\" to --param is not in the format <name>:<value>.\n").arg(param.data()));
 	}
 
 	TQCString cdPath = args->getOption("cd");
@@ -911,9 +911,9 @@ xsldbgLoadStylesheet()
         startTimer();
     style = xmlParseFile((const char *) optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME));
     if (optionsGetIntOption(OPTIONS_TIMING))
-        endTimer(i18n("Parsing stylesheet %1").tqarg((const char*)optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)));
+        endTimer(i18n("Parsing stylesheet %1").arg((const char*)optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME)));
     if (style == NULL) {
-        xsldbgGenericErrorFunc(i18n("Error: Cannot parse file %1.\n").tqarg(xsldbgUrl(optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME))));
+        xsldbgGenericErrorFunc(i18n("Error: Cannot parse file %1.\n").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_SOURCE_FILE_NAME))));
         cur = NULL;
         if (!optionsGetIntOption(OPTIONS_SHELL)) {
             xsldbgGenericErrorFunc(i18n("Fatal error: Aborting debugger due to an unrecoverable error.\n"));
@@ -988,7 +988,7 @@ xsldbgLoadXmlData(void)
         doc = xmlParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME));
 #endif
     if (doc == NULL) {
-        xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").tqarg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))));
         if (!optionsGetIntOption(OPTIONS_SHELL)) {
             xsldbgGenericErrorFunc(i18n("Fatal error: Aborting debugger due to an unrecoverable error.\n"));
             xslDebugStatus = DEBUG_TQUIT;
@@ -997,7 +997,7 @@ xsldbgLoadXmlData(void)
             xslDebugStatus = DEBUG_STOP;
         }
     } else if (optionsGetIntOption(OPTIONS_TIMING))
-        endTimer(TQString("Parsing document %1").tqarg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME))).utf8().data());
+        endTimer(TQString("Parsing document %1").arg(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").tqarg(xsldbgUrl(path)));
+        xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(path)));
     }
 
     if (optionsGetIntOption(OPTIONS_TIMING)
         && (xslDebugStatus != DEBUG_TQUIT)) {
-        endTimer(TQString("Parsing document %1").tqarg(xsldbgUrl(path)));
+        endTimer(TQString("Parsing document %1").arg(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 (getThreadtqStatus() != XSLDBG_MSG_THREAD_RUN){
+	if (getThreadStatus() != 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 (getThreadtqStatus() != XSLDBG_MSG_THREAD_NOTUSED) {
+        if (getThreadStatus() != 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 (getThreadtqStatus() == XSLDBG_MSG_THREAD_RUN) {
+    if (getThreadStatus() == XSLDBG_MSG_THREAD_RUN) {
         vsnprintf(msgBuffer, sizeof(msgBuffer), msg, args);
 
         notifyTextXsldbgApp(XSLDBG_MSG_TEXTOUT, msgBuffer);
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.cpp
index 4fb4a6c9..c95ad640 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 threadtqStatus = XSLDBG_MSG_THREAD_NOTUSED;
-static int inputtqStatus = XSLDBG_MSG_AWAITING_INPUT;
+static int threadStatus = XSLDBG_MSG_THREAD_NOTUSED;
+static int inputStatus = 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
-getInputtqStatus(void)
+getInputStatus(void)
 {
-    return inputtqStatus;
+    return inputStatus;
 }
 
 void
-setInputtqStatus(XsldbgMessageEnum type)
+setInputStatus(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 */
-            inputtqStatus = type;
+            inputStatus = type;
             break;
 
         default:
@@ -76,26 +76,26 @@ setInputtqStatus(XsldbgMessageEnum type)
 
 /* the compiler will optimize this function to inline and to keep variable private*/
 int
-getThreadtqStatus(void)
+getThreadStatus(void)
 {
-    return threadtqStatus;
+    return threadStatus;
 }
 
 /* reset the status to @p type */
 void
-setThreadtqStatus(XsldbgMessageEnum type)
+setThreadStatus(XsldbgMessageEnum type)
 {
     switch (type) {
         case XSLDBG_MSG_THREAD_NOTUSED:
         case XSLDBG_MSG_THREAD_INIT:
         case XSLDBG_MSG_THREAD_RUN:
-            threadtqStatus = type;
+            threadStatus = type;
             break;
 
         case XSLDBG_MSG_THREAD_STOP:
         case XSLDBG_MSG_THREAD_DEAD:
             xslDebugStatus = DEBUG_TQUIT;
-            threadtqStatus = type;
+            threadStatus = type;
             break;
 
         default:
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h
index 00802843..d83e71f3 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbgthread.h
@@ -40,13 +40,13 @@ extern "C" {
 
     void setAppReady(int ready);
 
-    int getInputtqStatus(void);
+    int getInputStatus(void);
 
-    void setInputtqStatus(XsldbgMessageEnum type);
+    void setInputStatus(XsldbgMessageEnum type);
 
-    int getThreadtqStatus(void);
+    int getThreadStatus(void);
 
-    void setThreadtqStatus(XsldbgMessageEnum type);
+    void setThreadStatus(XsldbgMessageEnum type);
 
     void *xsldbgThreadMain(void *data);
 
diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp
index 1b8d2df3..95c75940 100644
--- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp
+++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp
@@ -10,7 +10,7 @@
 #include <ktexteditor/editorchooser.h>
 #include <tqfile.h>
 #include <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqptrlist.h>
 
 
diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui
index c24fe29e..b367d6a5 100644
--- a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui
@@ -188,7 +188,7 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>60</width>
                                             <height>32767</height>
@@ -208,7 +208,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -243,7 +243,7 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>60</width>
                                             <height>32767</height>
@@ -263,7 +263,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -313,7 +313,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>81</width>
                             <height>20</height>
@@ -330,7 +330,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -349,7 +349,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -358,7 +358,7 @@
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout18</cstring>
+                <cstring>layout18</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -442,7 +442,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -473,7 +473,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -498,7 +498,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui
index d4fad88d..d1fdba5c 100644
--- a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui
@@ -99,7 +99,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -124,7 +124,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgconfig.ui b/kxsldbg/kxsldbgpart/xsldbgconfig.ui
index e146a93b..0eb93145 100644
--- a/kxsldbg/kxsldbgpart/xsldbgconfig.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgconfig.ui
@@ -21,7 +21,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>300</width>
             <height>450</height>
@@ -36,7 +36,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout11</cstring>
+                <cstring>layout11</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -52,7 +52,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -80,7 +80,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout12</cstring>
+                                <cstring>layout12</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -192,7 +192,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -289,7 +289,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -310,7 +310,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -341,7 +341,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -360,7 +360,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>110</width>
                                     <height>0</height>
@@ -382,7 +382,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>110</width>
                                     <height>0</height>
@@ -402,7 +402,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -421,7 +421,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
index a7fa7a83..7dca86c8 100644
--- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
@@ -177,7 +177,7 @@ void XsldbgConfigImpl::deleteParam(TQString name)
 		isOk = paramList.remove(param);
 
 	if (isOk == false)
-	  kdDebug() << TQString(" Param %1 dosn't exist").tqarg(name) << endl;
+	  kdDebug() << TQString(" Param %1 dosn't exist").arg(name) << endl;
 	else
 	  kdDebug() << "Deleted param " << name << endl;
 }
diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
index 7a4f4960..deead4fa 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) && (getInputtqStatus() == XSLDBG_MSG_AWAITING_INPUT) &&
+	if  ((getInputReady() == 0) && (getInputStatus() == XSLDBG_MSG_AWAITING_INPUT) &&
 		(commandQue.count() > 0)){
 		 TQString msg = commandQue.first();
  		 commandQue.remove(msg);
 		::fakeInput((const char*)msg.utf8());
 	}
 
-      	if ((!updateText.isEmpty()) && (getInputtqStatus() == XSLDBG_MSG_AWAITING_INPUT)){
+      	if ((!updateText.isEmpty()) && (getInputStatus() == 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){
-		setThreadtqStatus(XSLDBG_MSG_THREAD_STOP);
+		setThreadStatus(XSLDBG_MSG_THREAD_STOP);
 	}
 
 	  /* it always succeeds at the moment */
diff --git a/kxsldbg/kxsldbgpart/xsldbgentities.ui b/kxsldbg/kxsldbgpart/xsldbgentities.ui
index 627c56ff..17b847db 100644
--- a/kxsldbg/kxsldbgpart/xsldbgentities.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgentities.ui
@@ -79,7 +79,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -110,7 +110,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -135,7 +135,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui
index 3ae22f36..21c7cb19 100644
--- a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui
@@ -90,7 +90,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>
@@ -121,7 +121,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -170,7 +170,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -214,7 +214,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -239,7 +239,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.cpp b/kxsldbg/kxsldbgpart/xsldbginspector.cpp
index 9503eeae..2591b448 100644
--- a/kxsldbg/kxsldbgpart/xsldbginspector.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbginspector.cpp
@@ -17,7 +17,7 @@
 #include <tqwidget.h>
 #include <tqmime.h>
 #include <tqdragobject.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqimage.h>
diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui
index 31831e7f..04872236 100644
--- a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui
+++ b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui
@@ -58,7 +58,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -107,7 +107,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -137,7 +137,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>
@@ -214,7 +214,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -251,7 +251,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="2" column="1">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -309,7 +309,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -334,7 +334,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui b/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui
index 742c9514..a69244bf 100644
--- a/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgmsgdialog.ui
@@ -81,7 +81,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -127,7 +127,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -152,7 +152,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h b/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h
index 1c605e7e..fbb50f73 100644
--- a/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h
+++ b/kxsldbg/kxsldbgpart/xsldbgmsgdialogimpl.h
@@ -15,7 +15,7 @@
   */
 
 #include "xsldbgmsgdialog.h"
-#include <tqtextedit.h>
+#include <textedit.h>
 
 class XsldbgMsgDialogImpl : public XsldbgMsgDialog {
 
diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
index 03584163..71b21e7f 100644
--- a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
@@ -21,7 +21,7 @@
 
 #include <klocale.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmessagebox.h>
 #include <tqdialog.h>
 #include <tqpushbutton.h>
@@ -56,7 +56,7 @@ XsldbgOutputView::XsldbgOutputView(TQWidget * parent)
   : TQTextEdit(parent, "outputview")
 {
   new TQBoxLayout(this, TQBoxLayout::TopToBottom);
-  tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
+  setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
   setMinimumSize(TQSize(500, 80));
   setCaption(i18n("xsldbg Output"));
   setText(i18n("\t\txsldbg output capture ready\n\n"));
diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.h b/kxsldbg/kxsldbgpart/xsldbgoutputview.h
index caae76be..c3eb2402 100644
--- a/kxsldbg/kxsldbgpart/xsldbgoutputview.h
+++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.h
@@ -21,7 +21,7 @@
 /**
   *@author Keith Isdale
   */
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqmessagebox.h>
 
 class TQDialog;
diff --git a/kxsldbg/kxsldbgpart/xsldbgsources.ui b/kxsldbg/kxsldbgpart/xsldbgsources.ui
index b2b07d6a..e31f6ea6 100644
--- a/kxsldbg/kxsldbgpart/xsldbgsources.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgsources.ui
@@ -96,7 +96,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -121,7 +121,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui b/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui
index b93d24ea..5629f8c6 100644
--- a/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui
+++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeed.ui
@@ -41,7 +41,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <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="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="wordwrap" stdset="0">
@@ -66,7 +66,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>51</height>
@@ -129,7 +129,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>51</height>
@@ -160,7 +160,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -185,7 +185,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -210,7 +210,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp
index 9df822c8..bcc1852e 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").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 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 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/kdemacros.h.in b/lib/compatibility/kmdi/qextmdi/kdemacros.h.in
index 9308c18d..bfae0947 100644
--- a/lib/compatibility/kmdi/qextmdi/kdemacros.h.in
+++ b/lib/compatibility/kmdi/qextmdi/kdemacros.h.in
@@ -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 tqlayout of the vtable.
+ * binary incompatible as it breaks the layout of the vtable.
  */
 
 #define RESERVE_VIRTUAL_1 \
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
index f4bd138b..8008c9e4 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.cpp
@@ -22,7 +22,7 @@
 #include "kdockwidget_p.h"
 
 #include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqobjectlist.h>
 #include <tqstrlist.h>
@@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
 
   paint.begin( this );
 
-  tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
+  tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
 
   paint.end();
 }
@@ -221,8 +221,8 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
 #endif
   d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) );
 
-  tqlayout = new TQHBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  layout = new TQHBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   drag = new KDockWidgetHeaderDrag( this, parent );
 
@@ -234,7 +234,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
   connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock()));
 
   stayButton = new KDockButton_Private( this, "DockStayButton" );
-  TQToolTip::add( stayButton, i18n("Freeze the window tqgeometry", "Freeze") );
+  TQToolTip::add( stayButton, i18n("Freeze the window geometry", "Freeze") );
   stayButton->setToggleButton( true );
   stayButton->setPixmap( const_cast< const char** >(not_close_xpm) );
   stayButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
@@ -258,15 +258,15 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
   d->dummy->setFixedSize( 1,closeButton->pixmap()->height() );
 
 
-  tqlayout->addWidget( drag );
-  tqlayout->addWidget( dockbackButton );
-  tqlayout->addWidget( d->toDesktopButton );
-  tqlayout->addWidget( d->dummy);
-  tqlayout->addWidget( stayButton );
-  tqlayout->addWidget( closeButton );
-  tqlayout->activate();
+  layout->addWidget( drag );
+  layout->addWidget( dockbackButton );
+  layout->addWidget( d->toDesktopButton );
+  layout->addWidget( d->dummy);
+  layout->addWidget( stayButton );
+  layout->addWidget( closeButton );
+  layout->activate();
   d->dummy->hide();
-  drag->setFixedHeight( tqlayout->tqminimumSize().height() );
+  drag->setFixedHeight( layout->minimumSize().height() );
 }
 
 void KDockWidgetHeader::setTopLevel( bool isTopLevel )
@@ -291,7 +291,7 @@ void KDockWidgetHeader::setTopLevel( bool isTopLevel )
     if( d->showToDesktopButton )
       d->toDesktopButton->show();
   }
-  tqlayout->activate();
+  layout->activate();
 
    bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) ||
         d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) ||
@@ -318,9 +318,9 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
 {
   if ( !nd ) return;
 
-  delete tqlayout;
-  tqlayout = new TQHBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  delete layout;
+  layout = new TQHBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   delete drag;
   drag = nd;
@@ -329,26 +329,26 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
   }
 
 
-  tqlayout->addWidget( drag );
-  tqlayout->addWidget( dockbackButton );
-  tqlayout->addWidget( d->dummy );
-  tqlayout->addWidget( d->toDesktopButton );
-  tqlayout->addWidget( stayButton );
+  layout->addWidget( drag );
+  layout->addWidget( dockbackButton );
+  layout->addWidget( d->dummy );
+  layout->addWidget( d->toDesktopButton );
+  layout->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) {
-      tqlayout->addWidget(it.current());
+      layout->addWidget(it.current());
 	dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this));
   }
   if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
-  tqlayout->addWidget( closeButton );
-  tqlayout->activate();
-  kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<tqlayout->tqminimumSize().height()<<endl;
+  layout->addWidget( closeButton );
+  layout->activate();
+  kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->minimumSize().height()<<endl;
 #ifdef __GNUC__
 #warning FIXME
 #endif
-  drag->setFixedHeight( closeButton->height()); // /*tqlayout->minimumS*/tqsizeHint().height() );
+  drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/sizeHint().height() );
 }
 
 void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
@@ -362,26 +362,26 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
 
 	btn->show();
 
-	delete tqlayout;
-	tqlayout = new TQHBoxLayout( this );
-	tqlayout->setResizeMode( TQLayout::Minimum );
+	delete layout;
+	layout = new TQHBoxLayout( this );
+	layout->setResizeMode( TQLayout::Minimum );
 
-	tqlayout->addWidget( drag );
- 	tqlayout->addWidget( dockbackButton );
-	tqlayout->addWidget( d->toDesktopButton );
-	tqlayout->addWidget( d->dummy);
-	tqlayout->addWidget( stayButton );
+	layout->addWidget( drag );
+ 	layout->addWidget( dockbackButton );
+	layout->addWidget( d->toDesktopButton );
+	layout->addWidget( d->dummy);
+	layout->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) {
-	        tqlayout->addWidget(it.current());
+	        layout->addWidget(it.current());
 		dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this));
    	}
   	if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
-	tqlayout->addWidget( closeButton );
-	tqlayout->activate();
-	drag->setFixedHeight( tqlayout->tqminimumSize().height() );
+	layout->addWidget( closeButton );
+	layout->activate();
+	drag->setFixedHeight( layout->minimumSize().height() );
 }
 
 void KDockWidgetHeader::removeButton(KDockButton_Private* btn) {
@@ -425,12 +425,12 @@ void KDockWidgetHeader::setDragEnabled(bool b)
 #ifndef NO_KDE2
 void KDockWidgetHeader::saveConfig( KConfig* c )
 {
-  c->writeEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), stayButton->isOn() );
+  c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() );
 }
 
 void KDockWidgetHeader::loadConfig( KConfig* c )
 {
-  setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), false ) );
+  setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) );
 }
 #endif
 
@@ -497,8 +497,8 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP
 
   d->_parent = parent;
 
-  tqlayout = new TQVBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  layout = new TQVBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   manager = dockManager;
   manager->childDock->append( TQT_TQOBJECT(this) );
@@ -577,7 +577,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe)
 	TQWidget::paintEvent(pe);
         TQPainter paint;
         paint.begin( this );
-        tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
+        tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
         paint.end();
 }
 
@@ -604,7 +604,7 @@ void KDockWidget::mousePressEvent(TQMouseEvent* mme)
 		int styleheight;
 		TQPoint mp;
 		mp=mme->pos();
-      		styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+      		styleheight=2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
 		bbottom=mp.y()>=height()-styleheight;
 		btop=mp.y()<=styleheight;
 		bleft=mp.x()<=styleheight;
@@ -692,7 +692,7 @@ void  KDockWidget::mouseMoveEvent(TQMouseEvent* mme)
 	int styleheight;
 	TQPoint mp;
 	mp=mme->pos();
-      	styleheight=2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this);
+      	styleheight=2*tqstyle().pixelMetric(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 tqlayout;
+    delete layout;
     header = h;
-    tqlayout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
-    tqlayout->addWidget( header );
+    layout = new TQVBoxLayout( this );
+    layout->setResizeMode( TQLayout::Minimum );
+    layout->addWidget( header );
      setWidget( widget );
   } else {
     header = h;
-    tqlayout->addWidget( header );
+    layout->addWidget( header );
   }
   kdDebug(282)<<caption()<<": KDockWidget::setHeader"<<endl;
   setEnableDocking(eDocking);
@@ -774,7 +774,7 @@ void KDockWidget::updateHeader()
 {
   if ( parent() ){
 #ifdef BORDERLESS_WINDOWS
-      tqlayout->setMargin(0);
+      layout->setMargin(0);
       setMouseTracking(false);
       setCursor(TQCursor(ArrowCursor));
 #endif
@@ -792,7 +792,7 @@ void KDockWidget::updateHeader()
     header->setTopLevel( true );
     header->show();
 #ifdef BORDERLESS_WINDOWS
-      tqlayout->setMargin(2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth,this));
+      layout->setMargin(2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this));
       setMouseTracking(true);
 #endif
   }
@@ -811,7 +811,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
   }
 
   if ( manager && s == manager->main ){
-      setGeometry( TQRect(TQPoint(0,0), manager->main->tqgeometry().size()) );
+      setGeometry( TQRect(TQPoint(0,0), manager->main->geometry().size()) );
   }
 
   if ( !s )
@@ -1089,7 +1089,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
   if ( !parentDock ){
     // dock to a toplevel dockwidget means newDock is toplevel now
     newDock->move( target->frameGeometry().topLeft() );
-    newDock->resize( target->tqgeometry().size() );
+    newDock->resize( target->geometry().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->tqgeometry();
+    TQRect geom=newDock->geometry();
     TQWidget *wantTransient=tab->transientTo();
     newDock->setDockWindowTransient(wantTransient,wantTransient);
     newDock->setGeometry(geom);
@@ -1438,10 +1438,10 @@ void KDockWidget::setWidget( TQWidget* mw )
   if (!mw->ownCursor()) mw->setCursor(TQCursor(ArrowCursor));
 #endif
   widget = mw;
-  delete tqlayout;
+  delete layout;
 
-  tqlayout = new TQVBoxLayout( this );
-  tqlayout->setResizeMode( TQLayout::Minimum );
+  layout = new TQVBoxLayout( this );
+  layout->setResizeMode( TQLayout::Minimum );
 
   KDockContainer* dc = dynamic_cast<KDockContainer*>(widget);
   if (dc)
@@ -1456,8 +1456,8 @@ void KDockWidget::setWidget( TQWidget* mw )
 
   {
      header->show();
-     tqlayout->addWidget( header );
-     tqlayout->addWidget( widget,1 );
+     layout->addWidget( header );
+     layout->addWidget( widget,1 );
   }
   updateHeader();
   emit widgetSet(mw);
@@ -1478,7 +1478,7 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab )
   tab->parentWidget()->setName( listOfName.utf8() );
   tab->parentWidget()->setCaption( listOfCaption );
 
-  tab->parentWidget()->tqrepaint( false ); // KDockWidget->tqrepaint
+  tab->parentWidget()->repaint( false ); // KDockWidget->repaint
   if ( tab->parentWidget()->parent() )
     if ( tab->parentWidget()->parent()->inherits("KDockSplitter") )
       ((KDockSplitter*)(tab->parentWidget()->parent()))->updateName();
@@ -1551,13 +1551,13 @@ void KDockWidget::loseFormerBrotherDockWidget()
     TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
                          this, TQT_SLOT(loseFormerBrotherDockWidget()) );
   formerBrotherDockWidget = 0L;
-  tqrepaint();
+  repaint();
 }
 
 void KDockWidget::dockBack()
 {
   if( formerBrotherDockWidget) {
-    // search all tqchildren if it tries to dock back to a child
+    // search all children if it tries to dock back to a child
     bool found = false;
     TQObjectList* cl = queryList("KDockWidget");
     TQObjectListIt it( *cl );
@@ -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->tqgeometry());
+            d->dragRect = TQRect(curdw->geometry());
             TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
             d->dragRect.moveTopLeft(p);
             drawDragRectangle();
@@ -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->tqgeometry());
+              d->dragRect = TQRect(curdw->geometry());
               TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
               d->dragRect.moveTopLeft(p);
               drawDragRectangle();
@@ -1775,7 +1775,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
             break;
           } else {
             if (dropCancel && curdw) {
-              d->dragRect = TQRect(curdw->tqgeometry());
+              d->dragRect = TQRect(curdw->geometry());
               TQPoint p = curdw->mapToGlobal(TQPoint(0,0));
               d->dragRect.moveTopLeft(p);
             }else
@@ -1831,7 +1831,7 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
     return 0L;
   }
 #if defined(_OS_WIN32_) || defined(Q_OS_WIN32)
-  p = p->tqtopLevelWidget();
+  p = p->topLevelWidget();
 #endif
   TQWidget* w = 0L;
   findChildDockWidget( w, p, p->mapFromGlobal(pos) );
@@ -1892,7 +1892,7 @@ void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const
     while ( it.current() ) {
       if ( it.current()->isWidgetType() ) {
         w = (TQWidget*)it.current();
-        if ( w->isVisible() && w->tqgeometry().contains(pos) ) {
+        if ( w->isVisible() && w->geometry().contains(pos) ) {
           if ( w->inherits("KDockWidget") ) ww = w;
           findChildDockWidget( ww, w, w->mapFromParent(pos) );
           return;
@@ -2051,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::tqfromLatin1(b? "true" : "false"));
+    return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false"));
 }
 
 
@@ -2090,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::tqfromLatin1(it.current())));
+        subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current())));
         el.appendChild(subel);
     }
 
@@ -2160,7 +2160,7 @@ void KDockManager::writeConfig(TQDomElement &base)
     KDockWidget *obj1;
     while ( (obj1=(KDockWidget*)it.current()) ) {
         if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) )
-            mainWidgetStr = TQString::tqfromLatin1(obj1->name());
+            mainWidgetStr = TQString::fromLatin1(obj1->name());
         nList.append(obj1->name());
         ++it;
     }
@@ -2178,7 +2178,7 @@ void KDockManager::writeConfig(TQDomElement &base)
         KDockWidget *obj = getDockWidgetFromName( *nListIt);
         if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.find( obj->firstName.latin1() ) == -1
                              || nameList.find(obj->lastName.latin1()) == -1)) {
-            // Skip until tqchildren are saved (why?)
+            // Skip until children are saved (why?)
             ++nListIt;
 //            nList.next();
 //falk?            if ( !nList.current() ) nList.first();
@@ -2225,7 +2225,7 @@ void KDockManager::writeConfig(TQDomElement &base)
             }
         }
 
-        groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name())));
+        groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name())));
         groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent()));
         if ( !obj->parent() ) {
             groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size())));
@@ -2498,7 +2498,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
       c->writeEntry( "Main:view", obj->name() );
   }
 
-//  kdDebug(282)<<TQString("list size: %1").tqarg(nList.count())<<endl;
+//  kdDebug(282)<<TQString("list size: %1").arg(nList.count())<<endl;
   for (TQObjectListIt it(d->containerDocks);it.current();++it)
   {
   	KDockContainer* dc = dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget);
@@ -2506,7 +2506,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
 		dc->prepareSave(nList);
 	}
   }
-//  kdDebug(282)<<TQString("new list size: %1").tqarg(nList.count())<<endl;
+//  kdDebug(282)<<TQString("new list size: %1").arg(nList.count())<<endl;
 
   TQStringList::Iterator nListIt=nList.begin();
   while ( nListIt!=nList.end() ){
@@ -2529,7 +2529,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
         c->writeEntry( cname+":type", "GROUP");
         if ( !obj->parent() ){
           c->writeEntry( cname+":parent", "___null___");
-          c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+          c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
         } else {
           c->writeEntry( cname+":parent", "yes");
@@ -2561,7 +2561,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
         c->writeEntry( cname+":type", "TAB_GROUP");
         if ( !obj->parent() ){
           c->writeEntry( cname+":parent", "___null___");
-          c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+          c->writeEntry( cname+":geometry", 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);
@@ -2585,7 +2585,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group )
         c->writeEntry( cname+":tabToolTip", obj->toolTipString());
         if ( !obj->parent() ){
           c->writeEntry( cname+":type", "NULL_DOCK");
-          c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
+          c->writeEntry( cname+":geometry", 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);
@@ -2660,7 +2660,7 @@ void KDockManager::readConfig( KConfig* c, TQString group )
     obj = 0L;
 
     if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){
-      TQRect r = c->readRectEntry( oname + ":tqgeometry" );
+      TQRect r = c->readRectEntry( oname + ":geometry" );
       obj = getDockWidgetFromName( oname );
       obj->applyToWidget( 0L );
       obj->setGeometry(r);
@@ -2877,13 +2877,13 @@ void KDockManager::slotMenuPopup()
     ++it;
     if ( obj->mayBeHide() )
     {
-      menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Hide %1").tqarg(obj->caption()), numerator++ );
+      menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Hide %1").arg(obj->caption()), numerator++ );
       menuData->append( new MenuDockData( obj, true ) );
     }
 
     if ( obj->mayBeShow() )
     {
-      menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Show %1").tqarg(obj->caption()), numerator++ );
+      menu->insertItem( obj->icon() ? *(obj->icon()) : TQPixmap(), i18n("Show %1").arg(obj->caption()), numerator++ );
       menuData->append( new MenuDockData( obj, false ) );
     }
   }
@@ -2935,14 +2935,14 @@ void KDockManager::drawDragRectangle()
     KDockMainWindow* pMain = 0L;
     KDockWidget* pTLDockWdg = 0L;
     TQWidget* topWdg;
-    if (pDockWdgAtRect->tqtopLevelWidget() == main) {
+    if (pDockWdgAtRect->topLevelWidget() == main) {
       isOverMainWdg = true;
       topWdg = pMain = (KDockMainWindow*) main;
       unclipped = pMain->testWFlags( WPaintUnclipped );
       pMain->setWFlags( WPaintUnclipped );
     }
     else {
-      topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->tqtopLevelWidget();
+      topWdg = pTLDockWdg = (KDockWidget*) pDockWdgAtRect->topLevelWidget();
       unclipped = pTLDockWdg->testWFlags( WPaintUnclipped );
       pTLDockWdg->setWFlags( WPaintUnclipped );
     }
@@ -3059,11 +3059,11 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize)
     delete list;
 #if 0
     KDockSplitter *split;
-//    for (unsigned int i=0;i<tqchildren()->count();i++)
+//    for (unsigned int i=0;i<children()->count();i++)
     {
-//    	TQPtrList<TQObject> list(tqchildren());
-//       TQObject *obj=((TQPtrList<TQObject*>)tqchildren())->at(i);
-	TQObject *obj=tqchildren()->getFirst();
+//    	TQPtrList<TQObject> list(children());
+//       TQObject *obj=((TQPtrList<TQObject*>)children())->at(i);
+	TQObject *obj=children()->getFirst();
        if (split = dynamic_cast<KDockSplitter*>(obj))
        {
           split->setGeometry( TQRect(TQPoint(0,0), size() ));
@@ -3096,12 +3096,12 @@ void KDockArea::setMainDockWidget( KDockWidget* mdw )
 
 
 // KDOCKCONTAINER - AN ABSTRACTION OF THE KDOCKTABWIDGET
-KDockContainer::KDockContainer(){m_overlapMode=false; m_tqchildrenListBegin=0; m_tqchildrenListEnd=0;}
+KDockContainer::KDockContainer(){m_overlapMode=false; m_childrenListBegin=0; m_childrenListEnd=0;}
 KDockContainer::~KDockContainer(){
 
-	if (m_tqchildrenListBegin)
+	if (m_childrenListBegin)
 	{
-		struct ListItem *tmp=m_tqchildrenListBegin;
+		struct ListItem *tmp=m_childrenListBegin;
 		while (tmp)
 		{
 			struct ListItem *tmp2=tmp->next;
@@ -3109,8 +3109,8 @@ KDockContainer::~KDockContainer(){
 			delete tmp;
 			tmp=tmp2;
 		}
-		m_tqchildrenListBegin=0;
-		m_tqchildrenListEnd=0;
+		m_childrenListBegin=0;
+		m_childrenListEnd=0;
 	}
 
 }
@@ -3156,7 +3156,7 @@ KDockWidget *KDockContainer::parentDockWidget(){return 0;}
 
 TQStringList KDockContainer::containedWidgets() const {
 	TQStringList tmp;
-	for (struct ListItem *it=m_tqchildrenListBegin;it;it=it->next) {
+	for (struct ListItem *it=m_childrenListBegin;it;it=it->next) {
 		tmp<<TQString(it->data);
 	}
 
@@ -3172,36 +3172,36 @@ void KDockContainer::insertWidget (KDockWidget *dw, TQPixmap, const TQString &,
 		it->data=strdup(dw->name());
 		it->next=0;
 
-		if (m_tqchildrenListEnd)
+		if (m_childrenListEnd)
 		{
-			m_tqchildrenListEnd->next=it;
-			it->prev=m_tqchildrenListEnd;
-			m_tqchildrenListEnd=it;
+			m_childrenListEnd->next=it;
+			it->prev=m_childrenListEnd;
+			m_childrenListEnd=it;
 		}
 		else
 		{
 			it->prev=0;
-			m_tqchildrenListEnd=it;
-			m_tqchildrenListBegin=it;
+			m_childrenListEnd=it;
+			m_childrenListBegin=it;
 		}
 	}
 void KDockContainer::removeWidget (KDockWidget *dw){
-	for (struct ListItem *tmp=m_tqchildrenListBegin;tmp;tmp=tmp->next)
+	for (struct ListItem *tmp=m_childrenListBegin;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_tqchildrenListBegin) m_tqchildrenListBegin=tmp->next;
-			if (tmp==m_tqchildrenListEnd) m_tqchildrenListEnd=tmp->prev;
+			if (tmp==m_childrenListBegin) m_childrenListBegin=tmp->next;
+			if (tmp==m_childrenListEnd) m_childrenListEnd=tmp->prev;
 			delete tmp;
 			break;
 		}
 	}
 }
 
-//m_tqchildren.remove(dw->name());}
+//m_children.remove(dw->name());}
 void KDockContainer::undockWidget (KDockWidget *){;}
 void KDockContainer::setToolTip(KDockWidget *, TQString &){;}
 void KDockContainer::setPixmap(KDockWidget*,const TQPixmap&){;}
@@ -3212,11 +3212,11 @@ void KDockContainer::save (TQDomElement&){;}
 void KDockContainer::prepareSave(TQStringList &names)
 {
 
-	for (struct ListItem *tmp=m_tqchildrenListBegin;tmp; tmp=tmp->next)
+	for (struct ListItem *tmp=m_childrenListBegin;tmp; tmp=tmp->next)
 		names.remove(tmp->data);
-//	for (uint i=0;i<m_tqchildren.count();i++)
+//	for (uint i=0;i<m_children.count();i++)
 //	{
-//		names.remove(m_tqchildren.at(i));
+//		names.remove(m_children.at(i));
 //	}
 }
 
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
index 82872a4c..c435dbfc 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h
@@ -328,9 +328,9 @@ protected slots:
 protected:
 
   /**
-   * A tqlayout manager for placing the embedded buttons (close and stay)
+   * A layout manager for placing the embedded buttons (close and stay)
    */
-  TQHBoxLayout* tqlayout;
+  TQHBoxLayout* layout;
 
   /**
    * a little button for closing (undocking and hiding) the dockwidget
@@ -454,7 +454,7 @@ public:
    */
   KDockWidget( KDockManager* dockManager, const char* name,
                const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString(),
-               const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ), WFlags f = 0);
+               const TQString& strTabPageLabel = TQString::fromLatin1( " " ), WFlags f = 0);
 
   /**
    * Destructs a dockwidget.
@@ -856,9 +856,9 @@ private:
   TQWidget* widget;
 
   /**
-   * the tqlayout manager that takes care about proper resizing and moving the embedded widget and the header
+   * the layout manager that takes care about proper resizing and moving the embedded widget and the header
    */
-  TQVBoxLayout* tqlayout;
+  TQVBoxLayout* layout;
 
   /**
    * the responsible dockmanager
@@ -946,7 +946,7 @@ public:
 #ifndef NO_KDE2
   /**
    * Saves the current state of the dockmanager and of all controlled widgets.
-   * State means here to save the tqgeometry, visibility, parents, internal object names, orientation,
+   * State means here to save the geometry, visibility, parents, 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.
    *
@@ -963,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 tqlayout,
+   * So in principle, in order to restore a window layout,
    * 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.
@@ -978,11 +978,11 @@ public:
   void setMainDockWidget2(KDockWidget *);
 
   /**
-   * Saves the current dock window tqlayout into a DOM tree below the given element.
+   * Saves the current dock window layout into a DOM tree below the given element.
    */
   void writeConfig(TQDomElement &base);
   /**
-   * Reads the current dock window tqlayout from a DOM tree below the given element.
+   * Reads the current dock window layout from a DOM tree below the given element.
    */
   void readConfig(TQDomElement &base);
 
@@ -1318,7 +1318,7 @@ 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' tqchildren gets initialized
+   * @li information about the dock state of this' children gets initialized
    * @li a dockmanager is created...
    * @li ...and gets initialized
    * @li the main dockwidget is set to 0
@@ -1368,14 +1368,14 @@ public:
    * @return    a pointer to the new created dockwidget
    */
   KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
-    const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
+    const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::fromLatin1( " " ) );
 
   /**
-   * Saves the current dock window tqlayout into a DOM tree below the given element.
+   * Saves the current dock window layout into a DOM tree below the given element.
    */
   void writeDockConfig(TQDomElement &base);
   /**
-   * Reads the current dock window tqlayout from a DOM tree below the given element.
+   * Reads the current dock window layout from a DOM tree below the given element.
    */
   void readDockConfig(TQDomElement &base);
 
@@ -1494,7 +1494,7 @@ public:
   KDockWidget* getMainDockWidget(){ return mainDockWidget; }
 
   KDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L,
-    const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::tqfromLatin1( " " ) );
+    const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::fromLatin1( " " ) );
 
   void writeDockConfig(TQDomElement &base);
   void readDockConfig(TQDomElement &base);
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h
index 1ac686d9..9ee9e8e7 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h
@@ -77,8 +77,8 @@ private:
 
 
 
-  struct ListItem *m_tqchildrenListBegin;
-  struct ListItem *m_tqchildrenListEnd;
+  struct ListItem *m_childrenListBegin;
+  struct ListItem *m_childrenListEnd;
 
   class KDockContainerPrivate;
   KDockContainerPrivate *d;
diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
index 331b9082..49ddccdc 100644
--- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.cpp
@@ -180,20 +180,20 @@ void KDockSplitter::setupMinMaxSize()
   // Set the minimum and maximum sizes
   int minx, maxx, miny, maxy;
   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 = 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();
 
     miny = (miny > 4) ? miny : 4;
     maxy = (maxy < 32000) ? maxy : 32000;
     minx = (minx > 2) ? minx : 2;
     maxx = (maxx < 32000) ? maxx : 32000;
   } else {
-    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 = 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 = (minx > 4) ? minx : 4;
     maxx = (maxx < 32000) ? maxx : 32000;
@@ -351,20 +351,20 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge
 	if (initialised) {
 		if (m_orientation ==Qt::Vertical) {
 			if (child0==overlappingWidget) {
-				if (position<(child0->tqminimumSize().width()))
-					position=child0->tqminimumSize().width();
+				if (position<(child0->minimumSize().width()))
+					position=child0->minimumSize().width();
 				if (position>width()) position=width()-4;
-			} else if (position>(width()-(child1->tqminimumSize().width())-4)){
-				position=width()-(child1->tqminimumSize().width())-4;
+			} else if (position>(width()-(child1->minimumSize().width())-4)){
+				position=width()-(child1->minimumSize().width())-4;
 				if (position<0) position=0;
 			}
 		} else {// orientation  ==Qt::Horizontal
 			if (child0==overlappingWidget) {
-				if (position<(child0->tqminimumSize().height()))
-					position=child0->tqminimumSize().height();
+				if (position<(child0->minimumSize().height()))
+					position=child0->minimumSize().height();
 				if (position>height()) position=height()-4;
-			} else if (position>(height()-(child1->tqminimumSize().height())-4)){
-				position=height()-(child1->tqminimumSize().height())-4;
+			} else if (position>(height()-(child1->minimumSize().height())-4)){
+				position=height()-(child1->minimumSize().height())-4;
 				if (position<0) position=0;
 
 			}
@@ -378,15 +378,15 @@ int KDockSplitter::checkValue( int position ) const
 {
   if (initialised){
     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;
+      if (position < (child0->minimumSize().width()))
+        position = child0->minimumSize().width();
+      if ((width()-4-position) < (child1->minimumSize().width()))
+        position = width() - (child1->minimumSize().width()) -4;
     } else {
-      if (position < (child0->tqminimumSize().height()))
-        position = (child0->tqminimumSize().height());
-      if ((height()-4-position) < (child1->tqminimumSize().height()))
-        position = height() - (child1->tqminimumSize().height()) -4;
+      if (position < (child0->minimumSize().height()))
+        position = (child0->minimumSize().height());
+      if ((height()-4-position) < (child1->minimumSize().height()))
+        position = height() - (child1->minimumSize().height()) -4;
     }
   }
 
@@ -423,7 +423,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
         } else {
           xpos = factor * checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
           resizeEvent(0);
-          divider->tqrepaint(true);
+          divider->repaint(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->tqrepaint(true);
+          divider->repaint(true);
         }
       }
       handled= true;
@@ -452,7 +452,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
         }
         xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height();
         resizeEvent(0);
-        divider->tqrepaint(true);
+        divider->repaint(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->tqrepaint(true);
+        divider->repaint(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 tqchildren min/max size
+    // change children min/max size
     setupMinMaxSize();
     setSeparatorPos(xpos);
   }
@@ -492,7 +492,7 @@ void KDockSplitter::updateName()
   TQString new_name = TQString( child0->name() ) + "," + child1->name();
   parentWidget()->setName( new_name.latin1() );
   parentWidget()->setCaption( child0->caption() + "," + child1->caption() );
-  parentWidget()->tqrepaint( false );
+  parentWidget()->repaint( false );
 
   ((KDockWidget*)parentWidget())->firstName = child0->name();
   ((KDockWidget*)parentWidget())->lastName = child1->name();
@@ -553,7 +553,7 @@ KDockButton_Private::~KDockButton_Private()
 
 void KDockButton_Private::drawButton( TQPainter* p )
 {
-  p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) );
+  p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().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( tqcolorGroup().dark() );
+    p->setPen( colorGroup().dark() );
     p->lineTo( width() - 1, height() - 1 );
     p->lineTo( 0, height() - 1 );
   }
   if ( isOn() || isDown() ){
-    p->setPen( tqcolorGroup().dark() );
+    p->setPen( colorGroup().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;
-  tqrepaint();
+  repaint();
 }
 
 void KDockButton_Private::leaveEvent( TQEvent * )
 {
   moveMouse = false;
-  tqrepaint();
+  repaint();
 }
 
 /*************************************************************************/
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
index bb258c6b..3d87eace 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.cpp
@@ -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 tqchildren
+		//disable the labels of all the other children
 		TQPtrListIterator<KMdiChildFrm> it( *m_pZ );
 		for ( ; ( *it ); ++it )
 			( *it )->m_pCaption->setActive( false );
@@ -230,7 +230,7 @@ void KMdiChildArea::setTopChild( KMdiChildFrm* child, bool /* bSetFocus */ )
 
 void KMdiChildArea::resizeEvent( TQResizeEvent* e )
 {
-	//If we have a maximized tqchildren at the top , adjust its size
+	//If we have a maximized children at the top , adjust its size
 	KMdiChildFrm* child = topChild();
 	if ( child && child->state() == KMdiChildFrm::Maximized  )
 	{
@@ -368,7 +368,7 @@ void KMdiChildArea::focusTopChild()
 
 	if ( !lastChild->m_pClient->hasFocus() )
 	{
-		//disable the labels of all the other tqchildren
+		//disable the labels of all the other children
 		TQPtrListIterator<KMdiChildFrm> it ( *m_pZ );
 		for ( ; ( *it ); ++it )
 		{
@@ -424,10 +424,10 @@ void KMdiChildArea::cascadeMaximized()
 			childFrm->move( pnt );
 			TQSize curSize( width() - pnt.x(), height() - pnt.y() );
 			
-			if ( ( childFrm->tqminimumSize().width() > curSize.width() ) ||
-			     ( childFrm->tqminimumSize().height() > curSize.height() ) )
+			if ( ( childFrm->minimumSize().width() > curSize.width() ) ||
+			     ( childFrm->minimumSize().height() > curSize.height() ) )
 			{
-				childFrm->resize( childFrm->tqminimumSize() );
+				childFrm->resize( childFrm->minimumSize() );
 			}
 			else
 				childFrm->resize( curSize );
@@ -611,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 tqlayout
+	// create an array to form grid layout
 	int *numRows = new int[ numCols ];
 	int numCurCol = 0;
 	
@@ -742,7 +742,7 @@ void KMdiChildArea::layoutMinimizedChildren()
 			}
 			
 			child->move( posX, posY - child->height() );
-			posX = child->tqgeometry().right();
+			posX = child->geometry().right();
 		}
 	}
 }
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h
index e175373e..d9d0184e 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildarea.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildarea.h
@@ -138,13 +138,13 @@ public:
 	void setTopChild( KMdiChildFrm* child, bool setFocus = false );
 	
 	/**
-	 * Returns the topmost child (the active one) or 0 if there are no tqchildren.
+	 * Returns the topmost child (the active one) or 0 if there are no children.
 	 * 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 tqchildren
+	 * Returns the number of visible children
 	 */
 	int getVisibleChildCount() const;
 	
@@ -157,31 +157,31 @@ public:
 	
 	/**
 	 * Sets the MDI childframe window caption font
-	 * A retqlayout does not occur when using this function
+	 * A relayout does not occur when using this function
 	 */
 	void setMdiCaptionFont( const TQFont &fnt );
 	
 	/**
 	 * Sets the foreground color of the active MDI childframe window caption
-	 * A retqlayout does not occur when using this function
+	 * A relayout does not occur when using this function
 	 */
 	void setMdiCaptionActiveForeColor( const TQColor &clr );
 	
 	/**
 	 * Sets the background color of the active MDI childframe window captions
-	 * A retqlayout does not occur when using this function
+	 * A relayout does not occur when using this function
 	 */
 	void setMdiCaptionActiveBackColor( const TQColor &clr );
 	
 	/**
 	 * Sets the foreground color of inactive MDI childframe window captions
-	 * A retqlayout does not occur when using this function
+	 * A relayout does not occur when using this function
 	 */
 	void setMdiCaptionInactiveForeColor( const TQColor &clr );
 	
 	/**
 	 * Sets the background color of inactive MDI childframe window captions
-	 * A retqlayout does not occur when using this function
+	 * A relayout does not occur when using this function
 	 */
 	void setMdiCaptionInactiveBackColor( const TQColor &clr );
 	
@@ -240,7 +240,7 @@ public slots:
 	void tileVertically();
 	
 	/**
-	 * Position and tqlayout the minimized child frames
+	 * Position and layout the minimized child frames
 	 */
 	void layoutMinimizedChildren();
 
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
index 8086e7f4..21427186 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.cpp
@@ -278,7 +278,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e )
 	if ( !m_pClient )
 		return;
 	
-	if ( m_pClient->tqminimumSize() == m_pClient->tqmaximumSize() )
+	if ( m_pClient->minimumSize() == m_pClient->maximumSize() )
 		return; 
 
 	if ( m_bResizing )
@@ -329,11 +329,11 @@ void KMdiChildFrm::resizeWindow( int resizeCorner, int xPos, int yPos )
 	// it could be the client forces the childframe to enlarge its minimum size
 	if ( m_pClient )
 	{
-		minWidth = m_pClient->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
-		minHeight = m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+		minWidth = m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+		minHeight = m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
 		            m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR;
-		maxWidth = m_pClient->tqmaximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
-		maxHeight = m_pClient->tqmaximumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+		maxWidth = m_pClient->maximumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER;
+		maxHeight = m_pClient->maximumSize().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 / tqlayout behavior don't change
+			// client min / max size / layout 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->tqmaximumSize().width(), m_pClient->tqmaximumSize().height() );
+			m_pClient->setMaximumSize( m_pClient->maximumSize().width(), m_pClient->maximumSize().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 / tqlayout behavior
+			// restore client min / max size / layout behavior
 			m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() );
 			m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() );
-			if ( m_pClient->tqlayout() != 0L )
+			if ( m_pClient->layout() != 0L )
 			{
-				m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode );
+				m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode );
 			}
 			m_pMinimize->setPixmap( *m_pMinButtonPixmap );
 			m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
@@ -555,12 +555,12 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 			{
 				m_pClient->m_stateChanged = true;
 				m_state = state;
-				// restore client min / max size / tqlayout behavior
+				// restore client min / max size / layout behavior
 				m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() );
 				m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() );
-				if ( m_pClient->tqlayout() != 0L )
+				if ( m_pClient->layout() != 0L )
 				{
-					m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode );
+					m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode );
 				}
 				setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
 				// reset to maximize-captionbar
@@ -581,7 +581,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 			{
 				m_pClient->m_stateChanged = true;
 				m_state = state;
-				// client min / max size / tqlayout behavior don't change
+				// client min / max size / layout behavior don't change
 				setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
 				m_pMaximize->setPixmap( *m_pRestoreButtonPixmap );
 				int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER;
@@ -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 ( tqgeometry() != maximizedFrmRect )
+				if ( geometry() != 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 / tqlayout behavior
-			m_oldClientMinSize = m_pClient->tqminimumSize();
-			m_oldClientMaxSize = m_pClient->tqmaximumSize();
-			if ( m_pClient->tqlayout() != 0L )
+			// save client min / max size / layout behavior
+			m_oldClientMinSize = m_pClient->minimumSize();
+			m_oldClientMaxSize = m_pClient->maximumSize();
+			if ( m_pClient->layout() != 0L )
 			{
-				m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode();
+				m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
 			}
 			m_pClient->setMinimumSize( 0, 0 );
 			m_pClient->setMaximumSize( 0, 0 );
-			if ( m_pClient->tqlayout() != 0L )
+			if ( m_pClient->layout() != 0L )
 			{
-				m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize );
+				m_pClient->layout() ->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 / tqlayout behavior
-			m_oldClientMinSize = m_pClient->tqminimumSize();
-			m_oldClientMaxSize = m_pClient->tqmaximumSize();
-			if ( m_pClient->tqlayout() != 0L )
+			// save client min / max size / layout behavior
+			m_oldClientMinSize = m_pClient->minimumSize();
+			m_oldClientMaxSize = m_pClient->maximumSize();
+			if ( m_pClient->layout() != 0L )
 			{
-				m_oldLayoutResizeMode = m_pClient->tqlayout() ->tqresizeMode();
+				m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
 			}
-			m_restoredRect = tqgeometry();
+			m_restoredRect = geometry();
 			m_pClient->setMinimumSize( 0, 0 );
 			m_pClient->setMaximumSize( 0, 0 );
-			if ( m_pClient->tqlayout() != 0L )
+			if ( m_pClient->layout() != 0L )
 			{
-				m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize );
+				m_pClient->layout() ->setResizeMode( TQLayout::FreeResize );
 			}
 			switchToMinimizeLayout();
 			m_pManager->childMinimized( this, false );
@@ -694,7 +694,7 @@ void KMdiChildFrm::setCaption( const TQString& text )
 void KMdiChildFrm::enableClose( bool bEnable )
 {
 	m_pClose->setEnabled( bEnable );
-	m_pClose->tqrepaint( false );
+	m_pClose->repaint( false );
 }
 
 //============ setIcon ==================//
@@ -779,8 +779,8 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
 	{
 		//reparent to this widget , no flags , point , show it
 		TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos );
-		TQSize mincs = w->tqminimumSize();
-		TQSize maxcs = w->tqmaximumSize();
+		TQSize mincs = w->minimumSize();
+		TQSize maxcs = w->maximumSize();
 		w->setMinimumSize( 0, 0 );
 		w->setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
 
@@ -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->tqminimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
+		setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
 
 	if ( m_pClient->minimumHeight() > m_pManager->m_defaultChildFrmSize.height() )
 	{
-		setMinimumHeight( m_pClient->tqminimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
+		setMinimumHeight( m_pClient->minimumSize().height() + KMDI_CHILDFRM_DOUBLE_BORDER +
 		                  m_pCaption->heightHint() + KMDI_CHILDFRM_SEPARATOR );
 	}
 }
@@ -826,8 +826,8 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 	if ( focusedChildWidget != 0 )
 		nameOfFocusedWidget = focusedChildWidget->name();
 
-	TQSize mins = m_pClient->tqminimumSize();
-	TQSize maxs = m_pClient->tqmaximumSize();
+	TQSize mins = m_pClient->minimumSize();
+	TQSize maxs = m_pClient->maximumSize();
 	m_pClient->reparent( 0, 0, mapToGlobal( pos() ) - pos() + positionOffset, isVisible() );
 	m_pClient->setMinimumSize( mins.width(), mins.height() );
 	m_pClient->setMaximumSize( maxs.width(), maxs.height() );
@@ -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 tqchildren
+	//The buttons are caption children
 	if ( KMdiMainFrm::frameDecorOfAttachedViews() == KMdi::Win95Look )
 	{
 		rightOffset2 += 2;
@@ -1153,7 +1153,7 @@ 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 tqchildren
+			// child and its children
 			TQObject* pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child());
 			if ( ( pLostChild != 0L )   /*&& (pLostChild->inherits(TQWIDGET_OBJECT_NAME_STRING))*/ )
 			{
@@ -1174,7 +1174,7 @@ 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 tqchildren (as we did when we got our client).
+			// child and its children (as we did when we got our client).
 			// XXX see linkChildren() and focus policy stuff
 			TQObject* pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
 			if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) )
@@ -1284,9 +1284,9 @@ void KMdiChildFrm::showSystemMenu()
 	
 	TQRect iconGeom;
 	if ( KMdiMainFrm::frameDecorOfAttachedViews() == KMdi::Win95Look )
-		iconGeom = m_pWinIcon->tqgeometry();
+		iconGeom = m_pWinIcon->geometry();
 	else
-		iconGeom = m_pUnixIcon->tqgeometry();
+		iconGeom = m_pUnixIcon->geometry();
 	
 	popupmenuPosition = TQPoint( iconGeom.x(), iconGeom.y() + captionHeight() + KMDI_CHILDFRM_BORDER );
 	systemMenu() ->popup( mapToGlobal( popupmenuPosition ) );
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
index a63c4ed9..78f4492c 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrm.h
@@ -33,7 +33,7 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <tqdatetime.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <tqdict.h>
 
@@ -247,12 +247,12 @@ public:
 	TQRect mdiAreaContentsRect() const;
 	
 	/**
-	 * Returns the tqgeometry that will be restored by calling restore().
+	 * Returns the geometry that will be restored by calling restore().
 	 */
 	TQRect restoreGeometry() const;
 	
 	/**
-	 * Sets the tqgeometry that will be restored by calling restore().
+	 * Sets the geometry that will be restored by calling restore().
 	 */
 	void setRestoreGeometry( const TQRect& newRestGeo );
 	
@@ -354,7 +354,7 @@ protected:
 	virtual bool eventFilter( TQObject*, TQEvent* ); 
 	
 	/**
-	 * Calculates the new tqgeometry from the new mouse position given as parameters
+	 * Calculates the new geometry from the new mouse position given as parameters
 	 * and calls KMdiChildFrm::setGeometry
 	 */
 	void resizeWindow( int resizeCorner, int x, int y );
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp
index f243a2a7..ed4ba2d6 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildfrmcaption.cpp
@@ -182,7 +182,7 @@ void KMdiChildFrmCaption::setActive( bool bActive )
 	                                            m_pParent->m_pManager->m_captionInactiveBackColor );
 
 	m_bActive = bActive;
-	tqrepaint( false );
+	repaint( false );
 }
 
 //=============== setCaption ===============//
@@ -190,7 +190,7 @@ void KMdiChildFrmCaption::setActive( bool bActive )
 void KMdiChildFrmCaption::setCaption( const TQString& text )
 {
 	m_szCaption = text;
-	tqrepaint( false );
+	repaint( false );
 }
 
 //============== heightHint ===============//
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp
index 93dcbb56..8afdf249 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.cpp
@@ -107,14 +107,14 @@ void KMdiChildView::trackIconAndCaptionChanges( TQWidget *view )
 }
 
 
-//============== internal tqgeometry ==============//
+//============== internal geometry ==============//
 
 TQRect KMdiChildView::internalGeometry() const
 {
 	if ( mdiParent() )
 	{ // is attached
 		// get the client area coordinates inside the MDI child frame
-		TQRect posInFrame = tqgeometry();
+		TQRect posInFrame = geometry();
 		// map these values to the parent of the MDI child frame
 		// (this usually is the MDI child area) and return
 		TQPoint ptTopLeft = mdiParent() ->mapToParent( posInFrame.topLeft() );
@@ -123,14 +123,14 @@ TQRect KMdiChildView::internalGeometry() const
 	}
 	else
 	{
-		TQRect geo = tqgeometry();
+		TQRect geo = geometry();
 		TQRect frameGeo = externalGeometry();
 		return TQRect( frameGeo.x(), frameGeo.y(), geo.width(), geo.height() );
-		//      return tqgeometry();
+		//      return geometry();
 	}
 }
 
-//============== set internal tqgeometry ==============//
+//============== set internal geometry ==============//
 
 void KMdiChildView::setInternalGeometry( const TQRect& newGeometry )
 {
@@ -142,7 +142,7 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry )
 		int nFrameSizeTop = geo.y() - frameGeo.y();
 		int nFrameSizeLeft = geo.x() - frameGeo.x();
 
-		// create the new tqgeometry that is accepted by the TQWidget::setGeometry() method
+		// create the new geometry that is accepted by the TQWidget::setGeometry() method
 		TQRect newGeoTQt;
 		newGeoTQt.setX( newGeometry.x() - nFrameSizeLeft );
 		newGeoTQt.setY( newGeometry.y() - nFrameSizeTop );
@@ -152,7 +152,7 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry )
 		//      newGeoTQt.setWidth(newGeometry.width()+KMDI_MDI_CHILDFRM_DOUBLE_BORDER);
 		//      newGeoTQt.setHeight(newGeometry.height()+mdiParent()->captionHeight()+KMDI_MDI_CHILDFRM_DOUBLE_BORDER);
 
-		// set the tqgeometry
+		// set the geometry
 		mdiParent()->setGeometry( newGeoTQt );
 	}
 	else
@@ -163,7 +163,7 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry )
 		int nFrameSizeTop = geo.y() - frameGeo.y();
 		int nFrameSizeLeft = geo.x() - frameGeo.x();
 
-		// create the new tqgeometry that is accepted by the TQWidget::setGeometry() method
+		// create the new geometry that is accepted by the TQWidget::setGeometry() method
 		TQRect newGeoTQt;
 
 		newGeoTQt.setX( newGeometry.x() - nFrameSizeLeft );
@@ -172,19 +172,19 @@ void KMdiChildView::setInternalGeometry( const TQRect& newGeometry )
 		newGeoTQt.setWidth( newGeometry.width() );
 		newGeoTQt.setHeight( newGeometry.height() );
 
-		// set the tqgeometry
+		// set the geometry
 		setGeometry( newGeoTQt );
 	}
 }
 
-//============== external tqgeometry ==============//
+//============== external geometry ==============//
 
 TQRect KMdiChildView::externalGeometry() const
 {
 	return mdiParent() ? mdiParent()->frameGeometry() : frameGeometry();
 }
 
-//============== set external tqgeometry ==============//
+//============== set external geometry ==============//
 
 void KMdiChildView::setExternalGeometry( const TQRect& newGeometry )
 {
@@ -202,7 +202,7 @@ void KMdiChildView::setExternalGeometry( const TQRect& newGeometry )
 		int nFrameSizeTop = geo.y() - frameGeo.y();
 		int nFrameSizeLeft = geo.x() - frameGeo.x();
 
-		// create the new tqgeometry that is accepted by the TQWidget::setGeometry() method
+		// create the new geometry that is accepted by the TQWidget::setGeometry() method
 		// not attached => the window system makes the frame
 		TQRect newGeoTQt;
 		newGeoTQt.setX( newGeometry.x() + nFrameSizeLeft );
@@ -210,7 +210,7 @@ void KMdiChildView::setExternalGeometry( const TQRect& newGeometry )
 		newGeoTQt.setWidth( newGeometry.width() - nTotalFrameWidth );
 		newGeoTQt.setHeight( newGeometry.height() - nTotalFrameHeight );
 
-		// set the tqgeometry
+		// set the geometry
 		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 tqgeometry();
+		return geometry();
 }
 
 //============== setRestoreGeometry ================//
@@ -491,7 +491,7 @@ 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 tqchildren
+	// child and its children
 	const TQObject * pLostChild = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(TQT_BASE_OBJECT_NAME::sender()));
 	if ( pLostChild && ( pLostChild->isWidgetType() ) )
 	{
@@ -564,7 +564,7 @@ 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 tqchildren
+		// child and its children
 		TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
 		if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) )
 		{
@@ -593,7 +593,7 @@ 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 tqchildren
+		// install ourself as event filter for the new child and its children
 		// (as we did when we were added to the MDI system).
 		TQObject * pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
 		if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) )
diff --git a/lib/compatibility/kmdi/qextmdi/kmdichildview.h b/lib/compatibility/kmdi/qextmdi/kmdichildview.h
index 52cca9e0..af0c8030 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdichildview.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdichildview.h
@@ -71,7 +71,7 @@ class KMdiChildViewPrivate;
   *   KMdiChildView* pMDICover = new KMdiChildView( pNewView->caption());
   *   pMDICover->setIcon(icon);
   *   m_MDICoverList.append( pMDICover);
-  *   TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout");
+  *   TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "layout");
   *   pNewView->reparent( pMDICover, TQPoint(0,0));
   *   pLayout->addWidget( pNewView);
   *   pMDICover->setName( pNewView->name());
@@ -271,12 +271,12 @@ public:
 	bool isMaximized() const;
 	
 	/**
-	 * Returns the tqgeometry of this MDI child window as TQWidget::tqgeometry() does.
+	 * Returns the geometry of this MDI child window as TQWidget::geometry() does.
 	 */
 	TQRect internalGeometry() const;
 	
 	/**
-	 * Sets the tqgeometry of the client area of this MDI child window. The
+	 * Sets the geometry 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
 	 * and height is the width and height of the client area. Please note: This
@@ -285,12 +285,12 @@ public:
 	void setInternalGeometry( const TQRect& newGeomety );
 	
 	/**
-	 * Returns the frame tqgeometry of this window or of the parent if there is any...
+	 * Returns the frame geometry of this window or of the parent if there is any...
 	 */
 	TQRect externalGeometry() const;
 	
 	/**
-	 * Sets the tqgeometry of the frame of this MDI child window. The top left
+	 * Sets the geometry 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
 	 * the width and height of the widget frame. Please note: This differs
@@ -316,12 +316,12 @@ public:
 	virtual void maximize( bool bAnimate );
 	
 	/**
-	 * Returns the tqgeometry that will be restored by calling restore().
+	 * Returns the geometry that will be restored by calling restore().
 	 */
 	TQRect restoreGeometry();
 	
 	/**
-	 * Sets the tqgeometry that will be restored by calling restore().
+	 * Sets the geometry that will be restored by calling restore().
 	 */
 	void setRestoreGeometry( const TQRect& newRestGeo );
 	
@@ -359,7 +359,7 @@ public:
 	 */
 	inline void updateTimeStamp()
 	{
-		m_time.setDate( TQDate::tqcurrentDate() );
+		m_time.setDate( TQDate::currentDate() );
 		m_time.setTime( TQTime::currentTime() );
 	}
 	
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidefines.h b/lib/compatibility/kmdi/qextmdi/kmdidefines.h
index f8dfdeb2..ce41244a 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidefines.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdidefines.h
@@ -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 tqgeometry of the
+      * That means it is stay-on-top and toplevel. UseKMdiSizeHint should use the restore geometry 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 fa3394ad..b80b497b 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
@@ -24,7 +24,7 @@
 #include "kdockwidget_private.h"
 
 #include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
 #include <kmultitabbar.h>
@@ -70,9 +70,9 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit
 
 
 	if ( m_horizontal )
-		l = new TQVBoxLayout( this ); //vertical tqlayout for top and bottom docks
+		l = new TQVBoxLayout( this ); //vertical layout for top and bottom docks
 	else
-		l = new TQHBoxLayout( this ); //horizontal tqlayout for left and right docks
+		l = new TQHBoxLayout( this ); //horizontal layout 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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+	m_ws->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
 
-	//tqlayout the tabbar
+	//layout the tabbar
 	if ( position == KDockWidget::DockLeft || position == KDockWidget::DockTop )
 	{
 		//add the tabbar then the widget stack
@@ -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" ).tqarg( parent() ->name() ) ) );
+	el.appendChild( doc.createTextNode( TQString( "%1" ).arg( parent() ->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" ).tqarg( i ) );
+		el.setAttribute( "pos", TQString( "%1" ).arg( i ) );
 		TQString s = tabCaptions[ *it2 ];
 		if ( !s.isEmpty() )
 		{
@@ -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" ).tqarg( parent() ->name() ) );
-	cfg->setGroup( group_or_prefix + TQString( "::%1" ).tqarg( parent() ->name() ) );
+	cfg->deleteGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
+	cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
 
 	if ( isOverlapMode() )
 		cfg->writeEntry( "overlapMode", "true" );
@@ -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").tqarg(i),m_ws->widget(it.current()->id())->name());
-		cfg->writeEntry( TQString( "widget%1" ).tqarg( i ), ( *it2 ) );
+		//    cfg->writeEntry(TQString("widget%1").arg(i),m_ws->widget(it.current()->id())->name());
+		cfg->writeEntry( TQString( "widget%1" ).arg( i ), ( *it2 ) );
 		TQString s = tabCaptions[ *it2 ];
 		if ( !s.isEmpty() )
 		{
-			cfg->writeEntry( TQString( "widget%1-tabCaption" ).tqarg( i ), s );
+			cfg->writeEntry( TQString( "widget%1-tabCaption" ).arg( i ), s );
 		}
 		s = tabTooltips[ *it2 ];
 		if ( !s.isEmpty() )
 		{
-			cfg->writeEntry( TQString( "widget%1-tabTooltip" ).tqarg( i ), s );
+			cfg->writeEntry( TQString( "widget%1-tabTooltip" ).arg( 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" ).tqarg( parent() ->name() ) );
+	cfg->setGroup( group_or_prefix + TQString( "::%1" ).arg( parent() ->name() ) );
 
 	if ( cfg->readEntry( "overlapMode" ) != "false" )
 		activateOverlapMode( m_tb->width() );
@@ -685,19 +685,19 @@ void KMdiDockContainer::load( KConfig* cfg, const TQString& group_or_prefix )
 	TQString raise;
 	while ( true )
 	{
-		TQString dwn = cfg->readEntry( TQString( "widget%1" ).tqarg( i ) );
+		TQString dwn = cfg->readEntry( TQString( "widget%1" ).arg( i ) );
 		if ( dwn.isEmpty() )
 			break;
 		kdDebug( 760 ) << k_funcinfo << "configuring dockwidget :" << dwn << endl;
 		KDockWidget *dw = ( ( KDockWidget* ) parent() ) ->dockManager() ->getDockWidgetFromName( dwn );
 		if ( dw )
 		{
-			TQString s = cfg->readEntry( TQString( "widget%1-tabCaption" ).tqarg( i ) );
+			TQString s = cfg->readEntry( TQString( "widget%1-tabCaption" ).arg( i ) );
 			if ( !s.isEmpty() )
 			{
 				dw->setTabPageLabel( s );
 			}
-			s = cfg->readEntry( TQString( "widget%1-tabTooltip" ).tqarg( i ) );
+			s = cfg->readEntry( TQString( "widget%1-tabTooltip" ).arg( i ) );
 			if ( !s.isEmpty() )
 			{
 				dw->setToolTipString( s );
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp
index fb5ed357..f2c2d599 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdidocumentviewtabwidget.cpp
@@ -56,7 +56,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQString & l
 	KTabWidget::insertTab( child, label, index );
 	showPage( child );
 	maybeShow();
-	tabBar() ->tqrepaint();
+	tabBar() ->repaint();
 }
 
 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() ->tqrepaint();
+	tabBar() ->repaint();
 }
 
 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() ->tqrepaint();
+	tabBar() ->repaint();
 }
 
 void KMdiDocumentViewTabWidget::removePage ( TQWidget * w )
diff --git a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
index 0cf76c04..f27391c8 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdiguiclient.cpp
@@ -128,8 +128,8 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 	if ( domDocument().documentElement().isNull() )
 	{
 
-		TQString completeDescription = TQString::tqfromLatin1( guiDescription )
-		                              .tqarg( actionListName );
+		TQString completeDescription = TQString::fromLatin1( guiDescription )
+		                              .arg( actionListName );
 
 		setXML( completeDescription, false /*merge*/ );
 	}
@@ -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" ).tqarg( mtva->wrappedWidget() ->caption() ),
+	KAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( 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" ).tqarg( mtva->wrappedWidget() ->caption() ) );
+	( ( ToggleToolViewAction* ) a ) ->setCheckedState( i18n( "Hide %1" ).arg( mtva->wrappedWidget() ->caption() ) );
 #endif
 
 	connect( a, TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( actionDeleted( TQObject* ) ) );
diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
index aaa07ff8..4449cb4f 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.cpp
@@ -38,7 +38,7 @@
 #include <assert.h>
 
 #include <tqcursor.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqobjectlist.h>
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
@@ -56,9 +56,9 @@
 
 #include <tqtoolbutton.h>
 #include <tqdockarea.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 #include <tqmap.h>
 #include <tqvaluelist.h>
@@ -298,16 +298,16 @@ void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu )
 //============ ~KMdiMainFrm ============//
 KMdiMainFrm::~KMdiMainFrm()
 {
-	//save the tqchildren first to a list, as removing invalidates our iterator
-	TQValueList<KMdiChildView*> tqchildren;
+	//save the children first to a list, as removing invalidates our iterator
+	TQValueList<KMdiChildView*> children;
 	for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() )
-		tqchildren.append( w );
+		children.append( w );
 
 	// safely close the windows so properties are saved...
 	TQValueListIterator<KMdiChildView*> childIt;
-	for ( childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt )
+	for ( childIt = children.begin(); childIt != children.end(); ++childIt )
 	{
-		closeWindow( *childIt, false ); // without re-tqlayout taskbar!
+		closeWindow( *childIt, false ); // without re-layout taskbar!
 	}
 
 	emit lastChildViewClosed();
@@ -423,7 +423,7 @@ KMdiChildView* KMdiMainFrm::createWrapper( TQWidget *view, const TQString& name,
 
 	KMdiChildView* pMDICover = new KMdiChildView( name /*caption*/, 0L /*parent*/,
 	                                              name.latin1() );
-	TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout" );
+	TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "layout" );
 	view->reparent( pMDICover, TQPoint( 0, 0 ) );
 	pLayout->addWidget( view );
 	//  pMDICover->setName(name);
@@ -586,7 +586,7 @@ KMdiToolViewAccessor *KMdiMainFrm::addToolWindow( TQWidget* pWnd, KDockWidget::D
 		pWnd = pDW;
 	}
 
-	TQRect r = pWnd->tqgeometry();
+	TQRect r = pWnd->geometry();
 
 	KMdiToolViewAccessor *mtva = new KMdiToolViewAccessor( this, pWnd, tabToolTip, ( tabCaption == 0 ) ? pWnd->caption() : tabCaption );
 	m_pToolViews->insert( tvta, mtva );
@@ -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->tqgeometry();
+	TQRect childAreaGeo = m_pMdi->geometry();
 	if ( topLeftMdiChildArea.x() < 0 || topLeftMdiChildArea.y() < 0 ||
 	     ( topLeftMdiChildArea.x() + frameGeo.width() > childAreaGeo.width() ) ||
 	     ( topLeftMdiChildArea.y() + frameGeo.height() > childAreaGeo.height() ) )
@@ -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->tqgeometry();
+		TQRect r = lpC->geometry();
 		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 );
@@ -705,7 +705,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
 #ifdef TQ_WS_X11
 		if ( mdiMode() == KMdi::ToplevelMode )
 		{
-			XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() );
+			XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
 		}
 #endif
 
@@ -715,7 +715,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
 #ifdef TQ_WS_X11
 	if ( mdiMode() == KMdi::ToplevelMode )
 	{
-		XSetTransientForHint( qt_xdisplay(), pWnd->winId(), tqtopLevelWidget() ->winId() );
+		XSetTransientForHint( qt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
 	}
 #endif
 
@@ -1238,14 +1238,14 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e )
  */
 void KMdiMainFrm::closeAllViews()
 {
-	//save the tqchildren first to a list, as removing invalidates our iterator
-	TQValueList<KMdiChildView*> tqchildren;
+	//save the children first to a list, as removing invalidates our iterator
+	TQValueList<KMdiChildView*> children;
 	for ( KMdiChildView * w = m_pDocumentViews->first();w;w = m_pDocumentViews->next() )
 	{
-		tqchildren.append( w );
+		children.append( w );
 	}
 	TQValueListIterator<KMdiChildView *> childIt;
-	for ( childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt )
+	for ( childIt = children.begin(); childIt != children.end(); ++childIt )
 	{
 		( *childIt )->close();
 	}
@@ -1273,7 +1273,7 @@ void KMdiMainFrm::closeActiveView()
 		m_pCurrentWindow->close();
 }
 
-/** find the root dockwidgets and store their tqgeometry */
+/** find the root dockwidgets and store their geometry */
 void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetList, TQValueList<TQRect>* positionList )
 {
 	//nothing is valid
@@ -1289,7 +1289,7 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis
 		pObjList = queryList( "KDockWidget_Compat::KDockWidget" );
 
 	TQObjectListIt it( *pObjList );
-	// for all dockwidgets (which are tqchildren of this mainwindow)
+	// for all dockwidgets (which are children of this mainwindow)
 	while ( ( *it ) )
 	{
 		KDockWidget* dockWindow = 0L; /* pDockW */
@@ -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 tqgeometry
+	// 1.) select the dockwidgets to be undocked and store their geometry
 	TQPtrList<KDockWidget> rootDockWidgetList;
 	TQValueList<TQRect> positionList;
 
@@ -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 tqgeometry
+		// select the dockwidgets to be undocked and store their geometry
 		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 tqgeometry
+		// select the dockwidgets to be undocked and store their geometry
 		findRootDockWidgets( &rootDockWidgetList, &positionList );
 		kdDebug(760) << k_funcinfo << "Found " << rootDockWidgetList.count() << " widgets to undock" << endl;
 		
@@ -1663,8 +1663,8 @@ void KMdiMainFrm::finishTabPageMode()
 			if ( pView->isToolView() )
 				continue;
 			kdDebug(760) << "KMdiMainFrm::finishTabPageMode: in loop" << endl;
-			TQSize mins = pView->tqminimumSize();
-			TQSize maxs = pView->tqmaximumSize();
+			TQSize mins = pView->minimumSize();
+			TQSize maxs = pView->maximumSize();
 			TQSize sz = pView->size();
 			TQWidget* pParent = pView->parentWidget();
 			TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
@@ -2079,8 +2079,8 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
 			KMdiChildView* pView = it.current();
 			if ( pView->isToolView() )
 				continue;
-			TQSize mins = pView->tqminimumSize();
-			TQSize maxs = pView->tqmaximumSize();
+			TQSize mins = pView->minimumSize();
+			TQSize maxs = pView->maximumSize();
 			TQSize sz = pView->size();
 			TQWidget* pParent = pView->parentWidget();
 			TQPoint p( pParent->mapToGlobal( pParent->pos() ) - pParent->pos() + m_undockPositioningOffset );
diff --git a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
index 18a47c3a..ea19c899 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
+++ b/lib/compatibility/kmdi/qextmdi/kmdimainfrm.h
@@ -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 tqshape of the attached MDI views using setFrameDecorOfAttachedViews().
+ * You can dynamically change the shape of the attached MDI views using setFrameDecorOfAttachedViews().
  *
  * Additionally, here's a hint how to restore the mainframe's settings from config file:
  * \code
@@ -526,7 +526,7 @@ public slots:
 	
 	/**
 	 * Adds a KMdiChildView to the MDI system. The main frame takes control of it.
-	 * \param rectNormal Sets the tqgeometry for this child view
+	 * \param rectNormal Sets the geometry 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
diff --git a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
index 7e775ccc..662924f3 100644
--- a/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmditaskbar.cpp
@@ -102,7 +102,7 @@ void KMdiTaskBarButton::fitText( const TQString& origStr, int newWidth )
 {
 	TQButton::setText( m_actualText );
 
-	int actualWidth = tqsizeHint().width();
+	int actualWidth = sizeHint().width();
 	int realLetterCount = origStr.length();
 	int newLetterCount = ( newWidth * realLetterCount ) / actualWidth;
 	int w = newWidth + 1;
@@ -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 = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
-	int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
+	tbHandlePixel = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
+	int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
 	if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) )
 	{
 		for ( b = m_pButtonList->first();b;b = m_pButtonList->next() )
 		{
 			b->setText( b->actualText() );
-			if ( b->width() != b->tqsizeHint().width() )
+			if ( b->width() != b->sizeHint().width() )
 			{
-				b->setFixedWidth( b->tqsizeHint().width() );
+				b->setFixedWidth( b->sizeHint().width() );
 				b->show();
 			}
 		}
diff --git a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
index 3e69c674..a5935ffd 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.cpp
@@ -28,7 +28,7 @@
 #include "kmultitabbar_p.moc"
 #include <tqbutton.h>
 #include <tqpopupmenu.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqtooltip.h>
 #include <tqfontmetrics.h>
@@ -110,7 +110,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style)
 		mainLayout->setAutoAdd(true);
 
 	}
-        viewport()->tqrepaint();
+        viewport()->repaint();
 }
 
 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(tqcolorGroup().shadow());
+                paint->setPen(colorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());
-                paint->setPen(tqcolorGroup().background().dark(120));
+                paint->setPen(colorGroup().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(tqcolorGroup().light());
+                paint->setPen(colorGroup().light());
 		paint->drawLine(23,0,23,viewport()->height());
                 paint->drawLine(22,0,22,viewport()->height());
 
-                paint->setPen(tqcolorGroup().shadow());
+                paint->setPen(colorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());
 	}
 	else
 	if (m_position==KMultiTabBar::Bottom)
 	{
-		paint->setPen(tqcolorGroup().shadow());
+		paint->setPen(colorGroup().shadow());
 		paint->drawLine(0,0,viewport()->width(),0);
-                paint->setPen(tqcolorGroup().background().dark(120));
+                paint->setPen(colorGroup().background().dark(120));
                 paint->drawLine(0,1,viewport()->width(),1);
 	}
 	else
 	{
-	        paint->setPen(tqcolorGroup().light());
+	        paint->setPen(colorGroup().light());
 		paint->drawLine(0,23,viewport()->width(),23);
                 paint->drawLine(0,22,viewport()->width(),22);
 
-/*                paint->setPen(tqcolorGroup().shadow());
+/*                paint->setPen(colorGroup().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 tqgeometry"<<box->tqgeometry()<<endl;
-	kdDebug()<<"KMultiTabBarInternal::resizeEvent - tqgeometry"<<tqgeometry()<<endl;*/
+	kdDebug()<<"KMultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl;
+	kdDebug()<<"KMultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/
 	if (ev) TQScrollView::resizeEvent(ev);
 
 	if ( (m_style==KMultiTabBar::KDEV3) ||
@@ -378,7 +378,7 @@ 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()->tqrepaint();
+	viewport()->repaint();
 }
 
 
@@ -435,13 +435,13 @@ void KMultiTabBarButton::slotClicked()
 void KMultiTabBarButton::setPosition(KMultiTabBar::KMultiTabBarPosition pos)
 {
 	m_position=pos;
-	tqrepaint();
+	repaint();
 }
 
 void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style)
 {
 	m_style=style;
-	tqrepaint();
+	repaint();
 }
 
 void KMultiTabBarButton::hideEvent( TQHideEvent* he) {
@@ -457,7 +457,7 @@ void KMultiTabBarButton::showEvent( TQShowEvent* he) {
 }
 
 
-TQSize KMultiTabBarButton::tqsizeHint() const
+TQSize KMultiTabBarButton::sizeHint() const
 {
     constPolish();
 
@@ -473,7 +473,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const
     }
 #endif
     if ( isMenuButton() )
-        w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+        w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
 
     if ( pixmap() ) {
         TQPixmap *pm = (TQPixmap *)pixmap();
@@ -483,7 +483,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const
         TQString s( text() );
         bool empty = s.isEmpty();
         if ( empty )
-            s = TQString::tqfromLatin1("XXXX");
+            s = TQString::fromLatin1("XXXX");
         TQFontMetrics fm = fontMetrics();
         TQSize sz = fm.size( ShowPrefix, s );
         if(!empty || !w)
@@ -526,7 +526,7 @@ void KMultiTabBarTab::setTabsPosition(KMultiTabBar::KMultiTabBarPosition pos)
 	}
 
 	setPosition(pos);
-//	tqrepaint();
+//	repaint();
 }
 
 void KMultiTabBarTab::setIcon(const TQString& icon)
@@ -578,12 +578,12 @@ void KMultiTabBarTab::updateState()
 		if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) {
 			setFixedWidth(24);
 			if ((m_style==KMultiTabBar::KDEV3)  || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
-				setFixedHeight(KMultiTabBarButton::tqsizeHint().width());
+				setFixedHeight(KMultiTabBarButton::sizeHint().width());
 			} else setFixedHeight(36);
 		} else {
 			setFixedHeight(24);
 			if ((m_style==KMultiTabBar::KDEV3)  || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
-				setFixedWidth(KMultiTabBarButton::tqsizeHint().width());
+				setFixedWidth(KMultiTabBarButton::sizeHint().width());
 			} else setFixedWidth(36);
 		}
 	} else {
@@ -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::tqsizeHint();
+			sh=TQSize(this->height(),this->width());//KMultiTabBarButton::sizeHint();
 			else sh=TQSize(this->width(),this->height());
 	}
 	else
@@ -651,8 +651,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 
 	if (isOn()) st|=TQStyle::Style_On;
 
-	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);
+	tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
 
 	switch (m_position) {
 		case KMultiTabBar::Left:
@@ -668,8 +668,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 			paint->drawPixmap(0,0,pixmap);
 			break;
 	}
-//	tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
-//		tqcolorGroup(),TQStyle::Style_Enabled);
+//	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
+//		colorGroup(),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, tqcolorGroup().background());
+	paint->fillRect(0, 0, 24, 24, colorGroup().background());
 
 	if (!isOn())
 	{
 
 		if (m_position==KMultiTabBar::Right)
 		{
-			paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background()));
+			paint->fillRect(0,0,21,21,TQBrush(colorGroup().background()));
 
-			paint->setPen(tqcolorGroup().background().dark(150));
+			paint->setPen(colorGroup().background().dark(150));
 			paint->drawLine(0,22,23,22);
 
 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().shadow());
 			paint->drawLine(0,0,0,23);
-			paint->setPen(tqcolorGroup().background().dark(120));
+			paint->setPen(colorGroup().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(tqcolorGroup().background()));
+                        paint->fillRect(0,1,23,22,TQBrush(colorGroup().background()));
 
                         paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-                        paint->setPen(tqcolorGroup().background().dark(120));
+                        paint->setPen(colorGroup().background().dark(120));
                         paint->drawLine(23,0,23,23);
 
 
-                        paint->setPen(tqcolorGroup().light());
+                        paint->setPen(colorGroup().light());
                         paint->drawLine(0,22,23,22);
                         paint->drawLine(0,23,23,23);
-                	paint->setPen(tqcolorGroup().shadow());
+                	paint->setPen(colorGroup().shadow());
                 	paint->drawLine(0,0,23,0);
-                        paint->setPen(tqcolorGroup().background().dark(120));
+                        paint->setPen(colorGroup().background().dark(120));
                         paint->drawLine(0,1,23,1);
 
 		}
 		else
 		{
-			paint->setPen(tqcolorGroup().background().dark(120));
+			paint->setPen(colorGroup().background().dark(120));
 			paint->drawLine(0,23,23,23);
-			paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background()));
+			paint->fillRect(0,0,23,21,TQBrush(colorGroup().background()));
 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-			paint->setPen(tqcolorGroup().light());
+			paint->setPen(colorGroup().light());
 			paint->drawLine(23,0,23,23);
 			paint->drawLine(22,0,22,23);
 
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().shadow());
 			paint->drawLine(0,0,0,23);
 
 		}
@@ -741,12 +741,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 	{
 		if (m_position==KMultiTabBar::Right)
 		{
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().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(tqcolorGroup().light()));
+			paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().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(tqcolorGroup().light()));
+				painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
 
-				painter.setPen(tqcolorGroup().text());
+				painter.setPen(colorGroup().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(tqcolorGroup().light()));
+			paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 			if (m_showActiveTabText)
 			{
-				paint->setPen(tqcolorGroup().text());
+				paint->setPen(colorGroup().text());
 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 			}
 		}
 		else
 		if (m_position==KMultiTabBar::Bottom)
 		{
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().shadow());
 			paint->drawLine(0,23,width()-1,23);
 			paint->drawLine(0,22,width()-1,22);
-			paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light()));
+			paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 			if (m_showActiveTabText)
 			{
-				paint->setPen(tqcolorGroup().text());
+				paint->setPen(colorGroup().text());
 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 			}
 
@@ -797,10 +797,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 		{
 
 
-			paint->setPen(tqcolorGroup().shadow());
+			paint->setPen(colorGroup().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(tqcolorGroup().light()));
+			paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().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(tqcolorGroup().light()));
+                                painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
 
-                                painter.setPen(tqcolorGroup().text());
+                                painter.setPen(colorGroup().text());
                                 painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 
                                 paint->rotate(-90);
@@ -839,13 +839,13 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam
 	if (bm==Vertical)
 	{
 		m_l=new TQVBoxLayout(this);
-		tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
+		setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
 //		setFixedWidth(24);
 	}
 	else
 	{
 		m_l=new TQHBoxLayout(this);
-		tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
+		setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
 //		setFixedHeight(24);
 	}
 	m_l->setMargin(0);
@@ -980,7 +980,7 @@ void KMultiTabBar::fontChange(const TQFont& /* oldFont */)
 {
 	for (uint i=0;i<tabs()->count();i++)
 		tabs()->at(i)->resize();
-	tqrepaint();
+	repaint();
 }
 
 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 fc246b1f..904027a3 100644
--- a/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
+++ b/lib/compatibility/kmdi/qextmdi/kmultitabbar.h
@@ -28,7 +28,7 @@
 #include <tqscrollview.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 #include <tqptrlist.h>
 #include <tqpushbutton.h>
@@ -181,7 +181,7 @@ public slots:
          */
 	void setText(const TQString &);
 
-	TQSize tqsizeHint() const;
+	TQSize sizeHint() const;
 
 protected:
 	KMultiTabBar::KMultiTabBarPosition m_position;
diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
index 26a1c5e4..c8393a8e 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
+++ b/lib/compatibility/kmdi/qextmdi/ktabbar.cpp
@@ -80,7 +80,7 @@ void KTabBar::setTabEnabled( int id, bool enabled )
                     emit selected( t->identifier() );
                 }
             }
-            tqrepaint( r );
+            repaint( r );
         }
     }
 }
@@ -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 = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
-                yoff = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
+                xoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
+                yoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
             }
             else {
                 xoff = 7;
@@ -252,7 +252,7 @@ void KTabBar::dragMoveEvent( TQDragMoveEvent *e )
     TQTab *tab = selectTab( e->pos() );
     if( tab ) {
         bool accept = false;
-        // The tqreceivers of the testCanDecode() signal has to adjust
+        // The receivers of the testCanDecode() signal has to adjust
         // 'accept' accordingly.
         emit testCanDecode( e, accept);
         if ( accept && tab != TQTabBar::tab( currentTab() ) ) {
@@ -293,7 +293,7 @@ void KTabBar::setTabColor( int id, const TQColor& color )
     TQTab *t = tab( id );
     if ( t ) {
         mTabColors.insert( id, color );
-        tqrepaint( t->rect(), false );
+        repaint( t->rect(), false );
     }
 }
 
@@ -302,7 +302,7 @@ const TQColor &KTabBar::tabColor( int id  ) const
     if ( mTabColors.contains( id ) )
         return mTabColors[id];
 
-    return tqcolorGroup().foreground();
+    return colorGroup().foreground();
 }
 
 int KTabBar::insertTab( TQTab *t, int index )
@@ -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 = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
-        int inactiveYShift = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
+        int inactiveXShift = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
+        int inactiveYShift = tqstyle().pixelMetric( 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( tqcolorGroup() );
+    TQColorGroup cg( colorGroup() );
     if ( mTabColors.contains( t->identifier() ) )
         cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] );
 
-    tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, r,
-                             t->isEnabled() ? cg : tqpalette().disabled(),
+    tqstyle().drawControl( TQStyle::CE_TabBarLabel, p, this, r,
+                             t->isEnabled() ? cg : palette().disabled(),
                              flags, TQStyleOption(t) );
 }
 
diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
index 55fdcaf8..8d74ebe3 100644
--- a/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
+++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.cpp
@@ -160,8 +160,8 @@ bool KTabWidget::tabCloseActivatePrevious() const
 unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
 {
     int hframe, overlap;
-    hframe  = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
-    overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
+    hframe  = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
+    overlap = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
 
     TQFontMetrics fm = tabBar()->fontMetrics();
     int x = 0;
@@ -250,7 +250,7 @@ void KTabWidget::resizeTabs( int changeTabIndex )
         newMaxLength=d->m_maxLength;
         uint lcw=0, rcw=0;
 
-        int tabBarHeight = tabBar()->tqsizeHint().height();
+        int tabBarHeight = tabBar()->sizeHint().height();
         if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() )
             lcw = TQMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
         if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() )
@@ -294,7 +294,7 @@ void KTabWidget::dragMoveEvent( TQDragMoveEvent *e )
 {
     if ( isEmptyTabbarSpace( e->pos() ) ) {
         bool accept = false;
-        // The tqreceivers of the testCanDecode() signal has to adjust
+        // The receivers of the testCanDecode() signal has to adjust
         // 'accept' accordingly.
         emit testCanDecode( e, accept);
         e->accept( accept );
@@ -445,7 +445,7 @@ void KTabWidget::removePage( TQWidget * w ) {
 bool KTabWidget::isEmptyTabbarSpace( const TQPoint &p ) const
 {
     TQPoint point( p );
-    TQSize size( tabBar()->tqsizeHint() );
+    TQSize size( tabBar()->sizeHint() );
     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/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp
index 87c35918..3b8f053d 100644
--- a/lib/compatibility/knewstuff/downloaddialog.cpp
+++ b/lib/compatibility/knewstuff/downloaddialog.cpp
@@ -37,11 +37,11 @@
 #include <knewstuff/knewstuffgeneric.h>
 #include <knewstuff/engine.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqdom.h>
 #include <tqlabel.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 #include <tqtimer.h> // hack
 
 using namespace KNS;
@@ -321,7 +321,7 @@ void DownloadDialog::slotResult(KIO::Job *job)
   m_data[job] = "";
 }
 
-int DownloadDialog::installtqStatus(Entry *entry)
+int DownloadDialog::installStatus(Entry *entry)
 {
   TQDate date;
   TQString datestring;
@@ -357,16 +357,16 @@ void DownloadDialog::addEntry(Entry *entry)
       slotPage(m_frame);
     }
   }*/
-  installed = installtqStatus(entry);
+  installed = installStatus(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").tqarg(entry->rating()));
+    entry->name(), entry->version(), TQString("%1").arg(entry->rating()));
   KListViewItem *tmp_d = new NumSortListViewItem(lv_d,
-    entry->name(), entry->version(), TQString("%1").tqarg(entry->downloads()));
+    entry->name(), entry->version(), TQString("%1").arg(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"
-    ).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)
+    ).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)
   );
 
   info.append(i18n
   (
     "Preview: %1\n"
     "Payload: %2\n"
-    ).tqarg(e->preview().url()
-    ).tqarg(e->payload().url()
+    ).arg(e->preview().url()
+    ).arg(e->payload().url()
   ));
 
   KMessageBox::information(this, info, i18n("Details"));
@@ -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)").tqarg(
-        e->name()).tqarg(e->author()).tqarg(KGlobal::locale()->formatDate(e->releaseDate())).tqarg(e->summary(lang)).tqarg(e->license()));
+      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()));
     }
     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)").tqarg(
-        e->name()).tqarg(e->author()).tqarg(KGlobal::locale()->formatDate(e->releaseDate())).tqarg(tmp).tqarg(e->summary(lang)).tqarg(e->license()));
+      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()));
     }
 
-    if(installtqStatus(e) == 1) enabled = false;
+    if(installStatus(e) == 1) enabled = false;
     else enabled = true;
 
     TQPushButton *de, *in;
diff --git a/lib/compatibility/knewstuff/downloaddialog.h b/lib/compatibility/knewstuff/downloaddialog.h
index b5c1de0a..99fb82a9 100644
--- a/lib/compatibility/knewstuff/downloaddialog.h
+++ b/lib/compatibility/knewstuff/downloaddialog.h
@@ -208,7 +208,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
     Entry *getEntry();
     void loadProvider(Provider *p);
     void install(Entry *e);
-    int installtqStatus(Entry *e);
+    int installStatus(Entry *e);
 
     ProviderLoader *m_loader;
     TQString m_entryname;
diff --git a/lib/compatibility/knewstuff/engine.cpp b/lib/compatibility/knewstuff/engine.cpp
index e15b27c6..ca63ea98 100644
--- a/lib/compatibility/knewstuff/engine.cpp
+++ b/lib/compatibility/knewstuff/engine.cpp
@@ -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").tqarg( mUploadFile) );
+  text.append( i18n("Data file: %1\n").arg( mUploadFile) );
   if (!mPreviewFile.isEmpty()) {
-    text.append( i18n("Preview image: %1\n").tqarg( mPreviewFile) );
+    text.append( i18n("Preview image: %1\n").arg( mPreviewFile) );
   }
-  text.append( i18n("Content information: %1\n").tqarg( mUploadMetaFile) );
+  text.append( i18n("Content information: %1\n").arg( 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.") );
 
diff --git a/lib/compatibility/knewstuff/entry.cpp b/lib/compatibility/knewstuff/entry.cpp
index 0f3b98b4..b7149428 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::tqcurrentDate() ), mRating( 0 ),
+  mRelease( 0 ), mReleaseDate( TQDate::currentDate() ), mRating( 0 ),
   mDownloads( 0 )
 {
 }
diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp
index 7fa15372..6a37aa61 100644
--- a/lib/compatibility/knewstuff/knewstuff.cpp
+++ b/lib/compatibility/knewstuff/knewstuff.cpp
@@ -35,7 +35,7 @@ KAction* KNS::standardAction(const TQString& what,
                              const char *slot, KActionCollection* parent,
                              const char *name)
 {
-    return new KAction(i18n("Download New %1").tqarg(what), "knewstuff",
+    return new KAction(i18n("Download New %1").arg(what), "knewstuff",
                        0, recvr, slot, parent, name);
 }
 
diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.cpp b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
index c7b4b855..93610a20 100644
--- a/lib/compatibility/knewstuff/knewstuffgeneric.cpp
+++ b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdir.h>
 
 #include <kdebug.h>
@@ -131,7 +131,7 @@ TQString KNewStuffGeneric::downloadDestination( KNS::Entry *entry )
   if ( KStandardDirs::exists( file ) ) {
     int result = KMessageBox::warningContinueCancel( parentWidget(),
         i18n("The file '%1' already exists. Do you want to override it?")
-        .tqarg( file ),
+        .arg( file ),
         TQString(), i18n("Overwrite") );
     if ( result == KMessageBox::Cancel ) return TQString();
   }
diff --git a/lib/compatibility/knewstuff/knewstuffsecure.cpp b/lib/compatibility/knewstuff/knewstuffsecure.cpp
index d9bf82af..7b98dbba 100644
--- a/lib/compatibility/knewstuff/knewstuffsecure.cpp
+++ b/lib/compatibility/knewstuff/knewstuffsecure.cpp
@@ -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>.").tqarg(key.id.right(8)).tqarg(key.name).tqarg(key.mail);
+          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);
       }
    }
   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>").tqarg(errorString).tqarg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue)
+      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)
           valid = true;
   } else
-    KMessageBox::information(parentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").tqarg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information");
+    KMessageBox::information(parentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").arg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information");
   if (valid)
   {
      installResource();
diff --git a/lib/compatibility/knewstuff/providerdialog.cpp b/lib/compatibility/knewstuff/providerdialog.cpp
index a6625870..f87ba458 100644
--- a/lib/compatibility/knewstuff/providerdialog.cpp
+++ b/lib/compatibility/knewstuff/providerdialog.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 #include <tqlabel.h>
 
diff --git a/lib/compatibility/knewstuff/security.cpp b/lib/compatibility/knewstuff/security.cpp
index 9dc5615a..8ef377b7 100644
--- a/lib/compatibility/knewstuff/security.cpp
+++ b/lib/compatibility/knewstuff/security.cpp
@@ -174,7 +174,7 @@ void Security::slotDataArrived(KProcIO *procIO)
          {
            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>").tqarg(m_secretKey).tqarg(key.name).tqarg(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>").arg(m_secretKey).arg(key.name).arg(key.mail));
            if (result == KPasswordDialog::Accepted)
            {
              procIO->writeStdin(password, true);
diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp
index 4eaed4aa..2c418c10 100644
--- a/lib/compatibility/knewstuff/uploaddialog.cpp
+++ b/lib/compatibility/knewstuff/uploaddialog.cpp
@@ -20,7 +20,7 @@
 
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqspinbox.h>
 #include <tqstring.h>
diff --git a/quanta/Quanta-3.3-plan.kno b/quanta/Quanta-3.3-plan.kno
index eb2837b7..fc22ca65 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, 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>
+<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>
 </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 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>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>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 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>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>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 tqlayout will take experimentation, and user feedback. In fact it would take a fair amount of study and refinement.</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>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 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>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>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 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>
+<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>
 </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 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>
+<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>
 </body></html>
 
 \NewEntry 0 Plug Ins
diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp
index 1e2a1b8b..7538ebe9 100644
--- a/quanta/components/csseditor/colorrequester.cpp
+++ b/quanta/components/csseditor/colorrequester.cpp
@@ -56,7 +56,7 @@ void colorRequester::init()
      d->edit = new KLineEdit( this, "line edit" );
 
      myButton = new KPushButton( this, "kfile button");
-     TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("colorize"));
+     TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("colorize"));
      TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
      myButton->setIconSet( iconSet );
      myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp
index 58e67d0f..411f056c 100644
--- a/quanta/components/csseditor/colorslider.cpp
+++ b/quanta/components/csseditor/colorslider.cpp
@@ -37,9 +37,9 @@ 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->tqsetAlignment(TQt::AlignHCenter);
-  centerLabel->tqsetAlignment(TQt::AlignHCenter);
-  rightLabel->tqsetAlignment(TQt::AlignHCenter);  
+  leftLabel->setAlignment(TQt::AlignHCenter);
+  centerLabel->setAlignment(TQt::AlignHCenter);
+  rightLabel->setAlignment(TQt::AlignHCenter);  
   leftLabel->setTextFormat (TQt::RichText ) ;
   centerLabel->setTextFormat ( TQt::RichText ) ;
   rightLabel->setTextFormat (TQt::RichText  ) ;
diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp
index e548d7d9..7f65e9c7 100644
--- a/quanta/components/csseditor/csseditor.cpp
+++ b/quanta/components/csseditor/csseditor.cpp
@@ -16,12 +16,12 @@
  ***************************************************************************/
 
 #include "csseditor.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabwidget.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
-#include <tqtextedit.h>
-#include <tqtextstream.h>
+#include <textedit.h>
+#include <textstream.h>
 #include <tqfileinfo.h>
 
 #include <kapplication.h>
diff --git a/quanta/components/csseditor/csseditors.ui b/quanta/components/csseditor/csseditors.ui
index d1fe0993..2661d75d 100644
--- a/quanta/components/csseditor/csseditors.ui
+++ b/quanta/components/csseditor/csseditors.ui
@@ -32,7 +32,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>280</width>
                     <height>20</height>
@@ -41,7 +41,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="2" column="2">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -117,13 +117,13 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="tqminimumSize">
+                <property name="minimumSize">
                     <size>
                         <width>33</width>
                         <height>7</height>
                     </size>
                 </property>
-                <property name="tqmaximumSize">
+                <property name="maximumSize">
                     <size>
                         <width>290</width>
                         <height>32767</height>
@@ -338,7 +338,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>200</height>
@@ -363,7 +363,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32766</width>
                             <height>32766</height>
diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp
index 7e61cf02..cdf9db04 100644
--- a/quanta/components/csseditor/cssselector.cpp
+++ b/quanta/components/csseditor/cssselector.cpp
@@ -21,7 +21,7 @@
 #include <tqlineedit.h>
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtabwidget.h>
 #include <tqobjectlist.h>
 #include <tqfileinfo.h>
diff --git a/quanta/components/csseditor/cssselectors.ui b/quanta/components/csseditor/cssselectors.ui
index dd899b1b..cb4ed81b 100644
--- a/quanta/components/csseditor/cssselectors.ui
+++ b/quanta/components/csseditor/cssselectors.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout11</cstring>
+                <cstring>layout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -61,7 +61,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -70,7 +70,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="3" column="2">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -111,7 +111,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="2">
                         <property name="name">
-                            <cstring>tqlayout13</cstring>
+                            <cstring>layout13</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -127,7 +127,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -185,7 +185,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -220,7 +220,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>24</height>
@@ -266,7 +266,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -329,7 +329,7 @@
                         <property name="sizeType">
                             <enum>Minimum</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>40</width>
                                 <height>20</height>
@@ -403,7 +403,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>40</width>
                                 <height>20</height>
@@ -412,7 +412,7 @@
                     </spacer>
                     <widget class="TQLayoutWidget" row="0" column="2">
                         <property name="name">
-                            <cstring>tqlayout14</cstring>
+                            <cstring>layout14</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -428,7 +428,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -478,7 +478,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -521,7 +521,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -597,7 +597,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>40</width>
                                 <height>20</height>
@@ -606,7 +606,7 @@
                     </spacer>
                     <widget class="TQLayoutWidget" row="0" column="2">
                         <property name="name">
-                            <cstring>tqlayout13</cstring>
+                            <cstring>layout13</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -622,7 +622,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -672,7 +672,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -715,7 +715,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -791,7 +791,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>40</width>
                                 <height>20</height>
@@ -800,7 +800,7 @@
                     </spacer>
                     <widget class="TQLayoutWidget" row="0" column="2">
                         <property name="name">
-                            <cstring>tqlayout17</cstring>
+                            <cstring>layout17</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -816,7 +816,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -866,7 +866,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -917,7 +917,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
@@ -939,7 +939,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>380</width>
                     <height>20</height>
diff --git a/quanta/components/csseditor/data/config.xml b/quanta/components/csseditor/data/config.xml
index 988041ca..15fd659f 100644
--- a/quanta/components/csseditor/data/config.xml
+++ b/quanta/components/csseditor/data/config.xml
@@ -469,9 +469,9 @@
     <freeedit/>
   </right>
     
-  <table-tqlayout>
+  <table-layout>
     <list value="auto,fixed,inherit"/>     
-  </table-tqlayout>
+  </table-layout>
    
   <text-align>
     <list value="center,justify,right,left,inherit"/>         
@@ -503,9 +503,9 @@
     <freeedit/>
   </top> 
     
-  <tqunicode-bidi>
+  <unicode-bidi>
     <list value="normal,embed,bidi-override,inherit"/>     
-  </tqunicode-bidi> 
+  </unicode-bidi> 
    
   <vertical-align>     
     <list value="baseline,inherit,sub,super,top,text-top,middle,bottom,text-bottom"/>      
diff --git a/quanta/components/csseditor/encodingselector.cpp b/quanta/components/csseditor/encodingselector.cpp
index f8ba4ac6..4aef2399 100644
--- a/quanta/components/csseditor/encodingselector.cpp
+++ b/quanta/components/csseditor/encodingselector.cpp
@@ -20,7 +20,7 @@
 #include "encodingselector.h"
 #include <kglobal.h>
 #include <kcharsets.h> 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 /**
   *@author gulmini luciano
diff --git a/quanta/components/csseditor/encodingselectors.ui b/quanta/components/csseditor/encodingselectors.ui
index 6ac64343..178eacc4 100644
--- a/quanta/components/csseditor/encodingselectors.ui
+++ b/quanta/components/csseditor/encodingselectors.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -52,7 +52,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -76,7 +76,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp
index 273c5a4c..bd9e59ef 100644
--- a/quanta/components/csseditor/fontfamilychooser.cpp
+++ b/quanta/components/csseditor/fontfamilychooser.cpp
@@ -36,14 +36,14 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontF
 
   TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black );
   lePreview->setMinimumHeight( lePreview->fontMetrics().lineSpacing() );
-  lePreview->tqsetAlignment(TQt::AlignCenter);
+  lePreview->setAlignment(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.tqfamilies();
+  TQStringList families = fdb.families();
   for ( TQStringList::Iterator it = families.begin(); it != families.end(); ++it ) {
     if( (*it).contains('[') !=0  ) 
       it = families.remove(it);
@@ -52,20 +52,20 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontF
   if( families.count() != 0 ) lbAvailable->insertStringList(families);
   
        
-  TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("forward"));
+  TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("forward"));
   TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
   pbAdd->setIconSet(iconSet);
   pbAdd->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
   
-  iconSet = SmallIconSet(TQString::tqfromLatin1("back"));
+  iconSet = SmallIconSet(TQString::fromLatin1("back"));
   pbRemove->setIconSet(iconSet);
   pbRemove->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
   
-   iconSet = SmallIconSet(TQString::tqfromLatin1("up"));
+   iconSet = SmallIconSet(TQString::fromLatin1("up"));
   pbMoveUp->setIconSet(iconSet);
   pbMoveUp->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
   
-  iconSet = SmallIconSet(TQString::tqfromLatin1("down"));
+  iconSet = SmallIconSet(TQString::fromLatin1("down"));
   pbMoveDown->setIconSet(iconSet);
   pbMoveDown->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
 
diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui
index 86a109d9..7675741a 100644
--- a/quanta/components/csseditor/fontfamilychoosers.ui
+++ b/quanta/components/csseditor/fontfamilychoosers.ui
@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout42</cstring>
+                <cstring>layout42</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -40,7 +40,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout40</cstring>
+                        <cstring>layout40</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -48,7 +48,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout39</cstring>
+                                <cstring>layout39</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -56,7 +56,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout36</cstring>
+                                        <cstring>layout36</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -64,7 +64,7 @@
                                         </property>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>tqlayout20</cstring>
+                                                <cstring>layout20</cstring>
                                             </property>
                                             <vbox>
                                                 <property name="name">
@@ -87,7 +87,7 @@
                                         </widget>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>tqlayout15</cstring>
+                                                <cstring>layout15</cstring>
                                             </property>
                                             <vbox>
                                                 <property name="name">
@@ -145,7 +145,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout38</cstring>
+                                        <cstring>layout38</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -164,7 +164,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>20</width>
                                                     <height>40</height>
@@ -193,7 +193,7 @@
                                             <property name="title">
                                                 <string></string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>AlignCenter</set>
                                             </property>
                                             <property name="flat">
@@ -219,13 +219,13 @@
                                                     <property name="name">
                                                         <cstring>pbMoveUp</cstring>
                                                     </property>
-                                                    <property name="tqminimumSize">
+                                                    <property name="minimumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
                                                         </size>
                                                     </property>
-                                                    <property name="tqmaximumSize">
+                                                    <property name="maximumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
@@ -239,13 +239,13 @@
                                                     <property name="name">
                                                         <cstring>pbAdd</cstring>
                                                     </property>
-                                                    <property name="tqminimumSize">
+                                                    <property name="minimumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
                                                         </size>
                                                     </property>
-                                                    <property name="tqmaximumSize">
+                                                    <property name="maximumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
@@ -259,13 +259,13 @@
                                                     <property name="name">
                                                         <cstring>pbRemove</cstring>
                                                     </property>
-                                                    <property name="tqminimumSize">
+                                                    <property name="minimumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
                                                         </size>
                                                     </property>
-                                                    <property name="tqmaximumSize">
+                                                    <property name="maximumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
@@ -279,13 +279,13 @@
                                                     <property name="name">
                                                         <cstring>pbMoveDown</cstring>
                                                     </property>
-                                                    <property name="tqminimumSize">
+                                                    <property name="minimumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
                                                         </size>
                                                     </property>
-                                                    <property name="tqmaximumSize">
+                                                    <property name="maximumSize">
                                                         <size>
                                                             <width>22</width>
                                                             <height>22</height>
@@ -307,7 +307,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>20</width>
                                                     <height>40</height>
@@ -318,7 +318,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout6</cstring>
+                                        <cstring>layout6</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -358,7 +358,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout41</cstring>
+                        <cstring>layout41</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -374,7 +374,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>313</width>
                                     <height>20</height>
@@ -383,7 +383,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout9</cstring>
+                                <cstring>layout9</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp
index f1e1c101..922c7dbe 100644
--- a/quanta/components/csseditor/propertysetter.cpp
+++ b/quanta/components/csseditor/propertysetter.cpp
@@ -113,7 +113,7 @@ void propertySetter::addButton(){
 
   m_pb = new KPushButton(this);
   TQToolTip::add(m_pb, i18n( "More..." ));
-  TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("2rightarrow"));
+  TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("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/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp
index b94bdbcd..c62cc7a7 100644
--- a/quanta/components/csseditor/styleeditor.cpp
+++ b/quanta/components/csseditor/styleeditor.cpp
@@ -42,7 +42,7 @@
 StyleEditor::StyleEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){
   connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openCSSEditor()));
   setToolTip(i18n("Open css dialog"));
-  TQIconSet iconSet =  SmallIconSet(TQString::tqfromLatin1("stylesheet"));
+  TQIconSet iconSet =  SmallIconSet(TQString::fromLatin1("stylesheet"));
   TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
   m_pb->setIconSet(iconSet);
   m_iconWidth = pixMap.width();
diff --git a/quanta/components/csseditor/stylesheetparser.cpp b/quanta/components/csseditor/stylesheetparser.cpp
index 0a573925..0b80caa2 100644
--- a/quanta/components/csseditor/stylesheetparser.cpp
+++ b/quanta/components/csseditor/stylesheetparser.cpp
@@ -164,11 +164,11 @@ void stylesheetParser::parseSelector(){
       if (m_stylesheetStructure.contains(selectorName))
       {
         uint i = 2;
-        TQString s = selectorName + TQString("-v%1").tqarg(i);
+        TQString s = selectorName + TQString("-v%1").arg(i);
         while (m_stylesheetStructure.contains(s))
         {          
          i++;
-         s = selectorName + TQString("-v%1").tqarg(i);
+         s = selectorName + TQString("-v%1").arg(i);
         }
         selectorName = s;
       }
diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp
index 7a35ee23..994876a3 100644
--- a/quanta/components/csseditor/tlpeditors.cpp
+++ b/quanta/components/csseditor/tlpeditors.cpp
@@ -48,7 +48,7 @@ TLPEditor::~TLPEditor(){
 }
 
 void TLPEditor::setButtonIcon(TQString s){
-  TQIconSet iconSet =  SmallIconSet(TQString::tqfromLatin1(s.ascii()));
+  TQIconSet iconSet =  SmallIconSet(TQString::fromLatin1(s.ascii()));
   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/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui
index 3eb19d7a..5f43c131 100644
--- a/quanta/components/cvsservice/cvscommitdlgs.ui
+++ b/quanta/components/cvsservice/cvscommitdlgs.ui
@@ -105,7 +105,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>80</width>
                     <height>20</height>
diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp
index 930ebeec..9b409b34 100644
--- a/quanta/components/cvsservice/cvsservice.cpp
+++ b/quanta/components/cvsservice/cvsservice.cpp
@@ -17,8 +17,8 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqradiobutton.h>
-#include <tqtextedit.h>
-#include <tqtextstream.h>
+#include <textedit.h>
+#include <textstream.h>
 #include <tqtimer.h>
 
 //kde includes
@@ -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 ...").tqarg(m_updateToDlg->tagCombo->currentText());
+      commandStr = i18n("Updating to revision %1 ...").arg(m_updateToDlg->tagCombo->currentText());
     } else
     {
       extraOpts = "-D " + m_updateToDlg->dateLineEdit->text();
-      commandStr = i18n("Updating to the version from %1 ...").tqarg(+ m_updateToDlg->dateLineEdit->text());
+      commandStr = i18n("Updating to the version from %1 ...").arg(+ 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.").tqarg(fInfo.fileName()) + "\n", false);
+            emit showMessage(i18n("\"%1\" is already in the CVS ignore list.").arg(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.").tqarg(fInfo.fileName()) + "\n", false);
+          emit showMessage(i18n("\"%1\" added to the CVS ignore list.").arg(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.").tqarg(fInfo.fileName()) + "\n", false);
+          emit showMessage(i18n("\"%1\" is not in the CVS ignore list.").arg(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.").tqarg(fInfo.fileName()) + "\n", false);
+        emit showMessage(i18n("\"%1\" removed from the CVS ignore list.").arg(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>").tqarg(m_cvsCommand).tqarg(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>").arg(m_cvsCommand).arg(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.").tqarg(m_defaultFile).tqarg(m_repositoryPath) + "\n", false);
+  emit showMessage(i18n("Error: \"%1\" is not part of the\n\"%2\" repository.").arg(m_defaultFile).arg(m_repositoryPath) + "\n", false);
 }
 
 void CVSService::startService()
diff --git a/quanta/components/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui
index 4b85c5d2..d4d2dc7b 100644
--- a/quanta/components/cvsservice/cvsupdatetodlgs.ui
+++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui
@@ -82,7 +82,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -115,7 +115,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -147,7 +147,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>295</width>
                             <height>20</height>
diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui
index dd94f4ae..fcd4b1db 100644
--- a/quanta/components/debugger/conditionalbreakpointdialogs.ui
+++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui
@@ -62,7 +62,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -144,7 +144,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>30</width>
                     <height>20</height>
@@ -163,13 +163,13 @@
             <property name="name">
                 <cstring>ledWarning</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>22</width>
                     <height>22</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>22</width>
                     <height>22</height>
@@ -215,7 +215,7 @@
                     <property name="text">
                         <string>File:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
@@ -234,7 +234,7 @@
                     <property name="text">
                         <string>Objects of class:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
@@ -253,7 +253,7 @@
                     <property name="text">
                         <string>Function:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp
index 584e71f0..a087ae03 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").tqarg(service), true);
+        emit networkError(i18n("Listening on port %1").arg(service), true);
       }
       else
       {
         delete m_server;
         m_server = NULL;
         emit active(false);
-        emit networkError(i18n("Unable to listen on port %1").tqarg(service), true);
+        emit networkError(i18n("Unable to listen on port %1").arg(service), true);
       }
     }
   }
@@ -293,7 +293,7 @@ long DBGpNetwork::sendCommand(const TQString & command, const TQString & argumen
     return false;
 
   m_transaction_id++;
-  TQString commandline = command + TQString(" -i %1").tqarg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments;
+  TQString commandline = command + TQString(" -i %1").arg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments;
 
   kdDebug(24002) << k_funcinfo << ", sending: " << commandline << endl;
 
diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui
index b8ab40bd..10888885 100644
--- a/quanta/components/debugger/dbgp/dbgpsettingss.ui
+++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui
@@ -46,7 +46,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -207,7 +207,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>40</height>
@@ -496,7 +496,7 @@
                                 <property name="text">
                                     <string>Break on:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -605,7 +605,7 @@
                                 <property name="text">
                                     <string>Default mode:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter</set>
                                 </property>
                             </widget>
@@ -621,7 +621,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>40</height>
diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp
index 578fedb9..7c76066b 100644
--- a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp
+++ b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp
@@ -47,7 +47,7 @@ TQString TQByteArrayFifo::retrieve( )
 bool TQByteArrayFifo::append(const char * chars, size_t size )
 {
   // Resize the array, fail if not possible
-  if(!m_array.tqresize(m_size + size ))
+  if(!m_array.resize(m_size + size ))
     return false;
 
   // Copy the elements
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
index 4ee2bceb..3fe2f972 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
@@ -57,7 +57,7 @@ QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQS
   m_supportsasync = false;
   m_defaultExecutionState = Starting;
   setExecutionState(m_defaultExecutionState);
-  emit updatetqStatus(DebuggerUI::NoSession);
+  emit updateStatus(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 updatetqStatus(DebuggerUI::AwaitingConnection);
+    emit updateStatus(DebuggerUI::AwaitingConnection);
   else
-    emit updatetqStatus(DebuggerUI::NoSession);
+    emit updateStatus(DebuggerUI::NoSession);
 
 }
 
@@ -113,11 +113,11 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected)
 
   debuggerInterface()->setActiveLine("", 0);
   if(connected)
-    emit updatetqStatus(DebuggerUI::Connected);
+    emit updateStatus(DebuggerUI::Connected);
   else
   {
     setExecutionState(m_defaultExecutionState);
-    emit updatetqStatus(DebuggerUI::AwaitingConnection);
+    emit updateStatus(DebuggerUI::AwaitingConnection);
 
     profilerOpen(false);
   }
@@ -126,7 +126,7 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected)
 
 void QuantaDebuggerDBGp::slotNetworkError(const TQString &errormsg, bool log)
 {
-  debuggerInterface()->showtqStatus(errormsg, log);
+  debuggerInterface()->showStatus(errormsg, log);
 }
 
 
@@ -194,29 +194,29 @@ void QuantaDebuggerDBGp::setExecutionState(const TQString &state)
   if(state == "starting")
   {
     setExecutionState(Starting);
-    emit updatetqStatus(DebuggerUI::Paused);
+    emit updateStatus(DebuggerUI::Paused);
   }
   else if(state == "stopping")
   {
     setExecutionState(Stopping);
-    emit updatetqStatus(DebuggerUI::Paused);
+    emit updateStatus(DebuggerUI::Paused);
     m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket
   }
   else if(state == "stopped")
   {
     setExecutionState(Stopped);
-    emit updatetqStatus(DebuggerUI::Paused);
+    emit updateStatus(DebuggerUI::Paused);
     m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket
   }
   else if(state == "running")
   {
     setExecutionState(Running);
-    emit updatetqStatus(DebuggerUI::Running);
+    emit updateStatus(DebuggerUI::Running);
   }
   else if(state == "break")
   {
     setExecutionState(Break);
-    emit updatetqStatus(DebuggerUI::Paused);
+    emit updateStatus(DebuggerUI::Paused);
   }
 
 }
@@ -263,7 +263,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas)
     TQDomNode response = data.elementsByTagName("response").item(0);
     TQString command = attribute(response, "command");
 
-    // tqStatus command
+    // Status command
     if(command == "status")
       setExecutionState(attribute(response, "status"));
       
@@ -327,7 +327,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas)
   }
   else
   {
-    debuggerInterface()->showtqStatus(i18n("Unrecognized package: '%1%2'").tqarg(datas.left(50)).tqarg(datas.length() > 50 ? "..." : ""), true);
+    debuggerInterface()->showStatus(i18n("Unrecognized package: '%1%2'").arg(datas.left(50)).arg(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()->showtqStatus(
+    debuggerInterface()->showStatus(
       i18n("The debugger for %1 uses an unsupported protocol version (%2)")
-            .tqarg(attribute(initpacket, "language"))
-            .tqarg(attribute(initpacket, "protocol_version"))
+            .arg(attribute(initpacket, "language"))
+            .arg(attribute(initpacket, "protocol_version"))
           , true);
 
     endSession();
@@ -540,7 +540,7 @@ void QuantaDebuggerDBGp::addBreakpoint (DebuggerBreakpoint* breakpoint)
                         " -n " + TQString::number(breakpoint->line() + 1)
                         , breakpoint->condition());
 
-  breakpoint->setKey(TQString("id %1").tqarg(id));
+  breakpoint->setKey(TQString("id %1").arg(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").tqarg(id);
+    TQString oldkey = TQString("id %1").arg(id);
     DebuggerBreakpoint *bp = debuggerInterface()->findDebuggerBreakpoint(oldkey);
     if(bp)
       debuggerInterface()->updateBreakpointKey(*bp, attribute(response, "id"));
@@ -867,9 +867,9 @@ void QuantaDebuggerDBGp::profilerOpen(bool forceopen)
     else
     {
       if(forceopen)
-        KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").tqarg(profileroutput), i18n("Profiler File Error"));
+        KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").arg(profileroutput), i18n("Profiler File Error"));
       else
-        debuggerInterface()->showtqStatus(i18n("Unable to open profiler output (%1)").tqarg(profileroutput), false);
+        debuggerInterface()->showStatus(i18n("Unable to open profiler output (%1)").arg(profileroutput), false);
     }
   }
   else
@@ -923,7 +923,7 @@ void QuantaDebuggerDBGp::propertySetResponse( const TQDomNode & setnode)
 {
   if(attribute(setnode, "success") == "0")
   {
-    debuggerInterface()->showtqStatus(i18n("Unable to set value of variable."), true);
+    debuggerInterface()->showStatus(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" tqchildren="1" numtqchildren="4">
+    <property name="$arrayVar" fullname="$arrayVar" address="-1073754976" type="hash" children="1" numchildren="4">
       <property name="birthyear" fullname="$arrayVar['birthyear']" address="135522364" type="int">
         <![CDATA[1949]]>
       </property>
-      <property name="songs" fullname="$arrayVar['songs']" address="135522236" type="hash" tqchildren="1" numtqchildren="3">
+      <property name="songs" fullname="$arrayVar['songs']" address="135522236" type="hash" children="1" numchildren="3">
         <property name="0" fullname="$arrayVar['songs'][0]" address="135522332" type="string" encoding="base64">
           <![CDATA[SW5ub2NlbnQgV2hlbiBZb3UgRHJlYW0=]]>
         </property>
@@ -1021,16 +1021,16 @@ void QuantaDebuggerDBGp::handleError(const TQDomNode & statusnode )
           }
           else
           {
-            emit updatetqStatus(DebuggerUI::HaltedOnError);
-            debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true);
+            emit updateStatus(DebuggerUI::HaltedOnError);
+            debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true);
           }
           break; 
         }
         else
         {
           // Fatal error
-          emit updatetqStatus(DebuggerUI::HaltedOnError);
-          debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true);
+          emit updateStatus(DebuggerUI::HaltedOnError);
+          debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true);
         }
       }
       errornode = errornode.nextSibling();
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h
index 8e5b667f..668fbe30 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h
@@ -161,7 +161,7 @@ class QuantaDebuggerDBGp : public DebuggerClient
     void processCommand(const TQString&);
     
   signals:
-    void updatetqStatus(DebuggerUI::DebuggertqStatus);
+    void updateStatus(DebuggerUI::DebuggerStatus);
 };
 
 #endif
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp
index 0e65ee5c..fa8f9719 100644
--- a/quanta/components/debugger/debuggermanager.cpp
+++ b/quanta/components/debugger/debuggermanager.cpp
@@ -67,7 +67,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU
   if(m_client)
   {
     
-    disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus)));
+    disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
 
     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>").tqarg(errCode).tqarg(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>").arg(errCode).arg(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(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus)));
+    connect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
     
     // Load saved breakpoints
     if(Project::ref()->debuggerPersistentBreakpoints())
@@ -299,7 +299,7 @@ DebuggerManager::~DebuggerManager()
   if(m_client)
   {
         
-    disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus)));
+    disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus)));
 
     delete m_client;
     m_client = 0L;
@@ -605,7 +605,7 @@ bool DebuggerManager::setActiveLine (const TQString& file, int line )
     quantaApp->gotoFileAndLine(filename, line, 0);
   else
   {
-    showtqStatus(i18n("Unable to open file %1, check your basedirs and mappings.").tqarg(filename), true);
+    showStatus(i18n("Unable to open file %1, check your basedirs and mappings.").arg(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::showtqStatus(const TQString& a_message, bool log)
+bool DebuggerManager::showStatus(const TQString& a_message, bool log)
 {
   TQString message = a_message;
   quantaApp->slotStatusMsg(m_client->getName() + ": " + message);
diff --git a/quanta/components/debugger/debuggermanager.h b/quanta/components/debugger/debuggermanager.h
index 8fae5864..de032937 100644
--- a/quanta/components/debugger/debuggermanager.h
+++ b/quanta/components/debugger/debuggermanager.h
@@ -71,7 +71,7 @@ class DebuggerManager : public TQObject
     void updateBreakpointKey(const DebuggerBreakpoint &bp, const TQString& newkey);
 
     // Public help functions
-    bool showtqStatus(const TQString& message, bool log);
+    bool showStatus(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 d2f710b6..fdf32a5c 100644
--- a/quanta/components/debugger/debuggerui.cpp
+++ b/quanta/components/debugger/debuggerui.cpp
@@ -109,7 +109,7 @@ void DebuggerUI::showMenu()
   else
     m_debuggerMenuID  = 0;
 
-  // tqStatus indicator
+  // Status indicator
   quantaApp->statusBar()->insertFixedItem(i18n("Debugger Inactive"), IDS_STATUS_DEBUGGER);
 
 }
@@ -124,7 +124,7 @@ void DebuggerUI::hideMenu()
   }
   m_debuggerMenuID = 0;
 
-  // tqStatus indicator
+  // Status indicator
   quantaApp->statusBar()->removeItem(IDS_STATUS_DEBUGGER);
 
 }
@@ -148,7 +148,7 @@ void DebuggerUI::sendRequest(const KURL &url)
   m_preview->openURL(url);
 }
 
-void DebuggerUI::slottqStatus( DebuggertqStatus status )
+void DebuggerUI::slotStatus( DebuggerStatus status )
 {
   switch(status)
   {
diff --git a/quanta/components/debugger/debuggerui.h b/quanta/components/debugger/debuggerui.h
index de939315..c7e7d145 100644
--- a/quanta/components/debugger/debuggerui.h
+++ b/quanta/components/debugger/debuggerui.h
@@ -38,7 +38,7 @@ class DebuggerUI : public TQObject
   TQ_OBJECT
 
   public:
-    enum DebuggertqStatus
+    enum DebuggerStatus
     {
       NoSession = 0,
       AwaitingConnection,
@@ -83,8 +83,8 @@ class DebuggerUI : public TQObject
     WHTMLPart *m_preview;
 
   public slots:
-    // tqStatus indication 
-    void slottqStatus(DebuggerUI::DebuggertqStatus status);
+    // Status indication 
+    void slotStatus(DebuggerUI::DebuggerStatus status);
 
 };
 
diff --git a/quanta/components/debugger/debuggervariable.cpp b/quanta/components/debugger/debuggervariable.cpp
index 46f827cb..390290a7 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 copytqchildren )
+void DebuggerVariable::copy( DebuggerVariable * v, bool copychildren )
 {
   m_name = v->name();
-  m_size = (v->isScalar() || copytqchildren ? v->size() : m_valueList.count());
+  m_size = (v->isScalar() || copychildren ? 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(copytqchildren)
+  if(copychildren)
   {
     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 09a3873c..f8d674d5 100644
--- a/quanta/components/debugger/debuggervariablesets.ui
+++ b/quanta/components/debugger/debuggervariablesets.ui
@@ -46,7 +46,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -125,7 +125,7 @@
             <property name="text">
                 <string>New value:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignTop</set>
             </property>
         </widget>
@@ -139,7 +139,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>30</width>
                     <height>20</height>
diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui
index ccca567c..c9caa54c 100644
--- a/quanta/components/debugger/gubed/gubedsettingss.ui
+++ b/quanta/components/debugger/gubed/gubedsettingss.ui
@@ -46,7 +46,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -116,7 +116,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>40</height>
@@ -407,7 +407,7 @@
                                 <property name="text">
                                     <string>Break on:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -487,7 +487,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>50</height>
@@ -530,7 +530,7 @@
                                 <property name="name">
                                     <cstring>sliderDisplayDelay</cstring>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>27</height>
@@ -566,7 +566,7 @@
                                 <property name="text">
                                     <string>Slow</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
@@ -606,7 +606,7 @@
                                 <property name="text">
                                     <string>Default mode:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter</set>
                                 </property>
                             </widget>
@@ -617,7 +617,7 @@
                                 <property name="text">
                                     <string>Run speed:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter</set>
                                 </property>
                             </widget>
@@ -670,7 +670,7 @@
                         <property name="scaledContents">
                             <bool>false</bool>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
index d083739a..3edcd527 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
@@ -57,7 +57,7 @@ QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *parent, const char* name, co
   m_defaultExecutionState = Pause;
   setExecutionState(m_defaultExecutionState);
 
-  emit updatetqStatus(DebuggerUI::NoSession);
+  emit updateStatus(DebuggerUI::NoSession);
   m_datalen = -1;
 }
 
@@ -80,7 +80,7 @@ QuantaDebuggerGubed::~QuantaDebuggerGubed ()
     delete m_server;
     m_server = NULL;
   }
-  emit updatetqStatus(DebuggerUI::NoSession);
+  emit updateStatus(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 updatetqStatus(DebuggerUI::AwaitingConnection);
+      emit updateStatus(DebuggerUI::AwaitingConnection);
     }
   }
   else
@@ -123,14 +123,14 @@ void QuantaDebuggerGubed::startSession()
 
       if(m_server->listen())
       {
-        emit updatetqStatus(DebuggerUI::AwaitingConnection);
+        emit updateStatus(DebuggerUI::AwaitingConnection);
         debuggerInterface()->enableAction("debug_connect", false);
         debuggerInterface()->enableAction("debug_disconnect", true);
         debuggerInterface()->enableAction("debug_request", true);
       }
       else
       {
-        emit updatetqStatus(DebuggerUI::NoSession);
+        emit updateStatus(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 updatetqStatus(DebuggerUI::NoSession);
+  emit updateStatus(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 updatetqStatus(DebuggerUI::Paused);
+      emit updateStatus(DebuggerUI::Paused);
   }
   else if(newstate == Run)
   {
@@ -194,7 +194,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate)
 
     sendCommand("run", (char*)0L);
     if(isActive())
-      emit updatetqStatus(DebuggerUI::Running);
+      emit updateStatus(DebuggerUI::Running);
   }
   else if(newstate == Trace)
   {
@@ -203,7 +203,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate)
 
     sendCommand("trace", (char*)0L);
     if(isActive())
-      emit updatetqStatus(DebuggerUI::Tracing);
+      emit updateStatus(DebuggerUI::Tracing);
   }
 
   m_executionState = newstate;
@@ -259,14 +259,14 @@ void QuantaDebuggerGubed::slotError(int)
     if(m_socket->error())
     {
       kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl;
-      debuggerInterface()->showtqStatus(m_socket->KSocketBase::errorString(), false);
+      debuggerInterface()->showStatus(m_socket->KSocketBase::errorString(), false);
     }
   }
 
   if(m_server && m_server->error())
   {
     kdDebug(24002) << k_funcinfo << ", " << m_server->errorString() << endl;
-    debuggerInterface()->showtqStatus(m_server->errorString(), false);
+    debuggerInterface()->showStatus(m_server->errorString(), false);
   }
 
 }
@@ -294,7 +294,7 @@ void QuantaDebuggerGubed::slotReadyAccept()
       connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead()));
       connected();
 
-      emit updatetqStatus(DebuggerUI::Connected);
+      emit updateStatus(DebuggerUI::Connected);
     }
     else
     {
@@ -307,7 +307,7 @@ void QuantaDebuggerGubed::slotReadyAccept()
 // Connection established
 void QuantaDebuggerGubed::slotConnected(const KNetwork::KResolverEntry &)
 {
-  emit updatetqStatus(DebuggerUI::Connected);
+  emit updateStatus(DebuggerUI::Connected);
   connected();
 }
 
@@ -353,7 +353,7 @@ void QuantaDebuggerGubed::slotConnectionClosed()
 
   debuggerInterface()->setActiveLine("", 0);
 
-  emit updatetqStatus(DebuggerUI::AwaitingConnection);
+  emit updateStatus(DebuggerUI::AwaitingConnection);
   m_active = false;
 }
 
@@ -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").tqarg(cnt) + "%", args[TQString("arg%1").tqarg(cnt)]);
+      msg.replace("%" + TQString("%1").arg(cnt) + "%", args[TQString("arg%1").arg(cnt)]);
 
-    debuggerInterface()->showtqStatus(msg, false);
+    debuggerInterface()->showStatus(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()->showtqStatus(i18n("Syntax or parse error in %1)").tqarg(args["filenme"]), true);
+    debuggerInterface()->showStatus(i18n("Syntax or parse error in %1)").arg(args["filenme"]), true);
     return;
   }
   // A debugging session is running
@@ -479,7 +479,7 @@ 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()->showtqStatus(i18n("Error occurred: Line %1, Code %2 (%3) in  %4").tqarg(args["line"]).tqarg(args["errnum"]).tqarg(args["errmsg"]).tqarg(args["filename"]), true);
+    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);
 
     // Filter to get error code only and match it with out mask
     long error = args["errnum"].toLong();
@@ -492,21 +492,21 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
     else
       setExecutionState(Pause);
 
-    emit updatetqStatus(DebuggerUI::HaltedOnError);
+    emit updateStatus(DebuggerUI::HaltedOnError);
   }
   // We came across  a hard coded breakpoint
   else if(m_command == "forcebreak")
   {
     setExecutionState(Pause);
-    emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint);
-    debuggerInterface()->showtqStatus(i18n("Breakpoint reached"), true);
+    emit updateStatus(DebuggerUI::HaltedOnBreakpoint);
+    debuggerInterface()->showStatus(i18n("Breakpoint reached"), true);
   }
   // A conditional breakpoint was fulfilled
   else if(m_command == "conditionalbreak")
   {
     setExecutionState(Pause);
-    emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint);
-    debuggerInterface()->showtqStatus(i18n("Conditional breakpoint fulfilled"), true);
+    emit updateStatus(DebuggerUI::HaltedOnBreakpoint);
+    debuggerInterface()->showStatus(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()->showtqStatus(i18n("Established connection to %1").tqarg(args["filename"]), false);
+    debuggerInterface()->showStatus(i18n("Established connection to %1").arg(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()->showtqStatus(i18n("At end of include %1").tqarg(data), true);
+    //debuggerInterface()->showStatus(i18n("At end of include %1").arg(data), true);
     return;
   }
   // Check protocol version
@@ -557,7 +557,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas)
   {
     if(args["version"] != protocolversion)
     {
-      debuggerInterface()->showtqStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true);
+      debuggerInterface()->showStatus(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).tqarg(buffer.length());
+  buffer = TQString(command + ":%1;" + buffer).arg(buffer.length());
   m_socket->writeBlock(buffer.ascii(), buffer.length());
   return true;
 }
@@ -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:{").tqarg(args.size());
+  TQString ret = TQString("a:%1:{").arg(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;")
-                    .tqarg(it.key().length())
-                    .tqarg(it.key())
-                    .tqarg(it.data());
+                    .arg(it.key().length())
+                    .arg(it.key())
+                    .arg(it.data());
     else
       ret += TQString("s:%1:\"%2\";s:%3:\"%4\";")
-                    .tqarg(it.key().length())
-                    .tqarg(it.key())
-                    .tqarg(it.data().length())
-                    .tqarg(it.data());
+                    .arg(it.key().length())
+                    .arg(it.key())
+                    .arg(it.data().length())
+                    .arg(it.data());
 
   }
 
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h
index 4663d9fa..d041e90d 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.h
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.h
@@ -148,7 +148,7 @@ class QuantaDebuggerGubed : public DebuggerClient
     void slotReadyAccept();
 
   signals:
-    void updatetqStatus(DebuggerUI::DebuggertqStatus);
+    void updateStatus(DebuggerUI::DebuggerStatus);
 };
 
 #endif
diff --git a/quanta/components/debugger/interfaces/debuggerclient.cpp b/quanta/components/debugger/interfaces/debuggerclient.cpp
index 88b5460e..97140dbb 100644
--- a/quanta/components/debugger/interfaces/debuggerclient.cpp
+++ b/quanta/components/debugger/interfaces/debuggerclient.cpp
@@ -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.").tqarg(this->getName()).tqarg(action), i18n("Unsupported Debugger Function"));
+  KMessageBox::error(NULL, i18n("The current debugger, %1, does not support the \"%2\" instruction.").arg(this->getName()).arg(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.").tqarg(this->getName()), i18n("Settings"));
+   KMessageBox::error(NULL, i18n("%1 does not have any specific settings.").arg(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.").tqarg(this->getName()), i18n("Unsupported Debugger Function"));
+  KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(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.").tqarg(this->getName()), i18n("Unsupported Debugger Function"));
+  KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(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.").tqarg(this->getName()), i18n("Unsupported Debugger Function"));
+  KMessageBox::error(NULL, i18n("%1 does not support setting the value of variables.").arg(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 317ff3e3..69ba5650 100644
--- a/quanta/components/debugger/interfaces/debuggerclient.h
+++ b/quanta/components/debugger/interfaces/debuggerclient.h
@@ -109,7 +109,7 @@ class DebuggerClient : public TQObject
     DebuggerInterface *debuggerInterface();
 
   signals:
-    void updatetqStatus(DebuggerUI::DebuggertqStatus);
+    void updateStatus(DebuggerUI::DebuggerStatus);
 
 };
 
diff --git a/quanta/components/debugger/interfaces/debuggerinterface.h b/quanta/components/debugger/interfaces/debuggerinterface.h
index dabd685d..cf634884 100644
--- a/quanta/components/debugger/interfaces/debuggerinterface.h
+++ b/quanta/components/debugger/interfaces/debuggerinterface.h
@@ -44,7 +44,7 @@ class DebuggerInterface : public TQObject
     virtual void havenoBreakpoint (const TQString& file, int line) = 0;
 
     // Public help functions
-    virtual bool showtqStatus(const TQString& message, bool log) = 0;
+    virtual bool showStatus(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 96e4f628..c38e2fec 100644
--- a/quanta/components/debugger/pathmapper.cpp
+++ b/quanta/components/debugger/pathmapper.cpp
@@ -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.tqstartsWith(from, false))
+  if(path.startsWith(from, false))
   {
     translated.remove(0, from.length());
     translated = to + translated;
diff --git a/quanta/components/debugger/pathmapperdialog.cpp b/quanta/components/debugger/pathmapperdialog.cpp
index 671bb871..7f6f4027 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.tqstartsWith(from, false))
+  if(m_path.startsWith(from, false))
   {
     translated.remove(0, from.length());
     translated = to + translated;
diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui
index c0f27c04..58a79167 100644
--- a/quanta/components/debugger/pathmapperdialogs.ui
+++ b/quanta/components/debugger/pathmapperdialogs.ui
@@ -109,7 +109,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -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="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>22</width>
                             <height>22</height>
diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp
index 385849a5..af70da0a 100644
--- a/quanta/components/debugger/quantadebuggerinterface.cpp
+++ b/quanta/components/debugger/quantadebuggerinterface.cpp
@@ -52,9 +52,9 @@ void QuantaDebuggerInterface::havenoBreakpoint (const TQString& file, int line)
 }
 
 // Public help functions
-bool QuantaDebuggerInterface::showtqStatus(const TQString& message, bool log)
+bool QuantaDebuggerInterface::showStatus(const TQString& message, bool log)
 {
-  return m_manager->showtqStatus(message, log);
+  return m_manager->showStatus(message, log);
 }
 
 bool QuantaDebuggerInterface::setActiveLine(const TQString& file, int line)
diff --git a/quanta/components/debugger/quantadebuggerinterface.h b/quanta/components/debugger/quantadebuggerinterface.h
index 9c2ba724..5b9b5480 100644
--- a/quanta/components/debugger/quantadebuggerinterface.h
+++ b/quanta/components/debugger/quantadebuggerinterface.h
@@ -43,7 +43,7 @@ class QuantaDebuggerInterface : public DebuggerInterface
     void refreshBreakpoints();
 
     // Public help functions
-    bool showtqStatus(const TQString& message, bool log);
+    bool showStatus(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 72e4afa3..b8a6847b 100644
--- a/quanta/components/debugger/variableslistview.cpp
+++ b/quanta/components/debugger/variableslistview.cpp
@@ -21,7 +21,7 @@
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kinputdialog.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 // Quanta includes
 #include "variableslistview.h"
@@ -39,7 +39,7 @@ namespace VariablesListViewColumns
   enum Columns
   {
     Name = 0,
-    tqStatus,
+    Status,
     Value,
     Type,
     Size
@@ -160,7 +160,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab
 { 
   KListViewItem * item;
   
-  // Remove tqchildren that doesen't exist anymore
+  // Remove children 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 tqchildren
+  // Update and add children
   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::tqStatus, SmallIcon("ok"));
+    item->setPixmap(VariablesListViewColumns::Status, SmallIcon("ok"));
   else
-    item->setPixmap(VariablesListViewColumns::tqStatus, KPixmap());
+    item->setPixmap(VariablesListViewColumns::Status, 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").tqarg(v->name()));
+  quantaApp->messageOutput()->showMessage(i18n("Contents of variable %1:\n>>>\n").arg(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::tqclipboard()->setText(v->value());
+  TQApplication::clipboard()->setText(v->value());
 }
 
 #include "variableslistview.moc"
diff --git a/quanta/components/framewizard/areaattributedb.h b/quanta/components/framewizard/areaattributedb.h
index 528da3ea..79e105be 100644
--- a/quanta/components/framewizard/areaattributedb.h
+++ b/quanta/components/framewizard/areaattributedb.h
@@ -29,7 +29,7 @@ class areaAttribute : public TQObject{
   TQ_OBJECT
 
     private:
-      TQRect m_tqgeometry;
+      TQRect m_geometry;
       TQMap<TQString,TQString> m_attributeMap;     //tag specific attributes
 
     public:
@@ -38,13 +38,13 @@ class areaAttribute : public TQObject{
       void setAttribute(const TQString& name, const TQString& value){ m_attributeMap[name] = value; }
       void setAllAttributes(TQMap<TQString,TQString> map){ m_attributeMap = map; }
       void resetAttributes();
-      TQRect tqgeometry() const { return m_tqgeometry; }
+      TQRect geometry() const { return m_geometry; }
       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_tqgeometry = g; }
+      void setGeometry(TQRect g) { m_geometry = g; }
 };
 
 #endif
diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui
index 46a5354a..3e024de5 100644
--- a/quanta/components/framewizard/fmfpeditors.ui
+++ b/quanta/components/framewizard/fmfpeditors.ui
@@ -43,7 +43,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>55</width>
                             <height>0</height>
@@ -510,7 +510,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
diff --git a/quanta/components/framewizard/fmrceditors.ui b/quanta/components/framewizard/fmrceditors.ui
index e0a8926c..c977d86f 100644
--- a/quanta/components/framewizard/fmrceditors.ui
+++ b/quanta/components/framewizard/fmrceditors.ui
@@ -20,13 +20,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>300</width>
             <height>150</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>300</width>
             <height>150</height>
@@ -104,7 +104,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>31</width>
                             <height>0</height>
diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui
index cde1611f..3a3a1efd 100644
--- a/quanta/components/framewizard/framewizards.ui
+++ b/quanta/components/framewizard/framewizards.ui
@@ -20,13 +20,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -77,7 +77,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -161,7 +161,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>30</height>
@@ -221,7 +221,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>16</height>
@@ -295,7 +295,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>30</height>
diff --git a/quanta/components/framewizard/selectablearea.cpp b/quanta/components/framewizard/selectablearea.cpp
index 80c7aa00..c168e323 100644
--- a/quanta/components/framewizard/selectablearea.cpp
+++ b/quanta/components/framewizard/selectablearea.cpp
@@ -44,7 +44,7 @@ bool SelectableArea::eventFilter(TQObject *o, TQEvent *event){
                                              }
                                              break;
     case TQEvent::Resize : {
-                                          emit Resized( view()->tqgeometry() );
+                                          emit Resized( view()->geometry() );
                                           view()->hide();
                                           view()->show();
                                           return true;
diff --git a/quanta/components/framewizard/treenode.cpp b/quanta/components/framewizard/treenode.cpp
index 2faaf3d6..fd1f187f 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_tqchildrenList.setAutoDelete(true);
+  m_childrenList.setAutoDelete(true);
   m_atts = new areaAttribute;
 }
 
@@ -29,16 +29,16 @@ treeNode::~treeNode(){
 }
 
 void treeNode::addChildNode(const TQString &l) {
-  m_tqchildrenList.append( new treeNode(l,m_label) );
+  m_childrenList.append( new treeNode(l,m_label) );
 }
 
 void treeNode::removeChildNode(const TQString &l,bool autoDelete) {
-  m_tqchildrenList.setAutoDelete(autoDelete);
-  m_tqchildrenList.remove(findChild(l));
+  m_childrenList.setAutoDelete(autoDelete);
+  m_childrenList.remove(findChild(l));
 }
 
 treeNode* treeNode::findChild(const TQString &l){
-  TQPtrListIterator<treeNode> it( m_tqchildrenList );
+  TQPtrListIterator<treeNode> it( m_childrenList );
   treeNode *node;
   while ( (node = it.current()) != 0 ) {
     ++it;
@@ -68,25 +68,25 @@ void tree::refreshGeometries(treeNode *n){
       n->nextChild();
     }
 
-    TQPtrList<treeNode> list = n->tqchildrenList();
+    TQPtrList<treeNode> list = n->childrenList();
     TQPtrListIterator<treeNode> it( list );
     treeNode *node= it.current();
-    TQRect newGeometry = n->atts()->tqgeometry();
+    TQRect newGeometry = n->atts()->geometry();
     if(n->splitType()==VERTICAL){
-      newGeometry.setHeight(node->atts()->tqgeometry().height());
+      newGeometry.setHeight(node->atts()->geometry().height());
       while ( (node = it.current()) != 0 ) {
         ++it;
-        dim += node->atts()->tqgeometry().width();
+        dim += node->atts()->geometry().width();
         dim += 6;
       }
       newGeometry.setWidth(dim);
     }
     else
     if(n->splitType()==HORIZONTAL){
-      newGeometry.setWidth(node->atts()->tqgeometry().width());
+      newGeometry.setWidth(node->atts()->geometry().width());
       while ( (node = it.current()) != 0 ) {
         ++it;
-        dim += node->atts()->tqgeometry().height();
+        dim += node->atts()->geometry().height();
         dim += 6;
       }
       newGeometry.setHeight(dim);
diff --git a/quanta/components/framewizard/treenode.h b/quanta/components/framewizard/treenode.h
index c96d9b17..82d312fb 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_tqchildrenList;
+      TQPtrList<treeNode> m_childrenList;
       areaAttribute *m_atts;
 
    public:
      treeNode(const TQString &l=TQString(), const TQString &pl=TQString());
       ~treeNode();
       void addChildNode(const TQString &L);
-      void addChildNode(treeNode *n){ m_tqchildrenList.append(n); }
+      void addChildNode(treeNode *n){ m_childrenList.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_tqchildrenList.clear(); }
+      void removeChildren() { m_childrenList.clear(); }
       void setParentLabel(const TQString &s){ m_parentLabel = s;}
-      int  childPosition(treeNode* n){ return m_tqchildrenList.find(n); }
-      bool insertChild(unsigned int pos, treeNode* n) { return m_tqchildrenList.insert( pos, n); }
+      int  childPosition(treeNode* n){ return m_childrenList.find(n); }
+      bool insertChild(unsigned int pos, treeNode* n) { return m_childrenList.insert( pos, n); }
       TQString label() const { return m_label; }
       TQString parentLabel() const { return m_parentLabel; }
       SplitType splitType() const { return m_splitType; }
-      TQPtrList<treeNode> tqchildrenList() { return m_tqchildrenList; }
+      TQPtrList<treeNode> childrenList() { return m_childrenList; }
 
-      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* firstChild() { return m_childrenList.first(); }
+      treeNode* nextChild() { return m_childrenList.next(); }
+      treeNode* lastChild() { return m_childrenList.last(); }
+      treeNode* currentChild()  { return m_childrenList.current(); }
       treeNode* findChild(const TQString &L);
 
       areaAttribute* atts() { return m_atts; }
 
-      int countChildren() const { return m_tqchildrenList.count(); }
-      bool hasChildren() const { return !m_tqchildrenList.isEmpty(); }
+      int countChildren() const { return m_childrenList.count(); }
+      bool hasChildren() const { return !m_childrenList.isEmpty(); }
 };
 
 class tree{
diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp
index e822d7e0..4b1f62f3 100644
--- a/quanta/components/framewizard/visualframeeditor.cpp
+++ b/quanta/components/framewizard/visualframeeditor.cpp
@@ -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()->tqgeometry());
-  TQPtrList<treeNode> list=m_internalTree->findNode(l)->tqchildrenList();
+  TQRect newGeometry(m_internalTree->findNode(l)->atts()->geometry());
+  TQPtrList<treeNode> list=m_internalTree->findNode(l)->childrenList();
   TQPtrListIterator<treeNode> it( list );
   treeNode *node;
   if(m_internalTree->findNode(l)->splitType() == VERTICAL){
-    int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().width()-cP;
+    int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().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()->tqgeometry().height()-cP;
+    int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().height()-cP;
     while ( (node = it.current()) != 0 ) {
       ++it;
       newGeometry.setHeight( int(dummyDimension/m_internalTree->findNode(l)->countChildren()) );
@@ -145,12 +145,12 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){
       TQRegExp pattern("rows\\s*=\"([\\s\\d%,\\*]*)\"");
       pattern.search(line);
 
-      TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry();
+      TQRect dummy=m_internalTree->findNode(parent)->atts()->geometry();
       TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.height());
 
       int dummyDimension=dummy.height()-cancelledPixels(line.contains(",")+1);
 
-      TQPtrList<treeNode> list=m_internalTree->findNode(parent)->tqchildrenList();
+      TQPtrList<treeNode> list=m_internalTree->findNode(parent)->childrenList();
       TQPtrListIterator<treeNode> it( list );
       treeNode *node;
       while ( (node = it.current()) != 0 ) {
@@ -171,12 +171,12 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){
       TQRegExp pattern("cols\\s*=\"([\\s\\d%,\\*]*)\"");
       pattern.search(line);
 
-      TQRect dummy=m_internalTree->findNode(parent)->atts()->tqgeometry();
+      TQRect dummy=m_internalTree->findNode(parent)->atts()->geometry();
       TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.width());
 
       int dummyDimension=dummy.width()-cancelledPixels(line.contains(",")+1);
 
-      TQPtrList<treeNode> list=m_internalTree->findNode(parent)->tqchildrenList();
+      TQPtrList<treeNode> list=m_internalTree->findNode(parent)->childrenList();
       TQPtrListIterator<treeNode> it( list );
       treeNode *node;
       while ( (node = it.current()) != 0 ) {
@@ -258,7 +258,7 @@ void VisualFrameEditor::removeNode(const TQString &l){
         m_internalTree->findNode(parentLabel)->setSplitType(NONE);
       }
       else {
-        TQPtrList<treeNode> list = m_internalTree->findNode(parentLabel)->firstChild()->tqchildrenList();
+        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 );
@@ -304,7 +304,7 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){
     if(parent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast<TQSplitter *>(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize );
     else
     if(!m_firstInsertedSA) m_firstInsertedSA = sa;
-    sa->view()->setGeometry(n->atts()->tqgeometry());
+    sa->view()->setGeometry(n->atts()->geometry());
     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)));
@@ -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()->tqgeometry().width();
-                                 for(int i=1;i<=child_number;++i) dimMap[i]=n->tqchildrenList().at(i-1)->atts()->tqgeometry().width();
+    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();
                                  break;
-    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();
+    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();
                                       break;
     default:break;
   }
diff --git a/quanta/components/framewizard/visualframeeditor.h b/quanta/components/framewizard/visualframeeditor.h
index c7338128..39bb4b4c 100644
--- a/quanta/components/framewizard/visualframeeditor.h
+++ b/quanta/components/framewizard/visualframeeditor.h
@@ -50,7 +50,7 @@ class VisualFrameEditor : public TQHBox  {
    public:
       VisualFrameEditor( TQWidget * parent = 0, const char * name = 0);
       ~VisualFrameEditor();
-      void draw() { tqrepaint(); }
+      void draw() { repaint(); }
       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 a94c15e4..45bcf07c 100644
--- a/quanta/components/tableeditor/tableeditor.cpp
+++ b/quanta/components/tableeditor/tableeditor.cpp
@@ -204,7 +204,7 @@ void TableEditor::slotEditRow()
 
 void TableEditor::slotEditCol()
 {
-  KMessageBox::information(this, i18n("Edit col: %1").tqarg(m_col + 1));
+  KMessageBox::information(this, i18n("Edit col: %1").arg(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).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1));
+            setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(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).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1));
+          setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(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).").tqarg(nRow).tqarg(lastCol));
+              setCellText(m_dataTable, nRow - 1, lastCol + i, i18n("Merged with (%1, %2).").arg(nRow).arg(lastCol));
               m_dataTable->item(nRow-1, lastCol + i)->setEnabled(false);
               tableNode.node = new Node(0L);
               tableNode.node->tag = new Tag(*(n->tag));
@@ -924,7 +924,7 @@ void TableEditor::slotRemoveRow()
         int rowspan =  mainTableNode->node->tag->attributeValue("rowspan", true).toInt();
         rowspan--;
         if (rowspan > 1)
-          mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(rowspan));
+          mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(rowspan));
         else
           mainTableNode->node->tag->deleteAttribute("rowspan");
         updatedMainNodes.append(mainTableNode);
@@ -975,7 +975,7 @@ void TableEditor::slotRemoveCol()
         int colspan = mainTableNode->node->tag->attributeValue("colspan", true).toInt();
         colspan--;
         if (colspan > 1)
-          mainTableNode->node->tag->editAttribute("colspan", TQString("%1").tqarg(colspan));
+          mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(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").tqarg(rCol - lCol + 1));
+    mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(rCol - lCol + 1));
   if (bRow - tRow > 0)
-    mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(bRow - tRow + 1));
+    mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(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).").tqarg(tRow + 1).tqarg(lCol + 1));
+        setCellText(m_dataTable, tRow + i, lCol + j, i18n("Merged with (%1, %2).").arg(tRow + 1).arg(lCol + 1));
         m_dataTable->item(tRow + i, lCol + j)->setEnabled(false);
         TableNode *tableNode = &((*m_tableTags)[tRow + i][lCol + j]);
         Node::deleteNode(tableNode->node);
@@ -1271,7 +1271,7 @@ void TableEditor::configureCell(int row, int col, Node * node)
      return;
    // Header (TH) or standard cell?
    item->setHeader(node->tag->name.lower() == "th");
-   //Qt::Horizontal tqalignment
+   //Qt::Horizontal alignment
    TQt::AlignmentFlags flags;
    TQString align = node->tag->attributeValue("align", true);
    if (align == "right")
@@ -1284,8 +1284,8 @@ void TableEditor::configureCell(int row, int col, Node * node)
      flags = TQt::AlignHCenter;   // TH is centered by default
    else
      flags = TQt::AlignLeft;
-   item->tqsetAlignment(flags);
-   //Qt::Vertical tqalignment
+   item->setAlignment(flags);
+   //Qt::Vertical alignment
    TQString valign = node->tag->attributeValue("valign", true);
    if (valign == "top")
      flags = TQt::AlignTop;
diff --git a/quanta/components/tableeditor/tableeditors.ui b/quanta/components/tableeditor/tableeditors.ui
index f74a2620..29511351 100644
--- a/quanta/components/tableeditor/tableeditors.ui
+++ b/quanta/components/tableeditor/tableeditors.ui
@@ -40,7 +40,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -142,7 +142,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>276</width>
                                 <height>20</height>
@@ -159,7 +159,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>276</width>
                                 <height>20</height>
@@ -313,7 +313,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>340</width>
                                         <height>20</height>
@@ -392,7 +392,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>40</width>
                                 <height>20</height>
@@ -528,7 +528,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>340</width>
                                         <height>20</height>
@@ -555,7 +555,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>40</width>
                                 <height>20</height>
diff --git a/quanta/components/tableeditor/tableitem.cpp b/quanta/components/tableeditor/tableitem.cpp
index c2f4e298..aed532d1 100644
--- a/quanta/components/tableeditor/tableitem.cpp
+++ b/quanta/components/tableeditor/tableitem.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqpainter.h>
 #include "tableitem.h"
 
@@ -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::tqsizeHint() const
+TQSize TableItem::sizeHint() const
 {
-   TQSize size = TQTableItem::tqsizeHint();
+   TQSize size = TQTableItem::sizeHint();
    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 12e2b4b0..017738bf 100644
--- a/quanta/components/tableeditor/tableitem.h
+++ b/quanta/components/tableeditor/tableitem.h
@@ -35,16 +35,16 @@ public:
   virtual TQWidget* createEditor() const;
   // Get text from TQTextEdit
   virtual void setContentFromEditor(TQWidget *w);
-  // Paint cell - handle tqalignment (horizontal and vertical) and bold for header
+  // Paint cell - handle alignment (horizontal and vertical) and bold for header
   virtual void paint(TQPainter* p, const TQColorGroup& cg, const TQRect& cr, bool selected);
-  // Return A bit larger tqsizeHint because TQTextEdit has some margin around
-  virtual TQSize tqsizeHint() const;
+  // Return A bit larger sizeHint because TQTextEdit has some margin around
+  virtual TQSize sizeHint() const;
   // Get and set vertical aligment
   TQt::AlignmentFlags vAlignment()	{return m_valign;}
   void setVAlignment(TQt::AlignmentFlags flags)	{m_valign = flags;}
   // Get and set horizontal aligment
-  TQt::AlignmentFlags tqalignment()	{return m_halign;}
-  void tqsetAlignment(TQt::AlignmentFlags flags)	{m_halign = flags;}
+  TQt::AlignmentFlags alignment()	{return m_halign;}
+  void setAlignment(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/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index d5cace16..d8e44d45 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -190,7 +190,7 @@ void ActionConfigDialog::slotRemoveToolbar()
   }
   if (s != i18n("All"))
   {
-      if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").tqarg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue )
+      if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").arg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue )
     {
       m_toolbarItem = item;
       connect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), TQT_SLOT(slotToolbarRemoved(const TQString&)));
@@ -682,7 +682,7 @@ void ActionConfigDialog::saveCurrentAction()
         p_toolbar->guiClient->xmlFile(), p_toolbar->guiClient->instance());
     }
     TQWidget *toolBar = tb->page(i);
-    if (toolBar->tqminimumSizeHint().height() > 20)
+    if (toolBar->minimumSizeHint().height() > 20)
     {
       toolBar->adjustSize();
       toolBar->setGeometry(0,0, tb->width(), toolBar->height());
@@ -765,7 +765,7 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut)
     TQString s =  i18n("The '%1' key combination has already been allocated "
                 "to the \"%2\" action.\n"
                 "Please choose a unique key combination.").
-                tqarg(shortcutText).tqarg(global);
+                arg(shortcutText).arg(global);
     KMessageBox::sorry( this, s, i18n("Conflicting Shortcuts"));
   }
 }
@@ -805,7 +805,7 @@ void ActionConfigDialog::slotNewAction()
   static_cast<TagAction*>(currentAction)->setModified(true);
   TQListViewItem *currentItem = actionTreeView->currentItem();
   TQListViewItem *item = new KListViewItem(allActionsItem);
-  TQString actionText = TQString("Action_%1").tqarg(m_mainWindow->actionCollection()->count());
+  TQString actionText = TQString("Action_%1").arg(m_mainWindow->actionCollection()->count());
   currentAction->setText(actionText);
   item->setText(2, currentAction->name());
   item->setText(0, actionText);
@@ -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>").tqarg(currentAction->text()),TQString(),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>").arg(currentAction->text()),TQString(),KStdGuiItem::del()) == KMessageBox::Continue )
   {
     TQString actionName = currentAction->name();
     emit deleteUserAction(currentAction);
diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui
index d834bea7..fba7eaf9 100644
--- a/quanta/dialogs/actionconfigdialogs.ui
+++ b/quanta/dialogs/actionconfigdialogs.ui
@@ -39,7 +39,7 @@
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout17</cstring>
+                    <cstring>layout17</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -77,7 +77,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>16</width>
                                 <height>20</height>
@@ -94,7 +94,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>16</width>
                                 <height>20</height>
@@ -160,7 +160,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout9</cstring>
+                    <cstring>layout9</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -198,7 +198,7 @@
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>16</width>
                                 <height>20</height>
@@ -209,7 +209,7 @@
                         <property name="name">
                             <cstring>buttonOk</cstring>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>90</width>
                                 <height>0</height>
@@ -265,7 +265,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
@@ -311,13 +311,13 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>32</width>
                                         <height>32</height>
                                     </size>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>32</width>
                                         <height>32</height>
@@ -521,7 +521,7 @@
                                                             <verstretch>0</verstretch>
                                                         </sizepolicy>
                                                     </property>
-                                                    <property name="tqminimumSize">
+                                                    <property name="minimumSize">
                                                         <size>
                                                             <width>64</width>
                                                             <height>20</height>
@@ -740,7 +740,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>55</width>
                                 <height>20</height>
diff --git a/quanta/dialogs/casewidget.ui b/quanta/dialogs/casewidget.ui
index f3370603..6670afb0 100644
--- a/quanta/dialogs/casewidget.ui
+++ b/quanta/dialogs/casewidget.ui
@@ -12,7 +12,7 @@
             <height>158</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>500</width>
             <height>100</height>
diff --git a/quanta/dialogs/debuggeroptionss.ui b/quanta/dialogs/debuggeroptionss.ui
index 3bca0951..597fbcd6 100644
--- a/quanta/dialogs/debuggeroptionss.ui
+++ b/quanta/dialogs/debuggeroptionss.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>350</width>
             <height>220</height>
@@ -101,7 +101,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -120,7 +120,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/quanta/dialogs/dirtydialog.ui b/quanta/dialogs/dirtydialog.ui
index 50783723..b5331bb1 100644
--- a/quanta/dialogs/dirtydialog.ui
+++ b/quanta/dialogs/dirtydialog.ui
@@ -29,7 +29,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>400</width>
             <height>220</height>
@@ -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="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -120,7 +120,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp
index 972c4828..70d06c86 100644
--- a/quanta/dialogs/dirtydlg.cpp
+++ b/quanta/dialogs/dirtydlg.cpp
@@ -41,7 +41,7 @@ DirtyDlg::DirtyDlg(const TQString& srcName, const TQString& destName, bool creat
  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>").tqarg(srcName));
+ m_mainWidget->textLabel->setText(i18n("<qt>The file <b>%1</b> was changed outside of the Quanta editor.</qt>").arg(srcName));
  setMainWidget(m_mainWidget);
 }
 
diff --git a/quanta/dialogs/donationdialog.ui b/quanta/dialogs/donationdialog.ui
index c06a9c2f..ca0135df 100644
--- a/quanta/dialogs/donationdialog.ui
+++ b/quanta/dialogs/donationdialog.ui
@@ -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="tqsizeHint">
+            <property name="sizeHint">
                 <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="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>30</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>40</height>
diff --git a/quanta/dialogs/dtdselectdialog.ui b/quanta/dialogs/dtdselectdialog.ui
index b2455cf7..cd6a079b 100644
--- a/quanta/dialogs/dtdselectdialog.ui
+++ b/quanta/dialogs/dtdselectdialog.ui
@@ -21,7 +21,7 @@
             <height>161</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>440</width>
             <height>160</height>
@@ -45,7 +45,7 @@ Dialog message2:</string>
             <property name="scaledContents">
                 <bool>true</bool>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp
index 28f00ce3..c2595716 100644
--- a/quanta/dialogs/dtepeditdlg.cpp
+++ b/quanta/dialogs/dtepeditdlg.cpp
@@ -113,9 +113,9 @@ void DTEPEditDlg::readGeneral()
 void DTEPEditDlg::readPages()
 {
   int i = 1;
-  while (m_config->hasGroup(TQString("Page%1").tqarg(i)) && i < 6)
+  while (m_config->hasGroup(TQString("Page%1").arg(i)) && i < 6)
   {
-    m_config->setGroup(TQString("Page%1").tqarg(i));
+    m_config->setGroup(TQString("Page%1").arg(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>").tqarg(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>").arg(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").tqarg(num));
+      config->setGroup(TQString("Page%1").arg(num));
       writeEntry(config, "Title", pageTitleEdit1->text());
       writeEntry(config, "Groups", groupsEdit1->text());
     }
     if (enablePage2->isChecked())
     {
       num++;
-      config->setGroup(TQString("Page%1").tqarg(num));
+      config->setGroup(TQString("Page%1").arg(num));
       writeEntry(config, "Title", pageTitleEdit2->text());
       writeEntry(config, "Groups", groupsEdit2->text());
     }
     if (enablePage3->isChecked())
     {
       num++;
-      config->setGroup(TQString("Page%1").tqarg(num));
+      config->setGroup(TQString("Page%1").arg(num));
       writeEntry(config, "Title", pageTitleEdit3->text());
       writeEntry(config, "Groups", groupsEdit3->text());
     }
     if (enablePage4->isChecked())
     {
       num++;
-      config->setGroup(TQString("Page%1").tqarg(num));
+      config->setGroup(TQString("Page%1").arg(num));
       writeEntry(config, "Title", pageTitleEdit4->text());
       writeEntry(config, "Groups", groupsEdit4->text());
     }
     if (enablePage5->isChecked())
     {
       num++;
-      config->setGroup(TQString("Page%1").tqarg(num));
+      config->setGroup(TQString("Page%1").arg(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").tqarg(i)))
+  while (m_config->hasGroup(TQString("StructGroup_%1").arg(i)))
   {
     StructGroup group;
-    m_config->setGroup(TQString("StructGroup_%1").tqarg(i));
+    m_config->setGroup(TQString("StructGroup_%1").arg(i));
     group.name = m_config->readEntry("Name");
     group.noName = m_config->readEntry("No_Name");
     group.icon = m_config->readEntry("Icon");
@@ -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").tqarg(i));
+    config->setGroup(TQString("StructGroup_%1").arg(i));
     writeEntry(config, "Name", group.name);
     writeEntry(config, "No_Name", group.noName);
     writeEntry(config, "Icon", group.icon);
@@ -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>").tqarg(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>").arg(structuresList->currentText()), i18n("Delete Group"),KStdGuiItem::del()) == KMessageBox::Continue)
     {
       m_structGroups.remove(m_structGroups.at(currentItem));
       structuresList->removeItem(currentItem);
diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui
index ef7e47c7..e0d29eae 100644
--- a/quanta/dialogs/dtepeditdlgs.ui
+++ b/quanta/dialogs/dtepeditdlgs.ui
@@ -103,7 +103,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>40</width>
                                 <height>20</height>
@@ -158,7 +158,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>50</height>
@@ -505,7 +505,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>40</width>
                                 <height>20</height>
@@ -535,7 +535,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>50</height>
@@ -1069,7 +1069,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>False:</string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>AlignVCenter|AlignRight</set>
                                             </property>
                                         </widget>
@@ -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="tqalignment">
+                                            <property name="alignment">
                                                 <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="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>40</width>
                                                     <height>20</height>
@@ -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="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>270</height>
diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui
index 059c783d..802f6753 100644
--- a/quanta/dialogs/dtepstructureeditdlgs.ui
+++ b/quanta/dialogs/dtepstructureeditdlgs.ui
@@ -57,7 +57,7 @@
             <property name="text">
                 <string>&amp;Icon:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
@@ -76,13 +76,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>50</width>
                     <height>50</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>50</width>
                     <height>50</height>
@@ -206,7 +206,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -482,7 +482,7 @@ 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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>340</width>
                             <height>20</height>
diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp
index 636559ce..848814f3 100644
--- a/quanta/dialogs/filecombo.cpp
+++ b/quanta/dialogs/filecombo.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 // QT includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
 
@@ -35,7 +35,7 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name )
   baseURL = a_baseURL;
   m_absolutePath = false;
 
-  TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+  TQHBoxLayout *layout = 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("..."));
 
-  tqlayout  ->addWidget( combo );
-  tqlayout  ->addWidget( button );
+  layout  ->addWidget( combo );
+  layout  ->addWidget( button );
 
   connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) );
   connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&)));
@@ -58,7 +58,7 @@ FileCombo::FileCombo( TQWidget *parent, const char *name )
 {
   baseURL.setPath(".");
 
-  TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+  TQHBoxLayout *layout = 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("..."));
 
-  tqlayout  ->addWidget( combo );
-  tqlayout  ->addWidget( button );
+  layout  ->addWidget( combo );
+  layout  ->addWidget( button );
 
   connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) );
   connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&)));
diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui
index e5066449..ec85fa91 100644
--- a/quanta/dialogs/fourbuttonmessagebox.ui
+++ b/quanta/dialogs/fourbuttonmessagebox.ui
@@ -21,7 +21,7 @@
             <height>150</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>150</height>
@@ -35,7 +35,7 @@
             <property name="name">
                 <cstring>pixmapLabel</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32</width>
                     <height>32</height>
@@ -52,7 +52,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -110,7 +110,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/quanta/dialogs/loadentitydlgs.ui b/quanta/dialogs/loadentitydlgs.ui
index 007fbba4..10950ae7 100644
--- a/quanta/dialogs/loadentitydlgs.ui
+++ b/quanta/dialogs/loadentitydlgs.ui
@@ -59,7 +59,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp
index 46805d0e..bfaae460 100644
--- a/quanta/dialogs/settings/abbreviation.cpp
+++ b/quanta/dialogs/settings/abbreviation.cpp
@@ -17,8 +17,8 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqlineedit.h>
-#include <tqtextedit.h>
-#include <tqtextstream.h>
+#include <textedit.h>
+#include <textstream.h>
 #include <tqtimer.h>
 
 //kde includes
@@ -97,7 +97,7 @@ void AbbreviationDlg::slotNewGroup()
    {
       if (qConfig.abbreviations.contains(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>").tqarg(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>").arg(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>").tqarg(item->text(1)),TQString(),KStdGuiItem::del()) == KMessageBox::Continue)
+      KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> template?</qt>").arg(item->text(1)),TQString(),KStdGuiItem::del()) == KMessageBox::Continue)
   {
     m_currentAbbrev->abbreviations.remove(item->text(0)+" "+item->text(1));
     delete item;
@@ -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>").tqarg(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>").arg(s));
   }
 }
 
diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui
index 0c9c232a..b73e902b 100644
--- a/quanta/dialogs/settings/abbreviations.ui
+++ b/quanta/dialogs/settings/abbreviations.ui
@@ -170,7 +170,7 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
@@ -255,7 +255,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui
index 82d1976f..7a1367b9 100644
--- a/quanta/dialogs/settings/codetemplatedlgs.ui
+++ b/quanta/dialogs/settings/codetemplatedlgs.ui
@@ -21,7 +21,7 @@
             <height>72</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>400</width>
             <height>70</height>
diff --git a/quanta/dialogs/settings/filemaskss.ui b/quanta/dialogs/settings/filemaskss.ui
index e4c408d3..7fe28ce1 100644
--- a/quanta/dialogs/settings/filemaskss.ui
+++ b/quanta/dialogs/settings/filemaskss.ui
@@ -29,7 +29,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -73,7 +73,7 @@
                     <property name="name">
                         <cstring>lineMarkup</cstring>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignLeft</set>
                     </property>
                 </widget>
@@ -81,7 +81,7 @@
                     <property name="name">
                         <cstring>lineImage</cstring>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignLeft</set>
                     </property>
                 </widget>
@@ -130,7 +130,7 @@
                     <property name="name">
                         <cstring>lineText</cstring>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignLeft</set>
                     </property>
                 </widget>
@@ -146,7 +146,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -172,7 +172,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>153</width>
                             <height>20</height>
@@ -183,7 +183,7 @@
                     <property name="name">
                         <cstring>lineScript</cstring>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignLeft</set>
                     </property>
                 </widget>
@@ -196,7 +196,7 @@
             <property name="text">
                 <string>Default character &amp;encoding:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignLeft</set>
             </property>
             <property name="buddy" stdset="0">
@@ -224,7 +224,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -270,7 +270,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/quanta/dialogs/settings/parseroptionsui.ui b/quanta/dialogs/settings/parseroptionsui.ui
index 2637e71d..14095623 100644
--- a/quanta/dialogs/settings/parseroptionsui.ui
+++ b/quanta/dialogs/settings/parseroptionsui.ui
@@ -29,7 +29,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -74,7 +74,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>122</width>
                             <height>20</height>
@@ -102,7 +102,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>122</width>
                             <height>20</height>
@@ -282,7 +282,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/quanta/dialogs/settings/previewoptions.cpp b/quanta/dialogs/settings/previewoptions.cpp
index e1df2225..2df03ea9 100644
--- a/quanta/dialogs/settings/previewoptions.cpp
+++ b/quanta/dialogs/settings/previewoptions.cpp
@@ -31,9 +31,9 @@ PreviewOptions::PreviewOptions(TQWidget *parent, const char *name)
 PreviewOptions::~PreviewOptions(){
 }
 
-void PreviewOptions::setWindowLayout(const TQString& tqlayout )
+void PreviewOptions::setWindowLayout(const TQString& layout )
 {
-  if ( tqlayout == "Default") resetLayout->setChecked(true);
+  if ( layout == "Default") resetLayout->setChecked(true);
   else resetLayout->setChecked(false);
 }
 
@@ -64,12 +64,12 @@ TQString PreviewOptions::docPosition()
    return position;
 }
 
-TQString PreviewOptions::tqlayout()
+TQString PreviewOptions::layout()
 {
-  TQString tqlayout = "Custom";
+  TQString layout = "Custom";
   if ( resetLayout->isChecked() )
-      tqlayout = "Default";
-  return tqlayout;
+      layout = "Default";
+  return layout;
 }
 
 TQString PreviewOptions::closeButtons()
diff --git a/quanta/dialogs/settings/previewoptions.h b/quanta/dialogs/settings/previewoptions.h
index 24f1a765..a3cce15e 100644
--- a/quanta/dialogs/settings/previewoptions.h
+++ b/quanta/dialogs/settings/previewoptions.h
@@ -30,7 +30,7 @@ public:
   ~PreviewOptions();
 
   TQString position();
-  TQString tqlayout();
+  TQString layout();
   TQString closeButtons();
   TQString docPosition();
   uint toolviewTabs();
diff --git a/quanta/dialogs/settings/previewoptionss.ui b/quanta/dialogs/settings/previewoptionss.ui
index 02bdc979..821cdfcc 100644
--- a/quanta/dialogs/settings/previewoptionss.ui
+++ b/quanta/dialogs/settings/previewoptionss.ui
@@ -21,7 +21,7 @@
             <height>512</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>350</width>
             <height>220</height>
@@ -36,7 +36,7 @@
                 <cstring>resetLayout</cstring>
             </property>
             <property name="text">
-                <string>Reset window tqlayout to the default on the next startup</string>
+                <string>Reset window layout to the default on the next startup</string>
             </property>
         </widget>
         <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">
@@ -215,7 +215,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
diff --git a/quanta/dialogs/settings/styleoptionss.ui b/quanta/dialogs/settings/styleoptionss.ui
index e14cfda6..397c99af 100644
--- a/quanta/dialogs/settings/styleoptionss.ui
+++ b/quanta/dialogs/settings/styleoptionss.ui
@@ -29,7 +29,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>410</width>
             <height>250</height>
@@ -144,7 +144,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
@@ -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 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>
+                <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>
             </property>
         </widget>
     </grid>
diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp
index 23c372e1..01cb53ad 100644
--- a/quanta/dialogs/specialchardialog.cpp
+++ b/quanta/dialogs/specialchardialog.cpp
@@ -17,7 +17,7 @@
 
 #include <tqfile.h>
 #include <tqpushbutton.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h> 
 
 #include <klocale.h>
diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui
index e45807c8..d29bd1ba 100644
--- a/quanta/dialogs/specialchardialogs.ui
+++ b/quanta/dialogs/specialchardialogs.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -34,7 +34,7 @@
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -54,7 +54,7 @@
                     <property name="name">
                         <cstring>buttonChar</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -74,7 +74,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>112</width>
                             <height>20</height>
@@ -85,7 +85,7 @@
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -105,7 +105,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp
index b3af1391..cc0fa2fc 100644
--- a/quanta/dialogs/tagdialogs/colorcombo.cpp
+++ b/quanta/dialogs/tagdialogs/colorcombo.cpp
@@ -24,7 +24,7 @@
 // KColorDialog::getColor() so that in contains a parent argument. This
 // improves centering capability.
 //
-// tqlayout management added Oct 1997 by Mario Weilguni
+// layout management added Oct 1997 by Mario Weilguni
 // <mweilguni@sime.com>
 //
 
@@ -37,7 +37,7 @@
 #include <tqfile.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klineedit.h>
 #include <tqvalidator.h>
 #include <tqpainter.h>
diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h
index 398ddca4..ac7ed429 100644
--- a/quanta/dialogs/tagdialogs/colorcombo.h
+++ b/quanta/dialogs/tagdialogs/colorcombo.h
@@ -19,7 +19,7 @@
 //-----------------------------------------------------------------------------
 // KDE color selection combo box
 
-// tqlayout management added Oct 1997 by Mario Weilguni
+// layout management added Oct 1997 by Mario Weilguni
 // <mweilguni@sime.com>
 
 
diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp
index 0d6de8ed..713ccf2c 100644
--- a/quanta/dialogs/tagdialogs/listdlg.cpp
+++ b/quanta/dialogs/tagdialogs/listdlg.cpp
@@ -40,7 +40,7 @@ ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name )
     }
    listbox->setMinimumSize(350,150);
    adjustSize();
-   resize(tqsizeHint());
+   resize(sizeHint());
 
    connect(listbox,TQT_SIGNAL(doubleClicked( TQListBoxItem * )), TQT_SLOT(slotOk()));
 }
diff --git a/quanta/dialogs/tagdialogs/pictureview.cpp b/quanta/dialogs/tagdialogs/pictureview.cpp
index 07123b7c..65102ba8 100644
--- a/quanta/dialogs/tagdialogs/pictureview.cpp
+++ b/quanta/dialogs/tagdialogs/pictureview.cpp
@@ -69,7 +69,7 @@ void PictureView::slotSetImage(const TQString& file)
   picheight = pix->height();
 
   scale();
-  tqrepaint();
+  repaint();
 }
 
 /** try scale  image */
diff --git a/quanta/dialogs/tagdialogs/tagattr.cpp b/quanta/dialogs/tagdialogs/tagattr.cpp
index 08e4a42d..8103db31 100644
--- a/quanta/dialogs/tagdialogs/tagattr.cpp
+++ b/quanta/dialogs/tagdialogs/tagattr.cpp
@@ -24,7 +24,7 @@
 
 //qt includes
 #include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 //app includes
 #include "tagattr.h"
diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp
index ac9c8ffc..93ced2c5 100644
--- a/quanta/dialogs/tagdialogs/tagdialog.cpp
+++ b/quanta/dialogs/tagdialogs/tagdialog.cpp
@@ -179,7 +179,7 @@ void TagDialog::parseTag()
     else
     {
       TQString docString = "<!DOCTYPE TAGS>\n<TAGS>\n";
-      docString += TQString("<tag name=\"%1\">\n").tqarg(dtdTag->name());
+      docString += TQString("<tag name=\"%1\">\n").arg(dtdTag->name());
       docString += QuantaCommon::xmlFromAttributes(dtdTag->attributes());
       docString += "</tag>\n</TAGS>\n";
       doc.setContent(docString);
@@ -200,14 +200,14 @@ void TagDialog::parseTag()
   for (int i = 1; i <= numOfPages; i++)
   {
     Tagxml *extraPage = 0L;
-    dtdConfig->setGroup(TQString("Page%1").tqarg(i));
+    dtdConfig->setGroup(TQString("Page%1").arg(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").tqarg(i);
+    docString += TQString("<tag name=\"Page%1\">\n").arg(i);
     for (uint j = 0; j < groupList.count(); j++)
     {
        groupList[j] = groupList[j].stripWhiteSpace();
diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
index a761d62c..8639a16f 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
@@ -13,7 +13,7 @@
 #include <knumvalidator.h>
 #include <kiconloader.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqspinbox.h>
 
 #include "pictureview.h"
diff --git a/quanta/dialogs/tagdialogs/tagmail.ui b/quanta/dialogs/tagdialogs/tagmail.ui
index 84be37bc..e7a71fa1 100644
--- a/quanta/dialogs/tagdialogs/tagmail.ui
+++ b/quanta/dialogs/tagdialogs/tagmail.ui
@@ -39,7 +39,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32</width>
                     <height>32767</height>
@@ -117,7 +117,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
diff --git a/quanta/dialogs/tagdialogs/tagmisc.ui b/quanta/dialogs/tagdialogs/tagmisc.ui
index 24db77c7..f4842d4c 100644
--- a/quanta/dialogs/tagdialogs/tagmisc.ui
+++ b/quanta/dialogs/tagdialogs/tagmisc.ui
@@ -21,7 +21,7 @@
             <height>61</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>350</width>
             <height>60</height>
diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp
index 2b126d26..8a69d647 100644
--- a/quanta/dialogs/tagdialogs/tagxml.cpp
+++ b/quanta/dialogs/tagdialogs/tagxml.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp
index 543fe734..1d97652e 100644
--- a/quanta/messages/annotationoutput.cpp
+++ b/quanta/messages/annotationoutput.cpp
@@ -17,7 +17,7 @@
 #include <tqmap.h>
 #include <tqregexp.h>
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 
 #include <kdebug.h>
@@ -84,7 +84,7 @@ void AnnotationOutput::tabChanged(TQWidget *w)
 void AnnotationOutput::insertAnnotation(uint line, const TQString& fileName, const TQPair<TQString, TQString>& annotation)
 {
   line++;
-  TQString s = i18n("Line %1: %2").tqarg(line).tqarg(annotation.first);
+  TQString s = i18n("Line %1: %2").arg(line).arg(annotation.first);
   s.replace('\n', ' ');
   m_currentFileAnnotations->showMessage(line, 1, fileName, s);
 }
@@ -155,7 +155,7 @@ void AnnotationOutput::readAnnotations()
       TQString text = el.attribute("text");
       TQString receiver = el.attribute("receiver");
       text.replace('\n',' ');
-      TQString lineText = TQString("%1").tqarg(line);
+      TQString lineText = TQString("%1").arg(line);
       if (lineText.length() < 20)
       {
         TQString s;
@@ -198,7 +198,7 @@ void AnnotationOutput::readAnnotations()
   }
   if (m_yourAnnotationsNum > 0)
   {
-    setTabLabel(m_yourAnnotations, i18n("For You: %1").tqarg(m_yourAnnotationsNum));
+    setTabLabel(m_yourAnnotations, i18n("For You: %1").arg(m_yourAnnotationsNum));
   } else
   {
     setTabLabel(m_yourAnnotations, i18n("For You"));
diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp
index 94bfecfb..ef9e2058 100644
--- a/quanta/messages/messageoutput.cpp
+++ b/quanta/messages/messageoutput.cpp
@@ -25,9 +25,9 @@
 #include <kiconloader.h>
 
 // TQt includes
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "messageoutput.h"
 #include "messageitem.h"
@@ -146,7 +146,7 @@ TQString MessageOutput::content()
 
 void MessageOutput::copyContent()
 {
-  kapp->tqclipboard()->setText(content(), TQClipboard::Clipboard);
+  kapp->clipboard()->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>")
-      .tqarg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel)
+      .arg(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>")
-         .tqarg(url.url()));
+         .arg(url.url()));
      return;
    }
 
diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp
index 5008dcff..92e1e8f8 100644
--- a/quanta/parsers/dtd/dtd.cpp
+++ b/quanta/parsers/dtd/dtd.cpp
@@ -124,7 +124,7 @@ bool DTD::parseDTD(const KURL &url)
  TQString fileName = TQString();
  if (!KIO::NetAccess::download(url, fileName))
  {
-   KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
+   KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").arg(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]").tqarg(line) << endl;
+        kdDebug(24000) << TQString("Unknown tag: [%1]").arg(line) << endl;
       }
 
       if (it != lines.end()) ++it;
diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp
index b384e456..24d7c529 100644
--- a/quanta/parsers/dtd/dtdparser.cpp
+++ b/quanta/parsers/dtd/dtdparser.cpp
@@ -75,7 +75,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
   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>").tqarg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol)));
+    KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").arg( 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::tqfromLatin1(errorPtr->message);
+      TQString s = TQString::fromLatin1(errorPtr->message);
       if (!s.isEmpty())
         errorStr = s;
-      s = TQString::tqfromLatin1(errorPtr->str1);
+      s = TQString::fromLatin1(errorPtr->str1);
       if (!s.isEmpty())
         errorStr += "<br>" + s;
-      s = TQString::tqfromLatin1(errorPtr->str2);
+      s = TQString::fromLatin1(errorPtr->str2);
       if (!s.isEmpty())
         errorStr += "<br>" + s;
-      s = TQString::tqfromLatin1(errorPtr->str2);
+      s = TQString::fromLatin1(errorPtr->str2);
       if (!s.isEmpty())
         errorStr += "<br>" + s;
-      errorStr += TQString("(%1, %2)").tqarg(errorPtr->line).tqarg(errorPtr->int2);
+      errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(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>").tqarg(errorStr));
+    KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").arg(errorStr));
     return false;
   }
   if (targetDir.isEmpty())
@@ -155,7 +155,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
     } 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>")
-                             .tqarg(file.name()));
+                             .arg(file.name()));
       return false;
     }
   }
@@ -265,7 +265,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf)
 
         if (childNum > 0)
         {
-          stream << "<tqchildren>" << endl;
+          stream << "<children>" << 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 << "</tqchildren>" << endl;
+          stream << "</children>" << endl;
           stream << endl;
         }
         /*
         xmlElementContentPtr content_ptr = el_ptr->content;
         if (content_ptr)
         {
-          stream << "<tqchildren>" << endl;
+          stream << "<children>" << endl;
           while (content_ptr)
           {
             if (!TQString((const char*)content_ptr->name).isEmpty())
@@ -335,7 +335,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf)
               content_ptr = content_ptr->parent;
             }
           }
-          stream << "</tqchildren>" << endl;
+          stream << "</children>" << endl;
         } */
       }
       stream << "</tag>" << endl
diff --git a/quanta/parsers/dtd/dtepcreationdlg.ui b/quanta/parsers/dtd/dtepcreationdlg.ui
index db29d504..8c55bbcd 100644
--- a/quanta/parsers/dtd/dtepcreationdlg.ui
+++ b/quanta/parsers/dtd/dtepcreationdlg.ui
@@ -21,7 +21,7 @@
             <height>285</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>500</width>
             <height>200</height>
diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp
index 8206ac29..261d4f97 100644
--- a/quanta/parsers/parser.cpp
+++ b/quanta/parsers/parser.cpp
@@ -23,7 +23,7 @@
 #include <tqstrlist.h>
 #include <tqdatetime.h>
 #include <tqfile.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqvaluelist.h>
 #include <tqvaluestack.h>
 
@@ -860,7 +860,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
     j = 0;
     if (!closesPrevious)
     {
-      //move the tqchildren up one level
+      //move the children up one level
       Node *n = child;
       Node *m = child;
       while (n)
@@ -900,7 +900,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs)
       }
     } else
     {
-      //change the parent of tqchildren, so the prev will be the new parent
+      //change the parent of children, so the prev will be the new parent
       if (child)
       {
         Node *n = child;
@@ -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 tqchildren of prev
+      //move down the nodes starting with next one level and append to the list of children of prev
       if (next)
       {
         if (prev->child) //if the previous node has a child, append the next node after the last child
@@ -1020,7 +1020,7 @@ Node *Parser::rebuild(Document *w)
        return 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) << TQString("Invalid area: %1,%2,%3,%4").arg(area.bLine).arg(area.bCol).arg(area.eLine).arg(area.eCol) << "\n";
 
 //    kdDebug(24000) << "lastNode1: " << lastNode << " " << lastNode->tag << endl;
    deleteNodes(firstNode->nextSibling(), lastNode, modifs);
diff --git a/quanta/parsers/parsercommon.cpp b/quanta/parsers/parsercommon.cpp
index 9d1f9d0d..be660255 100644
--- a/quanta/parsers/parsercommon.cpp
+++ b/quanta/parsers/parsercommon.cpp
@@ -174,7 +174,7 @@ Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQStrin
      tag->setDtd(d);
   else
       tag->setDtd(dtd);
-  tag->name = i18n("%1 block").tqarg(dtd->specialAreaNames[areaName].upper());
+  tag->name = i18n("%1 block").arg(dtd->specialAreaNames[areaName].upper());
   tag->type = Tag::ScriptTag;
   tag->validXMLTag = false;
 
diff --git a/quanta/parsers/qtag.h b/quanta/parsers/qtag.h
index f19bcf5d..3f74a42f 100644
--- a/quanta/parsers/qtag.h
+++ b/quanta/parsers/qtag.h
@@ -243,7 +243,7 @@ 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 tqchildren defined and if trueIfNoChildsDefined is set to true. */
+  there are no children 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);
diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp
index 1dab9ccc..f402e0c8 100644
--- a/quanta/parsers/saparser.cpp
+++ b/quanta/parsers/saparser.cpp
@@ -201,7 +201,7 @@ 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").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl;
+                //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;
 
                 if (s_currentNode &&
                     (s_currentNode->tag->type == Tag::Text ||
@@ -351,7 +351,7 @@ bool SAParser::slotParseOneLine()
               s_currentNode->specialInsideXml = m_specialInsideXml;
             }
           }
-          //kdDebug(24000) << TQString("Special area %1 ends at %2, %3").tqarg(s_dtd->name).tqarg(s_line).tqarg(lastCol) << endl;
+          //kdDebug(24000) << TQString("Special area %1 ends at %2, %3").arg(s_dtd->name).arg(s_line).arg(lastCol) << endl;
 
           //create a closing node for the special area
           Tag *tag = new Tag();
@@ -468,7 +468,7 @@ bool SAParser::slotParseOneLine()
               s_currentNode = node;
             }
           }
-          //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;
+          //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;
 
           s_currentContext = s_context;
           s_col = s_context.area.bCol + s_context.startString.length();
@@ -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").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl;
+          //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;
           if (s_fullParse)
           {
             if ( s_currentNode  &&
@@ -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").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl;
+          //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;
 
           if (s_fullParse)
           {
@@ -649,7 +649,7 @@ 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").tqarg(s_startLine).tqarg(s_startCol).tqarg(areaStartString) << endl;
+  //kdDebug(24000) << TQString("Starting to parse at %1, %2 for %3").arg(s_startLine).arg(s_startCol).arg(areaStartString) << endl;
 
   s_searchForAreaEnd = false;
   s_searchForForcedAreaEnd = false;
diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp
index c8d4c6c9..1fe4505a 100644
--- a/quanta/parts/kafka/domtreeview.cpp
+++ b/quanta/parts/kafka/domtreeview.cpp
@@ -22,7 +22,7 @@
 #include <khtml_part.h>
 #include <klocale.h>
 #include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <dom/dom_text.h>
 
 #include "domtreeview.moc"
@@ -140,7 +140,7 @@ void DOMTreeView::slotItemClicked(TQListViewItem *cur_item)
 KafkaDOMTreeDialog::KafkaDOMTreeDialog(TQWidget *parent, KHTMLPart *part, const char* name, bool modal, WFlags fl )
 	: TQDialog(parent, name, modal, fl)
 {
-	tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) );
+	setSizePolicy( 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/htmldocumentpropertiesui.ui b/quanta/parts/kafka/htmldocumentpropertiesui.ui
index de2293dd..c826dd73 100644
--- a/quanta/parts/kafka/htmldocumentpropertiesui.ui
+++ b/quanta/parts/kafka/htmldocumentpropertiesui.ui
@@ -42,7 +42,7 @@
             <property name="name">
                 <cstring>listView1</cstring>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -137,7 +137,7 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>86</height>
@@ -170,7 +170,7 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>84</height>
@@ -187,7 +187,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>226</width>
                     <height>21</height>
@@ -220,7 +220,7 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -374,7 +374,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>250</width>
                     <height>0</height>
@@ -393,7 +393,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>250</width>
                     <height>0</height>
diff --git a/quanta/parts/kafka/kafkacommon.cpp b/quanta/parts/kafka/kafkacommon.cpp
index 5d7e8cdb..32f5f43c 100644
--- a/quanta/parts/kafka/kafkacommon.cpp
+++ b/quanta/parts/kafka/kafkacommon.cpp
@@ -999,7 +999,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling,
     if(!node)
         return 0L;
 
-    //Reset the listviews items pointers for node and its tqchildren
+    //Reset the listviews items pointers for node and its children
     n = node;
     b = false;
     while(n)
@@ -1100,7 +1100,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, N
     if(!node)
         return 0L;
 
-    //Reset the listviews items pointers for node and its tqchildren
+    //Reset the listviews items pointers for node and its children
     n = node;
     b = false;
     while(n)
@@ -2253,7 +2253,7 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh
             modif->setType(NodeModif::NodeRemoved);
         modif->setLocation(getLocation(node));
 
-        //log the tqchildren move if we don't extract the tqchildren
+        //log the children move if we don't extract the children
         if(!extractChildren)
         {
           location = getLocation(node);
diff --git a/quanta/parts/kafka/kafkacommon.h b/quanta/parts/kafka/kafkacommon.h
index 80a82122..6322919d 100644
--- a/quanta/parts/kafka/kafkacommon.h
+++ b/quanta/parts/kafka/kafkacommon.h
@@ -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 tqchildren. WARNING: it don't check
-	 * if the tqchildren of node are legal childs of the parent of node.
+	 * @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 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.
@@ -588,7 +588,7 @@ public:
     /**
 	 * An enumeration of all the possible return states of DTDExtractNode
 	 */
-	enum extractNodetqStatus
+	enum extractNodeStatus
 	{
 		//The node to extract was not found.
 		nothingExtracted = 0,
@@ -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::extractNodetqStatus.
+	 * @return Returns a kafkaCommon::extractNodeStatus.
 	 */
 	static int DTDExtractNode(const TQString &nodeName, Document *doc, Node *startNode,
 		int startOffset, Node *endNode, int endOffset, Node **cursorNode, long &cursorOffset,
@@ -986,7 +986,7 @@ public:
 	/**
 	 * 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 tqchildren or -1 if not found.
+	 * @return Returns the position of domNode inside domNode's parent's children or -1 if not found.
 	 */
 	static int childPosition(DOM::Node domNode);
 
diff --git a/quanta/parts/kafka/kafkadragobject.cpp b/quanta/parts/kafka/kafkadragobject.cpp
index 40aeac9a..5a614b23 100644
--- a/quanta/parts/kafka/kafkadragobject.cpp
+++ b/quanta/parts/kafka/kafkadragobject.cpp
@@ -18,7 +18,7 @@
 #include <kdebug.h>
 
 #include <tqdom.h> 
-#include <tqtextstream.h> 
+#include <textstream.h> 
  
 #include "kafkadragobject.h"
 #include "node.h"
@@ -51,7 +51,7 @@ KafkaDragObject::KafkaDragObject(Node const* item, TQWidget* dragSource, const c
 KafkaDragObject::~KafkaDragObject()
 {}
 
-TQByteArray KafkaDragObject::tqencodedData(const char* mimetype) const
+TQByteArray KafkaDragObject::encodedData(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->tqencodedData(m_mimetype);    
+    TQByteArray data = e->encodedData(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 65cf24a5..cc371b45 100644
--- a/quanta/parts/kafka/kafkadragobject.h
+++ b/quanta/parts/kafka/kafkadragobject.h
@@ -35,7 +35,7 @@ public:
     KafkaDragObject(Node const* item, TQWidget* dragSource = 0, const char* name = 0);
     ~KafkaDragObject();
 
-    TQByteArray tqencodedData(const char* c) const;
+    TQByteArray encodedData(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 52195d83..af44e908 100644
--- a/quanta/parts/kafka/kafkahtmlpart.cpp
+++ b/quanta/parts/kafka/kafkahtmlpart.cpp
@@ -18,9 +18,9 @@
 
 #include <tqfile.h>
 #include <tqpainter.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstringlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmainwindow.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
diff --git a/quanta/parts/kafka/kafkahtmlpart.h b/quanta/parts/kafka/kafkahtmlpart.h
index 17c25ddf..3f3e3c83 100644
--- a/quanta/parts/kafka/kafkahtmlpart.h
+++ b/quanta/parts/kafka/kafkahtmlpart.h
@@ -113,7 +113,7 @@ public:
     /** --------------- DOM::Node modifications -------------------------- */
 
     /**
-     * It will move DOM::Nodes from startNode to endNode as tqchildren of newParent. It does NOT check
+     * 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.
      * @param startNode The first node to move.
diff --git a/quanta/parts/kafka/kafkasyncoptionsui.ui b/quanta/parts/kafka/kafkasyncoptionsui.ui
index 509ab551..d82aa14f 100644
--- a/quanta/parts/kafka/kafkasyncoptionsui.ui
+++ b/quanta/parts/kafka/kafkasyncoptionsui.ui
@@ -51,7 +51,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>120</width>
                                     <height>31</height>
@@ -119,7 +119,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>27</width>
                                     <height>31</height>
@@ -175,7 +175,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>167</height>
diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp
index 1e177b0c..d21129cd 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_tqchildrenMovedUp = 0;
+  m_childrenMovedUp = 0;
   m_neighboursMovedDown = 0;
 }
 
@@ -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)->tqchildrenMovedUp() <<
+        kdDebug(24000)<< "==== ChildsNumber1 : " << (*it2)->childrenMovedUp() <<
         " - 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 6280a67f..6464c46d 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 tqchildren.
-   * @param tqchildrenNumber The number of tqchildren which are moved up
+   * For non-XmlEnd Node deletion without its children.
+   * @param childrenNumber The number of children which are moved up
    * at the location where was the deleted Node.
    */
-  void setChildrenMovedUp(int tqchildrenNumber) {m_tqchildrenMovedUp = tqchildrenNumber;}
+  void setChildrenMovedUp(int childrenNumber) {m_childrenMovedUp = childrenNumber;}
 
   /**
           * TODO:REMOVE
    * @return Returns the number of childs which were moved up.
    */
-  int tqchildrenMovedUp() {return m_tqchildrenMovedUp;}
+  int childrenMovedUp() {return m_childrenMovedUp;}
 
   /**
           * TODO:REMOVE
@@ -139,7 +139,7 @@ public:
     NodeTreeRemoved,
     //Moving a Node from one location to another. Implemented.
     NodeMoved,
-    //Moving a Node and its tqchildren from one location to another.
+    //Moving a Node and its children 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_tqchildrenMovedUp;
+  int m_childrenMovedUp;
   int m_neighboursMovedDown;
 };
 
diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp
index f51327a7..ee56255d 100644
--- a/quanta/parts/kafka/wkafkapart.cpp
+++ b/quanta/parts/kafka/wkafkapart.cpp
@@ -34,9 +34,9 @@
 
 #include <tqregexp.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdatetime.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqptrvector.h>
 
 #include "document.h"
@@ -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::tqclipboard()->setData(drag_object);
+        TQApplication::clipboard()->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::tqclipboard()->setData(drag_object);
+        TQApplication::clipboard()->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()
 {
-    TQClipboard *cb = TQApplication::tqclipboard();
+    TQClipboard *cb = TQApplication::clipboard();
     TQMimeSource* e = cb->data();
     Node* node = new Node(0);
 
diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp
index 0e91fce0..a293cabe 100644
--- a/quanta/parts/preview/whtmlpart.cpp
+++ b/quanta/parts/preview/whtmlpart.cpp
@@ -17,7 +17,7 @@
  
 //qt includes
 #include <tqfileinfo.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 //kde includes
 #include <kconfig.h>
@@ -103,7 +103,7 @@ void WHTMLPart::forward()
     hpos++;
     openURL( KURL( history.at(hpos) ) );
 
-    emit updatetqStatus( backEnable() , forwardEnable() );
+    emit updateStatus( backEnable() , forwardEnable() );
   }
 }
 
@@ -115,7 +115,7 @@ void WHTMLPart::back()
     hpos--;
     openURL(KURL(history.at(hpos)));
 
-    emit updatetqStatus(backEnable(), forwardEnable());
+    emit updateStatus(backEnable(), forwardEnable());
   }
 }
 
@@ -133,7 +133,7 @@ void WHTMLPart::addToHistory(const TQString &url)
 
    hpos = history.count()-1;
 
-   emit updatetqStatus( backEnable() , forwardEnable() );
+   emit updateStatus( backEnable() , forwardEnable() );
 
 }
 
diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h
index 2ec05dfe..bcf0af53 100644
--- a/quanta/parts/preview/whtmlpart.h
+++ b/quanta/parts/preview/whtmlpart.h
@@ -54,7 +54,7 @@ public slots:
   virtual bool eventFilter(TQObject *watched, TQEvent *e);
 
 signals:
-  void updatetqStatus( bool back, bool forward );
+  void updateStatus( bool back, bool forward );
   void previewHasFocus(bool focus);
   void showPreview(bool show);
   void openFile(const KURL&, const TQString&, bool);
diff --git a/quanta/plugins/pluginconfig.ui b/quanta/plugins/pluginconfig.ui
index 17f1d8f0..a82e6806 100644
--- a/quanta/plugins/pluginconfig.ui
+++ b/quanta/plugins/pluginconfig.ui
@@ -23,7 +23,7 @@
             <height>281</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>560</width>
             <height>280</height>
@@ -57,7 +57,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>247</width>
                     <height>20</height>
@@ -117,13 +117,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>48</width>
                             <height>48</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>48</width>
                             <height>48</height>
@@ -190,7 +190,7 @@
                     <property name="name">
                         <cstring>locationButton</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>28</width>
                             <height>32767</height>
diff --git a/quanta/plugins/plugineditor.ui b/quanta/plugins/plugineditor.ui
index d464cadb..f50908ab 100644
--- a/quanta/plugins/plugineditor.ui
+++ b/quanta/plugins/plugineditor.ui
@@ -22,7 +22,7 @@
             <height>306</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>500</width>
             <height>224</height>
@@ -163,7 +163,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>67</height>
diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp
index dab6dbd0..b6bd4e3e 100644
--- a/quanta/plugins/quantaplugin.cpp
+++ b/quanta/plugins/quantaplugin.cpp
@@ -119,7 +119,7 @@ bool QuantaPlugin::load()
       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.").tqarg(m_name).tqarg(m_name).tqarg(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.").arg(m_name).arg(m_name).arg(m_fileName));
     delete m_targetWidget;
     m_targetWidget = 0L;
     return false;
diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp
index 68d276bb..098c7828 100644
--- a/quanta/plugins/quantaplugininterface.cpp
+++ b/quanta/plugins/quantaplugininterface.cpp
@@ -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>").tqarg(*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>").arg(*it), i18n("Unsupported Plugin Type"), "CommandLinePluginWarning");
         continue;
       }
 
@@ -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>").tqarg(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>").arg(invalidNames), i18n("Invalid Plugins"), i18n("Edit Plugins"), i18n("Do Not Edit"));
       if(answer == KMessageBox::Yes)
       {
         slotPluginsEdit();
diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp
index 3c4e0024..29d23964 100644
--- a/quanta/project/eventconfigurationdlg.cpp
+++ b/quanta/project/eventconfigurationdlg.cpp
@@ -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>").tqarg(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>").arg(item->text(0)), i18n("Delete Event Configuration"),KStdGuiItem::del()) == KMessageBox::Continue)
    {
       delete item;
    }
diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui
index 98aadf20..82dbc51c 100644
--- a/quanta/project/eventconfigurationdlgs.ui
+++ b/quanta/project/eventconfigurationdlgs.ui
@@ -64,7 +64,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>172</width>
                             <height>20</height>
@@ -152,7 +152,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>150</width>
                             <height>20</height>
diff --git a/quanta/project/eventeditordlgs.ui b/quanta/project/eventeditordlgs.ui
index d93b1336..ac6efe68 100644
--- a/quanta/project/eventeditordlgs.ui
+++ b/quanta/project/eventeditordlgs.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>350</width>
             <height>0</height>
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index ebc16264..3bee7146 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -24,7 +24,7 @@
 // include QT files
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // include files for KDE
 #include <kactionclasses.h>
@@ -109,7 +109,7 @@ KURL::List Project::files()
   return list;
 }
 
-void Project::insertFile(const KURL& nameURL, bool tqrepaint )
+void Project::insertFile(const KURL& nameURL, bool repaint )
 {
   if (d->excludeRx.exactMatch(nameURL.path()))
       return;
@@ -118,7 +118,7 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint )
   if ( !d->baseURL.isParentOf(url) )
   {
     KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( d->baseURL.prettyURL(), d->m_mainWindow, "");
-    urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(nameURL.prettyURL(0, KURL::StripFileProtocol)));
+    urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(nameURL.prettyURL(0, KURL::StripFileProtocol)));
     urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly);
     urlRequesterDlg->exec();
     KURL destination = urlRequesterDlg->selectedURL();
@@ -150,19 +150,19 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint )
       d->dom.firstChild().firstChild().appendChild( el );
       KURL u = url.upURL();
       ProjectURL *parentURL = d->m_projectFiles.find(u);
-      int uploadtqStatus = 1;
+      int uploadStatus = 1;
       if (parentURL)
-        uploadtqStatus = parentURL->uploadtqStatus;
-      d->m_projectFiles.insert( new ProjectURL(url, "", uploadtqStatus, false, el) );
+        uploadStatus = parentURL->uploadStatus;
+      d->m_projectFiles.insert( new ProjectURL(url, "", uploadStatus, false, el) );
     }
     url.setPath(url.directory(false));
   }
   emit eventHappened("after_project_add", url.url(), TQString());
   setModified();
-  if ( tqrepaint )
+  if ( repaint )
   {
     emit reloadTree( &(d->m_projectFiles), false, TQStringList());
-    emit newtqStatus();
+    emit newStatus();
   }
 }
 
@@ -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>").tqarg(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>").arg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") )
           == KMessageBox::Yes)
       {
         d->m_tmpProjectFile = tempPath;
@@ -262,7 +262,7 @@ void Project::slotOpenProject(const KURL &url)
     {
       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>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), 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>").arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep") )
            == KMessageBox::Yes)
       {
         d->m_projectRecent->removeURL(url);
@@ -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").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol)));
+        urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol)));
         urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly);
         urlRequesterDlg->exec();
         destination = urlRequesterDlg->selectedURL();
@@ -384,7 +384,7 @@ void Project::slotRenamed(const KURL& oldURL, const KURL& newURL)
     setModified();  // there happens more than setting the flag !
 
   emit reloadTree(&(d->m_projectFiles), false, TQStringList());
-  emit newtqStatus();
+  emit newStatus();
 }
 
 
@@ -422,12 +422,12 @@ void Project::slotRemove(const KURL& urlToRemove)
   if (d->m_modified)
     setModified();  // there happens more than setting the flag !
   emit reloadTree( &(d->m_projectFiles), false, TQStringList() );
-  emit newtqStatus();
+  emit newStatus();
 
   TQString urlPath = QExtFileInfo::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>").tqarg(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>").arg(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");
@@ -952,7 +952,7 @@ void Project::slotUploadStatusChanged(const KURL& url, int status)
   {
     if ( it.currentKey().startsWith(urlStr) || it.currentKey() + "/" == urlStr)
     {
-      it.current()->uploadtqStatus = status;
+      it.current()->uploadStatus = status;
       el = it.current()->domElement;
       el.setAttribute("uploadstatus", status);
     }
@@ -960,7 +960,7 @@ void Project::slotUploadStatusChanged(const KURL& url, int status)
   setModified();
 }
 
-void Project::slotChangeDocumentFoldertqStatus(const KURL &url, bool status)
+void Project::slotChangeDocumentFolderStatus(const KURL &url, bool status)
 {
   ProjectURL *proUrl = d->m_projectFiles.find(url);
   if (! proUrl)
@@ -1280,7 +1280,7 @@ bool Project::queryClose()
       reloadTree( &(d->m_projectFiles), true, TQStringList());
       d->adjustActions();
       d->m_projectRecent->setCurrentItem(-1);
-      newtqStatus();
+      newStatus();
 //      kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
     }
   }
@@ -1345,7 +1345,7 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
   {
     KTextEditor::Mark *mark = marks.at(i);
     if (mark->type == KTextEditor::MarkInterface::Bookmark)
-          markList << TQString("%1").tqarg(mark->line);
+          markList << TQString("%1").arg(mark->line);
   }
   TQDomNodeList nl = d->dom.elementsByTagName("item");
   TQDomElement el;
diff --git a/quanta/project/project.h b/quanta/project/project.h
index 8c25ccf9..fc88c13b 100644
--- a/quanta/project/project.h
+++ b/quanta/project/project.h
@@ -79,7 +79,7 @@ public:
   TQStringList fileNameList();
   KURL::List files();
 
-  void insertFile( const KURL& nameURL, bool tqrepaint );
+  void insertFile( const KURL& nameURL, bool repaint );
   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
@@ -174,7 +174,7 @@ public slots:
   void slotRescanPrjDir();
   void slotFileDescChanged(const KURL& url, const TQString& desc);
   void slotUploadStatusChanged(const KURL& url, int status);
-  void slotChangeDocumentFoldertqStatus(const KURL& url, bool status);
+  void slotChangeDocumentFolderStatus(const KURL& url, bool status);
 
   void slotReloadProjectDocs();
 
@@ -194,7 +194,7 @@ signals:
   void messages(const TQString& );
   void enableMessageWidget();
 
-  void newtqStatus();
+  void newStatus();
   void statusMsg(const TQString &);
   /** No descriptions */
   void newProjectLoaded(const TQString &, const KURL &, const KURL &);
@@ -204,7 +204,7 @@ signals:
   void getUserToolbarFiles(KURL::List *);
   void loadToolbarFile(const KURL &);
   /** ask for the tree status for saving in project */
-  void getTreetqStatus(TQStringList *);
+  void getTreeStatus(TQStringList *);
   void eventHappened(const TQString&, const TQString&, const TQString& );
 
 private:
diff --git a/quanta/project/projectlist.cpp b/quanta/project/projectlist.cpp
index ec46ecb9..d0e5b942 100644
--- a/quanta/project/projectlist.cpp
+++ b/quanta/project/projectlist.cpp
@@ -80,8 +80,8 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
       } else
       {
         bool docFolder = (el.attribute("documentFolder", "false") == "true");
-        int uploadtqStatus = el.attribute("uploadstatus", "-1").toInt();
-        if (uploadtqStatus == -1)
+        int uploadStatus = el.attribute("uploadstatus", "-1").toInt();
+        if (uploadStatus == -1)
           el.setAttribute("uploadstatus", 1);
         //remove non-existent local files
         if ( url.isLocalFile() )
diff --git a/quanta/project/projectnewfinal.cpp b/quanta/project/projectnewfinal.cpp
index 05dd7cf4..1821429c 100644
--- a/quanta/project/projectnewfinal.cpp
+++ b/quanta/project/projectnewfinal.cpp
@@ -17,7 +17,7 @@
 
 // qt includes
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // kde includes
 #include <kiconloader.h>
@@ -37,6 +37,6 @@ ProjectNewFinal::~ProjectNewFinal(){
 
 void ProjectNewFinal::setMargin(int i)
 {
-  tqlayout()->setMargin(i);
+  layout()->setMargin(i);
 }
 
diff --git a/quanta/project/projectnewfinals.ui b/quanta/project/projectnewfinals.ui
index 136245bb..fc3603c9 100644
--- a/quanta/project/projectnewfinals.ui
+++ b/quanta/project/projectnewfinals.ui
@@ -29,13 +29,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>620</width>
             <height>410</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32000</width>
             <height>32000</height>
@@ -61,13 +61,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>115</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>115</width>
                     <height>480</height>
@@ -79,7 +79,7 @@
             <property name="scaledContents">
                 <bool>true</bool>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignTop|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
@@ -95,7 +95,7 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -104,7 +104,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout11</cstring>
+                <cstring>layout11</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -141,7 +141,7 @@
                             <property name="name">
                                 <cstring>TextLabel3_2_3</cstring>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>32767</height>
@@ -160,7 +160,7 @@
                             <property name="name">
                                 <cstring>TextLabel3_2_2_2</cstring>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>32767</height>
@@ -227,7 +227,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp
index 8869cbdc..be93eb3d 100644
--- a/quanta/project/projectnewgeneral.cpp
+++ b/quanta/project/projectnewgeneral.cpp
@@ -19,7 +19,7 @@
 #include <tqdir.h>
 #include <tqevent.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -164,7 +164,7 @@ TQString ProjectNewGeneral::type()
 
 void ProjectNewGeneral::setMargin(int i)
 {
-  tqlayout()->setMargin(i);
+  layout()->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>").tqarg(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>").arg(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>")
-                                  .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
+                                  .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
    }
 }
 
@@ -225,7 +225,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e )
       url = QExtFileInfo::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>").tqarg(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>").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
         linePrjTmpl->setFocus();
         emit enableNextButton(this, false);
       } else
@@ -239,7 +239,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e )
       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>")
-                                    .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
+                                    .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
         linePrjToolbar->setFocus();
         emit enableNextButton(this, false);
       } else
diff --git a/quanta/project/projectnewgenerals.ui b/quanta/project/projectnewgenerals.ui
index 8176cb04..b58173eb 100644
--- a/quanta/project/projectnewgenerals.ui
+++ b/quanta/project/projectnewgenerals.ui
@@ -32,13 +32,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>620</width>
             <height>410</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32000</width>
             <height>32000</height>
@@ -64,13 +64,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>115</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>115</width>
                     <height>480</height>
@@ -82,7 +82,7 @@
             <property name="scaledContents">
                 <bool>true</bool>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignTop|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
@@ -98,7 +98,7 @@
             <property name="sizeType">
                 <enum>Preferred</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -107,7 +107,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout12</cstring>
+                <cstring>layout12</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -141,13 +141,13 @@
                             <property name="name">
                                 <cstring>buttonToolbar</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32</width>
                                     <height>32767</height>
@@ -174,13 +174,13 @@
                             <property name="name">
                                 <cstring>buttonTmpl</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32</width>
                                     <height>32767</height>
@@ -202,7 +202,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32</width>
                                     <height>32767</height>
@@ -277,7 +277,7 @@
                     <property name="text">
                         <string>File:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -307,7 +307,7 @@
                             <property name="text">
                                 <string>Protocol: </string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter</set>
                             </property>
                             <property name="hAlign" stdset="0">
@@ -320,7 +320,7 @@
                             <property name="text">
                                 <string>Password:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -359,7 +359,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>26</height>
@@ -381,7 +381,7 @@
                             <property name="text">
                                 <string>Port:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -397,7 +397,7 @@
                             <property name="text">
                                 <string>Host:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp
index 1883c03a..fb67e4fb 100644
--- a/quanta/project/projectnewlocal.cpp
+++ b/quanta/project/projectnewlocal.cpp
@@ -75,7 +75,7 @@ void ProjectNewLocal::setBaseURL(const KURL& a_baseURL)
 {
   baseURL = a_baseURL;
   baseURL.adjustPath(1);
-  checkInsert->setText(i18n("Insert files from %1.").tqarg(baseURL.prettyURL(0, KURL::StripFileProtocol)));
+  checkInsert->setText(i18n("Insert files from %1.").arg(baseURL.prettyURL(0, KURL::StripFileProtocol)));
   listView->clear();
   fileList.clear();
   checkInsert->setChecked(false);
@@ -254,7 +254,7 @@ void ProjectNewLocal::slotAddFolder()
     {
 
       KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( baseURL.prettyURL(), this, "");
-      urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol)));
+      urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol)));
       urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly);
       urlRequesterDlg->exec();
       KURL destination = urlRequesterDlg->selectedURL();
diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui
index 5b737924..a23e8de7 100644
--- a/quanta/project/projectnewlocals.ui
+++ b/quanta/project/projectnewlocals.ui
@@ -29,13 +29,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>620</width>
             <height>410</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32000</width>
             <height>32000</height>
@@ -61,13 +61,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>115</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>115</width>
                     <height>480</height>
@@ -85,7 +85,7 @@
             <property name="scaledContents">
                 <bool>true</bool>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignTop|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
@@ -93,7 +93,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -184,7 +184,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -205,7 +205,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -221,7 +221,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>85</width>
                                     <height>20</height>
@@ -262,7 +262,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>89</width>
                                     <height>20</height>
@@ -281,7 +281,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui
index 4711434a..df0d8539 100644
--- a/quanta/project/projectnewwebs.ui
+++ b/quanta/project/projectnewwebs.ui
@@ -29,13 +29,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>620</width>
             <height>410</height>
         </size>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32000</width>
             <height>32000</height>
@@ -61,13 +61,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>115</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>115</width>
                     <height>480</height>
@@ -79,7 +79,7 @@
             <property name="scaledContents">
                 <bool>true</bool>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignTop|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
@@ -87,7 +87,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="1">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -103,7 +103,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>309</width>
                             <height>16</height>
@@ -178,7 +178,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -202,7 +202,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>228</width>
                             <height>20</height>
diff --git a/quanta/project/projectoptions.ui b/quanta/project/projectoptions.ui
index 9a577bdd..5d2e8cc8 100644
--- a/quanta/project/projectoptions.ui
+++ b/quanta/project/projectoptions.ui
@@ -40,13 +40,13 @@
             <property name="name">
                 <cstring>buttonToolbar</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32</width>
                     <height>32767</height>
@@ -60,13 +60,13 @@
             <property name="name">
                 <cstring>buttonTmpl</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32</width>
                     <height>32767</height>
@@ -88,7 +88,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>200</width>
                     <height>0</height>
@@ -162,7 +162,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>300</width>
                     <height>0</height>
@@ -302,7 +302,7 @@
                     <property name="name">
                         <cstring>TextLabel3_2_2_2</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index 52879849..ce3686bf 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -351,7 +351,7 @@ void ProjectPrivate::insertFiles( KURL::List files )
   progressBar->setTextEnabled(false);
 
   parent->reloadTree(&(m_projectFiles), false, TQStringList());
-  parent->newtqStatus();
+  parent->newStatus();
   parent->statusMsg(TQString());
 }
 
@@ -699,7 +699,7 @@ void ProjectPrivate::loadProjectXML()
   parent->statusMsg(TQString());
   parent->newProjectLoaded(projectName, baseURL, templateURL);
   parent->reloadTree(&(m_projectFiles), true, treeStatusFromXML());
-  parent->newtqStatus();
+  parent->newStatus();
   adjustActions();
 }
 
@@ -917,7 +917,7 @@ 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>")
-                                            .tqarg(currentProjectView), TQString(), i18n("Overwrite")) == KMessageBox::Continue)
+                                            .arg(currentProjectView), TQString(), i18n("Overwrite")) == KMessageBox::Continue)
       {
         node.parentNode().removeChild(node);
         break;
@@ -1056,7 +1056,7 @@ bool ProjectPrivate::createEmptyDom()
   if (!result)
   {
     parent->hideSplash();
-    KMessageBox::sorry(m_mainWindow, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").tqarg(projectURL.prettyURL(0, KURL::StripFileProtocol)));
+    KMessageBox::sorry(m_mainWindow, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").arg(projectURL.prettyURL(0, KURL::StripFileProtocol)));
     delete tempFile;
     tempFile = 0L;
     delete sessionTempFile;
@@ -1099,7 +1099,7 @@ void ProjectPrivate::getStatusFromTree()
     i--;
   }
   TQStringList folderList;
-  parent->getTreetqStatus( &folderList );
+  parent->getTreeStatus( &folderList );
   // toplevel folder is always open in a project and QExtFileInfo::toRelative
   // creates strange output -> we remove the toplevel folder
   if (folderList.count() > 0)
@@ -1122,7 +1122,7 @@ void ProjectPrivate::slotNewProject()
 {
   TQWizard *wiz = new TQWizard(m_mainWindow, "new", true);
   wiz->setCaption(i18n("New Project Wizard"));
-  wiz->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+  wiz->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
 
   png = new ProjectNewGeneral(0L);
 
@@ -1197,7 +1197,7 @@ void ProjectPrivate::slotNewProject()
   delete wiz;
 
   adjustActions();
-  parent->newtqStatus();
+  parent->newStatus();
 }
 
 /** close project and edited files */
@@ -1230,8 +1230,8 @@ void ProjectPrivate::slotProceedWithCloseProject(bool success)
   parent->reloadTree( &(m_projectFiles), true, TQStringList());
   adjustActions();
   m_projectRecent->setCurrentItem(-1);
-  parent->newtqStatus();
-  kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+  parent->newStatus();
+  kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
 }
 
 
@@ -1284,11 +1284,11 @@ bool ProjectPrivate::saveProject()
       f.close();
     }
     m_modified = false;
-    parent->statusMsg(i18n( "Wrote project file %1" ).tqarg(m_tmpProjectFile));
+    parent->statusMsg(i18n( "Wrote project file %1" ).arg(m_tmpProjectFile));
   } else
   {
     parent->hideSplash();
-    KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for writing.</qt>").tqarg(m_tmpProjectFile));
+    KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for writing.</qt>").arg(m_tmpProjectFile));
     result = false;
   }
   return result;
@@ -1339,7 +1339,7 @@ void ProjectPrivate::loadProjectFromTemp(const KURL &url, const TQString &tempFi
   } else
   {
     parent->hideSplash();
-    KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for reading.</qt>").tqarg(tempFile));
+    KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for reading.</qt>").arg(tempFile));
   }
 }
 
@@ -1351,13 +1351,13 @@ bool ProjectPrivate::loadProject(const KURL &url)
   if (!url.isValid())
   {
     parent->hideSplash();
-    KMessageBox::sorry(m_mainWindow, i18n("<qt>Malformed URL: <b>%1</b></qt>").tqarg(url.prettyURL()));
+    KMessageBox::sorry(m_mainWindow, i18n("<qt>Malformed URL: <b>%1</b></qt>").arg(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>").tqarg(url.prettyURL()), TQString(), KStdGuiItem::open()) == KMessageBox::Cancel)
+    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(), KStdGuiItem::open()) == KMessageBox::Cancel)
       return false;
   }
   TQString projectTmpFile;
@@ -1416,7 +1416,7 @@ bool ProjectPrivate::loadProject(const KURL &url)
   } else
   {
     parent->hideSplash();
-    KMessageBox::error(m_mainWindow, i18n("<qt>Cannot access the project file <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
+    KMessageBox::error(m_mainWindow, i18n("<qt>Cannot access the project file <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
     return false;
   }
   return true;
@@ -1532,7 +1532,7 @@ 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>").tqarg(errCode).tqarg(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>").arg(errCode).arg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error"));
       }
     }
   }
@@ -1639,7 +1639,7 @@ bool ProjectPrivate::uploadProjectFile()
   {
     removeFromConfig(projectURL.url());    // remove the project from the list of open projects
     if (quantaApp)
-      parent->statusMsg(i18n( "Uploaded project file %1" ).tqarg( projectURL.prettyURL()));
+      parent->statusMsg(i18n( "Uploaded project file %1" ).arg( projectURL.prettyURL()));
     // delete all temp files we used
     // first the one from creating a new project
     delete tempFile;
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index ba267753..fb439707 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -211,15 +211,15 @@ void ProjectUpload::slotBuildTree()
          uploadedTime = m_uploadTimeList[s];
        int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME);
        el.setAttribute("modified_time", modifiedTime);
-       int uploadtqStatus = el.attribute("uploadstatus", "1").toInt();
-       if (m_quickUpload || (forceUpload && uploadtqStatus == 0))
-        uploadtqStatus = 1;
-       if (m_quickUpload || (uploadedTime != modifiedTime && uploadtqStatus != 0))
+       int uploadStatus = el.attribute("uploadstatus", "1").toInt();
+       if (m_quickUpload || (forceUpload && uploadStatus == 0))
+        uploadStatus = 1;
+       if (m_quickUpload || (uploadedTime != modifiedTime && uploadStatus != 0))
        {
          modified.append( u );
          it->setSelected(true);
        }
-       if (uploadtqStatus == 2)
+       if (uploadStatus == 2)
          it->setConfirmUpload(true);
        totalProgress->setValue(i);
      }
@@ -382,7 +382,7 @@ void ProjectUpload::startUpload()
     } else
     {
       if (KMessageBox::warningContinueCancel(this, i18n("<qt><b>%1</b> seems to be unaccessible.<br>Do you want to proceed with upload?</qt>")
-          .tqarg(u.prettyURL(0, KURL::StripFileProtocol)),TQString(),KStdGuiItem::cont()) == KMessageBox::Continue)
+          .arg(u.prettyURL(0, KURL::StripFileProtocol)),TQString(),KStdGuiItem::cont()) == KMessageBox::Continue)
       {
         upload();
         return;
@@ -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").tqarg(currentURL.fileName()));
+    labelCurFile->setText(i18n("Current: %1").arg(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->tqrepaint();
+    it->repaint();
   }
   list->checkboxTree();
 }
@@ -564,7 +564,7 @@ void ProjectUpload::slotUploadNext()
      UploadTreeFile *itf = dynamic_cast<UploadTreeFile*>(it);
      if (itf)
       itf->setWhichPixmap( "check_clear" );
-     it->tqrepaint();
+     it->repaint();
     }
     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>").tqarg(profileName),
+      if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> upload profile?</qt>").arg(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>").tqarg(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>").arg(currentProfile), i18n("Profile Removal"));
               m_profilesNode.toElement().setAttribute("defaultProfile", currentProfile);
           }
           comboProfile->removeItem(idx);
diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui
index 3bc4e83a..42b79257 100644
--- a/quanta/project/projectuploads.ui
+++ b/quanta/project/projectuploads.ui
@@ -30,7 +30,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqmaximumSize">
+    <property name="maximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -48,7 +48,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -88,7 +88,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -172,7 +172,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>400</width>
                     <height>20</height>
@@ -338,7 +338,7 @@
                     <property name="text">
                         <string>Current: [none]</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
diff --git a/quanta/project/projecturl.h b/quanta/project/projecturl.h
index 02232234..cf3eae66 100644
--- a/quanta/project/projecturl.h
+++ b/quanta/project/projecturl.h
@@ -32,26 +32,26 @@ class ProjectURL : public KURL
 {
 public:
   TQString fileDesc;
-  int uploadtqStatus; ///< The upload state, see UploadtqStatus
+  int uploadStatus; ///< The upload state, see UploadStatus
   bool documentFolder;
   TQDomElement domElement;
 
   ProjectURL()
-    : KURL(), uploadtqStatus(1), documentFolder(false) {}
+    : KURL(), uploadStatus(1), documentFolder(false) {}
   
   ProjectURL(const KURL& url)
-    : KURL(url), uploadtqStatus(1), documentFolder(false) {}
+    : KURL(url), uploadStatus(1), documentFolder(false) {}
   
   ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder)
-    : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder) {}
+    : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder) {}
   
   ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder, TQDomElement el)
-    : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder), domElement(el) {}
+    : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder), domElement(el) {}
   
   virtual ~ProjectURL() {}
 
   /** The default state for a file when uploading */
-  enum UploadtqStatus
+  enum UploadStatus
   {
      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 9904cdf2..1d628667 100644
--- a/quanta/project/rescanprj.cpp
+++ b/quanta/project/rescanprj.cpp
@@ -18,7 +18,7 @@
 // qt includes
 #include <tqlistview.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 // kde includes
@@ -162,7 +162,7 @@ void RescanPrj::resizeEvent ( TQResizeEvent *t )
 {
   RescanPrjDir::resizeEvent(t);
 //  listView->setColumnWidth(0,listView->width()-listView->columnWidth(1)-20);
-//  MainLayout->setGeometry(tqchildrenRect());
+//  MainLayout->setGeometry(childrenRect());
 }
 
 void RescanPrj::slotSelect()
@@ -227,7 +227,7 @@ void RescanPrj::slotListDone(KIO::Job *)
   if (m_listJobCount == 0)
   {
     progressText->setText(i18n("Building tree:"));
-    progressText->tqrepaint();
+    progressText->repaint();
     progress->setTotalSteps(urlList.count());
     progress->setValue(0);
     URLListEntry urlEntry;
diff --git a/quanta/project/rescanprjdir.ui b/quanta/project/rescanprjdir.ui
index 019f40a7..8fb4b774 100644
--- a/quanta/project/rescanprjdir.ui
+++ b/quanta/project/rescanprjdir.ui
@@ -29,7 +29,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>620</width>
             <height>540</height>
@@ -83,13 +83,13 @@
             <property name="name">
                 <cstring>Line2</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>4</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>4</height>
@@ -148,7 +148,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>144</height>
diff --git a/quanta/project/teammembersdlg.cpp b/quanta/project/teammembersdlg.cpp
index 6d4ffa69..da902bf1 100644
--- a/quanta/project/teammembersdlg.cpp
+++ b/quanta/project/teammembersdlg.cpp
@@ -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>").tqarg(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>").arg(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>").tqarg(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>").arg(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>").tqarg(role).tqarg(it.current()->text(NAME_COL)), TQString(), 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>").arg(role).arg(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>").tqarg(nickName).tqarg(it.current()->text(NAME_COL)).tqarg(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>").arg(nickName).arg(it.current()->text(NAME_COL)).arg(it.current()->text(EMAIL_COL)));
           return false;
         } 
         ++it;
diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui
index eba26cf6..847c8b04 100644
--- a/quanta/project/teammembersdlgs.ui
+++ b/quanta/project/teammembersdlgs.ui
@@ -52,7 +52,7 @@
             <property name="text">
                 <string>Please select your identity from the member list.</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter</set>
             </property>
         </widget>
@@ -172,7 +172,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>100</width>
                             <height>20</height>
diff --git a/quanta/project/uploadprofiledlgs.ui b/quanta/project/uploadprofiledlgs.ui
index 40fbd905..de6521e6 100644
--- a/quanta/project/uploadprofiledlgs.ui
+++ b/quanta/project/uploadprofiledlgs.ui
@@ -122,7 +122,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>90</width>
                     <height>0</height>
@@ -144,7 +144,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>90</width>
                     <height>0</height>
@@ -167,7 +167,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>445</width>
                     <height>20</height>
@@ -263,7 +263,7 @@ is obscured, saving the password in any file is a security risk. Use this option
             <property name="text">
                 <string>&amp;Protocol:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">
diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui
index 466dbc27..a5a87110 100644
--- a/quanta/project/uploadprofilespage.ui
+++ b/quanta/project/uploadprofilespage.ui
@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -98,7 +98,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi
index 3903e794..f8002c6a 100644
--- a/quanta/quanta_uml.xmi
+++ b/quanta/quanta_uml.xmi
@@ -1010,7 +1010,7 @@ 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="tqrepaint" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="916" value="" type="bool" abstract="0" documentation="" name="repaint" 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" />
diff --git a/quanta/scripts/checkxml.kmdr b/quanta/scripts/checkxml.kmdr
index 07d72ddd..c6e1f98e 100755
--- a/quanta/scripts/checkxml.kmdr
+++ b/quanta/scripts/checkxml.kmdr
@@ -72,7 +72,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -207,7 +207,7 @@ checkXML index.docbook 2&gt;&amp;1</string>
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>30</width>
                                             <height>0</height>
@@ -237,7 +237,7 @@ checkXML index.docbook 2&gt;&amp;1</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>89</width>
                                     <height>0</height>
diff --git a/quanta/scripts/docbook_table.kmdr b/quanta/scripts/docbook_table.kmdr
index b3ac688e..48403654 100755
--- a/quanta/scripts/docbook_table.kmdr
+++ b/quanta/scripts/docbook_table.kmdr
@@ -40,7 +40,7 @@
             <property name="text">
                 <string>DocBook Table</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
diff --git a/quanta/scripts/dwt.kmdr b/quanta/scripts/dwt.kmdr
index 7a9b3ff6..ec4b5ff5 100755
--- a/quanta/scripts/dwt.kmdr
+++ b/quanta/scripts/dwt.kmdr
@@ -126,7 +126,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>0</width>
                                 <height>80</height>
@@ -162,7 +162,7 @@
                         <property name="textFormat">
                             <enum>AutoText</enum>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignTop|AlignLeft</set>
                         </property>
                     </widget>
@@ -179,7 +179,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>225</width>
                     <height>0</height>
diff --git a/quanta/scripts/gubed_install.kmdr b/quanta/scripts/gubed_install.kmdr
index 73047ad1..ace8e554 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="tqsizeHint">
+        <property name="sizeHint">
             <size>
                 <width>332</width>
                 <height>0</height>
@@ -79,7 +79,7 @@
         <property name="sizeType">
             <enum>Expanding</enum>
         </property>
-        <property name="tqsizeHint">
+        <property name="sizeHint">
             <size>
                 <width>0</width>
                 <height>175</height>
diff --git a/quanta/scripts/htmlquickstart.kmdr b/quanta/scripts/htmlquickstart.kmdr
index fb7b4336..402d6f0e 100755
--- a/quanta/scripts/htmlquickstart.kmdr
+++ b/quanta/scripts/htmlquickstart.kmdr
@@ -75,7 +75,7 @@ fi
             <property name="text">
                 <string>Quanta Plus Kommander Quick Start</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -89,7 +89,7 @@ fi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>33</width>
                     <height>0</height>
@@ -108,7 +108,7 @@ fi
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
diff --git a/quanta/scripts/listwizard.kmdr b/quanta/scripts/listwizard.kmdr
index ad0673cc..6333c60d 100755
--- a/quanta/scripts/listwizard.kmdr
+++ b/quanta/scripts/listwizard.kmdr
@@ -58,7 +58,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>296</width>
                             <height>0</height>
@@ -217,7 +217,7 @@ Select the list type:
 &lt;/ul&gt;
 &lt;/qt&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignJustify|AlignTop</set>
             </property>
         </widget>
diff --git a/quanta/scripts/meinproc.kmdr b/quanta/scripts/meinproc.kmdr
index 9b564df2..66f30040 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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>292</width>
                     <height>0</height>
@@ -172,7 +172,7 @@ fi</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -216,7 +216,7 @@ fi</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
diff --git a/quanta/scripts/picturewizard.kmdr b/quanta/scripts/picturewizard.kmdr
index ff48ed9e..1b965193 100755
--- a/quanta/scripts/picturewizard.kmdr
+++ b/quanta/scripts/picturewizard.kmdr
@@ -58,7 +58,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>342</width>
                             <height>0</height>
@@ -143,7 +143,7 @@ Select the type of markup appropriated to wrap your image:
 &lt;/ul&gt;
 &lt;/qt&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignJustify|AlignTop</set>
             </property>
         </widget>
diff --git a/quanta/scripts/tablewizard.kmdr b/quanta/scripts/tablewizard.kmdr
index b0176e88..ec002775 100755
--- a/quanta/scripts/tablewizard.kmdr
+++ b/quanta/scripts/tablewizard.kmdr
@@ -108,7 +108,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>141</width>
                             <height>0</height>
@@ -408,7 +408,7 @@ Select the table type:
 &lt;/ul&gt;
 &lt;/qt&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignJustify|AlignTop</set>
             </property>
         </widget>
diff --git a/quanta/scripts/tidy.kmdr b/quanta/scripts/tidy.kmdr
index 6bea7b90..472750ab 100755
--- a/quanta/scripts/tidy.kmdr
+++ b/quanta/scripts/tidy.kmdr
@@ -985,7 +985,7 @@ fi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>100</width>
                     <height>0</height>
@@ -1002,7 +1002,7 @@ fi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>80</width>
                     <height>0</height>
@@ -1019,7 +1019,7 @@ fi
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>125</width>
                     <height>0</height>
diff --git a/quanta/scripts/xmlval.kmdr b/quanta/scripts/xmlval.kmdr
index b9eb408d..494ca294 100755
--- a/quanta/scripts/xmlval.kmdr
+++ b/quanta/scripts/xmlval.kmdr
@@ -121,7 +121,7 @@ fi</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -165,7 +165,7 @@ fi</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -219,7 +219,7 @@ fi</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -343,7 +343,7 @@ fi
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
@@ -384,7 +384,7 @@ fi
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>228</width>
                     <height>0</height>
diff --git a/quanta/scripts/xsltproc.kmdr b/quanta/scripts/xsltproc.kmdr
index 2f5ee689..3d2227eb 100755
--- a/quanta/scripts/xsltproc.kmdr
+++ b/quanta/scripts/xsltproc.kmdr
@@ -51,7 +51,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 0f0d9933..68fe11e9 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -26,8 +26,8 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqlineedit.h>
-#include <tqtextcodec.h>
-#include <tqtextstream.h>
+#include <textcodec.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <tqradiobutton.h>
 
@@ -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>").tqarg( url.prettyURL(0, KURL::StripFileProtocol)));
+      KMessageBox::error(this, i18n("<qt>Cannot download <b>%1</b>.</qt>").arg( 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>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
+    KMessageBox::error(this, i18n("<qt>Cannot open <b>%1</b> for reading.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
 }
 
 /** Inserts text at the current cursor position */
@@ -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].tqunicode());
+        m_replaceStr = QuantaCommon::encodedChar(string[0].unicode());
         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].tqunicode();
+    uint c = string[0].unicode();
     if (c > 191)
     {
       m_replaceLine = line;
@@ -1303,7 +1303,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
       {
         if (!parentTQTag || (parentTQTag && parentTQTag->isChild(tagName)))
         {
-          tagName = tag->name() + TQString("%1").tqarg(i, 10);
+          tagName = tag->name() + TQString("%1").arg(i, 10);
           tagNameList += tagName;
           comments.insert(tagName, tag->comment);
           i++;
@@ -1319,7 +1319,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
     if ((tag->className == classStr ||
          isDerivatedFrom(classStr, tag->className)) && tag->name().upper().startsWith(word))
     {
-      tagName = tag->name() + TQString("%1").tqarg(i, 10);
+      tagName = tag->name() + TQString("%1").arg(i, 10);
       tagNameList += tagName;
       comments.insert(tagName, tag->comment);
       
@@ -2212,7 +2212,7 @@ void Document::slotCompletionAborted()
 }
 
 /** Ask for user confirmation if the file was changed outside. */
-void Document::checkDirtytqStatus()
+void Document::checkDirtyStatus()
 {
   TQString fileName;
   if (url().isLocalFile())
@@ -2576,9 +2576,9 @@ bool Document::hasChanged()
   return b;
 }
 
-void Document::setChanged(bool newtqStatus)
+void Document::setChanged(bool newStatus)
 {
-  changed = newtqStatus;
+  changed = newStatus;
 }
 
 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").tqarg(bl).tqarg(bc).tqarg(el).tqarg(ec));
+          s.prepend(TQString("%1,%2,%3,%4\n").arg(bl).arg(bc).arg(el).arg(ec));
         }
         result += s;
         if (skipFoundContent)
@@ -3043,7 +3043,7 @@ void Document::processDTD(const TQString& documentType)
 
   if (!isUntitled())
   {
-    quantaApp->messageOutput()->showMessage(i18n("\"%1\" is used for \"%2\".\n").tqarg(DTDs::ref()->getDTDNickNameFromName(dtdName)).tqarg(url().prettyURL(0, KURL::StripFileProtocol)));
+    quantaApp->messageOutput()->showMessage(i18n("\"%1\" is used for \"%2\".\n").arg(DTDs::ref()->getDTDNickNameFromName(dtdName)).arg(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() )
   {
-    setDirtytqStatus(true);
+    setDirtyStatus(true);
     if (this == ViewManager::ref()->activeDocument())
     {
-      checkDirtytqStatus();
+      checkDirtyStatus();
     }
   }
 }
diff --git a/quanta/src/document.h b/quanta/src/document.h
index ff76fbb3..a7fda743 100644
--- a/quanta/src/document.h
+++ b/quanta/src/document.h
@@ -143,9 +143,9 @@ work correctly. */
   void codeCompletionHintRequested();
   /** Returns the dirty status. */
   bool dirty() const {return m_dirty;};
-  void setDirtytqStatus(bool status) {m_dirty = status;};
+  void setDirtyStatus(bool status) {m_dirty = status;};
   /** Ask for user confirmation if the file was changed outside. */
-  void checkDirtytqStatus();
+  void checkDirtyStatus();
   /** Save the document and reset the dirty status. */
   void save();
   /** Save the document under a new name and calculate the new md5sum. */
@@ -159,7 +159,7 @@ work correctly. */
   /** Returns the changed status since the last query. Resets changed.*/
   bool hasChanged();
   /** Sets the changed status.*/
-  void setChanged(bool newtqStatus);
+  void setChanged(bool newStatus);
   /** Paste the contents of clipboard into the document */
   void paste();
 
@@ -170,7 +170,7 @@ 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 tqrepaint of the Kate view */
+  /** disable/enable the repaint of the Kate view */
   void activateRepaintView(bool activation);
   bool RepaintViewActivated() {return repaintEnabled;}
 
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index 7a6538f6..c378bd05 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -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 idleTimertqStatus = quantaApp->slotEnableIdleTimer(false);
+  //bool idleTimerStatus = quantaApp->slotEnableIdleTimer(false);
   emit enableIdleTimer(false);
   KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*.tag", 0L);
-  //quantaApp->slotEnableIdleTimer(idleTimertqStatus);
+  //quantaApp->slotEnableIdleTimer(idleTimerStatus);
   emit enableIdleTimer(true);
   TQString tmpStr;
   KURL::List::ConstIterator end_f = files.constEnd();
@@ -533,7 +533,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
       TQString tagStr;
       for (uint index = 1; index <= structGroupsCount; index++)
       {
-        dtdConfig->setGroup(TQString("StructGroup_%1").tqarg(index));
+        dtdConfig->setGroup(TQString("StructGroup_%1").arg(index));
         //new code
         group.name = dtdConfig->readEntry("Name").stripWhiteSpace();
         group.noName = dtdConfig->readEntry("No_Name").stripWhiteSpace();
@@ -583,7 +583,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
       TQString tagName;
       for (uint index = 1; index <= structGroupsCount; index++)
       {
-        dtdConfig->setGroup(TQString("StructGroup_%1").tqarg(index));
+        dtdConfig->setGroup(TQString("StructGroup_%1").arg(index));
         group.name = dtdConfig->readEntry("Name").stripWhiteSpace();
         group.noName = dtdConfig->readEntry("No_Name").stripWhiteSpace();
         group.icon = dtdConfig->readEntry("Icon").stripWhiteSpace();
@@ -685,7 +685,7 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, TQTagList
  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>").tqarg(fileName).tqarg(errorMsg).tqarg(errorLine).tqarg(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>").arg(fileName).arg(errorMsg).arg(errorLine).arg(errorCol),
    i18n("Invalid Tag File"));
    kdWarning() << fileName << ": " << errorMsg << ": " << errorLine << "," << errorCol << endl;
  }
@@ -794,7 +794,7 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
  for ( TQDomNode n = dom->firstChild(); !n.isNull(); n = n.nextSibling() )
  {
    tmpStr = n.nodeName();
-   if (tmpStr == "tqchildren")
+   if (tmpStr == "children")
    {
      TQDomElement el = n.toElement();
      TQDomElement item = el.firstChild().toElement();
@@ -914,7 +914,7 @@ void DTDs::slotLoadDTD()
       TQString nickName = dtdcfg.readEntry("NickName", dtdName);
       DTDStruct * dtd = m_dict->find(dtdName) ;
       if (dtd &&
-          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)
+          KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").arg(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>").tqarg(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>").arg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes)
           {
             w->setDTDIdentifier(dtdName);
             emit loadToolbarForDTD(w->getDTDIdentifier());
@@ -946,18 +946,18 @@ void DTDs::slotLoadDTEP(const TQString &_dirName, bool askForAutoload)
   TQString nickName = dtdcfg.readEntry("NickName", dtdName);
   DTDStruct * dtd = m_dict->find(dtdName) ;
   if ( dtd &&
-      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)
+      KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").arg(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>").tqarg(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>").arg(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>").tqarg(nickName), TQString(), 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>").arg(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>").tqarg(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>").arg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes)
     {
       w->setDTDIdentifier(dtdName);
       emit loadToolbarForDTD(w->getDTDIdentifier());
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index 212bc68f..b39b0c46 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -80,12 +80,12 @@ KQApplication::KQApplication()
      KConfig *config = kapp->config();
      config->setGroup("General Options");
      int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode);
-     TQString tqlayout = config->readEntry("Window tqlayout", "Default");
-     if (tqlayout == "Default" || args->isSet("resettqlayout"))
+     TQString layout = config->readEntry("Window layout", "Default");
+     if (layout == "Default" || args->isSet("resetlayout"))
      {
          mdiMode = KMdi::IDEAlMode;
          config->writeEntry("MDI mode", KMdi::IDEAlMode);
-         config->writeEntry("Window tqlayout", "Default");
+         config->writeEntry("Window layout", "Default");
      }
      quantaApp = new QuantaApp(mdiMode);
      config->setGroup("General Options");
@@ -151,11 +151,11 @@ int KQUniqueApplication::newInstance()
     KConfig *config = kapp->config();
     config->setGroup("General Options");
     int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode);
-    TQString tqlayout = config->readEntry("Window tqlayout", "Default");
-    if (tqlayout == "Default" || args->isSet("resettqlayout"))
+    TQString layout = config->readEntry("Window layout", "Default");
+    if (layout == "Default" || args->isSet("resetlayout"))
     {
         mdiMode = KMdi::IDEAlMode;
-        config->writeEntry("Window tqlayout", "Default");
+        config->writeEntry("Window layout", "Default");
         config->writeEntry("MDI mode", KMdi::IDEAlMode);
     }
     quantaApp = new QuantaApp(mdiMode);
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index 75d6918e..3e11bacb 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 },
-  { "resettqlayout", I18N_NOOP("Reset the tqlayout of the user interface to the default"), 0},
+  { "resetlayout", I18N_NOOP("Reset the layout of the user interface to the default"), 0},
   KCmdLineLastOption
   // INSERT YOUR COMMANDLINE OPTIONS HERE
 };
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index ee054cbe..e74240ca 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -32,9 +32,9 @@
 #include <tqradiobutton.h>
 #include <tqimage.h>
 #include <tqtimer.h>
-#include <tqtextcodec.h>
-#include <tqtextstream.h>
-#include <tqtextedit.h>
+#include <textcodec.h>
+#include <textstream.h>
+#include <textedit.h>
 #include <tqiodevice.h>
 #include <tqcombobox.h>
 #include <tqdockarea.h>
@@ -42,7 +42,7 @@
 #include <tqspinbox.h>
 #include <tqeventloop.h>
 #include <tqfontmetrics.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqptrlist.h>
 #include <tqbuffer.h>
 #include <tqdatetime.h>
@@ -258,7 +258,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm(
   m_parserEnabled = true;
   cursorLine = 0;
   cursorCol = 0;
-  emit eventHappened("quanta_start", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate), TQString());
+  emit eventHappened("quanta_start", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString());
   setAcceptDrops(true);
   tabWidget()->installEventFilter(this);
 }
@@ -375,7 +375,7 @@ void QuantaApp::slotFileOpen(const KURL::List &urls, const TQString& encoding)
   {
     if (!QExtFileInfo::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>").tqarg((*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>").arg((*i).prettyURL(0, KURL::StripFileProtocol)));
 
     } else
     {
@@ -412,7 +412,7 @@ void QuantaApp::slotFileOpenRecent(const KURL &url)
   if (!QExtFileInfo::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?").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep"))
+        i18n("The file %1 does not exist.\n Do you want to remove it from the list?").arg(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->checkDirtytqStatus();
+    w->checkDirtyStatus();
     if (w->isUntitled())
       slotFileSaveAs();
     else
@@ -457,7 +457,7 @@ bool QuantaApp::slotFileSaveAs(QuantaView *viewToSave)
   if (w)
   {
     KURL oldURL = w->url();
-    w->checkDirtytqStatus();
+    w->checkDirtyStatus();
     if (!w->isUntitled() && oldURL.isLocalFile())
     {
       fileWatcher->removeFile(oldURL.path());
@@ -523,7 +523,7 @@ bool QuantaApp::slotFileSaveAs(QuantaView *viewToSave)
     {
       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>").tqarg(saveUrl.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::add(), i18n("Do Not Add"))
+          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(), 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->checkDirtytqStatus();
+  w->checkDirtyStatus();
   TQString localTemplateDir = locateLocal("data", resourceDir + "templates/");
 
   do {
@@ -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").tqarg(localTemplateDir));
+      KMessageBox::sorry(this,i18n("You must save the templates in the following folder: \n\n%1").arg(localTemplateDir));
       query = KMessageBox::No;
     }
   } while (query != KMessageBox::Yes);
@@ -603,7 +603,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly)
     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>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error"));
+      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"));
     delete tempFile;
   } else
   {
@@ -684,7 +684,7 @@ void QuantaApp::slotFileCloseAll()
   part->write(" ");
   part->end();
 
-  slotNewtqStatus();
+  slotNewStatus();
 }
 
 void QuantaApp::slotFileQuit()
@@ -710,12 +710,12 @@ void QuantaApp::slotStatusMsg(const TQString &msg)
 {
   statusbarTimer->stop();
   statusBar()->changeItem(" " + KStringHandler::cPixelSqueeze(msg, statusBar()->fontMetrics(), progressBar->x() - 20), IDS_STATUS);
-  statusBar()->tqrepaint();
-  kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+  statusBar()->repaint();
+  kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
   statusbarTimer->start(10000, true);
 }
 
-/** tqrepaint preview */
+/** repaint preview */
 void QuantaApp::slotRepaintPreview()
 {
   Document *w = ViewManager::ref()->activeDocument();
@@ -915,7 +915,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo)
   }
 }
 
-void QuantaApp::slotNewtqStatus()
+void QuantaApp::slotNewStatus()
 {
   fileRecent->setEnabled(true);
   actionCollection()->action("project_open_recent")->setEnabled(true);
@@ -1348,7 +1348,7 @@ void QuantaApp::slotOptions()
     if (previewSettingsChanged)
       slotShowPreviewWidget(true);
     qConfig.docPosition = uiOptions->docPosition();
-    qConfig.windowLayout = uiOptions->tqlayout();
+    qConfig.windowLayout = uiOptions->layout();
 
     m_htmlPart->closeURL();
     m_htmlPart->begin( Project::ref()->projectBaseURL());
@@ -1356,7 +1356,7 @@ void QuantaApp::slotOptions()
     m_htmlPart->end();
 
     reparse(true);
-    slotNewtqStatus();
+    slotNewStatus();
   }
 
   m_config->sync();
@@ -1437,7 +1437,7 @@ void QuantaApp::slotShowPreviewWidget(bool show)
   }
 }
 
-void QuantaApp::slotChangePreviewtqStatus()
+void QuantaApp::slotChangePreviewStatus()
 {
     if (qConfig.previewPosition == "Editor")
     {
@@ -1446,7 +1446,7 @@ void QuantaApp::slotChangePreviewtqStatus()
     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 tqrepaint the content and restore the document on the disc.
+      //so we just repaint 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").tqarg(lineNumber).tqarg(columnNumber);
+  linenumber = i18n("Line: %1 Col: %2").arg(lineNumber).arg(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);
-  slotNewtqStatus();
+  slotNewStatus();
 }
 
 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").tqarg(cursorLine+1).tqarg(cursorCol+1);
+  linenumber = i18n("Line: %1 Col: %2").arg(cursorLine+1).arg(cursorCol+1);
   statusBar()->changeItem(linenumber, IDS_STATUS_CLM);
 }
 
@@ -1795,7 +1795,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl
     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->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
+    tb->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
 
   //kdDebug(24000) << "tb->iconSize() " << tb->iconSize() << endl;
    if (toolbarTab->iconText() == KToolBar::IconTextBottom)
@@ -1968,7 +1968,7 @@ void QuantaApp::slotContextMenuAboutToShow()
         urlUnderCursor = baseUrl;
         QuantaCommon::setUrl(urlUnderCursor, name.stripWhiteSpace());
         urlUnderCursor = QExtFileInfo::toAbsolute(urlUnderCursor, baseUrl);
-        action->setText(i18n("Open File: %1").tqarg(KStringHandler::lsqueeze(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol), 80)));
+        action->setText(i18n("Open File: %1").arg(KStringHandler::lsqueeze(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol), 80)));
         action->setEnabled(true);
       } else
       {
@@ -2027,7 +2027,7 @@ void QuantaApp::slotContextMenuAboutToShow()
       action = actionCollection()->action("debug_addwatch");
       if(action)
       {
-        action->setText(i18n("Add Watch: '%1'").tqarg(word));
+        action->setText(i18n("Add Watch: '%1'").arg(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'").tqarg(word));
+        action->setText(i18n("Set Value of '%1'").arg(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'...").tqarg(word));
+        action->setText(i18n("Break When '%1'...").arg(word));
         action->setEnabled(!word.isEmpty());
 
         if(!action->isPlugged(popup))
@@ -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>").tqarg(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>").arg(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)").tqarg(count);
-           i18nName = i18n(origName.utf8()) + TQString(" (%1)").tqarg(count);
+           newName = origName + TQString(" (%1)").arg(count);
+           i18nName = i18n(origName.utf8()) + TQString(" (%1)").arg(count);
            nameModified = true;
            count++;
            found = true;
@@ -2199,7 +2199,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url)
    int n = 1;
    while (m_toolbarList.find(toolbarId) != 0L)
    {
-     toolbarId = s + TQString("%1").tqarg(n);
+     toolbarId = s + TQString("%1").arg(n);
      toolbarId.replace(rx, "_");
      n++;
    }
@@ -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)").tqarg(error).tqarg(el).tqarg(ec)<<endl;
+      kdError(24000) << TQString("Error %1 at (%2, %3)").arg(error).arg(el).arg(ec)<<endl;
   p_toolbar->dom = dom;
 
   TQTextStream bufferStr(&buffer);
@@ -2461,7 +2461,7 @@ KURL QuantaApp::saveToolbarToFile(const TQString& toolbarName, const KURL& destF
   if (!QExtFileInfo::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>").tqarg(p_toolbar->name).tqarg(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>").arg(p_toolbar->name).arg(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>")
-                                  .tqarg(localToolbarsDir));
+                                  .arg(localToolbarsDir));
         query = KMessageBox::No;
       }
     } while (query != KMessageBox::Yes);
@@ -2591,7 +2591,7 @@ void QuantaApp::slotSaveProjectToolbar()
 void QuantaApp::slotAddToolbar()
 {
  bool ok;
- TQString name = KInputDialog::getText(i18n("New Toolbar"), i18n("Enter toolbar name:"), i18n("User_%1").tqarg(userToolbarsCount), &ok, this);
+ TQString name = KInputDialog::getText(i18n("New Toolbar"), i18n("Enter toolbar name:"), i18n("User_%1").arg(userToolbarsCount), &ok, this);
  if (ok)
  {
   userToolbarsCount++;
@@ -2600,7 +2600,7 @@ void QuantaApp::slotAddToolbar()
   int n = 1;
   while (m_toolbarList.find(toolbarId) != 0L)
   {
-    toolbarId = name + TQString("%1").tqarg(n);
+    toolbarId = name + TQString("%1").arg(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")
-      .tqarg(name.lower()).tqarg(name).tqarg(name).tqarg(toolbarId).tqarg(name);
+      .arg(name.lower()).arg(name).arg(name).arg(toolbarId).arg(name);
   tempFile->close();
 
   ToolbarXMLGUI * toolbarGUI = new ToolbarXMLGUI(tempFile->name());
@@ -3122,7 +3122,7 @@ void QuantaApp::focusInEvent(TQFocusEvent* e)
  if (w)
  {
     w->view()->setFocus();
-    w->checkDirtytqStatus();
+    w->checkDirtyStatus();
  }
 }
 
@@ -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>").tqarg(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>").arg(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>").tqarg(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>").arg(p_toolbar->name));
          dlg.setCaption(i18n("Save Toolbar"));
          dlg.pixmapLabel->setPixmap(BarIcon("messagebox_info", KIcon::SizeMedium));
          dlg.exec();
@@ -3784,7 +3784,7 @@ TQStringList QuantaApp::openedURLs() const
           Document *w = qView->document();
           if ( w )
           {
-            list.prepend( TQString("%1:%2").tqarg(w->editIf->editInterfaceNumber()).tqarg(w->url().url()));
+            list.prepend( TQString("%1:%2").arg(w->editIf->editInterfaceNumber()).arg(w->url().url()));
           }
       }
   }
@@ -4160,7 +4160,7 @@ bool QuantaApp::queryClose()
   {
     saveOptions();
    // kdDebug(24000) << "Quanta will exit" << endl;
-    emit eventHappened("quanta_exit", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate), TQString());
+    emit eventHappened("quanta_exit", TQDateTime::currentDateTime().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 tqlayout", qConfig.windowLayout);
+    m_config->writeEntry("Window layout", 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);
@@ -4327,7 +4327,7 @@ void QuantaApp::slotEditCurrentTag()
   slotEnableIdleTimer(true);
   if (isUnknown)
   {
-    TQString message = i18n("Unknown tag: %1").tqarg(tagName);
+    TQString message = i18n("Unknown tag: %1").arg(tagName);
     slotStatusMsg( message );
   }
 }
@@ -4840,7 +4840,7 @@ void QuantaApp::slotPasteHTMLQuoted()
   Document *w = ViewManager::ref()->activeDocument();
   if (w)
   {
-    TQClipboard *cb = tqApp->tqclipboard();
+    TQClipboard *cb = tqApp->clipboard();
     TQString text = cb->text();
 
     if ( ( !text.isNull() ) && (!text.isEmpty() ) )
@@ -4869,7 +4869,7 @@ void QuantaApp::slotPasteHTMLQuoted()
           int code = s.toInt(&ok);
           if (!ok || code < 191)
             continue;
-          text.replace(TQChar(code), TQString("&#%1;").tqarg(s));
+          text.replace(TQChar(code), TQString("&#%1;").arg(s));
         }
       }
       unsigned int line, col;
@@ -4885,7 +4885,7 @@ void QuantaApp::slotPasteURLEncoded()
  Document *w = ViewManager::ref()->activeDocument();
   if (w)
   {
-    TQClipboard *cb = tqApp->tqclipboard();
+    TQClipboard *cb = tqApp->clipboard();
     TQString text = cb->text();
 
     if ( ( !text.isNull() ) && (!text.isEmpty() ) )
@@ -5004,14 +5004,14 @@ void QuantaApp::slotCopy()
   if (m_htmlPart->view()->hasFocus())
   {
     TQString selection = m_htmlPart->selectedText();
-    TQClipboard *cb = TQApplication::tqclipboard();
+    TQClipboard *cb = TQApplication::clipboard();
     cb->setText(selection, TQClipboard::Clipboard);
   }
   else
   if (m_htmlPartDoc->view()->hasFocus())
   {
     TQString selection = m_htmlPartDoc->selectedText();
-    TQClipboard *cb = TQApplication::tqclipboard();
+    TQClipboard *cb = TQApplication::clipboard();
     cb->setText(selection, TQClipboard::Clipboard);
   }
 
diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h
index 1b7231e4..d0216e17 100644
--- a/quanta/src/quanta.h
+++ b/quanta/src/quanta.h
@@ -282,11 +282,11 @@ public slots:
        unexpected things may happen. */
   void slotStatusMsg(const TQString &text);
 
-  void slotNewtqStatus();
+  void slotNewStatus();
   void slotNewLineColumn();
-//  void slotUpdatetqStatus(TQWidget*);FIXME:
+//  void slotUpdateStatus(TQWidget*);FIXME:
 
-  /** tqrepaint preview */
+  /** repaint preview */
   void slotRepaintPreview();
   /** toggles showing the preview */
   void slotToggleShowPreview();
@@ -298,7 +298,7 @@ public slots:
         - hide if the preview was in the editor area
         - update if the preview is in a toolview
    */
-  void slotChangePreviewtqStatus();
+  void slotChangePreviewStatus();
   /** Called when the preview widget got or lost the focus */
   void slotPreviewHasFocus(bool focus);
 
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 5239c8de..24663af3 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -22,13 +22,13 @@
 #include <tqpainter.h>
 #include <tqtabwidget.h>
 #include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqeventloop.h>
 #include <tqtimer.h>
 #include <tqdom.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqpopupmenu.h>
 #include <tqdatetime.h>
 #include <tqradiobutton.h>
@@ -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 tqlayout
+  // Restore the dock layout
   m_config->setGroup  ("General Options");
-  TQString tqlayout = m_config->readEntry("Window tqlayout", "Default");
+  TQString layout = m_config->readEntry("Window layout", "Default");
   int mdiMode = m_config->readNumEntry("MDI mode", -1);
-  if (mdiMode != -1 && tqlayout != "Default")
+  if (mdiMode != -1 && layout != "Default")
   {
-      m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window tqlayout...
+      m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window layout...
       if (mdiMode != KMdi::IDEAlMode)
         m_quanta->setToolviewStyle(qConfig.toolviewTabs);
   }
@@ -268,7 +268,7 @@ void QuantaInit::initQuanta()
           TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
 
   m_quanta->slotFileNew();
-  m_quanta->slotNewtqStatus();
+  m_quanta->slotNewStatus();
   initToolBars();
   Project::ref()->setProjectToolbarVisible(m_quanta->factory()->container("project_toolbar", m_quanta)->isShown());
   Project::ref()->slotShowProjectToolbar(Project::ref()->hasProject());
@@ -301,7 +301,7 @@ void QuantaInit::initQuanta()
           continue;
       int length = s.find(";)") - begin + 1;
       TQString s2 = s.mid(begin, length - 1);
-      replacementMap[s[0].tqunicode()] = s2;
+      replacementMap[s[0].unicode()] = s2;
     }
     file.close();
   }
@@ -356,16 +356,16 @@ void QuantaInit::initStatusBar()
 void QuantaInit::initDocument()
 {
   m_quanta->m_doc = new QuantaDoc(0L);
-  connect(m_quanta->m_doc, TQT_SIGNAL(newtqStatus()),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus()));
+  connect(m_quanta->m_doc, TQT_SIGNAL(newStatus()),
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus()));
 }
 
 void QuantaInit::initProject()
 {
   Project *m_project = Project::ref(m_quanta);
 
-  connect(m_project, TQT_SIGNAL(getTreetqStatus(TQStringList *)),
-          pTab, TQT_SLOT(slotGetTreetqStatus(TQStringList *)));
+  connect(m_project, TQT_SIGNAL(getTreeStatus(TQStringList *)),
+          pTab, TQT_SLOT(slotGetTreeStatus(TQStringList *)));
   connect(m_project, TQT_SIGNAL(loadToolbarFile(const KURL &)),
           TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL &)));
   connect(m_project, TQT_SIGNAL(getUserToolbarFiles(KURL::List *)),
@@ -424,8 +424,8 @@ void QuantaInit::initProject()
   connect(m_project, TQT_SIGNAL(messages(const TQString&)),
           m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&)));
 
-  connect(m_project, TQT_SIGNAL(newtqStatus()),
-          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus()));
+  connect(m_project, TQT_SIGNAL(newStatus()),
+          TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus()));
 
   connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)),
           TemplatesTreeView::ref(), TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &)));
@@ -438,10 +438,10 @@ 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(changeUploadtqStatus(const KURL&, int)),
+  connect(pTab, TQT_SIGNAL(changeUploadStatus(const KURL&, int)),
           m_project, TQT_SLOT(slotUploadStatusChanged(const KURL&, int)));
-  connect(pTab, TQT_SIGNAL(changeDocumentFoldertqStatus(const KURL&, bool)),
-          m_project, TQT_SLOT(slotChangeDocumentFoldertqStatus(const KURL&, bool)));
+  connect(pTab, TQT_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)),
+          m_project, TQT_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool)));
 
   connect(m_project, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
 
@@ -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->slotUpdatetqStatus(w);//FIXME:
+//    m_quanta->slotUpdateStatus(w);//FIXME:
   }
 }
 
@@ -963,7 +963,7 @@ void QuantaInit::initActions()
           n = n.nextSibling();
         }
       } else
-        kdError(24000) << TQString("Error %1 at (%2, %3) in %4").tqarg(error).tqarg(el).tqarg(ec).tqarg(f.name()) << endl;
+        kdError(24000) << TQString("Error %1 at (%2, %3) in %4").arg(error).arg(el).arg(ec).arg(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").tqarg(error).tqarg(el).tqarg(ec).tqarg(f.name()) << endl;
+        kdError(24000) << TQString("Error %1 at (%2, %3) in %4").arg(error).arg(el).arg(ec).arg(f.name()) << endl;
         f.close();
       }
     } else
@@ -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>")
-            .tqarg(originalVersion.prettyURL(0, KURL::StripFileProtocol ))
-            .tqarg(KIO::convertSize(origSize)).tqarg(origTime)
-            .tqarg(KIO::convertSize(backupSize)).tqarg(backupTime));
+            .arg(originalVersion.prettyURL(0, KURL::StripFileProtocol ))
+            .arg(KIO::convertSize(origSize)).arg(origTime)
+            .arg(KIO::convertSize(backupSize)).arg(backupTime));
           w->buttonLoad->setText(i18n("&Restore the file from backup"));
           w->buttonIgnore->setText(i18n("Do &not restore the file from backup"));
           delete w->warningLabel;
@@ -1482,13 +1482,13 @@ void QuantaInit::checkRuntimeDependencies()
     if (dependency.type == Dependency::Executable)
     {
       if (KStandardDirs::findExe(dependency.execName).isNull())
-        errorStr += TQString(stdErrorMsg).tqarg(dependency.name).tqarg(dependency.url).tqarg(dependency.description);
+        errorStr += TQString(stdErrorMsg).arg(dependency.name).arg(dependency.url).arg(dependency.description);
 
     } else
     if (dependency.type == Dependency::Plugin)
     {
       if (!QuantaPlugin::validatePlugin(m_quanta->m_pluginInterface->plugin(dependency.execName)))
-        errorStr += TQString(stdErrorMsg).tqarg(dependency.name).tqarg(dependency.url).tqarg(dependency.description);
+        errorStr += TQString(stdErrorMsg).arg(dependency.name).arg(dependency.url).arg(dependency.description);
     }
   }
 
@@ -1500,7 +1500,7 @@ void QuantaInit::checkRuntimeDependencies()
                                             &appId);
   if (appId.isEmpty())
   {
-     errorStr += TQString(stdErrorMsg).tqarg("Cervisia (cvsservice)").tqarg("http://www.kde.org/apps/cervisia").tqarg(i18n("integrated CVS management"));
+     errorStr += TQString(stdErrorMsg).arg("Cervisia (cvsservice)").arg("http://www.kde.org/apps/cervisia").arg(i18n("integrated CVS management"));
   } else
   {
      CVSService::ref(m_quanta->actionCollection())->setAppId(appId);
@@ -1622,7 +1622,7 @@ int QuantaInit::runningQuantas()
   int i = 0;
   for (QCStringList::iterator it = list.begin(); it != list.end(); ++it)
   {
-    if (TQString(*it).tqstartsWith("quanta", false))
+    if (TQString(*it).startsWith("quanta", false))
       ++i;
   }
   return i;
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index 797c1172..3585cdb8 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -21,7 +21,7 @@
 #include <tqwidget.h>
 #include <tqtabwidget.h>
 #include <tqtabbar.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdragobject.h>
 #include <tqobject.h>
 
@@ -132,7 +132,7 @@ bool QuantaDoc::newDocument( const KURL& url, bool switchToExisting )
   else // select opened
   if (switchToExisting)
   {
-    view->document()->checkDirtytqStatus();
+    view->document()->checkDirtyStatus();
     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 idleTimertqStatus = quantaApp->slotEnableIdleTimer(false);
+  bool idleTimerStatus = 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(idleTimertqStatus);
+     quantaApp->slotEnableIdleTimer(idleTimerStatus);
      return;
   }
   Document *w = ViewManager::ref()->activeDocument();
@@ -211,23 +211,23 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
             highlightIf->setHlMode(htmlIdx);
       }
     }
-    emit newtqStatus();
+    emit newStatus();
   }
-  quantaApp->slotEnableIdleTimer(idleTimertqStatus);
+  quantaApp->slotEnableIdleTimer(idleTimerStatus);
 }
 
 void QuantaDoc::slotOpeningFailed(const KURL &url)
 {
     Q_UNUSED(url);
-    bool signaltqStatus = signalsBlocked();
+    bool signalStatus = 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>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
+    KMessageBox::error(quantaApp, i18n("<qt>Cannot open document <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
 */
     ViewManager::ref()->removeActiveView();
-    blockSignals(signaltqStatus);
+    blockSignals(signalStatus);
 }
 
 void QuantaDoc::slotOpeningCompleted(const KURL &url)
@@ -240,7 +240,7 @@ void QuantaDoc::slotOpeningCompleted(const KURL &url)
   quantaApp->reparse(true);
   if (url.isLocalFile())
     quantaApp->debugger()->fileOpened(url.prettyURL(0, KURL::StripFileProtocol));
-  quantaApp->slotNewtqStatus();
+  quantaApp->slotNewStatus();
   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());
@@ -272,7 +272,7 @@ void QuantaDoc::slotAttribPopup()
 
     if ( QuantaCommon::isKnownTag(w->getDTDIdentifier(),tagName) )
     {
-      TQString caption = i18n("Attributes of <%1>").tqarg(tagName);
+      TQString caption = i18n("Attributes of <%1>").arg(tagName);
       attribMenu->insertTitle( caption );
 
       AttributeList *list = QuantaCommon::tagAttributes(w->getDTDIdentifier(),tagName );
@@ -317,7 +317,7 @@ void QuantaDoc::slotAttribPopup()
       }
     }
     else {
-      TQString message = i18n("Unknown tag: %1").tqarg(tagName);
+      TQString message = i18n("Unknown tag: %1").arg(tagName);
       quantaApp->slotStatusMsg( message );
     }
   }
diff --git a/quanta/src/quantadoc.h b/quanta/src/quantadoc.h
index 0da3ff5e..ac7069d9 100644
--- a/quanta/src/quantadoc.h
+++ b/quanta/src/quantadoc.h
@@ -48,7 +48,7 @@ public slots:
   void slotOpeningFailed(const KURL &url);
 
 signals:
-  void newtqStatus();
+  void newStatus();
   void hideSplash();
   void eventHappened(const TQString&, const TQString&, const TQString& );
 
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index cb4c8ef9..f9a0dc06 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -21,7 +21,7 @@
 #include <tqtabbar.h>
 #include <tqtabwidget.h>
 #include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidgetstack.h>
 #include <tqdom.h>
 #include <tqfile.h>
@@ -208,7 +208,7 @@ void QuantaView::addDocument(Document *document)
 
   reloadUpdateTimers();
 
-   m_currentViewsLayout = -1; //force loading of this tqlayout
+   m_currentViewsLayout = -1; //force loading of this layout
    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 tqlayout
+  m_currentViewsLayout = -1; //force loading of this layout
   switch (currentViewsLayout)
   {
         case SourceOnly:
@@ -395,7 +395,7 @@ void QuantaView::slotSetSourceAndVPLLayout()
 
    if (m_document->defaultDTD()->name.contains("HTML", false) == 0)
    {
-      KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName));
+      KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName));
       KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" );
       if (ta2)
           ta2->setChecked(true);
@@ -444,7 +444,7 @@ void QuantaView::slotSetVPLOnlyLayout()
 
    if (m_document->defaultDTD()->name.contains("HTML", false) == 0)
    {
-      KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName));
+      KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName));
       KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" );
       if (ta2)
           ta2->setChecked(true);
@@ -1021,7 +1021,7 @@ 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->checkDirtytqStatus();
+  m_document->checkDirtyStatus();
   StructTreeView::ref()->useOpenLevelSetting = true;
   quantaApp->slotLoadToolbarForDTD(m_document->getDTDIdentifier());
 
@@ -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?").tqarg(fileName),
+          i18n("The file \"%1\" has been modified.\nDo you want to save it?").arg(fileName),
           i18n("Warning"), KStdGuiItem::save(), KStdGuiItem::discard());
     else
       want_save = KMessageBox::Yes;
@@ -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->setDirtytqStatus(false);
+      m_document->setDirtyStatus(false);
       m_document->removeBackup(quantaApp->config());
       fileWatcher->addFile(m_document->url().path());
 //      kdDebug(24000) << "addFile[saveDocument, 2]: " << m_document->url().path() << endl;
@@ -1176,7 +1176,7 @@ void QuantaView::slotSavingFailed(const TQString &error)
 void QuantaView::slotSavingCompleted()
 {
   m_saveResult = true;
-  m_document->setDirtytqStatus(false);
+  m_document->setDirtyStatus(false);
   m_document->removeBackup(quantaApp->config());
   if (m_eventLoopStarted)
     tqApp->exit_loop();
diff --git a/quanta/src/quantaview.h b/quanta/src/quantaview.h
index bf80aff1..3e34c43a 100644
--- a/quanta/src/quantaview.h
+++ b/quanta/src/quantaview.h
@@ -105,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 tqlayout*/
+  /** Return the curren views layout*/
   int currentViewsLayout() {return m_currentViewsLayout;}
 
   void reloadLayout();
@@ -221,7 +221,7 @@ private:
   TQGuardedPtr<KafkaDocument> m_kafkaDocument;
   TQSplitter *m_splitter;
   TQGridLayout *m_viewLayout;
-  int m_currentViewsLayout; ///< holds the current tqlayout, which can be SourceOnly, VPLOnly or SourceAndVPL
+  int m_currentViewsLayout; ///< holds the current layout, 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 6a6294e3..9446daf6 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -95,7 +95,7 @@ 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(slotChangePreviewtqStatus()));
+    connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewStatus()));
     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&)));
@@ -107,8 +107,8 @@ QuantaView* ViewManager::createView(const TQString &caption)
 void ViewManager::createNewDocument()
 {
   int i = 1;
-  while (isOpened(KURL("file:"+i18n("Untitled%1").tqarg(i)))) i++;
-  TQString fname = i18n("Untitled%1").tqarg(i);
+  while (isOpened(KURL("file:"+i18n("Untitled%1").arg(i)))) i++;
+  TQString fname = i18n("Untitled%1").arg(i);
   QuantaView *view = createView(fname);
 
 #ifdef ENABLE_EDITORS
@@ -139,7 +139,7 @@ void ViewManager::createNewDocument()
 
   quantaApp->setFocusProxy(w->view());
   w->view()->setFocusPolicy(TQ_WheelFocus);
-  connect( v, TQT_SIGNAL(newtqStatus()), quantaApp, TQT_SLOT(slotNewtqStatus()));
+  connect( v, TQT_SIGNAL(newStatus()), quantaApp, TQT_SLOT(slotNewStatus()));
 
   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->slotNewtqStatus();
+  quantaApp->slotNewStatus();
   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 tqchildren first to a list, as removing invalidates our iterator
-  TQValueList<KMdiChildView *> tqchildren;
+  //save the children first to a list, as removing invalidates our iterator
+  TQValueList<KMdiChildView *> children;
   for (it->first(); !it->isDone(); it->next())
   {
-      tqchildren.append(it->currentItem());
+      children.append(it->currentItem());
   }
   delete it;
   KURL::List modifiedList;
   TQValueListIterator<KMdiChildView *> childIt;
-  for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
+  for (childIt = children.begin(); childIt != children.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 = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
+      for (childIt = children.begin(); childIt != children.end(); ++childIt)
       {
         view = *childIt;
         qView = dynamic_cast<QuantaView*>(view);
@@ -311,7 +311,7 @@ void ViewManager::slotCloseOtherTabs()
     }
   }
 
-  for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
+  for (childIt = children.begin(); childIt != children.end(); ++childIt)
   {
       view = *childIt;
       if (view != currentView)
@@ -427,16 +427,16 @@ bool ViewManager::closeAll(bool createNew)
   parser->setSAParserEnabled(false);
   KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator();
   QuantaView *view;
-  //save the tqchildren first to a list, as removing invalidates our iterator
-  TQValueList<KMdiChildView *> tqchildren;
+  //save the children first to a list, as removing invalidates our iterator
+  TQValueList<KMdiChildView *> children;
   for (it->first(); !it->isDone(); it->next())
   {
-      tqchildren.append(it->currentItem());
+      children.append(it->currentItem());
   }
   delete it;
   KURL::List modifiedList;
   TQValueListIterator<KMdiChildView *> childIt;
-  for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
+  for (childIt = children.begin(); childIt != children.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 = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
+      for (childIt = children.begin(); childIt != children.end(); ++childIt)
       {
         view = dynamic_cast<QuantaView*>(*childIt);
         if (view)
@@ -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 = tqchildren.begin(); childIt != tqchildren.end(); ++childIt)
+  for (childIt = children.begin(); childIt != children.end(); ++childIt)
   {
       view = dynamic_cast<QuantaView*>(*childIt);
       if (view)
@@ -528,7 +528,7 @@ bool ViewManager::closeAll(bool createNew)
   if (createNew)
   {
       createNewDocument();
-      quantaApp->slotNewtqStatus();
+      quantaApp->slotNewStatus();
   }
   emit filesClosed(true);
   return true;
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index baf6bbe5..d2da546f 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -17,12 +17,12 @@
 
 // QT includes
 #include <tqeventloop.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfileinfo.h>
 #include <tqlabel.h>
 #include <tqimage.h>
 #include <tqregexp.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqpoint.h>
 #include <tqregexp.h>
 #include <tqlineedit.h>
@@ -106,7 +106,7 @@ void BaseTreeViewToolTip::maybeTip( const TQPoint &pos )
         text.append( "<br>" + item->text(1));
     }
     if ( !text.isEmpty() )
-      tip(m_view->tqitemRect(item), text);
+      tip(m_view->itemRect(item), text);
 }
 
 
@@ -265,7 +265,7 @@ void BaseTreeBranch::updateOpenFolder()
   while (item) {
     if (item->isDir() && item->isOpen()) {
       updateDirectory( item->url() );
-      kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+      kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
       // dive into the tree first
       newItem = dynamic_cast<KFileTreeViewItem *>(item->firstChild());
       if (newItem) {
@@ -371,7 +371,7 @@ void BaseTreeView::slotSelectFile(TQListViewItem *item)
     if ( QuantaCommon::checkMimeGroup(urlToOpen,"text") )
     {
       emit openFile(urlToOpen);
-      item->tqrepaint();
+      item->repaint();
     }
     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->tqrepaint();
+            item->repaint();
           }
         }
    }
@@ -494,15 +494,15 @@ FileInfoDlg* BaseTreeView::addFileInfoPage(KPropertiesDialog* propDlg)
          }
          qfile.close();
 
-         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));
+         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));
         }
         else if (mimetype.contains("image"))
         {              // assume it's an image file
           TQImage imagefile=TQImage(nameForInfo);
-          quantaFileProperties->lineNum->setText(i18n("Image size: %1 x %2").tqarg(imagefile.width()).tqarg(imagefile.height()));
+          quantaFileProperties->lineNum->setText(i18n("Image size: %1 x %2").arg(imagefile.width()).arg(imagefile.height()));
           quantaFileProperties->imageNum->hide();
           quantaFileProperties->imageSize->hide();
           quantaFileProperties->totalSize->hide();
@@ -536,7 +536,7 @@ void BaseTreeView::slotOpen()
   if (item)
   {
     emit open(item);
-    item->tqrepaint();
+    item->repaint();
   }
 }
 
@@ -648,7 +648,7 @@ void BaseTreeView::slotCopy()
 {
    if (currentItem())
    {
-     TQClipboard *cb = TQApplication::tqclipboard();
+     TQClipboard *cb = TQApplication::clipboard();
      cb->setText( currentURL().prettyURL() );
    }
 }
@@ -658,7 +658,7 @@ void BaseTreeView::slotPaste()
 {
   if (currentItem())
   {
-    TQClipboard *cb = TQApplication::tqclipboard();
+    TQClipboard *cb = TQApplication::clipboard();
     KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) );
 
     KURL url = currentURL();
@@ -952,7 +952,7 @@ bool BaseTreeView::isFileOpen(const KURL &url)
 
 bool BaseTreeView::isPathInClipboard()
 {
-  TQClipboard *cb = TQApplication::tqclipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   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->tqrepaint();
+      item->repaint();
     }
   }
 /*  TQListViewItemIterator iter(this);
   for ( ; iter.current(); ++iter )
   {
-    iter.current()->tqrepaint();
+    iter.current()->repaint();
   }*/
 }
 
@@ -1038,7 +1038,7 @@ void BaseTreeView::doRename(KFileTreeViewItem* kftvi, const TQString & newName)
     bool proceed = true;
     if (QExtFileInfo::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>").tqarg(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>").arg(newURL.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue;
     }
     if (proceed)
     {
@@ -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>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)).tqarg(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>").arg(url.prettyURL(0, KURL::StripFileProtocol)).arg(targetURL.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error"));
    delete tempFile;
 }
 
@@ -1216,7 +1216,7 @@ void BaseTreeView::slotCreateFile()
       url.setPath(url.directory() + "/" + fileName);
     if (QExtFileInfo::exists(url, false, this))
     {
-      KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").tqarg(fileName), i18n("Error Creating File"));
+      KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").arg(fileName), i18n("Error Creating File"));
       return;
     }
     KTempFile *tempFile = new KTempFile(tmpDir);
diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h
index b0418558..94c4611a 100644
--- a/quanta/treeviews/basetreeview.h
+++ b/quanta/treeviews/basetreeview.h
@@ -141,7 +141,7 @@ public:
   virtual ~BaseTreeView();
 
   /**
-   * Saves the list view's tqlayout (column widtsh, column order, sort column)
+   * Saves the list view's layout (column widtsh, column order, sort column)
    * to a KConfig group. Reimplemented to save the open folders.
    *
    * @param config the KConfig object to write to
@@ -150,7 +150,7 @@ public:
   void saveLayout(KConfig *config, const TQString &group);
 
   /**
-   * Reads the list view's tqlayout from a KConfig group as stored with
+   * Reads the list view's layout from a KConfig group as stored with
    * saveLayout. Reimplemented to load the open folders.
    *
    * @param config the KConfig object to read from
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index bebac21d..d543f5d0 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -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>").tqarg(url.url()));
+        KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url()));
       }
     } else
     { // remove
@@ -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>").tqarg(url.url()));
+    KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url()));
   }
 }
 
@@ -324,7 +324,7 @@ void FilesTreeView::slotChangeAlias()
           newBranch(url);
         }
       } else {
-        KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").tqarg(url.url()));
+        KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url()));
       }
     }
   }
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index dcfab886..205e5bf0 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -154,7 +154,7 @@ 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(slotChangeDocumentFoldertqStatus()));
+  m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus()));
   m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
   m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
@@ -400,7 +400,7 @@ void ProjectTreeView::slotCreateFile()
       url.setPath(url.directory() + "/" + fileName);
     if (QExtFileInfo::exists(url, false, this))
     {
-      KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").tqarg(fileName), i18n("Error Creating File"));
+      KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").arg(fileName), i18n("Error Creating File"));
       return;
     }
     KTempFile *tempFile = new KTempFile(tmpDir);
@@ -425,7 +425,7 @@ void ProjectTreeView::slotRemoveFromProject(int askForRemove)
     TQString nice = QExtFileInfo::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>").tqarg(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>").arg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") == KMessageBox::Continue )
     {
       if ( currentKFileTreeViewItem()->isDir() ) url.adjustPath(+1);
       emit removeFromProject(url);
@@ -527,7 +527,7 @@ void ProjectTreeView::slotAlwaysUpload()
       url.adjustPath(+1);
     if (m_projectFiles->contains(url) || url == m_projectBaseURL)
     {
-       emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload);
+       emit changeUploadStatus(url, ProjectURL::AlwaysUpload);
     }
 }
 
@@ -541,7 +541,7 @@ void ProjectTreeView::slotNeverUpload()
       url.adjustPath(+1);
     if (m_projectFiles->contains(url) || url == m_projectBaseURL)
     {
-       emit changeUploadtqStatus(url, ProjectURL::NeverUpload);
+       emit changeUploadStatus(url, ProjectURL::NeverUpload);
     }
 }
 
@@ -555,7 +555,7 @@ void ProjectTreeView::slotConfirmUpload()
       url.adjustPath(+1);
     if (m_projectFiles->contains(url) || url == m_projectBaseURL)
     {
-       emit changeUploadtqStatus(url, ProjectURL::ConfirmUpload);
+       emit changeUploadStatus(url, ProjectURL::ConfirmUpload);
     }
 }
 
@@ -573,7 +573,7 @@ void ProjectTreeView::slotUploadMenuAboutToShow()
     ProjectURL *proUrl = m_projectFiles->find( url );
     if (proUrl)
     {
-        switch (proUrl->uploadtqStatus)
+        switch (proUrl->uploadStatus)
         {
             case ProjectURL::NeverUpload:
                {
@@ -595,7 +595,7 @@ void ProjectTreeView::slotUploadMenuAboutToShow()
     }
 }
 
-void ProjectTreeView::slotChangeDocumentFoldertqStatus()
+void ProjectTreeView::slotChangeDocumentFolderStatus()
 {
     KFileTreeViewItem *kftvi = currentKFileTreeViewItem();
     if (! kftvi)
@@ -606,14 +606,14 @@ void ProjectTreeView::slotChangeDocumentFoldertqStatus()
     if (!m_documentFolderList.contains(currentURL()))
     {
       m_documentFolderList.append(currentURL());
-      emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload);
-      emit changeDocumentFoldertqStatus(url, true);
+      emit changeUploadStatus(url, ProjectURL::AlwaysUpload);
+      emit changeDocumentFolderStatus(url, true);
     } else
     {
       m_documentFolderList.remove(currentURL());
-      emit changeUploadtqStatus(url, false);
+      emit changeUploadStatus(url, false);
     }
-    currentItem()->tqrepaint();
+    currentItem()->repaint();
 }
 
 bool ProjectTreeView::isDocumentFolder(const KURL &url)
diff --git a/quanta/treeviews/projecttreeview.h b/quanta/treeviews/projecttreeview.h
index 1e290328..b5dfa5a5 100644
--- a/quanta/treeviews/projecttreeview.h
+++ b/quanta/treeviews/projecttreeview.h
@@ -83,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 slotGetTreetqStatus(TQStringList *folderToOpen)
+  void slotGetTreeStatus(TQStringList *folderToOpen)
   {
     m_projectDir->addOpenFolder(folderToOpen);
   }
@@ -107,8 +107,8 @@ signals: // Signals
   void loadToolbarFile(const KURL&);
   void uploadProject();
   void changeFileDescription(const KURL& url, const TQString& desc);
-  void changeUploadtqStatus(const KURL& url, int status);
-  void changeDocumentFoldertqStatus(const KURL& url, bool status);
+  void changeUploadStatus(const KURL& url, int status);
+  void changeDocumentFolderStatus(const KURL& url, bool status);
   void reloadProject();
 
 private:
@@ -170,7 +170,7 @@ private slots: // Private slots
   void slotNeverUpload();
   void slotConfirmUpload();
   void slotUploadMenuAboutToShow();
-  void slotChangeDocumentFoldertqStatus();
+  void slotChangeDocumentFolderStatus();
 };
 
 #endif
diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui
index 109caf2f..d70a6f6e 100644
--- a/quanta/treeviews/quantapropertiespage.ui
+++ b/quanta/treeviews/quantapropertiespage.ui
@@ -29,7 +29,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>300</width>
             <height>400</height>
@@ -86,7 +86,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>92</width>
                                 <height>20</height>
@@ -161,7 +161,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>93</width>
                                 <height>20</height>
@@ -207,7 +207,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp
index eb64dd0b..d7b5b3cc 100644
--- a/quanta/treeviews/scripttreeview.cpp
+++ b/quanta/treeviews/scripttreeview.cpp
@@ -36,7 +36,7 @@
 #include <tqlineedit.h>
 #include <tqregexp.h>
 #include <tqstringlist.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 //other includes
 #include <libxml/xmlmemory.h>
diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp
index 1618d588..ad2309da 100644
--- a/quanta/treeviews/servertreeview.cpp
+++ b/quanta/treeviews/servertreeview.cpp
@@ -188,7 +188,7 @@ void ServerTreeView::slotReloadTree( ProjectList *fileList, bool buildNewTree, c
   TQListViewItemIterator iter(this);
   for ( ; iter.current(); ++iter )
   {
-    iter.current()->tqrepaint();
+    iter.current()->repaint();
   }
 }
 
diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp
index e897d14c..0325645e 100644
--- a/quanta/treeviews/structtreetag.cpp
+++ b/quanta/treeviews/structtreetag.cpp
@@ -116,7 +116,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString
                 {
                   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").tqarg(line + 1).tqarg(qTagName).tqarg(parentTagName));
+                  parentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").arg(line + 1).arg(qTagName).arg(parentTagName));
                 }
                 TQString nextTagName;
                 if (node->next)
@@ -129,12 +129,12 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString
                     (!node->next || ( !node->getClosingNode()))  )
                 {
                   node->tag->write()->setErrorMark(line);
-                  parentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName));
+                  parentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").arg(line + 1).arg(col + 1).arg(qTagName));
                 } else
                 if (!parentTQTag && node->tag->name.upper() != "!DOCTYPE")
                 {
                   node->tag->write()->setErrorMark(line);
-                  parentTree->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));
+                  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));
                 }
               }
               break;
@@ -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.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName));
+                  parentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").arg(line + 1).arg(col + 1).arg(qTagName));
                 }
               }
               title = tag->tagStr().left(70).stripWhiteSpace();
diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp
index 24f48174..5cfe5dc9 100644
--- a/quanta/treeviews/structtreeview.cpp
+++ b/quanta/treeviews/structtreeview.cpp
@@ -376,7 +376,7 @@ void StructTreeView::deleteList(bool groupOnly)
   groupsCount = 0;
 }
 
-/** tqrepaint document structure */
+/** repaint document structure */
 void StructTreeView::slotReparse(Document *w, Node* node, int openLevel, bool groupOnly)
 {
   timer->restart();
@@ -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>").tqarg(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>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
   }
 }
 
diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h
index 66c6b68e..2087f3fc 100644
--- a/quanta/treeviews/structtreeview.h
+++ b/quanta/treeviews/structtreeview.h
@@ -72,7 +72,7 @@ public:
   bool useOpenLevelSetting;
 
 public slots: // Public slots
-  /** tqrepaint document structure */
+  /** repaint 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 * );
diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp
index 50e4825e..776ac366 100644
--- a/quanta/treeviews/tagattributeitems.cpp
+++ b/quanta/treeviews/tagattributeitems.cpp
@@ -81,11 +81,11 @@ ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* parent)
 {
   m_listView = listView;
   comboBox = new TQComboBox(false, m_listView->viewport() );
-  TQRect r = m_listView->tqitemRect( this );
+  TQRect r = m_listView->itemRect( this );
   if ( !r.size().isValid() )
   {
     m_listView->ensureItemVisible( this );
-    r = m_listView->tqitemRect( this );
+    r = m_listView->itemRect( this );
   }
   r.setX( m_listView->header()->sectionPos( 0 ) + 20);
   r.setWidth( m_listView->header()->sectionSize( 0 ) - 20);
@@ -262,11 +262,11 @@ void AttributeItem::hideEditor(int column)
 
 void AttributeItem::placeEditor( TQWidget *w, int column)
 {
-  TQRect r = m_listView->tqitemRect( this );
+  TQRect r = m_listView->itemRect( this );
   if ( !r.size().isValid() )
   {
     m_listView->ensureItemVisible( this );
-    r = m_listView->tqitemRect( this );
+    r = m_listView->itemRect( this );
   }
   if(column == 1)
   {
diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp
index 0ef63151..4d49c841 100644
--- a/quanta/treeviews/tagattributetree.cpp
+++ b/quanta/treeviews/tagattributetree.cpp
@@ -18,7 +18,7 @@
 #include <tqtimer.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 
 //kde includes
@@ -458,11 +458,11 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char
   widgetLayout = new TQGridLayout( this, 1, 1, 11, 6, "MainLayout");
 
   attrTree = new TagAttributeTree(this, "TagAttributeTree");
-  attrTree->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
+  attrTree->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
   widgetLayout->addMultiCellWidget( attrTree, 1, 1, 0, 3 );
 
   nodeName = new TQLabel(this, i18n( "Node Name" ).ascii());
-  nodeName->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed, 0, 0, nodeName->sizePolicy().hasHeightForWidth() ) );
+  nodeName->setSizePolicy( 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 tqchildren."));
+  TQToolTip::add(deleteAll, i18n("Delete the current tag and all its children."));
 
   widgetLayout->addWidget( deleteTag, 0, 2 );
   widgetLayout->addWidget( deleteAll, 0, 3 );
@@ -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>").tqarg(curNode->tag->name);
+      TQString s = i18n("Current tag: <b>%1</b>").arg(curNode->tag->name);
       nodeName->setText(KStringHandler::rPixelSqueeze(s, nodeName->fontMetrics(), attrTree->width()- 50));
     }
     else if(curNode->tag->type == Tag::Text)
diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui
index d08f6b28..a8cb7705 100644
--- a/quanta/treeviews/templatedirform.ui
+++ b/quanta/treeviews/templatedirform.ui
@@ -65,7 +65,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -81,7 +81,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>38</width>
                             <height>20</height>
@@ -109,7 +109,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>25</width>
                             <height>20</height>
@@ -134,7 +134,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>38</width>
                             <height>20</height>
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index 98fc5048..c26dc395 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -21,13 +21,13 @@
 // QT includes
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqdir.h>
 #include <tqpixmap.h>
 #include <tqheader.h>
 #include <tqpoint.h>
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
 #include <tqregexp.h>
 #include <tqlabel.h>
 #include <tqmap.h>
@@ -386,7 +386,7 @@ void TemplatesTreeView::slotNewDir()
     createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (nothing)"));
    } else
    {
-     createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType]));
+     createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (%1)").arg(typeToi18n[m_dirInfo.mimeType]));
    }
    if (createDirDlg->exec())
    {
@@ -404,7 +404,7 @@ 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.").tqarg(startDir));
+                   Maybe you do not have permission to write in the %1 folder.").arg(startDir));
       return;
    }
    if (! createDirDlg->parentAttr->isChecked())
@@ -467,13 +467,13 @@ void TemplatesTreeView::contentsDropEvent(TQDropEvent *e)
         bool proceed = true;
         if (QExtFileInfo::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>").tqarg(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>").arg(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>").tqarg(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>").arg(url.prettyURL(0, KURL::StripFileProtocol)));
           }
         }
         delete tempFile;
@@ -619,7 +619,7 @@ void TemplatesTreeView::slotProperties()
     m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (nothing)"));
    } else
    {
-    m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType]));
+    m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (%1)").arg(typeToi18n[m_parentDirInfo.mimeType]));
    }
    m_quantaProperties->preTextEdit->setText(m_dirInfo.preText);
    m_quantaProperties->postTextEdit->setText(m_dirInfo.postText);
@@ -846,7 +846,7 @@ void TemplatesTreeView::slotPaste()
 {
   if (currentItem())
   {
-    TQClipboard *cb = TQApplication::tqclipboard();
+    TQClipboard *cb = TQApplication::clipboard();
     KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) );
 
     KURL url;
@@ -873,9 +873,9 @@ void TemplatesTreeView::slotDelete()
     KURL url = currentURL();
     TQString msg;
     if ( currentKFileTreeViewItem()->isDir() )
-      msg = i18n("Do you really want to delete folder \n%1 ?\n").tqarg(url.path());
+      msg = i18n("Do you really want to delete folder \n%1 ?\n").arg(url.path());
     else
-      msg = i18n("Do you really want to delete file \n%1 ?\n").tqarg(url.path());
+      msg = i18n("Do you really want to delete file \n%1 ?\n").arg(url.path());
 
     if ( KMessageBox::warningContinueCancel(this, msg, TQString(), KStdGuiItem::del()) == KMessageBox::Continue )
     {
@@ -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>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)).tqarg(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>").arg(url.prettyURL(0, KURL::StripFileProtocol)).arg(targetURL.prettyURL(0, KURL::StripFileProtocol)));
    }
 }
 
diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp
index c4c40197..9c055424 100644
--- a/quanta/treeviews/uploadtreefile.cpp
+++ b/quanta/treeviews/uploadtreefile.cpp
@@ -28,7 +28,7 @@
 #include "resource.h"
 
 UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem)
-    : KListViewItem( parent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString())
+    : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString())
 {
   m_url = a_url;
   isDir = false;
@@ -41,7 +41,7 @@ UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, con
 }
 
 UploadTreeFile::UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem)
-    : KListViewItem( parent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString())
+    : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString())
 {
   m_url = a_url;
   isDir = false;
diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp
index 8f5457e2..259b81dc 100644
--- a/quanta/treeviews/uploadtreeview.cpp
+++ b/quanta/treeviews/uploadtreeview.cpp
@@ -56,8 +56,8 @@ int UploadTreeView::checkboxTree( TQListViewItem *it )
 
   TQListViewItem *itIter = it ? it->firstChild() : firstChild();
 
-  // 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".
+  // 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".
 
   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 tqchildren exist.
+          // All children exist.
           itF->setWhichPixmap( "check" );
           itF->setSelected( true );
         }
         else if (hadCheckFlags == 1) {
-          // No tqchildren exist.
+          // No children exist.
           itF->setWhichPixmap( "check_clear" );
           itF->setSelected( false );
         }
         else {
-          // Some tqchildren exist.
+          // Some children 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 tqchildren"
+          // Turn off "no children"
           if ( bitFlags % 2 == 1 ) bitFlags -= 1;
         }
         else
         {
           itF->setWhichPixmap("check_clear");
-          // Turn off "all tqchildren".
+          // Turn off "all children".
           if (bitFlags >> 1 == 1) bitFlags -= 2;
         }
 
@@ -162,17 +162,17 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it )
   if ( itF )
   {
     if (hadCheckFlags == 2) {
-      // All tqchildren exist.
+      // All children exist.
       itF->setWhichPixmap( "check" );
       itF->setSelected( true );
     }
     else if (hadCheckFlags == 1) {
-      // No tqchildren exist.
+      // No children exist.
       itF->setWhichPixmap( "check_clear" );
       itF->setSelected( false );
     }
     else {
-      // Some tqchildren exist.
+      // Some children exist.
       itF->setWhichPixmap( "check_grey" );
       itF->setSelected( true );
     }
@@ -199,7 +199,7 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it )
   {
     bool hasSelected = false;
     bool allSelected = true;
-    //check if the item has any tqchildren's selected
+    //check if the item has any children's selected
     TQListViewItemIterator iter(itF->firstChild());
     while ( iter.current() && iter.current() != itF->nextSibling())
     {
diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp
index b4d43f48..81db90c2 100644
--- a/quanta/utility/qpevents.cpp
+++ b/quanta/utility/qpevents.cpp
@@ -17,7 +17,7 @@
 //qt includes
 #include <tqdatetime.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 //kde includes
 #include <kapplication.h>
@@ -85,11 +85,11 @@ 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>").tqarg(ev.action).tqarg(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>").arg(ev.action).arg(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>").tqarg(ev.action).tqarg(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>").arg(ev.action).arg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about external actions") == KMessageBox::Cancel)
           return;
       }
       KURL url = KURL::fromPathOrURL(argument1);
@@ -221,7 +221,7 @@ 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>").tqarg(name), i18n("Event Handling Error"));
+    KMessageBox::sorry(0L, i18n("<qt>Unsupported event <b>%1</b>.</qt>").arg(name), i18n("Event Handling Error"));
 }
 
 bool QPEvents::handleEvent(const EventAction& ev)
@@ -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::tqcurrentDateTime().toString(Qt::ISODate) + ": ";
+        TQString s = TQDateTime::currentDateTime().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>.").tqarg(url.path()));
+        KMessageBox::sorry(0L, i18n("<qt>Logging failed. Check that you have write access to <i>%1</i>.").arg(url.path()));
         return false;
       }
     } else
-      KMessageBox::sorry(0L, i18n("<qt>Unsupported internal event action : <b>%1</b>.</qt>").tqarg(ev.action));
+      KMessageBox::sorry(0L, i18n("<qt>Unsupported internal event action : <b>%1</b>.</qt>").arg(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>").tqarg(name), i18n("Action Execution Error"));
+            KMessageBox::sorry(0L, i18n("<qt>The <b>%1</b> script action was not found on your system.</qt>").arg(name), i18n("Action Execution Error"));
       }  else
       KMessageBox::sorry(0L, i18n("Unsupported external event action."));
   } else
diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp
index 3208a874..e5329b8a 100644
--- a/quanta/utility/quantabookmarks.cpp
+++ b/quanta/utility/quantabookmarks.cpp
@@ -196,7 +196,7 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse
         }
   
         menu.insertItem(
-            TQString("%1 - \"%2\"").tqarg( (*it)->line+1 ).tqarg( bText ),
+            TQString("%1 - \"%2\"").arg( (*it)->line+1 ).arg( 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\"").tqarg( next->line + 1 )
-            .tqarg( KStringHandler::rsqueeze( doc->editIf->textLine( next->line ), 24 ) ) );
+        m_goNext->setText( i18n("&Next: %1 - \"%2\"").arg( next->line + 1 )
+            .arg( KStringHandler::rsqueeze( doc->editIf->textLine( next->line ), 24 ) ) );
         m_goNext->plug( &menu, idx );
         idx++;
       }
       if ( prev )
       {
-        m_goPrevious->setText( i18n("&Previous: %1 - \"%2\"").tqarg(prev->line + 1 )
-            .tqarg( KStringHandler::rsqueeze( doc->editIf->textLine( prev->line ), 24 ) ) );
+        m_goPrevious->setText( i18n("&Previous: %1 - \"%2\"").arg(prev->line + 1 )
+            .arg( KStringHandler::rsqueeze( doc->editIf->textLine( prev->line ), 24 ) ) );
         m_goPrevious->plug( &menu, idx );
         idx++;
       }
diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp
index e50e55da..7d86f59e 100644
--- a/quanta/utility/quantacommon.cpp
+++ b/quanta/utility/quantacommon.cpp
@@ -23,7 +23,7 @@
 #include <tqdir.h>
 #include <tqdom.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqwidget.h>
 
 //kde includes
@@ -50,7 +50,7 @@
 #include <kstringhandler.h>
 #include <tqwhatsthis.h>
 #include <tqtimer.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqdatastream.h>
 
 #include "qextfileinfo.h"
@@ -382,8 +382,8 @@ TQString QuantaCommon::qUrl(const KURL &url)
 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>")
-                             .tqarg(url.prettyURL(0, KURL::StripFileProtocol))
-                             .tqarg(url.protocol()+"://"+url.user()+"@"+url.host()));}
+                             .arg(url.prettyURL(0, KURL::StripFileProtocol))
+                             .arg(url.protocol()+"://"+url.user()+"@"+url.host()));}
 
 /**
 Adds the backslash before the special chars (like ?, *, . ) so the returned
@@ -596,7 +596,7 @@ DCOPReply QuantaCommon::callDCOPMethod(const TQString& interface, const TQString
   if (!kapp->inherits("KUniqueApplication"))
   {
     pid_t pid = ::getpid();
-    app += TQString("-%1").tqarg(pid);
+    app += TQString("-%1").arg(pid);
   }
   DCOPRef quantaRef(app.utf8(), interface.utf8());
   DCOPReply reply;
@@ -707,7 +707,7 @@ bool QuantaCommon::checkOverwrite(const KURL& url, TQWidget *window)
   if (QExtFileInfo::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>" ).tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), i18n("Overwrite")) == KMessageBox::Cancel)
+            i18n( "<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>" ).arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), i18n("Overwrite")) == KMessageBox::Cancel)
             result = false;
   }
 
@@ -746,8 +746,8 @@ TQString QuantaCommon::encodedChar(uint code)
 {
    
   if (replacementMap.contains(code))
-    return TQString("%1;").tqarg(replacementMap[code]);
+    return TQString("%1;").arg(replacementMap[code]);
   else
-    return TQString("&#%1;").tqarg(code);
+    return TQString("&#%1;").arg(code);
 }
 
diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp
index 69ddd0d5..375f6f6d 100644
--- a/quanta/utility/quantanetaccess.cpp
+++ b/quanta/utility/quantanetaccess.cpp
@@ -182,7 +182,7 @@ void QuantaNetAccess::checkProjectInsert(const KURL& target, TQWidget* window, b
     {
       TQString nice = QExtFileInfo::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>").tqarg(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>").arg(nice), i18n("Add to Project"), KStdGuiItem::add(), i18n("Do Not Add"), "AddToProject") )
       {
         return;
       }
@@ -207,7 +207,7 @@ bool QuantaNetAccess::checkProjectRemove(const KURL& src, TQWidget* window, bool
     {
       TQString nice = QExtFileInfo::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>").tqarg(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>").arg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") )
       {
         return false;
       }
@@ -230,7 +230,7 @@ bool QuantaNetAccess::checkProjectDel(const KURL& src, TQWidget* window, bool co
       {
         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>").tqarg(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>").arg(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>").tqarg(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>").arg(nice), i18n("Delete File or Folder"), KStdGuiItem::del(), "DeleteFileOrFolder") );
   }
   return true;
 }
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index f782ea9e..1db14cf1 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -338,10 +338,10 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto
             pid_t pid = ::getpid();
             if (kapp->inherits("KUniqueApplication"))
             {
-                command.replace("%pid", TQString("unique %1").tqarg(pid));
+                command.replace("%pid", TQString("unique %1").arg(pid));
             } else
             {
-                command.replace("%pid", TQString("%1").tqarg(pid));
+                command.replace("%pid", TQString("%1").arg(pid));
             }
             TQString buffer;
             TQString inputType = script.attribute("input","none");
@@ -461,7 +461,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto
                 if (proc->start(KProcess::NotifyOnExit, KProcess::All))
                 {
                     emit clearMessages();
-                    emit showMessage(i18n("The \"%1\" script started.\n").tqarg(actionText()), false);
+                    emit showMessage(i18n("The \"%1\" script started.\n").arg(actionText()), false);
                     if (!m_useInputFile)
                     {
                         if ( inputType == "current" || inputType == "selected" )
@@ -472,7 +472,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto
                     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>").tqarg(command + " " + args).tqarg(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>").arg(command + " " + args).arg(command), i18n("Script Not Found"));
                     ViewManager::ref()->activeView()->setFocus();
                     if (loopStarted)
                     {
@@ -592,10 +592,10 @@ bool TagAction::slotActionActivated()
     pid_t pid = ::getpid();
     if (kapp->inherits("KUniqueApplication"))
     {
-      command.replace("%pid", TQString("unique %1").tqarg(pid));
+      command.replace("%pid", TQString("unique %1").arg(pid));
     } else
     {
-      command.replace("%pid", TQString("%1").tqarg(pid));
+      command.replace("%pid", TQString("%1").arg(pid));
     }
     TQString buffer;
     TQString inputType = script.attribute("input","none");
@@ -715,7 +715,7 @@ bool TagAction::slotActionActivated()
     if (proc->start(KProcess::NotifyOnExit, KProcess::All))
     {
       emit clearMessages();
-      emit showMessage(i18n("The \"%1\" script started.\n").tqarg(actionText()), false);
+      emit showMessage(i18n("The \"%1\" script started.\n").arg(actionText()), false);
       if (!m_useInputFile)
       {
         if ( inputType == "current" || inputType == "selected" )
@@ -726,7 +726,7 @@ 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>").tqarg(command + " " + args).tqarg(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>").arg(command + " " + args).arg(command), i18n("Script Not Found"));
       ViewManager::ref()->activeView()->setFocus();
       if (loopStarted)
       {
@@ -787,7 +787,7 @@ void TagAction::slotGetScriptOutput( KProcess *, char *buffer, int buflen )
     if ( firstOutput )
     {
       emit showMessagesView();
-      emit showMessage(i18n("The \"%1\" script output:\n").tqarg(actionText()), false);
+      emit showMessage(i18n("The \"%1\" script output:\n").arg(actionText()), false);
     }
     emit showMessage(text, true);
   } else
@@ -847,7 +847,7 @@ void TagAction::slotGetScriptError( KProcess *, char *buffer, int buflen )
     if ( firstError )
     {
       emit showMessagesView();
-      emit showMessage(i18n("The \"%1\" script output:\n").tqarg(actionText()), false);
+      emit showMessage(i18n("The \"%1\" script output:\n").arg(actionText()), false);
     }
     emit showMessage(text, true);
   }
@@ -970,7 +970,7 @@ void TagAction::slotProcessExited(KProcess *process)
     tqApp->exit_loop();
     loopStarted = false;
   }
-  emit showMessage(i18n("The \"%1\" script has exited.").tqarg(actionText()), false);
+  emit showMessage(i18n("The \"%1\" script has exited.").arg(actionText()), false);
   delete process;
 }
 
@@ -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>").tqarg(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>").arg(actionText()), i18n("Action Not Responding"), i18n("Terminate"), i18n("Keep Running")) == KMessageBox::Yes))
   {
     if (::kill(-proc->pid(), SIGTERM))
     {
diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp
index 5331413a..b3e58d56 100644
--- a/quanta/utility/toolbartabwidget.cpp
+++ b/quanta/utility/toolbartabwidget.cpp
@@ -14,7 +14,7 @@
 
 //qt includes
 #include <tqevent.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqpoint.h>
 #include <tqtabbar.h>
@@ -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* tqchildrenList = queryList("KToolBarButton");
-      for (uint i = 0; i < tqchildrenList->count(); i++)
+      TQObjectList* childrenList = queryList("KToolBarButton");
+      for (uint i = 0; i < childrenList->count(); i++)
       {
-        KToolBarButton *w = static_cast<KToolBarButton*>(TQT_TQWIDGET(tqchildrenList->at(i)));
+        KToolBarButton *w = static_cast<KToolBarButton*>(TQT_TQWIDGET(childrenList->at(i)));
         TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos());
         TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height());
         if (TQRect(p1, p2).contains(p))
         {
           currentActionName = w->textLabel();
           TQString actionName = currentActionName;
-          m_popupMenu->insertItem(i18n("Remove Action - %1").tqarg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction()));
-          m_popupMenu->insertItem(i18n("Edit Action - %1").tqarg(actionName), this, TQT_SLOT(slotEditAction()));
+          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()));
           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>").tqarg(currentActionName),TQString(),KStdGuiItem::del()) == KMessageBox::Continue )
+    if ( KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure you want to remove the <b>%1</b> action?</qt>").arg(currentActionName),TQString(),KStdGuiItem::del()) == KMessageBox::Continue )
   {
     emit removeAction(m_toolbarTab->tabUnderMouse, currentActionName);
   }