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

467 files changed, 2671 insertions, 2671 deletions

diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp
index 73c41d12..a099397e 100644
--- a/cervisia/addremovedlg.cpp
+++ b/cervisia/addremovedlg.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfileinfo.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqstringlist.h>
 #include <kapplication.h>
@@ -40,18 +40,18 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     TQLabel *textlabel = new TQLabel
         ( (action==Add)?       i18n("Add the following files to the repository:") :
           (action==AddBinary)? i18n("Add the following binary files to the repository:") :
                                i18n("Remove the following files from the repository:") ,
           mainWidget );
-    tqlayout->addWidget(textlabel);
+    layout->addWidget(textlabel);
 
     m_listBox = new TQListBox(mainWidget);
     m_listBox->setSelectionMode(TQListBox::NoSelection);
-    tqlayout->addWidget(m_listBox, 5);
+    layout->addWidget(m_listBox, 5);
 
     // Add warning message to dialog when user wants to remove a file
     if (action==Remove)
@@ -69,9 +69,9 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char
                                               "your local working copy."), mainWidget);
         warningLayout->addWidget(warningText);
 
-        tqlayout->addSpacing(5);
-        tqlayout->addLayout(warningLayout);
-        tqlayout->addSpacing(5);
+        layout->addSpacing(5);
+        layout->addLayout(warningLayout);
+        layout->addSpacing(5);
     }
 
     if( action == Remove )
diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp
index e451fca0..187e0e16 100644
--- a/cervisia/addrepositorydlg.cpp
+++ b/cervisia/addrepositorydlg.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kconfig.h>
 #include <klineedit.h>
@@ -40,10 +40,10 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo,
 {
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout* layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     TQLabel* repo_label = new TQLabel(i18n("&Repository:"), mainWidget);
-    tqlayout->addWidget(repo_label);
+    layout->addWidget(repo_label);
     
     repo_edit = new KLineEdit(mainWidget);
     repo_edit->setFocus();
@@ -53,33 +53,33 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo,
         repo_edit->setText(repo);
         repo_edit->setEnabled(false);
     }
-    tqlayout->addWidget(repo_edit);
+    layout->addWidget(repo_edit);
     
     TQLabel* rsh_label = new TQLabel(i18n("Use remote &shell (only for :ext: repositories):"), mainWidget);
-    tqlayout->addWidget(rsh_label);
+    layout->addWidget(rsh_label);
     
     rsh_edit = new KLineEdit(mainWidget);
     rsh_label->setBuddy(rsh_edit);
-    tqlayout->addWidget(rsh_edit);
+    layout->addWidget(rsh_edit);
     
     TQLabel* server_label = new TQLabel(i18n("Invoke this program on the server side:"),
                                       mainWidget);
-    tqlayout->addWidget(server_label);
+    layout->addWidget(server_label);
     
     server_edit = new KLineEdit(mainWidget);
     server_label->setBuddy(server_edit);
-    tqlayout->addWidget(server_edit);
+    layout->addWidget(server_edit);
 
     TQHBox* compressionBox = new TQHBox(mainWidget);
     m_useDifferentCompression = new TQCheckBox(i18n("Use different &compression level:"), compressionBox);
     
     m_compressionLevel = new KIntNumInput(compressionBox);
     m_compressionLevel->setRange(0, 9, 1, false);
-    tqlayout->addWidget(compressionBox);
+    layout->addWidget(compressionBox);
     
     m_retrieveCvsignoreFile = new TQCheckBox(i18n("Download cvsignore file from "
                                             "server"), mainWidget);
-    tqlayout->addWidget(m_retrieveCvsignoreFile);
+    layout->addWidget(m_retrieveCvsignoreFile);
 
     connect( repo_edit, TQT_SIGNAL(textChanged(const TQString&)),
              this, TQT_SLOT(repoChanged()) );
diff --git a/cervisia/annotatectl.cpp b/cervisia/annotatectl.cpp
index 09d0cef0..1f220342 100644
--- a/cervisia/annotatectl.cpp
+++ b/cervisia/annotatectl.cpp
@@ -79,7 +79,7 @@ void AnnotateController::showDialog(const TQString& fileName, const TQString& re
     // hide progress dialog
     delete d->progress; d->progress = 0;
 
-    d->dialog->setCaption(i18n("CVS Annotate: %1").tqarg(fileName));
+    d->dialog->setCaption(i18n("CVS Annotate: %1").arg(fileName));
     d->dialog->show();
 }
 
diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp
index f3d80605..6d99c573 100644
--- a/cervisia/annotateview.cpp
+++ b/cervisia/annotateview.cpp
@@ -175,7 +175,7 @@ void AnnotateView::addLine(const LogInfo& logInfo, const TQString& content,
 }
 
 
-TQSize AnnotateView::tqsizeHint() const
+TQSize AnnotateView::sizeHint() const
 {
     TQFontMetrics fm(fontMetrics());
     return TQSize(100 * fm.width("0"), 10 * fm.lineSpacing());
@@ -191,7 +191,7 @@ void AnnotateView::slotQueryToolTip(const TQPoint& viewportPos,
         const int column(header()->sectionAt(viewportPos.x()));
         if ((column == AnnotateViewItem::AuthorColumn) && !item->m_logInfo.m_author.isNull())
         {
-            viewportRect = tqitemRect(item);
+            viewportRect = itemRect(item);
             text = item->m_logInfo.createToolTipText(false);
         }
     }
diff --git a/cervisia/annotateview.h b/cervisia/annotateview.h
index e4c78b58..aa6d947b 100644
--- a/cervisia/annotateview.h
+++ b/cervisia/annotateview.h
@@ -46,7 +46,7 @@ public:
     void addLine(const Cervisia::LogInfo& logInfo, const TQString& content,
                  bool odd);
 
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
 
 private slots:
 
diff --git a/cervisia/cervisia.1.in b/cervisia/cervisia.1.in
index 3a0c720a..b60c2f3c 100644
--- a/cervisia/cervisia.1.in
+++ b/cervisia/cervisia.1.in
@@ -144,7 +144,7 @@ Cervisia \- Graphical CVS frontend
          [\ \fB\-\-nocrashhandler\fR\ ]
          [\ \fB\-\-waitforwm\fR\ ]
          [\ \fB\-\-style\fR\ \fIstyle\fR\ ]
-         [\ \fB\-\-tqgeometry\fR\ \fItqgeometry\fR\ ]
+         [\ \fB\-\-geometry\fR\ \fIgeometry\fR\ ]
          [\ \fB\-\-resolve\fR\ \fIfilename\fR\ ]
          [\ \fB\-\-log\fR\ \fIfilename\fR\ ]
          [\ \fB\-\-annotate\fR\ \fIfilename\fR\ ]
@@ -193,9 +193,9 @@ Waits for a \s-1WM_NET\s0 compatible windowmanager
 .IP "\fB\-\-style\fR \fIstyle\fR" 4
 .IX Item "--style style"
 Sets the application \s-1GUI\s0 style
-.IP "\fB\-\-tqgeometry\fR \fItqgeometry\fR" 4
-.IX Item "--tqgeometry tqgeometry"
-Sets the tqgeometry of the main window
+.IP "\fB\-\-geometry\fR \fIgeometry\fR" 4
+.IX Item "--geometry geometry"
+Sets the geometry of the main window
 .SH "FILES"
 .IX Header "FILES"
 \&\fI_KDECONFDIR_/cervisiarc\fR \- global configuration file
diff --git a/cervisia/cervisia.pod b/cervisia/cervisia.pod
index 75ea6b27..940ba8e0 100644
--- a/cervisia/cervisia.pod
+++ b/cervisia/cervisia.pod
@@ -14,7 +14,7 @@ B<cervisia>
          S<[ B<--nocrashhandler> ]>
          S<[ B<--waitforwm> ]>
          S<[ B<--style> I<style> ]>
-         S<[ B<--tqgeometry> I<tqgeometry> ]>
+         S<[ B<--geometry> I<geometry> ]>
          S<[ B<--resolve> I<filename> ]>
          S<[ B<--log> I<filename> ]>
          S<[ B<--annotate> I<filename> ]>
@@ -80,9 +80,9 @@ Waits for a WM_NET compatible windowmanager
 
 Sets the application GUI style
 
-=item B<--tqgeometry> I<tqgeometry>
+=item B<--geometry> I<geometry>
 
-Sets the tqgeometry of the main window
+Sets the geometry of the main window
 
 =head1 FILES
 
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 9087bacc..beebe356 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -22,7 +22,7 @@
 #include <tqmessagebox.h>
 #include <tqpushbutton.h>
 #include <tqpopupmenu.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtooltip.h>
 #include <kaboutdata.h>
 #include <kaction.h>
@@ -213,7 +213,7 @@ void CervisiaPart::slotSetupStatusBar()
 {
     // create the active filter indicator and add it to the statusbar
     filterLabel = new TQLabel("UR", m_statusBar->statusBar());
-    filterLabel->setFixedSize(filterLabel->tqsizeHint());
+    filterLabel->setFixedSize(filterLabel->sizeHint());
     filterLabel->setText("");
     TQToolTip::add(filterLabel,
                   i18n("F - All files are hidden, the tree shows only folders\n"
@@ -258,7 +258,7 @@ void CervisiaPart::setupActions()
     action->setWhatsThis( hint );
 
     action = new KAction( i18n("&Status"), "vcs_status", Key_F5,
-                          this, TQT_SLOT( slottqStatus() ),
+                          this, TQT_SLOT( slotStatus() ),
                           actionCollection(), "file_status" );
     hint = i18n("Updates the status (cvs -n update) of the selected files and folders");
     action->setToolTip( hint );
@@ -726,7 +726,7 @@ void CervisiaPart::aboutCervisia()
                           "GNU General Public License for more details.\n"
                           "See the ChangeLog file for a list of contributors."));
     TQMessageBox::about(0, i18n("About Cervisia"),
-                       aboutstr.tqarg(CERVISIA_VERSION).tqarg(TDE_VERSION_STRING));
+                       aboutstr.arg(CERVISIA_VERSION).arg(TDE_VERSION_STRING));
 }
 
 
@@ -856,7 +856,7 @@ void CervisiaPart::slotUpdate()
 }
 
 
-void CervisiaPart::slottqStatus()
+void CervisiaPart::slotStatus()
 {
     TQStringList list = update->multipleSelection();
     if (list.isEmpty())
@@ -1166,13 +1166,13 @@ void CervisiaPart::slotAnnotate()
 
 void CervisiaPart::slotDiffBase()
 {
-    showDiff(TQString::tqfromLatin1("BASE"));
+    showDiff(TQString::fromLatin1("BASE"));
 }
 
 
 void CervisiaPart::slotDiffHead()
 {
-    showDiff(TQString::tqfromLatin1("HEAD"));
+    showDiff(TQString::fromLatin1("HEAD"));
 }
 
 
@@ -1694,7 +1694,7 @@ void CervisiaPart::slotJobFinished()
     {
         KNotifyClient::event(widget()->parentWidget()->winId(), "cvs_commit_done",
                              i18n("A CVS commit to repository %1 is done")
-                             .tqarg(repository));
+                             .arg(repository));
         m_jobType = Unknown;
     }
 }
@@ -1764,7 +1764,7 @@ bool CervisiaPart::openSandbox(const TQString &dirname)
     if (dostatus)
     {
         update->setSelected(update->firstChild(), true);
-        slottqStatus();
+        slotStatus();
     }
 
     //load the recentCommits for this app from the KConfig app
diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h
index b802e8ad..7a3802fd 100644
--- a/cervisia/cervisiapart.h
+++ b/cervisia/cervisiapart.h
@@ -83,7 +83,7 @@ public slots:
 
     void slotOpen();
     void slotResolve();
-    void slottqStatus();
+    void slotStatus();
     void slotUpdate();
     void slotChangeLog();
     void slotCommit();
diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp
index 9d00a8e8..429becfd 100644
--- a/cervisia/changelogdlg.cpp
+++ b/cervisia/changelogdlg.cpp
@@ -22,7 +22,7 @@
 #include "changelogdlg.h"
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <kconfig.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
@@ -33,7 +33,7 @@
 
 static inline TQString DateStringISO8601()
 {
-    return TQDate::tqcurrentDate().toString(Qt::ISODate);
+    return TQDate::currentDate().toString(Qt::ISODate);
 }
 
 
diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp
index 9be04dd4..a5cb5689 100644
--- a/cervisia/checkoutdlg.cpp
+++ b/cervisia/checkoutdlg.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqdir.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <kprocess.h>
@@ -55,9 +55,9 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service,
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout* layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
-    TQGridLayout* grid = new TQGridLayout(tqlayout);
+    TQGridLayout* grid = new TQGridLayout(layout);
     grid->setColStretch(0, 1);
     grid->setColStretch(1, 20);
     for( int i = 0; i < ((action==Checkout)? 4 : 10); ++i )
@@ -66,7 +66,7 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service,
     repo_combo = new TQComboBox(true, mainWidget);
     repo_combo->setFocus();
     // make sure combobox is smaller than the screen
-    repo_combo->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+    repo_combo->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
     grid->addWidget(repo_combo, 0, 1);
 
     TQLabel* repo_label = new TQLabel(repo_combo, i18n("&Repository:"), mainWidget);
diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp
index a2e587f3..1861fd6c 100644
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 #include <klistview.h>
 #include <kconfig.h>
@@ -61,10 +61,10 @@ CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service,
 {
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     TQLabel *textlabel = new TQLabel( i18n("Commit the following &files:"), mainWidget );
-    tqlayout->addWidget(textlabel);
+    layout->addWidget(textlabel);
 
     m_fileList = new KListView(mainWidget);
     m_fileList->addColumn("");
@@ -75,30 +75,30 @@ CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service,
              this, TQT_SLOT(fileSelected(TQListViewItem*)));
     connect( m_fileList, TQT_SIGNAL(selectionChanged()),
              this, TQT_SLOT(fileHighlighted()) );
-    tqlayout->addWidget(m_fileList, 5);
+    layout->addWidget(m_fileList, 5);
 
     TQLabel *archivelabel = new TQLabel(i18n("Older &messages:"), mainWidget);
-    tqlayout->addWidget(archivelabel);
+    layout->addWidget(archivelabel);
 
     combo = new TQComboBox(mainWidget);
     archivelabel->setBuddy(combo);
     connect( combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboActivated(int)) );
     // make sure that combobox is smaller than the screen
-    combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
-    tqlayout->addWidget(combo);
+    combo->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+    layout->addWidget(combo);
 
     TQLabel *messagelabel = new TQLabel(i18n("&Log message:"), mainWidget);
-    tqlayout->addWidget(messagelabel);
+    layout->addWidget(messagelabel);
 
     edit = new Cervisia::LogMessageEdit(mainWidget);
     messagelabel->setBuddy(edit);
     edit->setCheckSpellingEnabled(true);
     edit->setFocus();
     edit->setMinimumSize(400, 100);
-    tqlayout->addWidget(edit, 10);
+    layout->addWidget(edit, 10);
 
     m_useTemplateChk = new TQCheckBox(i18n("Use log message &template"), mainWidget);
-    tqlayout->addWidget(m_useTemplateChk);
+    layout->addWidget(m_useTemplateChk);
     connect( m_useTemplateChk, TQT_SIGNAL(clicked()), this, TQT_SLOT(useTemplateClicked()) );
 
     checkForTemplateFile();
diff --git a/cervisia/cvsinitdlg.cpp b/cervisia/cvsinitdlg.cpp
index cf0b4641..904a1682 100644
--- a/cervisia/cvsinitdlg.cpp
+++ b/cervisia/cvsinitdlg.cpp
@@ -20,7 +20,7 @@
 #include "cvsinitdlg.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 #include <kfiledialog.h>
diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp
index 822a77ae..398c1c47 100644
--- a/cervisia/cvsservice/repository.cpp
+++ b/cervisia/cvsservice/repository.cpp
@@ -223,7 +223,7 @@ void Repository::Private::readConfig()
     //
     // In order to be able to read this group, we then have to manually add
     // the port number to it.
-    TQString repositoryGroup = TQString::tqfromLatin1("Repository-") + location;
+    TQString repositoryGroup = TQString::fromLatin1("Repository-") + location;
     if( !config->hasGroup(repositoryGroup) )
     {
         // find the position of the first path separator
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp
index 8d7ed8c8..4c8f666e 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -23,7 +23,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqkeycode.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
@@ -51,30 +51,30 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
-    TQGridLayout *pairtqlayout = new TQGridLayout(tqlayout);
-    pairtqlayout->setRowStretch(0, 0);
-    pairtqlayout->setRowStretch(1, 1);
-    pairtqlayout->setColStretch(1, 0);
-    pairtqlayout->addColSpacing(1, 16);
-    pairtqlayout->setColStretch(0, 10);
-    pairtqlayout->setColStretch(2, 10);
+    TQGridLayout *pairlayout = new TQGridLayout(layout);
+    pairlayout->setRowStretch(0, 0);
+    pairlayout->setRowStretch(1, 1);
+    pairlayout->setColStretch(1, 0);
+    pairlayout->addColSpacing(1, 16);
+    pairlayout->setColStretch(0, 10);
+    pairlayout->setColStretch(2, 10);
 
     revlabel1 = new TQLabel(mainWidget);
-    pairtqlayout->addWidget(revlabel1, 0, 0);
+    pairlayout->addWidget(revlabel1, 0, 0);
 
     revlabel2 = new TQLabel(mainWidget);
-    pairtqlayout->addWidget(revlabel2, 0, 2);
+    pairlayout->addWidget(revlabel2, 0, 2);
 
     diff1 = new DiffView(cfg, true, false, mainWidget);
     diff2 = new DiffView(cfg, true, true, mainWidget);
     DiffZoomWidget *zoom = new DiffZoomWidget(cfg, mainWidget);
     zoom->setDiffView(diff2);
 
-    pairtqlayout->addWidget(diff1, 1, 0);
-    pairtqlayout->addWidget(zoom,  1, 1);
-    pairtqlayout->addWidget(diff2, 1, 2);
+    pairlayout->addWidget(diff1, 1, 0);
+    pairlayout->addWidget(zoom,  1, 1);
+    pairlayout->addWidget(diff2, 1, 2);
 
     diff1->setPartner(diff2);
     diff2->setPartner(diff1);
@@ -91,25 +91,25 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo
 
     nofnlabel = new TQLabel(mainWidget);
     // avoids auto resize when the text is changed
-    nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").tqarg(10000)));
+    nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").arg(10000)));
 
-    backbutton = new TQPushButton(TQString::tqfromLatin1("&<<"), mainWidget);
+    backbutton = new TQPushButton(TQString::fromLatin1("&<<"), mainWidget);
     connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) );
 
-    forwbutton = new TQPushButton(TQString::tqfromLatin1("&>>"), mainWidget);
+    forwbutton = new TQPushButton(TQString::fromLatin1("&>>"), mainWidget);
     connect( forwbutton, TQT_SIGNAL(clicked()), TQT_SLOT(forwClicked()) );
 
     connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) );
 
-    TQBoxLayout *buttontqlayout = new TQHBoxLayout(tqlayout);
-    buttontqlayout->addWidget(syncbox, 0);
-    buttontqlayout->addStretch(4);
-    buttontqlayout->addWidget(itemscombo);
-    buttontqlayout->addStretch(1);
-    buttontqlayout->addWidget(nofnlabel);
-    buttontqlayout->addStretch(1);
-    buttontqlayout->addWidget(backbutton);
-    buttontqlayout->addWidget(forwbutton);
+    TQBoxLayout *buttonlayout = new TQHBoxLayout(layout);
+    buttonlayout->addWidget(syncbox, 0);
+    buttonlayout->addStretch(4);
+    buttonlayout->addWidget(itemscombo);
+    buttonlayout->addStretch(1);
+    buttonlayout->addWidget(nofnlabel);
+    buttonlayout->addStretch(1);
+    buttonlayout->addWidget(backbutton);
+    buttonlayout->addWidget(forwbutton);
 
     setHelp("diff");
 
@@ -189,18 +189,18 @@ static TQString regionAsString(int linenoA, int linecountA, int linenoB, int lin
     int lineendB = linenoB+linecountB-1;
     TQString res;
     if (linecountB == 0)
-        res = TQString("%1,%2d%3").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB-1);
+        res = TQString("%1,%2d%3").arg(linenoA).arg(lineendA).arg(linenoB-1);
     else if (linecountA == 0)
-        res = TQString("%1a%2,%3").tqarg(linenoA-1).tqarg(linenoB).tqarg(lineendB);
+        res = TQString("%1a%2,%3").arg(linenoA-1).arg(linenoB).arg(lineendB);
     else if (linenoA == lineendA)
         if (linenoB == lineendB)
-            res = TQString("%1c%2").tqarg(linenoA).tqarg(linenoB);
+            res = TQString("%1c%2").arg(linenoA).arg(linenoB);
         else
-            res = TQString("%1c%2,%3").tqarg(linenoA).tqarg(linenoB).tqarg(lineendB);
+            res = TQString("%1c%2,%3").arg(linenoA).arg(linenoB).arg(lineendB);
     else if (linenoB == lineendB)
-        res = TQString("%1,%2c%3").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB);
+        res = TQString("%1,%2c%3").arg(linenoA).arg(lineendA).arg(linenoB);
     else
-        res = TQString("%1,%2c%3,%4").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB).tqarg(lineendB);
+        res = TQString("%1,%2c%3,%4").arg(linenoA).arg(lineendA).arg(linenoB).arg(lineendB);
 
     return res;
 
@@ -222,7 +222,7 @@ bool DiffDialog::parseCvsDiff(CvsService_stub* service, const TQString& fileName
     TQStringList linesA, linesB;
     int linenoA, linenoB;
 
-    setCaption(i18n("CVS Diff: %1").tqarg(fileName));
+    setCaption(i18n("CVS Diff: %1").arg(fileName));
     revlabel1->setText( revA.isEmpty()?
                         i18n("Repository:")
                         : i18n("Revision ")+revA+":" );
@@ -408,9 +408,9 @@ void DiffDialog::updateNofN()
 {
     TQString str;
     if (markeditem >= 0)
-	str = i18n("%1 of %2").tqarg(markeditem+1).tqarg(items.count());
+	str = i18n("%1 of %2").arg(markeditem+1).arg(items.count());
     else
-	str = i18n("%1 differences").tqarg(items.count());
+	str = i18n("%1 differences").arg(items.count());
     nofnlabel->setText(str);
 
     itemscombo->setCurrentItem(markeditem==-2? 0 : markeditem+1);
@@ -443,8 +443,8 @@ void DiffDialog::updateHighlight(int newitem)
 	    diff1->setCenterLine(item->linenoA);
 	    diff2->setCenterLine(item->linenoB);
 	}
-    diff1->tqrepaint();
-    diff2->tqrepaint();
+    diff1->repaint();
+    diff2->repaint();
     updateNofN();
 }
 
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 554e6d3f..eacd7847 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -293,7 +293,7 @@ int DiffView::cellWidth(int col)
 }
 
 
-TQSize DiffView::tqsizeHint() const
+TQSize DiffView::sizeHint() const
 {
     TQFontMetrics fm(font());
     return TQSize( 4*fm.width("0123456789"), fm.lineSpacing()*8 );
@@ -391,7 +391,7 @@ void DiffView::wheelEvent(TQWheelEvent *e)
 DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *parent, const char *name)
     : TQFrame(parent, name)
 {
-    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
+    setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
 
     cfg.setGroup("Colors");
     TQColor defaultColor=TQColor(237, 190, 190);
@@ -415,9 +415,9 @@ void DiffZoomWidget::setDiffView(DiffView *view)
 }
 
 
-TQSize DiffZoomWidget::tqsizeHint() const
+TQSize DiffZoomWidget::sizeHint() const
 {
-    return TQSize(25, tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent, this));
+    return TQSize(25, tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent, this));
 }
 
 
@@ -426,7 +426,7 @@ bool DiffZoomWidget::eventFilter(TQObject *o, TQEvent *e)
     if (e->type() == TQEvent::Show
         || e->type() == TQEvent::Hide
         || e->type() == TQEvent::Resize)
-        tqrepaint();
+        repaint();
 
     return TQFrame::eventFilter(o, e);
 }
diff --git a/cervisia/diffview.h b/cervisia/diffview.h
index 2a2b998b..9bc57b06 100644
--- a/cervisia/diffview.h
+++ b/cervisia/diffview.h
@@ -74,7 +74,7 @@ public:
 
     virtual void setFont(const TQFont &font);
     virtual int cellWidth(int col);
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
     virtual void paintCell(TQPainter *p, int row, int col);
     virtual void wheelEvent(TQWheelEvent *);
     const TQScrollBar *scrollBar() const
@@ -112,7 +112,7 @@ public:
     ~DiffZoomWidget();
 
     void setDiffView(DiffView *view);
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
 protected:
     void paintEvent(TQPaintEvent *);
diff --git a/cervisia/entry.h b/cervisia/entry.h
index 2c0a1c98..f3705d35 100644
--- a/cervisia/entry.h
+++ b/cervisia/entry.h
@@ -43,7 +43,7 @@ struct Entry
     };
 
     /**
-     * Sets status to \a EntrytqStatus::Unknown and type to \a File.
+     * Sets status to \a EntryStatus::Unknown and type to \a File.
      */
     Entry();
 
@@ -60,7 +60,7 @@ struct Entry
     /**
      * The status of this entry.
      */
-    EntrytqStatus m_status;
+    EntryStatus m_status;
 
     /**
      * The revision of this entry.
diff --git a/cervisia/entry_status.cpp b/cervisia/entry_status.cpp
index c76c135c..00ff3b32 100644
--- a/cervisia/entry_status.cpp
+++ b/cervisia/entry_status.cpp
@@ -28,10 +28,10 @@ namespace Cervisia
 {
 
 
-TQString toString(EntrytqStatus entrytqStatus)
+TQString toString(EntryStatus entryStatus)
 {
     TQString result;
-    switch (entrytqStatus)
+    switch (entryStatus)
     {
     case LocallyModified:
         result = i18n("Locally Modified");
diff --git a/cervisia/entry_status.h b/cervisia/entry_status.h
index b1d6cf6f..aa964735 100644
--- a/cervisia/entry_status.h
+++ b/cervisia/entry_status.h
@@ -31,7 +31,7 @@ namespace Cervisia
 /**
  * All stati a an entry could have.
  */
-enum EntrytqStatus
+enum EntryStatus
 {
     LocallyModified,
     LocallyAdded,
@@ -51,11 +51,11 @@ enum EntrytqStatus
 /**
  * The entry status as translated string.
  *
- * @param entrytqStatus The entry status to translate.
+ * @param entryStatus The entry status to translate.
  *
  * @return The translated string.
  */
-TQString toString(EntrytqStatus entrytqStatus);
+TQString toString(EntryStatus entryStatus);
 
 
 } // namespace Cervisia
diff --git a/cervisia/entry_status_change.h b/cervisia/entry_status_change.h
index 7935cf1d..3518eed8 100644
--- a/cervisia/entry_status_change.h
+++ b/cervisia/entry_status_change.h
@@ -44,7 +44,7 @@ struct EntryStatusChange
     /**
      * The new status of the entry.
      */
-    EntrytqStatus m_status;
+    EntryStatus m_status;
 };
 
 
diff --git a/cervisia/globalignorelist.cpp b/cervisia/globalignorelist.cpp
index 4b5c8a47..b3834a42 100644
--- a/cervisia/globalignorelist.cpp
+++ b/cervisia/globalignorelist.cpp
@@ -81,7 +81,7 @@ void GlobalIgnoreList::addEntry(const TQString& entry)
         // Bug #89215:
         // Make sure '.' and '..' are always in the ignore list, so
         // UpdateDirItem::maybeScanDir() doesn't loop endlessly.
-        addEntriesFromString(TQString::tqfromLatin1(". .."));
+        addEntriesFromString(TQString::fromLatin1(". .."));
     }
 }
 
@@ -92,7 +92,7 @@ void GlobalIgnoreList::setup()
 .nse_depinfo #* .#* cvslog.* ,* CVS CVS.adm .del-* *.a *.olb *.o *.obj\
 *.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig *.rej *.exe _$* *$";
     
-    addEntriesFromString(TQString::tqfromLatin1(ignorestr));
+    addEntriesFromString(TQString::fromLatin1(ignorestr));
     addEntriesFromString(TQString::fromLocal8Bit(::getenv("CVSIGNORE")));
     addEntriesFromFile(TQDir::homeDirPath() + "/.cvsignore");  
     
diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp
index 1eb3b6ee..273dbc33 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -22,7 +22,7 @@
 
 #include <tqcheckbox.h>
 #include <tqdatetime.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqregexp.h>
 #include <kconfig.h>
@@ -145,7 +145,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
 {
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     listview = new KListView(mainWidget);
     listview->setSelectionMode(TQListView::NoSelection);
@@ -159,7 +159,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
     listview->addColumn(i18n("File"));
     listview->addColumn(i18n("Repo Path"));
     listview->setFocus();
-    tqlayout->addWidget(listview, 1);
+    layout->addWidget(listview, 1);
 
     commit_box = new TQCheckBox(i18n("Show c&ommit events"), mainWidget);
     commit_box->setChecked(true);
@@ -215,7 +215,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
     connect( dirname_edit, TQT_SIGNAL(returnPressed()),
              this, TQT_SLOT(choiceChanged()) );
 
-    TQGridLayout *grid = new TQGridLayout(tqlayout);
+    TQGridLayout *grid = new TQGridLayout(layout);
     grid->setColStretch(0, 1);
     grid->setColStretch(1, 0);
     grid->setColStretch(2, 4);
@@ -246,7 +246,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name)
     for (int i = 0; i < listview->columns(); ++i)
         listview->setColumnWidthMode(i, TQListView::Manual);
 
-    listview->restoreLayout(&partConfig, TQString::tqfromLatin1("HistoryListView"));
+    listview->restoreLayout(&partConfig, TQString::fromLatin1("HistoryListView"));
 }
 
 
@@ -254,7 +254,7 @@ HistoryDialog::~HistoryDialog()
 {
     saveDialogSize(partConfig, "HistoryDialog");
 
-    listview->saveLayout(&partConfig, TQString::tqfromLatin1("HistoryListView"));
+    listview->saveLayout(&partConfig, TQString::fromLatin1("HistoryListView"));
 }
 
 
diff --git a/cervisia/ignorelistbase.cpp b/cervisia/ignorelistbase.cpp
index 74036d25..bc9850fa 100644
--- a/cervisia/ignorelistbase.cpp
+++ b/cervisia/ignorelistbase.cpp
@@ -21,7 +21,7 @@ using namespace Cervisia;
 
 #include <tqfile.h>
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 
 void IgnoreListBase::addEntriesFromString(const TQString& str)
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index 84954778..278a32a6 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -25,10 +25,10 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqtabwidget.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqwhatsthis.h>
 #include <kconfig.h>
 #include <kdebug.h>
@@ -110,7 +110,7 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
     tags.setAutoDelete(true);
 
     TQWidget *mainWidget = new TQWidget(splitter);
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     for (int i = 0; i < 2; ++i)
     {
@@ -118,10 +118,10 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name)
         {
             TQFrame *frame = new TQFrame(mainWidget);
             frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-            tqlayout->addWidget(frame);
+            layout->addWidget(frame);
         }
 
-        TQGridLayout *grid = new TQGridLayout(tqlayout);
+        TQGridLayout *grid = new TQGridLayout(layout);
         grid->setRowStretch(0, 0);
         grid->setRowStretch(1, 0);
         grid->setRowStretch(2, 1);
@@ -233,7 +233,7 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName)
     cvsService = service;
     filename = fileName;
 
-    setCaption(i18n("CVS Log: %1").tqarg(filename));
+    setCaption(i18n("CVS Log: %1").arg(filename));
 
     DCOPRef job = cvsService->log(filename);
     if( !cvsService->ok() )
diff --git a/cervisia/loginfo.cpp b/cervisia/loginfo.cpp
index 8e6464d0..8d4bd323 100644
--- a/cervisia/loginfo.cpp
+++ b/cervisia/loginfo.cpp
@@ -19,7 +19,7 @@
 
 #include "loginfo.h"
 
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 #include <kglobal.h>
 #include <klocale.h>
@@ -41,7 +41,7 @@ TQString TagInfo::toString(bool prefixWithType) const
     TQString text;
     if (prefixWithType)
     {
-        text += typeToString() + TQString::tqfromLatin1(": ");
+        text += typeToString() + TQString::fromLatin1(": ");
     }
     text += m_name;
 
@@ -71,32 +71,32 @@ TQString TagInfo::typeToString() const
 
 TQString LogInfo::createToolTipText(bool showTime) const
 {
-    TQString text(TQString::tqfromLatin1("<nobr><b>"));
+    TQString text(TQString::fromLatin1("<nobr><b>"));
     text += TQStyleSheet::escape(m_revision);
-    text += TQString::tqfromLatin1("</b>&nbsp;&nbsp;");
+    text += TQString::fromLatin1("</b>&nbsp;&nbsp;");
     text += TQStyleSheet::escape(m_author);
-    text += TQString::tqfromLatin1("&nbsp;&nbsp;<b>");
+    text += TQString::fromLatin1("&nbsp;&nbsp;<b>");
     text += TQStyleSheet::escape(dateTimeToString(showTime));
-    text += TQString::tqfromLatin1("</b></nobr>");
+    text += TQString::fromLatin1("</b></nobr>");
 
     if (!m_comment.isEmpty())
     {
-        text += TQString::tqfromLatin1("<pre>");
+        text += TQString::fromLatin1("<pre>");
         text += TQStyleSheet::escape(m_comment);
-        text += TQString::tqfromLatin1("</pre>");
+        text += TQString::fromLatin1("</pre>");
     }
 
     if (!m_tags.isEmpty())
     {
-        text += TQString::tqfromLatin1("<i>");
+        text += TQString::fromLatin1("<i>");
         for (TTagInfoSeq::const_iterator it = m_tags.begin();
              it != m_tags.end(); ++it)
         {
             if (it != m_tags.begin() || m_comment.isEmpty())
-                text += TQString::tqfromLatin1("<br>");
+                text += TQString::fromLatin1("<br>");
             text += TQStyleSheet::escape((*it).toString());
         }
-        text += TQString::tqfromLatin1("</i>");
+        text += TQString::fromLatin1("</i>");
     }
 
     return text;
diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp
index 439ba36f..d676718a 100644
--- a/cervisia/loglist.cpp
+++ b/cervisia/loglist.cpp
@@ -69,7 +69,7 @@ LogListViewItem::LogListViewItem(TQListView* list, const Cervisia::LogInfo& logI
 
     setText(Tags, logInfo.tagsToString(Cervisia::TagInfo::Tag,
                                        Cervisia::LogInfo::NoTagType,
-                                       TQString::tqfromLatin1(", ")));
+                                       TQString::fromLatin1(", ")));
 }
 
 
@@ -131,13 +131,13 @@ LogListView::LogListView(KConfig& cfg, TQWidget *parent, const char *name)
     for (int i = 0; i < columns(); ++i)
         setColumnWidthMode(i, Manual);
 
-    restoreLayout(&partConfig, TQString::tqfromLatin1("LogList view"));
+    restoreLayout(&partConfig, TQString::fromLatin1("LogList view"));
 }
 
 
 LogListView::~LogListView()
 {
-    saveLayout(&partConfig, TQString::tqfromLatin1("LogList view"));
+    saveLayout(&partConfig, TQString::fromLatin1("LogList view"));
 }
 
 
@@ -220,7 +220,7 @@ void LogListView::slotQueryToolTip(const TQPoint& viewportPos,
 {
     if (const LogListViewItem* item = static_cast<LogListViewItem*>(itemAt(viewportPos)))
     {
-        viewportRect = tqitemRect(item);
+        viewportRect = itemRect(item);
         text = item->m_logInfo.createToolTipText();
     }
 }
diff --git a/cervisia/logmessageedit.cpp b/cervisia/logmessageedit.cpp
index 90b0d405..4d5fdc04 100644
--- a/cervisia/logmessageedit.cpp
+++ b/cervisia/logmessageedit.cpp
@@ -22,7 +22,7 @@
 #include "logmessageedit.h"
 using Cervisia::LogMessageEdit;
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <kaccel.h>
 
 
@@ -76,7 +76,7 @@ void LogMessageEdit::keyPressEvent(TQKeyEvent* event)
     if( noModifier )
     {
         TQString keycode = event->text();
-        if( !keycode.isEmpty() && keycode.tqunicode()->isPrint() )
+        if( !keycode.isEmpty() && keycode.unicode()->isPrint() )
         {
             KTextEdit::keyPressEvent(event);
             tryCompletion();
diff --git a/cervisia/logplainview.cpp b/cervisia/logplainview.cpp
index 44754cd4..474046f0 100644
--- a/cervisia/logplainview.cpp
+++ b/cervisia/logplainview.cpp
@@ -21,7 +21,7 @@
 
 #include <tqregexp.h>
 #include <tqstringlist.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <kfind.h>
 #include <kfinddialog.h>
 #include <klocale.h>
@@ -53,7 +53,7 @@ void LogPlainView::addRevision(const LogInfo& logInfo)
     // assemble revision information lines
     TQString logEntry;
 
-    logEntry += "<b>" + i18n("revision %1").tqarg(TQStyleSheet::escape(logInfo.m_revision)) +
+    logEntry += "<b>" + i18n("revision %1").arg(TQStyleSheet::escape(logInfo.m_revision)) +
                 "</b>";
     logEntry += " &nbsp;[<a href=\"revA#" + TQStyleSheet::escape(logInfo.m_revision) + "\">" +
                 i18n("Select for revision A") +
@@ -62,8 +62,8 @@ void LogPlainView::addRevision(const LogInfo& logInfo)
                 i18n("Select for revision B") +
                 "</a>]<br>";
     logEntry += "<i>" +
-                i18n("date: %1; author: %2").tqarg(TQStyleSheet::escape(logInfo.dateTimeToString()))
-                                            .tqarg(TQStyleSheet::escape(logInfo.m_author)) +
+                i18n("date: %1; author: %2").arg(TQStyleSheet::escape(logInfo.dateTimeToString()))
+                                            .arg(TQStyleSheet::escape(logInfo.m_author)) +
                 "</i>";
 
     append(logEntry);
diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp
index 88684312..95bf9035 100644
--- a/cervisia/logtree.cpp
+++ b/cervisia/logtree.cpp
@@ -243,13 +243,13 @@ void LogTreeView::setSelectedPair(TQString selectionA, TQString selectionB)
         if (oldstate != newstate)
         {
             it.current()->selected = newstate;
-            tqrepaint(false);
+            repaint(false);
         }
     }
 }
 
 
-TQSize LogTreeView::tqsizeHint() const
+TQSize LogTreeView::sizeHint() const
 {
     return TQSize(2 * static_width, 3 * static_height);
 }
diff --git a/cervisia/logtree.h b/cervisia/logtree.h
index f1af28b9..c895c183 100644
--- a/cervisia/logtree.h
+++ b/cervisia/logtree.h
@@ -56,7 +56,7 @@ public:
     virtual void paintCell(TQPainter *p, int row, int col, const TQRect& cr,
                            bool selected, const TQColorGroup& cg);
 
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
     
     virtual TQString text(int row, int col) const;
 
diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp
index be371c62..fb9e5ad4 100644
--- a/cervisia/mergedlg.cpp
+++ b/cervisia/mergedlg.cpp
@@ -23,7 +23,7 @@
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqstyle.h>
@@ -40,15 +40,15 @@ MergeDialog::MergeDialog(CvsService_stub* service,
       cvsService(service)
 {
     int const iComboBoxMinWidth(30 * fontMetrics().width('0'));
-    int const iWidgetIndent(tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
+    int const iWidgetIndent(tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     bybranch_button = new TQRadioButton(i18n("Merge from &branch:"), mainWidget);
     bybranch_button->setChecked(true);
-    tqlayout->addWidget(bybranch_button);
+    layout->addWidget(bybranch_button);
 
     branch_combo = new TQComboBox(true, mainWidget);
     branch_combo->setMinimumWidth(iComboBoxMinWidth);
@@ -57,13 +57,13 @@ MergeDialog::MergeDialog(CvsService_stub* service,
     connect( branch_button, TQT_SIGNAL(clicked()),
              this, TQT_SLOT(branchButtonClicked()) );
             
-    TQBoxLayout *branchedit_layout = new TQHBoxLayout(tqlayout);
+    TQBoxLayout *branchedit_layout = new TQHBoxLayout(layout);
     branchedit_layout->addSpacing(iWidgetIndent);
     branchedit_layout->addWidget(branch_combo, 2);
     branchedit_layout->addWidget(branch_button, 0);
     
     bytags_button = new TQRadioButton(i18n("Merge &modifications:"), mainWidget);
-    tqlayout->addWidget(bytags_button);
+    layout->addWidget(bytags_button);
 
     TQLabel *tag1_label = new TQLabel(i18n("between tag: "), mainWidget);
     tag1_combo = new TQComboBox(true, mainWidget);
@@ -77,7 +77,7 @@ MergeDialog::MergeDialog(CvsService_stub* service,
     connect( tag_button, TQT_SIGNAL(clicked()),
              this, TQT_SLOT(tagButtonClicked()) );
 
-    TQGridLayout *tagsedit_layout = new TQGridLayout(tqlayout);
+    TQGridLayout *tagsedit_layout = new TQGridLayout(layout);
     tagsedit_layout->addColSpacing(0, iWidgetIndent);
     tagsedit_layout->setColStretch(0, 0);
     tagsedit_layout->setColStretch(1, 1);
diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp
index 76ae72d1..7a13b15c 100644
--- a/cervisia/misc.cpp
+++ b/cervisia/misc.cpp
@@ -60,7 +60,7 @@ static int FindWhiteSpace(const TQString& str, int index)
     if( index < 0 || index >= length )
         return -1;
 
-    const TQChar* const startPos = str.tqunicode();
+    const TQChar* const startPos = str.unicode();
     const TQChar* const endPos   = startPos + length;
 
     const TQChar* pos = startPos + index;
@@ -215,7 +215,7 @@ bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* parent)
     if( fi.exists() )
     {
         result = (KMessageBox::warningContinueCancel(parent,
-                  i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").tqarg(fileName),
+                  i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(fileName),
                   i18n("Overwrite File?"),
                   KGuiItem(i18n("&Overwrite"), "filesave", i18n("Overwrite the file"))) == KMessageBox::Continue);
     }
@@ -261,14 +261,14 @@ TQStringList splitLine(TQString line, char delim)
 
 const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* parent)
 {
-    return FetchBranchesAndTags(TQString::tqfromLatin1("branch"), cvsService,
+    return FetchBranchesAndTags(TQString::fromLatin1("branch"), cvsService,
                                 parent);
 }
 
 
 const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* parent)
 {
-    return FetchBranchesAndTags(TQString::tqfromLatin1("revision"), cvsService,
+    return FetchBranchesAndTags(TQString::fromLatin1("revision"), cvsService,
                                 parent);
 }
 
diff --git a/cervisia/patchoptiondlg.cpp b/cervisia/patchoptiondlg.cpp
index 6516528f..6d232eca 100644
--- a/cervisia/patchoptiondlg.cpp
+++ b/cervisia/patchoptiondlg.cpp
@@ -21,7 +21,7 @@ using Cervisia::PatchOptionDialog;
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
 #include <knuminput.h>
diff --git a/cervisia/progressdlg.cpp b/cervisia/progressdlg.cpp
index abf23d1a..674642f9 100644
--- a/cervisia/progressdlg.cpp
+++ b/cervisia/progressdlg.cpp
@@ -20,7 +20,7 @@
 #include "progressdlg.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqtimer.h>
@@ -90,8 +90,8 @@ void ProgressDialog::setupGui(const TQString& heading)
     TQHBoxLayout* hboxLayout = new TQHBoxLayout(headingBox);
 
     TQLabel* textLabel = new TQLabel(heading, headingBox);
-    textLabel->setMinimumWidth(textLabel->tqsizeHint().width());
-    textLabel->setFixedHeight(textLabel->tqsizeHint().height());
+    textLabel->setMinimumWidth(textLabel->sizeHint().width());
+    textLabel->setFixedHeight(textLabel->sizeHint().height());
     hboxLayout->addWidget(textLabel);
     hboxLayout->addStretch();
 
@@ -104,7 +104,7 @@ void ProgressDialog::setupGui(const TQString& heading)
     TQFontMetrics fm(d->resultbox->fontMetrics());
     d->resultbox->setMinimumSize(fm.width("0")*70, fm.lineSpacing()*8);
 
-    resize(tqsizeHint());
+    resize(sizeHint());
 }
 
 
diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp
index eb248cc1..004226a8 100644
--- a/cervisia/protocolview.cpp
+++ b/cervisia/protocolview.cpp
@@ -124,7 +124,7 @@ void ProtocolView::slotJobExited(bool normalExit, int exitStatus)
     if( normalExit )
     {
         if( exitStatus )
-            msg = i18n("[Exited with status %1]\n").tqarg(exitStatus);
+            msg = i18n("[Exited with status %1]\n").arg(exitStatus);
         else
             msg = i18n("[Finished]\n");
     }
@@ -180,8 +180,8 @@ void ProtocolView::appendLine(const TQString &line)
         color = remoteChangeColor;
 
     append(color.isValid()
-           ? TQString("<font color=\"%1\"><b>%2</b></font>").tqarg(color.name())
-                                                           .tqarg(escapedLine)
+           ? TQString("<font color=\"%1\"><b>%2</b></font>").arg(color.name())
+                                                           .arg(escapedLine)
            : escapedLine);
 }
 
diff --git a/cervisia/protocolview.h b/cervisia/protocolview.h
index 42995d85..5a10195e 100644
--- a/cervisia/protocolview.h
+++ b/cervisia/protocolview.h
@@ -22,7 +22,7 @@
 #ifndef PROTOCOLVIEW_H
 #define PROTOCOLVIEW_H
 
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <dcopobject.h>
 
 class TQPoint;
diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp
index a9e8a9fd..43b597a0 100644
--- a/cervisia/qttableview.cpp
+++ b/cervisia/qttableview.cpp
@@ -33,8 +33,8 @@ enum ScrollBarDirtyFlags {
 };
 
 
-#define HSBEXT horizontalScrollBar()->tqsizeHint().height()
-#define VSBEXT verticalScrollBar()->tqsizeHint().width()
+#define HSBEXT horizontalScrollBar()->sizeHint().height()
+#define VSBEXT verticalScrollBar()->sizeHint().width()
 
 
 class TQCornerSquare : public TQWidget		// internal class
@@ -87,7 +87,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
   used by functions such as setXOffset() or maxYOffset().
 
   \i The \e widget coordinates. (0,0) is the top-left corner of the widget,
-  \e including the frame.  They are used by functions such as tqrepaint().
+  \e including the frame.  They are used by functions such as repaint().
 
   \i The \e view coordinates.  (0,0) is the top-left corner of the view, \e
   excluding the frame.  This is the least-used coordinate system; it is used by
@@ -134,7 +134,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * )
   The \link setCellHeight() cell height\endlink and \link setCellWidth()
   cell width\endlink are set to 0.
 
-  Frame line tqshapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
+  Frame line shapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
   see TQFrame::setFrameStyle().
 
   Note that the \a f argument is \e not \link setTableFlags() table
@@ -206,7 +206,7 @@ void QtTableView::show()
 
 
 /*!
-  \overload void QtTableView::tqrepaint( bool erase )
+  \overload void QtTableView::repaint( bool erase )
   Repaints the entire view.
 */
 
@@ -220,16 +220,16 @@ void QtTableView::show()
   If \a w is negative, it is replaced with <code>width() - x</code>.
   If \a h is negative, it is replaced with <code>height() - y</code>.
 
-  Doing a tqrepaint() usually is faster than doing an update(), but
+  Doing a repaint() usually is faster than doing an update(), but
   calling update() many times in a row will generate a single paint
   event.
 
   At present, QtTableView is the only widget that reimplements \link
-  TQWidget::tqrepaint() tqrepaint()\endlink.	 It does this because by
+  TQWidget::repaint() repaint()\endlink.	 It does this because by
   clearing and then repainting one cell at at time, it can make the
   screen flicker less than it would otherwise.  */
 
-void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
+void QtTableView::repaint( int x, int y, int w, int h, bool erase )
 {
     if ( !isVisible() || testWState(WState_BlockUpdates) )
 	return;
@@ -248,7 +248,7 @@ void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
 }
 
 /*!
-  \overload void QtTableView::tqrepaint( const TQRect &r, bool erase )
+  \overload void QtTableView::repaint( const TQRect &r, bool erase )
   Replaints rectangle \a r. If \a erase is TRUE draws the background
   using the palette's background.
 */
@@ -287,7 +287,7 @@ void QtTableView::setNumRows( int rows )
 	nRows = rows;
 	if ( autoUpdate() && isVisible() &&
 	     ( oldLastVisible != lastRowVisible() || oldTopCell != topCell() ) )
-		tqrepaint( oldTopCell != topCell() );
+		repaint( oldTopCell != topCell() );
     } else {
 	// Be more careful - if destructing, bad things might happen.
 	nRows = rows;
@@ -327,7 +327,7 @@ void QtTableView::setNumCols( int cols )
     if ( autoUpdate() && isVisible() ) {
 	int maxCol = lastColVisible();
 	if ( maxCol >= oldCols || maxCol >= nCols )
-	    tqrepaint();
+	    repaint();
     }
     updateScrollBars( horRange );
     updateFrameSize();
@@ -590,7 +590,7 @@ void QtTableView::setCellWidth( int cellWidth )
 
     updateScrollBars( horSteps | horRange );
     if ( autoUpdate() && isVisible() )
-	tqrepaint();
+	repaint();
 
 }
 
@@ -642,7 +642,7 @@ void QtTableView::setCellHeight( int cellHeight )
 #endif
     cellH = (short)cellHeight;
     if ( autoUpdate() && isVisible() )
-	tqrepaint();
+	repaint();
     updateScrollBars( verSteps | verRange );
 }
 
@@ -816,7 +816,7 @@ void QtTableView::setTableFlags( uint f )
 	     (f & Tbl_snapToVGrid) != 0 && yCellDelta != 0 ) {
 	    snapToGrid( (f & Tbl_snapToHGrid) != 0,	// do snapping
 			(f & Tbl_snapToVGrid) != 0 );
-	    repaintMask |= Tbl_snapToGrid;	// tqrepaint table
+	    repaintMask |= Tbl_snapToGrid;	// repaint table
 	}
     }
 
@@ -824,7 +824,7 @@ void QtTableView::setTableFlags( uint f )
 	setAutoUpdate( TRUE );
 	updateScrollBars();
 	if ( isVisible() && (f & repaintMask) )
-	    tqrepaint();
+	    repaint();
     }
 
 }
@@ -880,7 +880,7 @@ void QtTableView::clearTableFlags( uint f )
 	    (f & Tbl_smoothVScrolling) != 0 && yCellDelta != 0 ) {
 	    snapToGrid( (f & Tbl_smoothHScrolling) != 0,      // do snapping
 			(f & Tbl_smoothVScrolling) != 0 );
-	    repaintMask |= Tbl_smoothScrolling;		     // tqrepaint table
+	    repaintMask |= Tbl_smoothScrolling;		     // repaint table
 	}
     }
     if ( f & Tbl_snapToHGrid ) {
@@ -893,7 +893,7 @@ void QtTableView::clearTableFlags( uint f )
 	setAutoUpdate( TRUE );
 	updateScrollBars();	     // returns immediately if nothing to do
 	if ( isVisible() && (f & repaintMask) )
-	    tqrepaint();
+	    repaint();
     }
 
 }
@@ -915,20 +915,20 @@ void QtTableView::clearTableFlags( uint f )
   automatically whenever it has changed in some way (for example, when a
   \link setTableFlags() flag\endlink is changed).
 
-  If \a enable is FALSE, the view does NOT tqrepaint itself or update
+  If \a enable is FALSE, the view does NOT repaint itself or update
   its internal state variables when it is changed.  This can be
   useful to avoid flicker during large changes and is singularly
   useless otherwise. Disable auto-update, do the changes, re-enable
-  auto-update and call tqrepaint().
+  auto-update and call repaint().
 
   \warning Do not leave the view in this state for a long time
   (i.e., between events). If, for example, the user interacts with the
   view when auto-update is off, strange things can happen.
 
-  Setting auto-update to TRUE does not tqrepaint the view; you must call
-  tqrepaint() to do this.
+  Setting auto-update to TRUE does not repaint the view; you must call
+  repaint() to do this.
 
-  \sa autoUpdate(), tqrepaint()
+  \sa autoUpdate(), repaint()
 */
 
 void QtTableView::setAutoUpdate( bool enable )
@@ -962,7 +962,7 @@ void QtTableView::updateCell( int row, int col, bool erase )
     TQRect uR = TQRect( xPos, yPos,
 		      cellW ? cellW : cellWidth(col),
 		      cellH ? cellH : cellHeight(row) );
-    tqrepaint( uR.intersect(viewRect()), erase );
+    repaint( uR.intersect(viewRect()), erase );
 }
 
 
@@ -1378,13 +1378,13 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 
     // Note that this needs to be done regardless whether we do
     // eraseInPaint or not. Reason: a subclass may implement
-    // flicker-freeness and encourage the use of tqrepaint(FALSE).
+    // flicker-freeness and encourage the use of repaint(FALSE).
     // The subclass, however, cannot draw all pixels, just those
     // inside the cells. So QtTableView is reponsible for all pixels
     // outside the cells.
 
     TQRect viewR = viewRect();
-    const TQColorGroup g = tqcolorGroup();
+    const TQColorGroup g = colorGroup();
 
     if ( xPos <= maxX ) {
 	TQRect r = viewR;
@@ -1430,7 +1430,7 @@ void QtTableView::wheelEvent( TQWheelEvent * e )
 
 void QtTableView::updateView()
 {
-    tqrepaint( viewRect() );
+    repaint( viewRect() );
 }
 
 /*!
@@ -1447,7 +1447,7 @@ TQScrollBar *QtTableView::verticalScrollBar() const
 #ifndef TQT_NO_CURSOR
 	sb->setCursor( arrowCursor );
 #endif
-        sb->resize( sb->tqsizeHint() ); // height is irrelevant
+        sb->resize( sb->sizeHint() ); // height is irrelevant
 	Q_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
 	sb->setFocusPolicy( TQ_NoFocus );
@@ -1478,7 +1478,7 @@ TQScrollBar *QtTableView::horizontalScrollBar() const
 #ifndef TQT_NO_CURSOR
 	sb->setCursor( arrowCursor );
 #endif
-	sb->resize( sb->tqsizeHint() ); // width is irrelevant
+	sb->resize( sb->sizeHint() ); // width is irrelevant
 	sb->setFocusPolicy( TQ_NoFocus );
 	Q_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
@@ -1526,7 +1526,7 @@ void QtTableView::setHorScrollBar( bool on, bool update )
 	else
 	    sbDirty = sbDirty | verMask;
 	if ( hideScrollBar && isVisible() )
-	    tqrepaint( hScrollBar->x(), hScrollBar->y(),
+	    repaint( hScrollBar->x(), hScrollBar->y(),
 		     width() - hScrollBar->x(), hScrollBar->height() );
     }
     if ( update )
@@ -1565,7 +1565,7 @@ void QtTableView::setVerScrollBar( bool on, bool update )
 	else
 	    sbDirty = sbDirty | horMask;
 	if ( hideScrollBar && isVisible() )
-	    tqrepaint( vScrollBar->x(), vScrollBar->y(),
+	    repaint( vScrollBar->x(), vScrollBar->y(),
 		     vScrollBar->width(), height() - vScrollBar->y() );
     }
     if ( update )
@@ -2010,7 +2010,7 @@ void QtTableView::updateScrollBars( uint f )
 	if ( sbDirty & horValue )
 	    hScrollBar->setValue( xOffs );
 
-			// show scrollbar only when it has a sane tqgeometry
+			// show scrollbar only when it has a sane geometry
 	if ( !hScrollBar->isVisible() )
 	    hScrollBar->show();
     }
@@ -2034,7 +2034,7 @@ void QtTableView::updateScrollBars( uint f )
 	if ( sbDirty & verValue )
 	    vScrollBar->setValue( yOffs );
 
-			// show scrollbar only when it has a sane tqgeometry
+			// show scrollbar only when it has a sane geometry
 	if ( !vScrollBar->isVisible() )
 	    vScrollBar->show();
     }
@@ -2257,7 +2257,7 @@ void QtTableView::showOrHideScrollBars()
   Call this function when the table view's total size is changed;
   typically because the result of cellHeight() or cellWidth() have changed.
 
-  This function does not tqrepaint the widget.
+  This function does not repaint the widget.
 */
 
 void QtTableView::updateTableSize()
diff --git a/cervisia/qttableview.h b/cervisia/qttableview.h
index ce2af64b..b3c8ff8a 100644
--- a/cervisia/qttableview.h
+++ b/cervisia/qttableview.h
@@ -32,9 +32,9 @@ public:
     virtual void setPalette( const TQPalette & );
     void	show();
 
-    void	tqrepaint( bool erase=TRUE );
-    void	tqrepaint( int x, int y, int w, int h, bool erase=TRUE );
-    void	tqrepaint( const TQRect &, bool erase=TRUE );
+    void	repaint( bool erase=TRUE );
+    void	repaint( int x, int y, int w, int h, bool erase=TRUE );
+    void	repaint( const TQRect &, bool erase=TRUE );
 
 protected:
     QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 );
@@ -236,11 +236,11 @@ inline TQRect QtTableView::cellUpdateRect() const
 inline bool QtTableView::autoUpdate() const
 { return isUpdatesEnabled(); }
 
-inline void QtTableView::tqrepaint( bool erase )
-{ tqrepaint( 0, 0, width(), height(), erase ); }
+inline void QtTableView::repaint( bool erase )
+{ repaint( 0, 0, width(), height(), erase ); }
 
-inline void QtTableView::tqrepaint( const TQRect &r, bool erase )
-{ tqrepaint( r.x(), r.y(), r.width(), r.height(), erase ); }
+inline void QtTableView::repaint( const TQRect &r, bool erase )
+{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); }
 
 inline void QtTableView::updateScrollBars()
 { updateScrollBars( 0 ); }
diff --git a/cervisia/repositories.cpp b/cervisia/repositories.cpp
index 7f52a39d..f17bb7b9 100644
--- a/cervisia/repositories.cpp
+++ b/cervisia/repositories.cpp
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <tqfile.h>
 #include <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <kapplication.h>
 #include <kconfig.h>
 
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index 64adc69e..90d64a4f 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -21,7 +21,7 @@
 
 #include "repositorydlg.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
 #include <kconfig.h>
@@ -141,14 +141,14 @@ void RepositoryListItem::setIsLoggedIn(bool isLoggedIn)
 
 void RepositoryListItem::changeLoginStatusColumn()
 {
-    TQString logintqStatus;
+    TQString loginStatus;
     
     if( LoginNeeded(repository()) )
-        logintqStatus = m_isLoggedIn ? i18n("Logged in") : i18n("Not logged in");
+        loginStatus = m_isLoggedIn ? i18n("Logged in") : i18n("Not logged in");
     else
-        logintqStatus = i18n("No login required");
+        loginStatus = i18n("No login required");
         
-    setText(3, logintqStatus);
+    setText(3, loginStatus);
 }
 
 
@@ -186,7 +186,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
     m_loginButton  = actionbox->addButton(i18n("Login..."));
     m_logoutButton = actionbox->addButton(i18n("Logout"));
     actionbox->addStretch();
-    actionbox->tqlayout();
+    actionbox->layout();
     hbox->addWidget(actionbox, 0);
 
     m_loginButton->setEnabled(false);
@@ -231,7 +231,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService,
     for (int i = 0; i < m_repoList->columns(); ++i)
         m_repoList->setColumnWidthMode(i, TQListView::Manual);
 
-    m_repoList->restoreLayout(&m_partConfig, TQString::tqfromLatin1("RepositoryListView"));
+    m_repoList->restoreLayout(&m_partConfig, TQString::fromLatin1("RepositoryListView"));
 }
 
 
@@ -239,7 +239,7 @@ RepositoryDialog::~RepositoryDialog()
 {
     saveDialogSize(m_partConfig, "RepositoryDialog");
 
-    m_repoList->saveLayout(&m_partConfig, TQString::tqfromLatin1("RepositoryListView"));
+    m_repoList->saveLayout(&m_partConfig, TQString::fromLatin1("RepositoryListView"));
 
     delete m_serviceConfig;
 }
@@ -274,7 +274,7 @@ void RepositoryDialog::readConfigFile()
         RepositoryListItem* ritem = static_cast<RepositoryListItem*>(item);
 
         // read entries from cvs DCOP service configuration
-        m_serviceConfig->setGroup(TQString::tqfromLatin1("Repository-") +
+        m_serviceConfig->setGroup(TQString::fromLatin1("Repository-") +
                                   ritem->repository());
 
         TQString rsh       = m_serviceConfig->readEntry("rsh", TQString());
@@ -490,7 +490,7 @@ void RepositoryDialog::slotSelectionChanged()
 void RepositoryDialog::writeRepositoryData(RepositoryListItem* item)
 {
     // write entries to cvs DCOP service configuration
-    m_serviceConfig->setGroup(TQString::tqfromLatin1("Repository-") +
+    m_serviceConfig->setGroup(TQString::fromLatin1("Repository-") +
                               item->repository());
 
     m_serviceConfig->writeEntry("rsh", item->rsh());
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index fd3e7d9a..1e59d2a9 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -24,10 +24,10 @@
 #include <tqfile.h>
 #include <tqkeycode.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
-#include <tqtextcodec.h>
-#include <tqtextstream.h>
+#include <textcodec.h>
+#include <textstream.h>
 #include <kdebug.h>
 #include <kfiledialog.h>
 #include <klocale.h>
@@ -106,27 +106,27 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     TQSplitter *vertSplitter = new TQSplitter(Qt::Vertical, mainWidget);
 
     TQSplitter *splitter = new TQSplitter(Qt::Horizontal, vertSplitter);
 
     TQWidget *versionALayoutWidget = new TQWidget(splitter);
-    TQBoxLayout *versionAtqlayout = new TQVBoxLayout(versionALayoutWidget, 5);
+    TQBoxLayout *versionAlayout = new TQVBoxLayout(versionALayoutWidget, 5);
 
     TQLabel *revlabel1 = new TQLabel(i18n("Your version (A):"), versionALayoutWidget);
-    versionAtqlayout->addWidget(revlabel1);
+    versionAlayout->addWidget(revlabel1);
     diff1 = new DiffView(cfg, true, false, versionALayoutWidget);
-    versionAtqlayout->addWidget(diff1, 10);
+    versionAlayout->addWidget(diff1, 10);
 
     TQWidget* versionBLayoutWidget = new TQWidget(splitter);
-    TQBoxLayout *versionBtqlayout = new TQVBoxLayout(versionBLayoutWidget, 5);
+    TQBoxLayout *versionBlayout = new TQVBoxLayout(versionBLayoutWidget, 5);
 
     TQLabel *revlabel2 = new TQLabel(i18n("Other version (B):"), versionBLayoutWidget);
-    versionBtqlayout->addWidget(revlabel2);
+    versionBlayout->addWidget(revlabel2);
     diff2 = new DiffView(cfg, true, false, versionBLayoutWidget);
-    versionBtqlayout->addWidget(diff2, 10);
+    versionBlayout->addWidget(diff2, 10);
 
     diff1->setPartner(diff2);
     diff2->setPartner(diff1);
@@ -140,7 +140,7 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
     merge = new DiffView(cfg, false, false, mergeLayoutWidget);
     mergeLayout->addWidget(merge, 10);
 
-    tqlayout->addWidget(vertSplitter);
+    layout->addWidget(vertSplitter);
 
     abutton = new TQPushButton("&A", mainWidget);
     connect( abutton, TQT_SIGNAL(clicked()), TQT_SLOT(aClicked()) );
@@ -158,7 +158,7 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
     connect( editbutton, TQT_SIGNAL(clicked()), TQT_SLOT(editClicked()) );
 
     nofnlabel = new TQLabel(mainWidget);
-    nofnlabel->tqsetAlignment(AlignCenter);
+    nofnlabel->setAlignment(AlignCenter);
 
     backbutton = new TQPushButton("&<<", mainWidget);
     connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) );
@@ -166,17 +166,17 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
     forwbutton = new TQPushButton("&>>", mainWidget);
     connect( forwbutton, TQT_SIGNAL(clicked()), TQT_SLOT(forwClicked()) );
 
-    TQBoxLayout *buttontqlayout = new TQHBoxLayout(tqlayout);
-    buttontqlayout->addWidget(abutton, 1);
-    buttontqlayout->addWidget(bbutton, 1);
-    buttontqlayout->addWidget(abbutton, 1);
-    buttontqlayout->addWidget(babutton, 1);
-    buttontqlayout->addWidget(editbutton, 1);
-    buttontqlayout->addStretch(1);
-    buttontqlayout->addWidget(nofnlabel, 2);
-    buttontqlayout->addStretch(1);
-    buttontqlayout->addWidget(backbutton, 1);
-    buttontqlayout->addWidget(forwbutton, 1);
+    TQBoxLayout *buttonlayout = new TQHBoxLayout(layout);
+    buttonlayout->addWidget(abutton, 1);
+    buttonlayout->addWidget(bbutton, 1);
+    buttonlayout->addWidget(abbutton, 1);
+    buttonlayout->addWidget(babutton, 1);
+    buttonlayout->addWidget(editbutton, 1);
+    buttonlayout->addStretch(1);
+    buttonlayout->addWidget(nofnlabel, 2);
+    buttonlayout->addStretch(1);
+    buttonlayout->addWidget(backbutton, 1);
+    buttonlayout->addWidget(forwbutton, 1);
 
     connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(saveClicked()) );
     connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) );
@@ -222,7 +222,7 @@ bool ResolveDialog::parseFile(const TQString &name)
     int advanced1, advanced2;
     enum { Normal, VersionA, VersionB } state;
 
-    setCaption(i18n("CVS Resolve: %1").tqarg(name));
+    setCaption(i18n("CVS Resolve: %1").arg(name));
 
     fname = name;
   
@@ -383,9 +383,9 @@ void ResolveDialog::updateNofN()
 {
     TQString str;
     if (markeditem >= 0)
-        str = i18n("%1 of %2").tqarg(markeditem+1).tqarg(items.count());
+        str = i18n("%1 of %2").arg(markeditem+1).arg(items.count());
     else
-        str = i18n("%1 conflicts").tqarg(items.count());
+        str = i18n("%1 conflicts").arg(items.count());
     nofnlabel->setText(str);
 
     backbutton->setEnabled(markeditem != -1);
@@ -424,9 +424,9 @@ void ResolveDialog::updateHighlight(int newitem)
         diff2->setCenterLine(item->linenoB);
         merge->setCenterOffset(item->offsetM);
     }
-    diff1->tqrepaint();
-    diff2->tqrepaint();
-    merge->tqrepaint();
+    diff1->repaint();
+    diff2->repaint();
+    merge->repaint();
     updateNofN();
 }
 
@@ -456,7 +456,7 @@ void ResolveDialog::updateMergedVersion(ResolveItem* item,
     while ( (item = items.next()) != 0 )
         item->offsetM += difference;
 
-    merge->tqrepaint();
+    merge->repaint();
 }
 
 
@@ -562,9 +562,9 @@ void ResolveDialog::editClicked()
     }
 
     delete dlg;
-    diff1->tqrepaint();
-    diff2->tqrepaint();
-    merge->tqrepaint();
+    diff1->repaint();
+    diff2->repaint();
+    merge->repaint();
 }
 
 
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index eecdd41f..f1437f24 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqgrid.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqwidgetlist.h>
 #include <tqhbuttongroup.h>
@@ -52,7 +52,7 @@ namespace
     inline TQPixmap LoadIcon(const char* iconName)
     {
         KIconLoader* loader = KGlobal::instance()->iconLoader();
-        return loader->loadIcon(TQString::tqfromLatin1(iconName), KIcon::NoGroup,
+        return loader->loadIcon(TQString::fromLatin1(iconName), KIcon::NoGroup,
                                  KIcon::SizeMedium);
     }
 }
@@ -73,7 +73,7 @@ void FontButton::chooseFont()
         return;
 
     setFont(newFont);
-    tqrepaint(false);
+    repaint(false);
 }
 
 
@@ -99,7 +99,7 @@ SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *nam
     addDiffPage();
 
     //
-    // tqStatus Options
+    // Status Options
     //
     addStatusPage();
 
@@ -204,7 +204,7 @@ void SettingsDialog::writeSettings()
     CervisiaSettings::setDiffDeleteColor(m_diffDeleteButton->color());
 
     // I'm not yet sure whether this is a hack or not :-)
-    TQWidgetListIt it(*TQApplication::tqallWidgets());
+    TQWidgetListIt it(*TQApplication::allWidgets());
     for (; it.current(); ++it)
         {
             TQWidget *w = it.current();
@@ -236,24 +236,24 @@ void SettingsDialog::addGeneralPage()
 {
     TQFrame* generalPage = addPage(i18n("General"), TQString(),
                                   LoadIcon("misc"));
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(generalPage, 0, KDialog::spacingHint());
+    TQVBoxLayout* layout = new TQVBoxLayout(generalPage, 0, KDialog::spacingHint());
 
     TQLabel *usernamelabel = new TQLabel( i18n("&User name for the change log editor:"), generalPage );
     usernameedit = new KLineEdit(generalPage);
     usernameedit->setFocus();
     usernamelabel->setBuddy(usernameedit);
 
-    tqlayout->addWidget(usernamelabel);
-    tqlayout->addWidget(usernameedit);
+    layout->addWidget(usernamelabel);
+    layout->addWidget(usernameedit);
 
     TQLabel *cvspathlabel = new TQLabel( i18n("&Path to CVS executable, or 'cvs':"), generalPage );
     cvspathedit = new KURLRequester(generalPage);
     cvspathlabel->setBuddy(cvspathedit);
 
-    tqlayout->addWidget(cvspathlabel);
-    tqlayout->addWidget(cvspathedit);
+    layout->addWidget(cvspathlabel);
+    layout->addWidget(cvspathedit);
 
-    tqlayout->addStretch();
+    layout->addStretch();
 }
 
 
@@ -341,37 +341,37 @@ void SettingsDialog::addLookAndFeelPage()
     m_changelogFontBox = new FontButton(i18n("Font for ChangeLog View..."),
                                         fontGroupBox);
 
-    TQGroupBox* tqcolorGroupBox = new TQGroupBox(4, Qt::Horizontal,
+    TQGroupBox* colorGroupBox = new TQGroupBox(4, Qt::Horizontal,
                                              i18n("Colors"), lookPage);
-    tqcolorGroupBox->setColumns(4);
-    tqcolorGroupBox->setInsideSpacing(KDialog::spacingHint());
+    colorGroupBox->setColumns(4);
+    colorGroupBox->setInsideSpacing(KDialog::spacingHint());
 
-    TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), tqcolorGroupBox);
-    m_conflictButton      = new KColorButton(tqcolorGroupBox);
+    TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), colorGroupBox);
+    m_conflictButton      = new KColorButton(colorGroupBox);
     conflictLabel->setBuddy(m_conflictButton);
 
-    TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), tqcolorGroupBox);
-    m_diffChangeButton      = new KColorButton(tqcolorGroupBox);
+    TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), colorGroupBox);
+    m_diffChangeButton      = new KColorButton(colorGroupBox);
     diffChangeLabel->setBuddy(m_diffChangeButton);
 
-    TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), tqcolorGroupBox);
-    m_localChangeButton      = new KColorButton(tqcolorGroupBox);
+    TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), colorGroupBox);
+    m_localChangeButton      = new KColorButton(colorGroupBox);
     localChangeLabel->setBuddy(m_localChangeButton);
 
-    TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), tqcolorGroupBox);
-    m_diffInsertButton      = new KColorButton(tqcolorGroupBox);
+    TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), colorGroupBox);
+    m_diffInsertButton      = new KColorButton(colorGroupBox);
     diffInsertLabel->setBuddy(m_diffInsertButton);
 
-    TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), tqcolorGroupBox);
-    m_remoteChangeButton      = new KColorButton(tqcolorGroupBox);
+    TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), colorGroupBox);
+    m_remoteChangeButton      = new KColorButton(colorGroupBox);
     remoteChangeLabel->setBuddy( m_remoteChangeButton );
 
-    TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), tqcolorGroupBox);
-    m_diffDeleteButton      = new KColorButton(tqcolorGroupBox);
+    TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), colorGroupBox);
+    m_diffDeleteButton      = new KColorButton(colorGroupBox);
     diffDeleteLabel->setBuddy(m_diffDeleteButton);
 
-    TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), tqcolorGroupBox);
-    m_notInCvsButton      = new KColorButton(tqcolorGroupBox);
+    TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), colorGroupBox);
+    m_notInCvsButton      = new KColorButton(colorGroupBox);
     notInCvsLabel->setBuddy(m_notInCvsButton);
 
     m_splitterBox = new TQCheckBox(i18n("Split main window &horizontally"), lookPage);
diff --git a/cervisia/settingsdlg_advanced.ui b/cervisia/settingsdlg_advanced.ui
index 2100e8ff..c15d391f 100644
--- a/cervisia/settingsdlg_advanced.ui
+++ b/cervisia/settingsdlg_advanced.ui
@@ -26,7 +26,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>41</height>
diff --git a/cervisia/stringmatcher.cpp b/cervisia/stringmatcher.cpp
index 0c7e833c..6e70a6e0 100644
--- a/cervisia/stringmatcher.cpp
+++ b/cervisia/stringmatcher.cpp
@@ -133,7 +133,7 @@ unsigned int countMetaCharacters(const TQString& text)
 {
     unsigned int count(0);
 
-    const TQChar* pos(text.tqunicode());
+    const TQChar* pos(text.unicode());
     const TQChar* posEnd(pos + text.length());
     while (pos < posEnd)
     {
diff --git a/cervisia/tagdlg.cpp b/cervisia/tagdlg.cpp
index 3d8b9516..b652c4c9 100644
--- a/cervisia/tagdlg.cpp
+++ b/cervisia/tagdlg.cpp
@@ -23,7 +23,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <klocale.h>
@@ -47,7 +47,7 @@ TagDialog::TagDialog(ActionType action, CvsService_stub* service,
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     if (action == Delete)
         {
@@ -61,7 +61,7 @@ TagDialog::TagDialog(ActionType action, CvsService_stub* service,
             connect( tag_button, TQT_SIGNAL(clicked()),
                      this, TQT_SLOT(tagButtonClicked()) );
 
-            TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout);
+            TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout);
             tagedit_layout->addWidget(tag_label);
             tagedit_layout->addWidget(tag_combo);
             tagedit_layout->addWidget(tag_button);
@@ -74,15 +74,15 @@ TagDialog::TagDialog(ActionType action, CvsService_stub* service,
 
             TQLabel *tag_label = new TQLabel(tag_edit, i18n("&Name of tag:"), mainWidget);
 
-            TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout);
+            TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout);
             tagedit_layout->addWidget(tag_label);
             tagedit_layout->addWidget(tag_edit);
 
             branchtag_button = new TQCheckBox(i18n("Create &branch with this tag"), mainWidget);
-            tqlayout->addWidget(branchtag_button);
+            layout->addWidget(branchtag_button);
 
             forcetag_button = new TQCheckBox(i18n("&Force tag creation even if tag already exists"), mainWidget);
-            tqlayout->addWidget(forcetag_button);
+            layout->addWidget(forcetag_button);
 	}
 
     setHelp("taggingbranching");
diff --git a/cervisia/tooltip.cpp b/cervisia/tooltip.cpp
index df3c4977..728945ca 100644
--- a/cervisia/tooltip.cpp
+++ b/cervisia/tooltip.cpp
@@ -72,12 +72,12 @@ TQString truncateLines(const TQString&      text,
     if (numberOfLines <= maxNumberOfLines)
         return text;
 
-    const TQChar* tqunicode(text.tqunicode());
-    for (int count(maxNumberOfLines); count; ++tqunicode)
-        if (*tqunicode == newLine)
+    const TQChar* unicode(text.unicode());
+    for (int count(maxNumberOfLines); count; ++unicode)
+        if (*unicode == newLine)
             --count;
 
-    return text.left(tqunicode - text.tqunicode() - 1);
+    return text.left(unicode - text.unicode() - 1);
 }
 
 
diff --git a/cervisia/updatedlg.cpp b/cervisia/updatedlg.cpp
index 55243796..eb559b2f 100644
--- a/cervisia/updatedlg.cpp
+++ b/cervisia/updatedlg.cpp
@@ -22,7 +22,7 @@
 
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqstyle.h>
@@ -40,15 +40,15 @@ UpdateDialog::UpdateDialog(CvsService_stub* service,
       cvsService(service)
 {
     int const iComboBoxMinWidth(40 * fontMetrics().width('0'));
-    int const iWidgetIndent(tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
+    int const iWidgetIndent(tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     bybranch_button = new TQRadioButton(i18n("Update to &branch: "), mainWidget);
     bybranch_button->setChecked(true);
-    tqlayout->addWidget(bybranch_button);
+    layout->addWidget(bybranch_button);
 
     branch_combo = new TQComboBox(true, mainWidget);
     branch_combo->setMinimumWidth(iComboBoxMinWidth);
@@ -57,13 +57,13 @@ UpdateDialog::UpdateDialog(CvsService_stub* service,
     connect( branch_button, TQT_SIGNAL(clicked()),
              this, TQT_SLOT(branchButtonClicked()) );
             
-    TQBoxLayout *branchedit_layout = new TQHBoxLayout(tqlayout);
+    TQBoxLayout *branchedit_layout = new TQHBoxLayout(layout);
     branchedit_layout->addSpacing(iWidgetIndent);
     branchedit_layout->addWidget(branch_combo);
     branchedit_layout->addWidget(branch_button);
     
     bytag_button = new TQRadioButton(i18n("Update to &tag: "), mainWidget);
-    tqlayout->addWidget(bytag_button);
+    layout->addWidget(bytag_button);
 
     tag_combo = new TQComboBox(true, mainWidget);
     tag_combo->setMinimumWidth(iComboBoxMinWidth);
@@ -72,17 +72,17 @@ UpdateDialog::UpdateDialog(CvsService_stub* service,
     connect( tag_button, TQT_SIGNAL(clicked()),
              this, TQT_SLOT(tagButtonClicked()) );
             
-    TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout);
+    TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout);
     tagedit_layout->addSpacing(iWidgetIndent);
     tagedit_layout->addWidget(tag_combo);
     tagedit_layout->addWidget(tag_button);
     
     bydate_button = new TQRadioButton(i18n("Update to &date ('yyyy-mm-dd'):"), mainWidget);
-    tqlayout->addWidget(bydate_button);
+    layout->addWidget(bydate_button);
 
     date_edit = new KLineEdit(mainWidget);
 
-    TQBoxLayout *dateedit_layout = new TQHBoxLayout(tqlayout);
+    TQBoxLayout *dateedit_layout = new TQHBoxLayout(layout);
     dateedit_layout->addSpacing(iWidgetIndent);
     dateedit_layout->addWidget(date_edit);
 
diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp
index 47ab5c65..52e44b2e 100644
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@@ -35,7 +35,7 @@
 
 
 using Cervisia::Entry;
-using Cervisia::EntrytqStatus;
+using Cervisia::EntryStatus;
 
 
 UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name)
@@ -65,13 +65,13 @@ UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name)
     for (int col = 0; col < columns(); ++col)
         setColumnWidthMode(col, TQListView::Manual);
 
-    restoreLayout(&m_partConfig, TQString::tqfromLatin1("UpdateView"));
+    restoreLayout(&m_partConfig, TQString::fromLatin1("UpdateView"));
 }
 
 
 UpdateView::~UpdateView()
 {
-    saveLayout(&m_partConfig, TQString::tqfromLatin1("UpdateView"));
+    saveLayout(&m_partConfig, TQString::fromLatin1("UpdateView"));
 }
 
 
@@ -548,7 +548,7 @@ void UpdateView::updateColors()
 
 
 /**
- * Process one line from the output of 'cvs update'. If parseAstqStatus
+ * Process one line from the output of 'cvs update'. If parseAsStatus
  * is true, it is assumed that the output is from a command
  * 'cvs update -n', i.e. cvs actually changes no files.
  */
@@ -556,7 +556,7 @@ void UpdateView::processUpdateLine(TQString str)
 {
     if (str.length() > 2 && str[1] == ' ')
     {
-        EntrytqStatus status(Cervisia::Unknown);
+        EntryStatus status(Cervisia::Unknown);
         switch (str[0].latin1())
         {
         case 'C':
@@ -586,8 +586,8 @@ void UpdateView::processUpdateLine(TQString str)
         updateItem(str.mid(2), status, false);
     }
 
-    const TQString removedFileStart(TQString::tqfromLatin1("cvs server: "));
-    const TQString removedFileEnd(TQString::tqfromLatin1(" is no longer in the repository"));
+    const TQString removedFileStart(TQString::fromLatin1("cvs server: "));
+    const TQString removedFileEnd(TQString::fromLatin1(" is no longer in the repository"));
     if (str.startsWith(removedFileStart) && str.endsWith(removedFileEnd))
     {
     }
@@ -600,7 +600,7 @@ void UpdateView::processUpdateLine(TQString str)
 }
 
 
-void UpdateView::updateItem(const TQString& filePath, EntrytqStatus status, bool isdir)
+void UpdateView::updateItem(const TQString& filePath, EntryStatus status, bool isdir)
 {
     if (isdir && filePath == TQChar('.'))
         return;
diff --git a/cervisia/updateview.h b/cervisia/updateview.h
index 181cf739..9fde0956 100644
--- a/cervisia/updateview.h
+++ b/cervisia/updateview.h
@@ -86,7 +86,7 @@ private slots:
     void itemExecuted(TQListViewItem *item);
     
 private:
-    void updateItem(const TQString &filename, Cervisia::EntrytqStatus status, bool isdir);
+    void updateItem(const TQString &filename, Cervisia::EntryStatus status, bool isdir);
     void rememberSelection(bool recursive);
     void syncSelection();
     void markUpdated(bool laststage, bool success);
diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index 4e07c1ab..9e0abc22 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -39,7 +39,7 @@
 
 
 using Cervisia::Entry;
-using Cervisia::EntrytqStatus;
+using Cervisia::EntryStatus;
 
 
 // ------------------------------------------------------------------------------
@@ -103,7 +103,7 @@ UpdateDirItem::UpdateDirItem(UpdateView* parent,
  * Update the status of an item; if it doesn't exist yet, create new one
  */
 void UpdateDirItem::updateChildItem(const TQString& name,
-                                    EntrytqStatus status,
+                                    EntryStatus status,
                                     bool isdir)
 {
     if (UpdateItem* item = findItem(name))
@@ -111,7 +111,7 @@ void UpdateDirItem::updateChildItem(const TQString& name,
         if (isFileItem(item))
         {
             UpdateFileItem* fileItem = static_cast<UpdateFileItem*>(item);
-            fileItem->settqStatus(status);
+            fileItem->setStatus(status);
         }
         return;
     }
@@ -127,7 +127,7 @@ void UpdateDirItem::updateChildItem(const TQString& name,
     else
     {
         entry.m_type = Entry::File;
-        createFileItem(entry)->settqStatus(status);
+        createFileItem(entry)->setStatus(status);
     }
 }
 
@@ -150,7 +150,7 @@ void UpdateDirItem::updateEntriesItem(const Entry& entry,
                 entry.m_status == Cervisia::LocallyRemoved ||
                 entry.m_status == Cervisia::Conflict)
             {
-                fileItem->settqStatus(entry.m_status);
+                fileItem->setStatus(entry.m_status);
             }
             fileItem->setRevTag(entry.m_revision, entry.m_tag);
             fileItem->setDate(entry.m_dateTime);
@@ -288,7 +288,7 @@ TQDateTime parseDateTime(const TQString &s)
 	TQDate date( year, month, day );
 	TQTime time;
 	int hour, minute, second;
-	int pivot = s.find( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
+	int pivot = s.find( TQRegExp(TQString::fromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
 	if ( pivot != -1 ) {
 	    hour = s.mid( pivot, 2 ).toInt();
 	    minute = s.mid( pivot+3, 2 ).toInt();
@@ -392,7 +392,7 @@ void UpdateDirItem::syncWithDirectory()
             // is file removed?
             if (!dir.exists(it.key()))
             {
-                fileItem->settqStatus(Cervisia::Removed);
+                fileItem->setStatus(Cervisia::Removed);
                 fileItem->setRevTag(TQString(), TQString());
             }
         }
@@ -501,14 +501,14 @@ UpdateFileItem::UpdateFileItem(UpdateDirItem* parent, const Entry& entry)
 }
 
 
-void UpdateFileItem::settqStatus(EntrytqStatus status)
+void UpdateFileItem::setStatus(EntryStatus status)
 {
     if (status != m_entry.m_status)
     {
         m_entry.m_status = status;
         const bool visible(applyFilter(updateView()->filter()));
         if (visible)
-            tqrepaint();
+            repaint();
     }
     m_undefined = false;
 }
@@ -584,7 +584,7 @@ void UpdateFileItem::setRevTag(const TQString& rev, const TQString& tag)
     if (isVisible())
     {
         widthChanged();
-        tqrepaint();
+        repaint();
     }
 }
 
@@ -598,13 +598,13 @@ void UpdateFileItem::setDate(const TQDateTime& date)
 void UpdateFileItem::markUpdated(bool laststage,
                                  bool success)
 {
-    EntrytqStatus newstatus = m_entry.m_status;
+    EntryStatus newstatus = m_entry.m_status;
 
     if (laststage)
     {
         if (undefinedState() && m_entry.m_status != Cervisia::NotInCVS)
             newstatus = success? Cervisia::UpToDate : Cervisia::Unknown;
-        settqStatus(newstatus);
+        setStatus(newstatus);
     }
     else
         setUndefinedState(true);
@@ -668,7 +668,7 @@ int UpdateFileItem::compare(TQListViewItem* i,
     case MimeType:
         iResult = KMimeType::findByPath(entry().m_name)->comment().localeAwareCompare(KMimeType::findByPath(item->entry().m_name)->comment());
         break;
-    case tqStatus:
+    case Status:
         if ((iResult = ::compare(statusClass(), item->statusClass())) == 0)
             iResult = entry().m_name.localeAwareCompare(item->entry().m_name);
         break;
@@ -698,7 +698,7 @@ TQString UpdateFileItem::text(int column) const
     case MimeType:
 	result = KMimeType::findByPath(entry().m_name)->comment();
 	break;
-    case tqStatus:
+    case Status:
         result = toString(entry().m_status);
         break;
     case Revision:
diff --git a/cervisia/updateview_items.h b/cervisia/updateview_items.h
index ca26930f..73694646 100644
--- a/cervisia/updateview_items.h
+++ b/cervisia/updateview_items.h
@@ -50,7 +50,7 @@ public:
     const Cervisia::Entry& entry() const { return m_entry; }
 
     // Returns the path (relative to the repository).
-    // TQString() for the root item and its (direct) tqchildren.
+    // TQString() for the root item and its (direct) children.
     // If it's not TQString() it ends with '/'.
     TQString dirPath() const;
 
@@ -78,7 +78,7 @@ public:
 
     void syncWithDirectory();
     void syncWithEntries();
-    void updateChildItem(const TQString& name, Cervisia::EntrytqStatus status, bool isdir);
+    void updateChildItem(const TQString& name, Cervisia::EntryStatus status, bool isdir);
     void updateEntriesItem(const Cervisia::Entry& entry, bool isBinary);
 
     bool wasScanned() const { return m_opened; }
@@ -119,7 +119,7 @@ class UpdateFileItem : public UpdateItem
 {
 public:
 
-    enum { Name, MimeType, tqStatus, Revision, TagOrDate, Timestamp };
+    enum { Name, MimeType, Status, Revision, TagOrDate, Timestamp };
 
     UpdateFileItem(UpdateDirItem* parent, const Cervisia::Entry& entry);
 
@@ -132,7 +132,7 @@ public:
                            int col, int width, int align);
     virtual int rtti() const { return RTTI; }
 
-    void settqStatus(Cervisia::EntrytqStatus status);
+    void setStatus(Cervisia::EntryStatus status);
     void setRevTag(const TQString& rev, const TQString& tag);
     void setDate(const TQDateTime& date);
     void setUndefinedState(bool b)
diff --git a/cervisia/updateview_visitors.cpp b/cervisia/updateview_visitors.cpp
index 8232d98c..0dae046b 100644
--- a/cervisia/updateview_visitors.cpp
+++ b/cervisia/updateview_visitors.cpp
@@ -47,7 +47,7 @@ void ApplyFilterVisitor::preVisit(UpdateDirItem* item)
 void ApplyFilterVisitor::postVisit(UpdateDirItem* item)
 {
     // a UpdateDirItem is visible if
-    // - it has visible tqchildren
+    // - it has visible children
     // - it is not opened
     // - empty directories are not hidden
     // - it has no parent (top level item)
diff --git a/cervisia/watchdlg.cpp b/cervisia/watchdlg.cpp
index 607dbd46..0ce48954 100644
--- a/cervisia/watchdlg.cpp
+++ b/cervisia/watchdlg.cpp
@@ -23,7 +23,7 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <klocale.h>
 
@@ -36,37 +36,37 @@ WatchDialog::WatchDialog(ActionType action, TQWidget *parent, const char *name)
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     TQLabel *textlabel = new TQLabel
 	( (action==Add)? i18n("Add watches for the following events:")
           :  i18n("Remove watches for the following events:"), mainWidget );
-    tqlayout->addWidget(textlabel, 0);
+    layout->addWidget(textlabel, 0);
 
     all_button = new TQRadioButton(i18n("&All"), mainWidget);
     all_button->setFocus();
     all_button->setChecked(true);
-    tqlayout->addWidget(all_button);
+    layout->addWidget(all_button);
     
     only_button = new TQRadioButton(i18n("&Only:"), mainWidget);
-    tqlayout->addWidget(only_button);
+    layout->addWidget(only_button);
 
-    TQGridLayout *eventstqlayout = new TQGridLayout(tqlayout);
-    eventstqlayout->addColSpacing(0, 20);
-    eventstqlayout->setColStretch(0, 0);
-    eventstqlayout->setColStretch(1, 1);
+    TQGridLayout *eventslayout = new TQGridLayout(layout);
+    eventslayout->addColSpacing(0, 20);
+    eventslayout->setColStretch(0, 0);
+    eventslayout->setColStretch(1, 1);
     
     commitbox = new TQCheckBox(i18n("&Commits"), mainWidget);
     commitbox->setEnabled(false);
-    eventstqlayout->addWidget(commitbox, 0, 1);
+    eventslayout->addWidget(commitbox, 0, 1);
     
     editbox = new TQCheckBox(i18n("&Edits"), mainWidget);
     editbox->setEnabled(false);
-    eventstqlayout->addWidget(editbox, 1, 1);
+    eventslayout->addWidget(editbox, 1, 1);
 
     uneditbox = new TQCheckBox(i18n("&Unedits"), mainWidget);
     uneditbox->setEnabled(false);
-    eventstqlayout->addWidget(uneditbox, 2, 1);
+    eventslayout->addWidget(uneditbox, 2, 1);
 
     TQButtonGroup* group = new TQButtonGroup(mainWidget);
     group->hide();
diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp
index afe9e7a3..e080eabf 100644
--- a/cervisia/watchersdlg.cpp
+++ b/cervisia/watchersdlg.cpp
@@ -19,7 +19,7 @@
 
 #include "watchersdlg.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtable.h>
 #include <kconfig.h>
 #include <klineedit.h>
@@ -37,7 +37,7 @@ WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* parent, const char* name)
 {
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     table = new TQTable(mainWidget, "watchersTable");
     table->setNumCols(5);
@@ -57,7 +57,7 @@ WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* parent, const char* name)
     header->setLabel(3, i18n("Unedit"));
     header->setLabel(4, i18n("Commit"));
     
-    tqlayout->addWidget(table, 1);
+    layout->addWidget(table, 1);
 
     setWFlags(TQt::WDestructiveClose | getWFlags());
 
diff --git a/kapptemplate/kapp/apppref.cpp b/kapptemplate/kapp/apppref.cpp
index 8716b3e0..4bee58ac 100644
--- a/kapptemplate/kapp/apppref.cpp
+++ b/kapptemplate/kapp/apppref.cpp
@@ -4,7 +4,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}pref.cpp
 
 #include <klocale.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 ${APP_NAME}Preferences::${APP_NAME}Preferences()
@@ -25,8 +25,8 @@ ${APP_NAME}Preferences::${APP_NAME}Preferences()
 ${APP_NAME}PrefPageOne::${APP_NAME}PrefPageOne(TQWidget *parent)
     : TQFrame(parent)
 {
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-    tqlayout->setAutoAdd(true);
+    TQHBoxLayout *layout = new TQHBoxLayout(this);
+    layout->setAutoAdd(true);
 
     new TQLabel("Add something here", this);
 }
@@ -34,8 +34,8 @@ ${APP_NAME}PrefPageOne::${APP_NAME}PrefPageOne(TQWidget *parent)
 ${APP_NAME}PrefPageTwo::${APP_NAME}PrefPageTwo(TQWidget *parent)
     : TQFrame(parent)
 {
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
-    tqlayout->setAutoAdd(true);
+    TQHBoxLayout *layout = new TQHBoxLayout(this);
+    layout->setAutoAdd(true);
 
     new TQLabel("Add something here", this);
 }
diff --git a/kapptemplate/kapp/appview.cpp b/kapptemplate/kapp/appview.cpp
index bc923619..9b62b749 100644
--- a/kapptemplate/kapp/appview.cpp
+++ b/kapptemplate/kapp/appview.cpp
@@ -3,7 +3,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}view.cpp
 #include "${APP_NAME_LC}view.h"
 
 #include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kurl.h>
 
@@ -16,7 +16,7 @@ ${APP_NAME}View::${APP_NAME}View(TQWidget *parent)
     : TQWidget(parent),
       DCOPObject("${APP_NAME}Iface")
 {
-    // setup our tqlayout manager to automatically add our widgets
+    // setup our layout manager to automatically add our widgets
     TQHBoxLayout *top_layout = new TQHBoxLayout(this);
     top_layout->setAutoAdd(true);
 
diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp
index adbda9db..40390ed1 100644
--- a/kapptemplate/kpartapp/app_part.cpp
+++ b/kapptemplate/kpartapp/app_part.cpp
@@ -11,7 +11,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp
 #include <kparts/genericfactory.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqmultilineedit.h>
 
 typedef KParts::GenericFactory<${APP_NAME}Part> ${APP_NAME}PartFactory;
diff --git a/kbabel/addons/kfile-plugins/kfile_po.cpp b/kbabel/addons/kfile-plugins/kfile_po.cpp
index cb2b6390..156f52c1 100644
--- a/kbabel/addons/kfile-plugins/kfile_po.cpp
+++ b/kbabel/addons/kfile-plugins/kfile_po.cpp
@@ -62,7 +62,7 @@ bool KPoPlugin::readInfo(KFileMetaInfo& metaInfo, uint)
 {
   PoInfo poInfo;
   TQStringList wordList;
-  ConversiontqStatus status = PoInfo::info(metaInfo.path(), poInfo, wordList, false, false, false);
+  ConversionStatus status = PoInfo::info(metaInfo.path(), poInfo, wordList, false, false, false);
   if (status == OK) {
     KFileMetaInfoGroup group = appendGroup(metaInfo, "CatalogInfo");
 
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 572c593c..01aa6b41 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -79,7 +79,7 @@
 #include <tqwhatsthis.h>
 #include <tqheader.h>
 #include <tqdragobject.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 
 using namespace KBabel;
@@ -126,7 +126,7 @@ void CatalogManager::init()
    
    if ( _project == NULL )
    {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(_configFile)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(_configFile)
 	    , i18n("Project File Error"));
 
 	_project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
@@ -136,13 +136,13 @@ void CatalogManager::init()
 	, TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
 
    TQWidget *view = new TQWidget(this);
-   TQVBoxLayout* tqlayout= new TQVBoxLayout(view);
-   tqlayout->setMargin(0);
-   tqlayout->setSpacing(KDialog::spacingHint());
+   TQVBoxLayout* layout= new TQVBoxLayout(view);
+   layout->setMargin(0);
+   layout->setSpacing(KDialog::spacingHint());
 
    _catalogManager=new CatalogManagerView(_project, view,"catalog manager");
-   tqlayout->addWidget(_catalogManager);
-   tqlayout->setStretchFactor(_catalogManager,1);
+   layout->addWidget(_catalogManager);
+   layout->setStretchFactor(_catalogManager,1);
 
    connect(this,TQT_SIGNAL(settingsChanged(KBabel::CatManSettings))
             ,TQT_TQOBJECT(_catalogManager),TQT_SLOT(setSettings(KBabel::CatManSettings)));
@@ -162,7 +162,7 @@ void CatalogManager::init()
    KWin::setIcons(winId(),BarIcon("catalogmanager",32)
            ,SmallIcon("catalogmanager"));
 
-   TQHBoxLayout* hBoxL = new TQHBoxLayout(tqlayout);
+   TQHBoxLayout* hBoxL = new TQHBoxLayout(layout);
    _progressLabel = new TQLabel(view);
    hBoxL->addWidget(_progressLabel);
    _progressBar=new KProgress(view);
@@ -431,7 +431,7 @@ void CatalogManager::setupActions()
     (void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
       TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" );
     (void)new KAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager),
-      TQT_SLOT( cvstqStatus( ) ), actionCollection( ), "cvs_status" );
+      TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" );
     (void)new KAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
       TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" );
     (void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
@@ -552,7 +552,7 @@ void CatalogManager::setupStatusBar()
     _statusProgressBar->hide();
 
     statusBar()->addWidget(progressBox,1);
-    statusBar()->setMinimumHeight(_statusProgressBar->tqsizeHint().height());
+    statusBar()->setMinimumHeight(_statusProgressBar->sizeHint().height());
 
     TQWhatsThis::add(statusBar(),
 	i18n("<qt><p><b>Statusbar</b></p>\n"
@@ -912,7 +912,7 @@ void CatalogManager::clearStatusProgressBar()
 
 void CatalogManager::setNumberOfFound(int toBeSent, int total)
 {
-    _foundLabel->setText(i18n("Found: %1/%2").tqarg(toBeSent).tqarg(total));
+    _foundLabel->setText(i18n("Found: %1/%2").arg(toBeSent).arg(total));
 }
 
 void CatalogManager::decreaseNumberOfFound()
@@ -1232,7 +1232,7 @@ void CatalogManager::projectOpen()
     }
     else
     {
-	KMessageBox::error (this, i18n("Cannot open project file %1").tqarg(file));
+	KMessageBox::error (this, i18n("Cannot open project file %1").arg(file));
     }
 }
 
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index 2473af73..10630c6d 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -80,8 +80,8 @@
 #include <tqwhatsthis.h>
 #include <tqheader.h>
 #include <tqdragobject.h>
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
 
 using namespace KBabel;
 
@@ -445,7 +445,7 @@ void CatalogManagerView::loadMarks()
 #endif
     {
 	KMessageBox::error(this,i18n(
-	    "Error while trying to open file:\n %1").tqarg(url.prettyURL()));
+	    "Error while trying to open file:\n %1").arg(url.prettyURL()));
 	return;
     }
 
@@ -471,7 +471,7 @@ void CatalogManagerView::loadMarks()
 	{
     	    KMessageBox::error(this
 		,i18n("Error while trying to read file:\n %1\n"
-		"Maybe it is not a valid file with list of markings.").tqarg(url.prettyURL()));
+		"Maybe it is not a valid file with list of markings.").arg(url.prettyURL()));
 	    f.close();
 	    return;
 	}
@@ -480,7 +480,7 @@ void CatalogManagerView::loadMarks()
     else
     {
 	KMessageBox::error(this,i18n(
-	    "Error while trying to open file:\n %1").tqarg(url.prettyURL()));
+	    "Error while trying to open file:\n %1").arg(url.prettyURL()));
     }
 
     KIO::NetAccess::removeTempFile( filename );
@@ -516,8 +516,8 @@ void CatalogManagerView::saveMarks()
     // ### FIXME: why is the file dialog not doing this?
     if ( KIO::NetAccess::exists( url2, false, this ) )
     {
-        if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
-	            "Do you want to overwrite it?").tqarg(url2.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
+        if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
+	            "Do you want to overwrite it?").arg(url2.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
 	{
 	    return;
 	}
@@ -568,7 +568,7 @@ void CatalogManagerView::saveMarks()
     {
         // ### KDE4 FIXME: strip the final \n of the message
         KMessageBox::error( this,
-            i18n( "An error occurred while trying to write to file:\n%1\n" ).tqarg( url.prettyURL()) );
+            i18n( "An error occurred while trying to write to file:\n%1\n" ).arg( url.prettyURL()) );
     }
     else if ( !localFile )
     {
@@ -577,7 +577,7 @@ void CatalogManagerView::saveMarks()
         {
             // ### KDE4 FIXME: strip the final \n of the message
             KMessageBox::error(this,
-                i18n("An error occurred while trying to upload the file:\n%1\n").tqarg(url.prettyURL()));
+                i18n("An error occurred while trying to upload the file:\n%1\n").arg(url.prettyURL()));
         }
     }
 
@@ -713,7 +713,7 @@ void CatalogManagerView::markedStatistics()
    showStatistics( i, markedDoList );
 }
 
-void CatalogManagerView::showStatistics( CatManListItem  *i, TQStringList &tqchildrenList )
+void CatalogManagerView::showStatistics( CatManListItem  *i, TQStringList &childrenList )
 {
    KLocale *locale = KGlobal::locale();
 
@@ -727,7 +727,7 @@ void CatalogManagerView::showStatistics( CatManListItem  *i, TQStringList &tqchi
       int totalUntranslated=0;
 
       TQStringList::const_iterator it;
-      for( it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it )
+      for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it )
       {
          CatManListItem* item = _fileList[(*it)];
 
@@ -768,29 +768,29 @@ void CatalogManagerView::showStatistics( CatManListItem  *i, TQStringList &tqchi
       if(name.isEmpty())
           msg = i18n("Statistics for all:\n");
       else
-          msg = i18n("Statistics for %1:\n").tqarg(name);
+          msg = i18n("Statistics for %1:\n").arg(name);
 
-      msg+=i18n("Number of packages: %1\n").tqarg(locale->formatNumber(totalPackages, 0));
+      msg+=i18n("Number of packages: %1\n").arg(locale->formatNumber(totalPackages, 0));
 
       percent=100.0-((double)needworkPo*100.0)/totalPackages;
-      msg+=i18n("Complete translated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalPackages-needworkPo, 0));
+      msg+=i18n("Complete translated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalPackages-needworkPo, 0));
 
       percent=100.0-((double)totalPo*100.0)/totalPackages;
-      msg+=i18n("Only template available: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalPackages-totalPo,0));
+      msg+=i18n("Only template available: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalPackages-totalPo,0));
       percent=((double)totalNoPot*100.0)/totalPackages;
-      msg+=i18n("Only PO file available: %1 % (%2)\n").tqarg(locale->formatNumber(percent,02)).tqarg(locale->formatNumber(totalNoPot, 0));
+      msg+=i18n("Only PO file available: %1 % (%2)\n").arg(locale->formatNumber(percent,02)).arg(locale->formatNumber(totalNoPot, 0));
 
-      msg+=i18n("Number of messages: %1\n").tqarg(locale->formatNumber(totalMsgid, 0));
+      msg+=i18n("Number of messages: %1\n").arg(locale->formatNumber(totalMsgid, 0));
 
       long int totalTranslated = totalMsgid - totalFuzzy - totalUntranslated;
       percent=((double)totalTranslated*100.0)/totalMsgid;
-      msg+=i18n("Translated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalTranslated, 0));
+      msg+=i18n("Translated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalTranslated, 0));
 
       percent=((double)totalFuzzy*100.0)/totalMsgid;
-      msg+=i18n("Fuzzy: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalFuzzy, 0));
+      msg+=i18n("Fuzzy: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalFuzzy, 0));
 
       percent=((double)totalUntranslated*100.0)/totalMsgid;
-      msg+=i18n("Untranslated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalUntranslated, 0));
+      msg+=i18n("Untranslated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalUntranslated, 0));
 
    KMessageBox::information(this,msg,i18n("Statistics"));
 }
@@ -807,7 +807,7 @@ void CatalogManagerView::checkSyntax()
       if(!item->hasPo())
          return;
 
-      Msgfmt::tqStatus status;
+      Msgfmt::Status status;
       TQString output;
       Msgfmt msgfmt;
 
@@ -850,7 +850,7 @@ void CatalogManagerView::checkSyntax()
    }
    else
    {
-      Msgfmt::tqStatus status;
+      Msgfmt::Status status;
       TQString output;
       Msgfmt msgfmt;
 
@@ -866,7 +866,7 @@ void CatalogManagerView::checkSyntax()
             if(!name.isEmpty())
             {
                msg=i18n("All files in folder %1 are syntactically correct.\n"
-"Output of \"msgfmt --statistics\":\n").tqarg(name)+output;
+"Output of \"msgfmt --statistics\":\n").arg(name)+output;
             }
             else
             {
@@ -882,7 +882,7 @@ void CatalogManagerView::checkSyntax()
             if(!name.isEmpty())
             {
                msg=i18n("At least one file in folder %1 has syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n").tqarg(name)+output;
+"Output of \"msgfmt --statistics\":\n").arg(name)+output;
             }
             else
             {
@@ -898,7 +898,7 @@ void CatalogManagerView::checkSyntax()
             if(!name.isEmpty())
             {
                msg=i18n("At least one file in folder %1 has header syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n").tqarg(name)+output;
+"Output of \"msgfmt --statistics\":\n").arg(name)+output;
             }
             else
             {
@@ -914,7 +914,7 @@ void CatalogManagerView::checkSyntax()
             if(!name.isEmpty())
             {
               msg=i18n("An error occurred while processing \"msgfmt --statistics *.po\" "
-"in folder %1").tqarg(name);
+"in folder %1").arg(name);
             }
             else
             {
@@ -985,10 +985,10 @@ void CatalogManagerView::mailFiles()
   CatManListItem* item = (CatManListItem*)currentItem();
   if(item->isDir()) {
     TQStringList filesToSend;
-    TQStringList tqchildrenList = item->allChildrenList(true);
+    TQStringList childrenList = item->allChildrenList(true);
 
     TQStringList::const_iterator it;
-    for (it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it) {
+    for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) {
       CatManListItem* i = _fileList[(*it)];
       if (i->hasPo()) {
 	filesToSend << i->poFile();
@@ -1023,10 +1023,10 @@ void CatalogManagerView::packageFiles( )
     CatManListItem* item = (CatManListItem*)currentItem();
     if(item->isDir()) {
         TQStringList filesToPackage;
-        TQStringList tqchildrenList = item->allChildrenList(true);
+        TQStringList childrenList = item->allChildrenList(true);
 
         TQStringList::const_iterator it;
-        for (it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it) {
+        for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) {
           CatManListItem* i = _fileList[(*it)];
           if (i->hasPo()) {
 	    filesToPackage << i->poFile();
@@ -1082,14 +1082,14 @@ void CatalogManagerView::cvsCommitMarked( )
   doCVSCommand( CVS::Commit, true );
 }
 
-void CatalogManagerView::cvstqStatus( )
+void CatalogManagerView::cvsStatus( )
 {
-  doCVSCommand( CVS::tqStatus );
+  doCVSCommand( CVS::Status );
 }
 
 void CatalogManagerView::cvsStatusMarked( )
 {
-  doCVSCommand( CVS::tqStatus, true );
+  doCVSCommand( CVS::Status, true );
 }
 
 void CatalogManagerView::cvsUpdateTemplate( )
@@ -1137,7 +1137,7 @@ void CatalogManagerView::doCVSCommand( CVS::Command cmd, bool marked, bool templ
     TQString cvsItem;
     CatManListItem * item = (CatManListItem*)currentItem( );
     if ( ( cmd == CVS::Commit || cmd == CVS::Diff ) && item->isDir( ) ) {
-      // all tqchildren including directories
+      // all children including directories
       TQStringList cvsItems = item->allChildrenFileList (true, false, true);
       if ( !cvsItems.isEmpty( ) )
         cvshandler->execCVSCommand( this, cmd, cvsItems, templates, config );
@@ -1249,7 +1249,7 @@ void CatalogManagerView::doSVNCommand( SVN::Command cmd, bool marked, bool templ
         TQString svnItem;
         CatManListItem * item = (CatManListItem*)currentItem( );
         if ( ( cmd == SVN::Commit || cmd == SVN::Diff ) && item->isDir( ) ) {
-      // all tqchildren including directories
+      // all children including directories
             TQStringList svnItems = item->allChildrenFileList (true, false, true);
             if ( !svnItems.isEmpty( ) )
                 svnhandler->execSVNCommand( this, cmd, svnItems, templates, config );
@@ -1283,14 +1283,14 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest )
    const TQString search = options.findStr.lower().simplifyWhiteSpace();
    TQStringList searchWords = TQStringList::split(' ', search);
 
-   TQStringList tqchildrenList;
-   if( i->isFile() ) tqchildrenList.append(i->name());
-   else tqchildrenList =i->allChildrenList(true);
+   TQStringList childrenList;
+   if( i->isFile() ) childrenList.append(i->name());
+   else childrenList =i->allChildrenList(true);
 
-   emit prepareFindProgressBar(tqchildrenList.size());
+   emit prepareFindProgressBar(childrenList.size());
 
    TQStringList::const_iterator it;
-   for( it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it )
+   for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it )
    {
 	 CatManListItem* item = _fileList[(*it)];
 
@@ -1341,7 +1341,7 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest )
 		const TQString foundItemFile = itemFile;
 
 		it++;
-		while( it != tqchildrenList.constEnd() )
+		while( it != childrenList.constEnd() )
 		{
         	    CatManListItem *item = _fileList[(*it)];
 
@@ -1499,12 +1499,12 @@ void CatalogManagerView::slotDeleteFile()
 
    if(item && item->isFile() && item->hasPo() && !item->hasPot())
    {
-      const TQString msg=i18n("Do you really want to delete the file %1?").tqarg(item->poFile());
+      const TQString msg=i18n("Do you really want to delete the file %1?").arg(item->poFile());
       if(KMessageBox::warningContinueCancel(this,msg,i18n("Warning"),KGuiItem( i18n("Delete"), "editdelete"))== KMessageBox::Continue)
       {
          if(!TQFile::remove(item->poFile()))
          {
-             KMessageBox::sorry(this,i18n("Was not able to delete the file %1!").tqarg(item->poFile()));
+             KMessageBox::sorry(this,i18n("Was not able to delete the file %1!").arg(item->poFile()));
          }
       }
    }
@@ -1765,7 +1765,7 @@ void CatalogManagerView::buildTree()
    {
       KMessageBox::error(this,i18n("You have not specified a valid folder "
 "for the base folder of the PO files:\n%1\n"
-"Please check your settings in the project settings dialog.").tqarg(_settings.poBaseDir));
+"Please check your settings in the project settings dialog.").arg(_settings.poBaseDir));
 
       _active=false;
       _updateNesting--;
@@ -1782,7 +1782,7 @@ void CatalogManagerView::buildTree()
    {
       KMessageBox::error(this,i18n("You have not specified a valid folder "
 "for the base folder of the PO template files:\n%1\n"
-"Please check your settings in the project settings dialog.").tqarg(_settings.potBaseDir));
+"Please check your settings in the project settings dialog.").arg(_settings.potBaseDir));
    }
 
    cvshandler->setPOTBaseDir( _settings.potBaseDir );
@@ -3008,7 +3008,7 @@ void CatalogManagerView::validate_internal( const TQStringList& files, const KDa
 	    true, i18n("Validation Options"), KDialogBase::Ok|KDialogBase::Cancel);
 	_validateOptions = new ValidationOptions(_validateOptionsDlg);
 	_validateOptionsDlg->setMainWidget( _validateOptions );
-	_validateOptions->resize( _validateOptions->tqsizeHint() );
+	_validateOptions->resize( _validateOptions->sizeHint() );
 
 	// setup stored values
 	_validateOptions->markAsFuzzy->setChecked( _markAsFuzzy );
diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h
index d923a3bb..fe4b7d35 100644
--- a/kbabel/catalogmanager/catalogmanagerview.h
+++ b/kbabel/catalogmanager/catalogmanagerview.h
@@ -161,7 +161,7 @@ public slots:
    void cvsUpdateMarked( );
    void cvsCommit( );
    void cvsCommitMarked( );
-   void cvstqStatus( );
+   void cvsStatus( );
    void cvsStatusMarked( );
    void cvsUpdateTemplate( );
    void cvsUpdateMarkedTemplate( );
@@ -235,7 +235,7 @@ public slots:
 
    /**
    * Returns the list of all currently selected files. If current selection is dir,
-   * it returns list of all its tqchildren.
+   * it returns list of all its children.
    */
    TQStringList current();
    /**
diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp
index d5997dd5..52f248e2 100644
--- a/kbabel/catalogmanager/catmanlistitem.cpp
+++ b/kbabel/catalogmanager/catmanlistitem.cpp
@@ -183,7 +183,7 @@ void CatManListItem::setOpen(bool open)
 
 TQStringList CatManListItem::allChildrenList(bool onlyFiles) const
 {
-   TQStringList tqchildrenList;
+   TQStringList childrenList;
 
    CatManListItem * myChild = (CatManListItem*)firstChild();
    while( myChild )
@@ -192,26 +192,26 @@ TQStringList CatManListItem::allChildrenList(bool onlyFiles) const
 
       if(myChild->isFile())
       {
-         tqchildrenList.append(name);
+         childrenList.append(name);
       }
       else if(myChild->isDir())
       {
          if(!onlyFiles)
-            tqchildrenList.append(name);
+            childrenList.append(name);
 
-         tqchildrenList+=myChild->allChildrenList(onlyFiles);
+         childrenList+=myChild->allChildrenList(onlyFiles);
       }
 
       myChild = (CatManListItem*)myChild->nextSibling();
    }
 
-   return tqchildrenList;
+   return childrenList;
 }
 
 
 TQStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs, bool onlyModified) const
 {
-   TQStringList tqchildrenList;
+   TQStringList childrenList;
 
    CatManListItem * myChild = (CatManListItem*)firstChild();
    while( myChild )
@@ -219,22 +219,22 @@ TQStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs,
       if(myChild->isFile() && myChild->hasPo() &&
        !(!myChild->isModified() && onlyModified))
       {
-         tqchildrenList.append(myChild->poFile());
+         childrenList.append(myChild->poFile());
       }
       else if(myChild->isDir())
       {
          if(!onlyFiles && (emptyDirs || myChild->_primary.exists() ))
 	 {
-            tqchildrenList.append(myChild->poFile());
+            childrenList.append(myChild->poFile());
 	 }
 
-         tqchildrenList+=myChild->allChildrenFileList(onlyFiles,false,onlyModified);
+         childrenList+=myChild->allChildrenFileList(onlyFiles,false,onlyModified);
       }
 
       myChild = (CatManListItem*)myChild->nextSibling();
    }
 
-   return tqchildrenList;
+   return childrenList;
 }
 
 
@@ -417,7 +417,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
 
              if(showPoInfo)
              {
-                _lastUpdated=TQDateTime::tqcurrentDateTime();
+                _lastUpdated=TQDateTime::currentDateTime();
 
 			    bool neededWork=needsWork();
 				bool needWork=false;
@@ -435,17 +435,17 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
                     const CVSHandler* cvsHandler = _view->cvsHandler();
                     const SVNHandler* svnHandler = _view->svnHandler();
                     
-                    const CVSHandler::FiletqStatus cvsFiletqStatus = cvsHandler->fstatus( poFile() );
-                    const SVNHandler::FiletqStatus svnFiletqStatus = svnHandler->fstatus( poFile() );
+                    const CVSHandler::FileStatus cvsFileStatus = cvsHandler->fstatus( poFile() );
+                    const SVNHandler::FileStatus svnFileStatus = svnHandler->fstatus( poFile() );
 
-                    _isModified = cvsHandler->isConsideredModified( cvsFiletqStatus )
-                        || svnHandler->isConsideredModified( svnFiletqStatus );
+                    _isModified = cvsHandler->isConsideredModified( cvsFileStatus )
+                        || svnHandler->isConsideredModified( svnFileStatus );
 
                     TQString versionControl;
-                    if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY )
-                        versionControl = cvsHandler->filetqStatus( cvsFiletqStatus );
-                    else if  ( svnFiletqStatus != SVNHandler::NO_REPOSITORY )
-                        versionControl = svnHandler->filetqStatus( svnFiletqStatus );
+                    if ( cvsFileStatus != CVSHandler::NO_REPOSITORY )
+                        versionControl = cvsHandler->fileStatus( cvsFileStatus );
+                    else if  ( svnFileStatus != SVNHandler::NO_REPOSITORY )
+                        versionControl = svnHandler->fileStatus( svnFileStatus );
                     else
                         versionControl = i18n("No version control");
 
@@ -532,7 +532,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren
 
              if(showPoInfo)
              {
-                _lastUpdated=TQDateTime::tqcurrentDateTime();
+                _lastUpdated=TQDateTime::currentDateTime();
 
 		// clean previous state information
 		setText(COL_FUZZY,TQString());
@@ -617,7 +617,7 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo )
         TQString name=_primary.fileName();
         setText(COL_NAME,name.left(name.length()-3));
 
-        _lastUpdated=TQDateTime::tqcurrentDateTime();
+        _lastUpdated=TQDateTime::currentDateTime();
 
 	bool neededWork=needsWork();
 	bool needWork=false;
@@ -625,14 +625,14 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo )
         TQPixmap icon;
 	_hasErrors=false;
 
-        const CVSHandler::FiletqStatus cvsFiletqStatus = _view->cvsHandler()->fstatus(poFile());
-        const SVNHandler::FiletqStatus svnFiletqStatus = _view->svnHandler()->fstatus(poFile());
+        const CVSHandler::FileStatus cvsFileStatus = _view->cvsHandler()->fstatus(poFile());
+        const SVNHandler::FileStatus svnFileStatus = _view->svnHandler()->fstatus(poFile());
 
         TQString versionControl;
-        if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY )
-            versionControl = _view->cvsHandler()->filetqStatus( cvsFiletqStatus );
-        else if  ( svnFiletqStatus != SVNHandler::NO_REPOSITORY )
-            versionControl = _view->svnHandler()->filetqStatus( svnFiletqStatus );
+        if ( cvsFileStatus != CVSHandler::NO_REPOSITORY )
+            versionControl = _view->cvsHandler()->fileStatus( cvsFileStatus );
+        else if  ( svnFileStatus != SVNHandler::NO_REPOSITORY )
+            versionControl = _view->svnHandler()->fileStatus( svnFileStatus );
         else
             versionControl = i18n("No version control");
  
diff --git a/kbabel/catalogmanager/catmanlistitem.h b/kbabel/catalogmanager/catmanlistitem.h
index ac22e2e8..b94a0618 100644
--- a/kbabel/catalogmanager/catmanlistitem.h
+++ b/kbabel/catalogmanager/catmanlistitem.h
@@ -68,11 +68,11 @@ public:
 
    /**
 	* returns the package names (including relative path) of the
-	* tqchildren of this item
+	* children of this item
 	*/
    TQStringList contentsList(bool onlyFiles=false) const;
    /**
-   * returns the package names of all tqchildren of this item
+   * returns the package names of all children of this item
    * (including all subdirectries)
    * @param onlyFiles flag, if only the names of files should be returned
    * @see CatManListItem::contentsList
@@ -80,7 +80,7 @@ public:
    TQStringList allChildrenList(bool onlyFiles=false) const;
 
    /**
-   * returns the relative file names of all tqchildren of this item
+   * returns the relative file names of all children of this item
    * (including all subdirectries)
    * @param onlyFiles flag, if only the names of files should be returned
    * @param emptyDirs flag, if the empty dirs (dirs without PO files in them) should be returned
@@ -183,7 +183,7 @@ private:
    * @param showPoInfo if true, reads information about the
    * file using @ref Catalog::info
    * ( slow for big files )
-   * @param includeChildren flag, if possible tqchildren should be updated,too
+   * @param includeChildren flag, if possible children should be updated,too
    * @param noParents flag, if parents should be updated, when state
    * of the item has changed
    */
diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp
index 25c37594..6fa274d4 100644
--- a/kbabel/catalogmanager/findinfilesdialog.cpp
+++ b/kbabel/catalogmanager/findinfilesdialog.cpp
@@ -34,7 +34,7 @@
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <kconfig.h>
@@ -48,7 +48,7 @@ FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* parent)
 		:FindDialog(forReplace, parent)
 {
 	TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("File Options"), mainWidget());
-	mainWidget()->tqlayout()->add(box);
+	mainWidget()->layout()->add(box);
 
 	_inAllFiles = new TQCheckBox(i18n("&In all files"),box);
 	_inMarked = new TQCheckBox(i18n("&Marked files"),box);
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index 1cfd6ab7..04ecd906 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -38,13 +38,13 @@
 #include <tqfileinfo.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextedit.h>
-#include <tqtextcodec.h>
+#include <textedit.h>
+#include <textcodec.h>
 // KDE include files
 #include <kconfig.h>
 #include <kdebug.h>
@@ -69,7 +69,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
 
   TQString temp;
 
-  TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
+  TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
 
   // Set the label's text depending on the CVS command.
   switch ( cmd ) {
@@ -79,18 +79,18 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
     case CVS::Commit:
       temp = i18n( "Commit the following files:" );
       break;
-    case CVS::tqStatus:
+    case CVS::Status:
       temp = i18n( "Get status for the following files:" );
       break;
     case CVS::Diff:
       temp = i18n( "Get diff for the following files:" );
       break;
   }
-  tqlayout->addWidget( new TQLabel( temp, this ) );
+  layout->addWidget( new TQLabel( temp, this ) );
 
   // Widget for showing the list of files.
   filebox = new TQListBox( this );
-  tqlayout->addWidget( filebox );
+  layout->addWidget( filebox );
 
   // Add special widgets for 'cvs commit'.
   if ( cmd == CVS::Commit ) {
@@ -101,25 +101,25 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
     oldMessages = new TQComboBox( this );
     oldMessages->setDuplicatesEnabled( false );
     label->setBuddy( oldMessages );
-    tqlayout->addWidget( label );
-    tqlayout->addWidget( oldMessages );
+    layout->addWidget( label );
+    layout->addWidget( oldMessages );
 
     // Textfield for entering a log message.
     label = new TQLabel( i18n( "&Log message:" ), this );
     logedit = new TQTextEdit( this );
     label->setBuddy( logedit );
-    tqlayout->addWidget( label );
-    tqlayout->addWidget( logedit );
+    layout->addWidget( label );
+    layout->addWidget( logedit );
 
     label = new TQLabel( i18n( "E&ncoding:" ), this );
     m_encodingComboBox = new KComboBox( this );
     label->setBuddy( m_encodingComboBox );
-    tqlayout->addWidget( label );
-    tqlayout->addWidget( m_encodingComboBox );
+    layout->addWidget( label );
+    layout->addWidget( m_encodingComboBox );
     TQStringList encodingList;
     // The last encoding will be added at the top of the list, when the seetings will be read.
-    encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" );
-    encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->mimeName() );
+    encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
+    encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->mimeName() );
     encodingList += KGlobal::charsets()->descriptiveEncodingNames();
     m_encodingComboBox->insertStringList( encodingList );
     
@@ -143,7 +143,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
     case CVS::Commit:
       temp = i18n( "&Commit" );
       break;
-    case CVS::tqStatus:
+    case CVS::Status:
       temp = i18n( "&Get Status" );
       break;
     case CVS::Diff:
@@ -156,19 +156,19 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config
 
   cancelBtn = new TQPushButton( i18n( "C&ancel" ), this );
   buttons->addWidget( cancelBtn );
-  tqlayout->addLayout( buttons );
+  layout->addLayout( buttons );
 
   TQFrame * line = new TQFrame( this );
   line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
-  tqlayout->addWidget( line );
+  layout->addWidget( line );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
+  layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
 
   output = new TQTextEdit( this );
   output->setReadOnly( true );
-  tqlayout->addWidget( output );
+  layout->addWidget( output );
 
-  resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
+  resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
 
   if ( cmd == CVS::Commit )
     logedit->setFocus( );
@@ -244,14 +244,14 @@ void CVSDialog::slotExecuteCommand( )
 
     if ( !codec )
     {
-        KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).tqarg( m_encoding ) );
+        KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).arg( m_encoding ) );
         return;
     }
     else if ( !codec->canEncode( msg ) )
     {
         const int res = KMessageBox::warningContinueCancel( this,
             i18n( "The commit log message cannot be encoded in the selected encoding: %1.\n"
-            "Do you want to continue?" ).tqarg( m_encoding ) );
+            "Do you want to continue?" ).arg( m_encoding ) );
         if ( res != KMessageBox::Continue )
             return;
     }
@@ -330,7 +330,7 @@ void CVSDialog::slotProcessStdout( KProcess*, char * buffer, int len )
   output->setCursorPosition( output->lines( ), 0 );
 
   // If the command is 'cvs status' or 'cvs diff' collect the output of stdout.
-  if ( (_cmd == CVS::tqStatus) || (_cmd == CVS::Diff) )
+  if ( (_cmd == CVS::Status) || (_cmd == CVS::Diff) )
     _statusOutput += TQString::fromLocal8Bit( buffer, len );
 }
 
@@ -348,7 +348,7 @@ void CVSDialog::slotProcessStderr( KProcess*, char * buffer, int len )
 void CVSDialog::slotProcessExited( KProcess * p )
 {
   if ( p->exitStatus( ) )
-    output->append( i18n( "[ Exited with status %1 ]" ).tqarg( p->exitStatus( ) ) );
+    output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) );
   else
     output->append( i18n( "[ Finished ]" ) );
 
@@ -383,9 +383,9 @@ void CVSDialog::readSettings( )
     m_logMessages.clear();
     m_squeezedLogMessages.clear();
     for ( int cnt = 0; cnt < 10; cnt++ )
-      if ( config->hasKey( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ) )
+      if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) )
     {
-      const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) );
+      const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) );
       if ( !logMessage.isEmpty() )
       {
           // If the message is too long, cut it to 80 characters (or the combo box becomes too wide)
@@ -398,7 +398,7 @@ void CVSDialog::readSettings( )
     }
 
     m_encoding = config->readEntry( "CVSEncoding", "UTF-8" );
-    m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice ( %1 )" ).tqarg( m_encoding ), 0);
+    m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice ( %1 )" ).arg( m_encoding ), 0);
   }
 }
 
@@ -413,7 +413,7 @@ void CVSDialog::saveSettings( )
     int cnt = 0;
     TQStringList::const_iterator it;
     for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt )
-      config->writeEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ), *it );
+      config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it );
 
     config->writeEntry( "CVSEncoding", m_encoding );
   }
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index b0764af8..b0be0345 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -81,7 +81,7 @@ void CVSHandler::setPOTBaseDir( const TQString& dir )
   emit signalIsPOTRepository( _isPOTRepository );
 }
 
-TQString CVSHandler::filetqStatus( const FiletqStatus status ) const
+TQString CVSHandler::fileStatus( const FileStatus status ) const
 {
   switch ( status ) {
     case NO_REPOSITORY:
@@ -111,7 +111,7 @@ TQString CVSHandler::filetqStatus( const FiletqStatus status ) const
   }
 }
 
-CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
+CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const
 {
   // no valid repository
   if ( !_isPORepository )
@@ -130,7 +130,7 @@ CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
   // ### FIXME: it does not take care of CVS/Entries.Log
   // a line in CVS/Entries has the following format:
   // [D]/NAME/REVISION/[CONFLICT+]TIMESTAMP/OPTIONS/TAGDATE
-  TQRegExp rx( TQString( "^D?/%1/" ).tqarg( info.fileName( ) ) );
+  TQRegExp rx( TQString( "^D?/%1/" ).arg( info.fileName( ) ) );
 
   TQString temp;
   TQTextStream stream( &entries );
@@ -177,7 +177,7 @@ CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const
   return UP_TO_DATE;
 }
 
-TQString CVSHandler::cvstqStatus( const TQString& filename ) const
+TQString CVSHandler::cvsStatus( const TQString& filename ) const
 {
   return map[filename];
 }
@@ -210,7 +210,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
       command += "commit -F @LOG@FILE@";
       checkToAdd( TQStringList( filename ) );
       break;
-    case CVS::tqStatus:
+    case CVS::Status:
       command += "status";
       break;
     case CVS::Diff:
@@ -241,7 +241,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr
       command += "commit -F @LOG@FILE@";
       checkToAdd( files );
       break;
-    case CVS::tqStatus:
+    case CVS::Status:
       command += "status";
       break;
     case CVS::Diff:
@@ -280,7 +280,7 @@ void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringL
   }
 
   if ( dia->exec( ) == KDialog::Accepted ) {
-    if ( cmd == CVS::tqStatus )
+    if ( cmd == CVS::Status )
       processStatusOutput( dia->statusOutput( ) );
     if ( cmd == CVS::Diff )
       processDiff( dia->statusOutput( ) );
@@ -383,7 +383,7 @@ void CVSHandler::processDiff( TQString output )
     KMessageBox::error( 0, error );
 }
 
-bool CVSHandler::isConsideredModified( const FiletqStatus status ) const
+bool CVSHandler::isConsideredModified( const FileStatus status ) const
 {
   /*
    * A file is modified if it is either:
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.h b/kbabel/catalogmanager/libcvs/cvshandler.h
index 1c08af92..5aeba57b 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.h
+++ b/kbabel/catalogmanager/libcvs/cvshandler.h
@@ -60,7 +60,7 @@ class CVSHandler : public TQObject
   TQ_OBJECT
 
   public:
-    enum FiletqStatus {
+    enum FileStatus {
       NO_REPOSITORY,
       NOT_IN_CVS,
       LOCALLY_ADDED,
@@ -75,9 +75,9 @@ class CVSHandler : public TQObject
     void setPOBaseDir( const TQString& dir );
     void setPOTBaseDir( const TQString& dir );
 
-    FiletqStatus fstatus( const TQString& filename ) const;
-    TQString filetqStatus( const FiletqStatus status ) const;
-    TQString cvstqStatus( const TQString& filename ) const;
+    FileStatus fstatus( const TQString& filename ) const;
+    TQString fileStatus( const FileStatus status ) const;
+    TQString cvsStatus( const TQString& filename ) const;
 
     void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
     void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
@@ -87,7 +87,7 @@ class CVSHandler : public TQObject
     /**
      * True if the file was modified or has another status considered as a modification
      */
-    bool isConsideredModified( const FiletqStatus status ) const;
+    bool isConsideredModified( const FileStatus status ) const;
 
   signals:
     void signalIsPORepository( bool );
diff --git a/kbabel/catalogmanager/libcvs/cvsresources.h b/kbabel/catalogmanager/libcvs/cvsresources.h
index 4c2bc144..9cac64db 100644
--- a/kbabel/catalogmanager/libcvs/cvsresources.h
+++ b/kbabel/catalogmanager/libcvs/cvsresources.h
@@ -35,7 +35,7 @@
 #define CVSRESOURCES_H
 
 namespace CVS {
-  enum Command { Update, Commit, tqStatus, Diff };
+  enum Command { Update, Commit, Status, Diff };
 }
 
 #endif // CVSRESOURCES_H
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index 756ace69..075a8235 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -38,12 +38,12 @@
 #include <tqfileinfo.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 // KDE include files
 #include <kconfig.h>
 #include <kdebug.h>
@@ -66,7 +66,7 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
 
   TQString temp;
 
-  TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
+  TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" );
 
   // Set the label's text depending on the SVN command.
   switch ( cmd ) {
@@ -89,11 +89,11 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
       temp = i18n( "Get information for the following files:" );
       break;
   }
-  tqlayout->addWidget( new TQLabel( temp, this ) );
+  layout->addWidget( new TQLabel( temp, this ) );
 
   // Widget for showing the list of files.
   filebox = new TQListBox( this );
-  tqlayout->addWidget( filebox );
+  layout->addWidget( filebox );
 
   // Add special widgets for 'svn commit'.
   if ( cmd == SVN::Commit ) {
@@ -104,15 +104,15 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
     oldMessages = new TQComboBox( this );
     oldMessages->setDuplicatesEnabled( false );
     label->setBuddy( oldMessages );
-    tqlayout->addWidget( label );
-    tqlayout->addWidget( oldMessages );
+    layout->addWidget( label );
+    layout->addWidget( oldMessages );
 
     // Textfield for entering a log message.
     label = new TQLabel( i18n( "&Log message:" ), this );
     logedit = new TQTextEdit( this );
     label->setBuddy( logedit );
-    tqlayout->addWidget( label );
-    tqlayout->addWidget( logedit );
+    layout->addWidget( label );
+    layout->addWidget( logedit );
 
     connect( oldMessages, TQT_SIGNAL( activated( int ) ),
       this, TQT_SLOT( slotComboActivated( int ) ) );
@@ -151,19 +151,19 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config
 
   cancelBtn = new TQPushButton( i18n( "C&ancel" ), this );
   buttons->addWidget( cancelBtn );
-  tqlayout->addLayout( buttons );
+  layout->addLayout( buttons );
 
   TQFrame * line = new TQFrame( this );
   line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
-  tqlayout->addWidget( line );
+  layout->addWidget( line );
 
-  tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
+  layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) );
 
   output = new TQTextEdit( this );
   output->setReadOnly( true );
-  tqlayout->addWidget( output );
+  layout->addWidget( output );
 
-  resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) );
+  resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) );
 
   if ( cmd == SVN::Commit )
     logedit->setFocus( );
@@ -327,7 +327,7 @@ void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len )
 void SVNDialog::slotProcessExited( KProcess * p )
 {
   if ( p->exitStatus( ) )
-    output->append( i18n( "[ Exited with status %1 ]" ).tqarg( p->exitStatus( ) ) );
+    output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) );
   else
     output->append( i18n( "[ Finished ]" ) );
 
@@ -362,9 +362,9 @@ void SVNDialog::readSettings( )
     m_logMessages.clear();
     m_squeezedLogMessages.clear();
     for ( int cnt = 0; cnt < 10; cnt++ )
-      if ( config->hasKey( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ) )
+      if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) )
       {
-        const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) );
+        const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) );
         if ( !logMessage.isEmpty() )
         {
           // If the message is too long, cut it to 80 characters (or the combo box becomes too wide)
@@ -390,7 +390,7 @@ void SVNDialog::saveSettings( )
     int cnt = 0;
     TQStringList::const_iterator it;
     for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt )
-      config->writeEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ), *it );
+      config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it );
   }
   m_config->sync();
 }
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index 5f91e1e8..d00c0858 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -83,7 +83,7 @@ void SVNHandler::setPOTBaseDir( const TQString& dir )
   emit signalIsPOTRepository( _isPOTRepository );
 }
 
-TQString SVNHandler::filetqStatus( const FiletqStatus status ) const
+TQString SVNHandler::fileStatus( const FileStatus status ) const
 {
   switch ( status ) {
     case NO_REPOSITORY:
@@ -115,7 +115,7 @@ TQString SVNHandler::filetqStatus( const FiletqStatus status ) const
   }
 }
 
-SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
+SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const
 {
   // no valid repository
   if ( !_isPORepository )
@@ -145,7 +145,7 @@ SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
   int errorLine, errorCol;
   TQDomNodeList nodelist;
   TQDomNode node;
-  TQDomElement entry, wctqStatus;
+  TQDomElement entry, wcStatus;
 
   // Parse the output.
   if ( !doc.setContent( out.getOutput(), &errorMsg, &errorLine, &errorCol ) ) {
@@ -177,22 +177,22 @@ SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const
   if ( node.isNull() )
     return ERROR_IN_WC;
 
-  wctqStatus = node.toElement();
+  wcStatus = node.toElement();
 
-  if ( wctqStatus.attributeNode("item").value() == "normal" )
+  if ( wcStatus.attributeNode("item").value() == "normal" )
     return UP_TO_DATE;
-  if ( wctqStatus.attributeNode("item").value() == "modified" )
+  if ( wcStatus.attributeNode("item").value() == "modified" )
     return LOCALLY_MODIFIED;
-  if ( wctqStatus.attributeNode("item").value() == "conflicted" )
+  if ( wcStatus.attributeNode("item").value() == "conflicted" )
     return CONFLICT;
-  if ( wctqStatus.attributeNode("item").value() == "unversioned" )
+  if ( wcStatus.attributeNode("item").value() == "unversioned" )
     return NOT_IN_SVN;
   // TODO Ignored entry should have separate return value probably.
-  if ( wctqStatus.attributeNode("item").value() == "ignored" )
+  if ( wcStatus.attributeNode("item").value() == "ignored" )
     return NOT_IN_SVN;
-  if ( wctqStatus.attributeNode("item").value() == "added" )
+  if ( wcStatus.attributeNode("item").value() == "added" )
     return LOCALLY_ADDED;
-  if ( wctqStatus.attributeNode("item").value() == "deleted" )
+  if ( wcStatus.attributeNode("item").value() == "deleted" )
     return LOCALLY_REMOVED;
   // TODO What to do with "missing", "incomplete", "replaced", "merged",
   // "obstructed", "external"? Can these appear at all in our case?
@@ -269,7 +269,7 @@ no_status_xml:
 
 }
 
-TQString SVNHandler::svntqStatus( const TQString& filename ) const
+TQString SVNHandler::svnStatus( const TQString& filename ) const
 {
   return map[filename];
 }
@@ -491,7 +491,7 @@ void SVNHandler::processDiff( TQString output )
     KMessageBox::error( 0, error );
 }
 
-bool SVNHandler::isConsideredModified( const FiletqStatus status ) const
+bool SVNHandler::isConsideredModified( const FileStatus status ) const
 {
   /*
    * A file is modified if it is either:
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.h b/kbabel/catalogmanager/libsvn/svnhandler.h
index 57ce13b4..2506d0bd 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.h
+++ b/kbabel/catalogmanager/libsvn/svnhandler.h
@@ -58,7 +58,7 @@ class SVNHandler : public TQObject
   TQ_OBJECT
 
   public:
-    enum FiletqStatus {
+    enum FileStatus {
       NO_REPOSITORY,
       NOT_IN_SVN,
       LOCALLY_ADDED,
@@ -74,9 +74,9 @@ class SVNHandler : public TQObject
     void setPOBaseDir( const TQString& dir );
     void setPOTBaseDir( const TQString& dir );
 
-    FiletqStatus fstatus( const TQString& filename ) const;
-    TQString filetqStatus( const FiletqStatus status ) const;
-    TQString svntqStatus( const TQString& filename ) const;
+    FileStatus fstatus( const TQString& filename ) const;
+    TQString fileStatus( const FileStatus status ) const;
+    TQString svnStatus( const TQString& filename ) const;
 
     void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config );
     void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config );
@@ -86,7 +86,7 @@ class SVNHandler : public TQObject
     /**
      * True if the file was modified or has another status considered as a modification
      */
-    bool isConsideredModified( const FiletqStatus status ) const;
+    bool isConsideredModified( const FileStatus status ) const;
 
   signals:
     void signalIsPORepository( bool );
diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp
index 16373a0b..56074c66 100644
--- a/kbabel/catalogmanager/multiroughtransdlg.cpp
+++ b/kbabel/catalogmanager/multiroughtransdlg.cpp
@@ -36,7 +36,7 @@
 #include "multiroughtransdlg.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
@@ -58,9 +58,9 @@ MultiRoughTransDlg::MultiRoughTransDlg(KBabelDictBox *dict, TQPtrList<CatManList
     filesProgressbar->setTextEnabled(true);
     filesProgressbar->setFormat("%v/%m (%p%)");
     filesProgressbar->setTotalSteps(files.count());
-    TQHBoxLayout* mytqlayout= new TQHBoxLayout(bars->tqlayout());
-    mytqlayout->add(label);
-    mytqlayout->add(filesProgressbar); 
+    TQHBoxLayout* mylayout= new TQHBoxLayout(bars->layout());
+    mylayout->add(label);
+    mylayout->add(filesProgressbar); 
     
     msgButtonClicked(0);
 }
@@ -82,7 +82,7 @@ void MultiRoughTransDlg::translate()
 	    if( catalog->openURL( url ) != OK )
 	    {
 		KMessageBox::error(this, i18n("Error while trying to read file:\n %1\n"
-		    "Maybe it is not a valid PO file.").tqarg(url.prettyURL()));
+		    "Maybe it is not a valid PO file.").arg(url.prettyURL()));
 		filesProgressbar->advance(1);
 		continue;
 	    }
@@ -94,7 +94,7 @@ void MultiRoughTransDlg::translate()
 	    if( catalog->openURL( poturl, url ) != OK )
 	    {
 		KMessageBox::error(this, i18n("Error while trying to read file:\n %1\n"
-		    "Maybe it is not a valid PO file.").tqarg(poturl.prettyURL()));
+		    "Maybe it is not a valid PO file.").arg(poturl.prettyURL()));
 		filesProgressbar->advance(1);
 		continue;
 	    }
@@ -131,13 +131,13 @@ void MultiRoughTransDlg::showAllStatistics()
             "Exact translations: %2 (%3%)\n"
             "Approximate translations: %4 (%5%)\n"
             "Nothing found: %6 (%7%)")
-            .tqarg( locale->formatNumber(tt,0) )
-            .tqarg( locale->formatNumber(etc,0) )
-            .tqarg( locale->formatNumber( ((double)(10000*etc/tt))/100) )
-            .tqarg( locale->formatNumber(ptc,0) )
-            .tqarg( locale->formatNumber(((double)(10000*ptc/tt))/100) )
-            .tqarg( locale->formatNumber(nothing,0) )
-            .tqarg( locale->formatNumber(((double)(10000*nothing/tt)/100) ) );
+            .arg( locale->formatNumber(tt,0) )
+            .arg( locale->formatNumber(etc,0) )
+            .arg( locale->formatNumber( ((double)(10000*etc/tt))/100) )
+            .arg( locale->formatNumber(ptc,0) )
+            .arg( locale->formatNumber(((double)(10000*ptc/tt))/100) )
+            .arg( locale->formatNumber(nothing,0) )
+            .arg( locale->formatNumber(((double)(10000*nothing/tt)/100) ) );
 
     KMessageBox::information(this, statMsg
             , i18n("Rough Translation Statistics"));
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index 42fd3f39..8ac02c0d 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -187,7 +187,7 @@ void ValidateProgressDialog::validate_internal()
 	"\n"
 	"Checked files: %1\n"
 	"Number of errors: %2\n"
-	"Number of ignored errors: %3").tqarg(checked).tqarg(errors).tqarg(ignorederrors),i18n("Validation Done"));
+	"Number of ignored errors: %3").arg(checked).arg(errors).arg(ignorederrors),i18n("Validation Done"));
     }
 
     delete _tool;
diff --git a/kbabel/catalogmanager/validateprogresswidget.ui b/kbabel/catalogmanager/validateprogresswidget.ui
index 01cb4c5f..a1573341 100644
--- a/kbabel/catalogmanager/validateprogresswidget.ui
+++ b/kbabel/catalogmanager/validateprogresswidget.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -28,7 +28,7 @@
                     <property name="name">
                         <cstring>_currentAction</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>92</width>
                             <height>0</height>
diff --git a/kbabel/catalogmanager/validateprogresswidget.ui.h b/kbabel/catalogmanager/validateprogresswidget.ui.h
index 70655c72..e6fddef2 100644
--- a/kbabel/catalogmanager/validateprogresswidget.ui.h
+++ b/kbabel/catalogmanager/validateprogresswidget.ui.h
@@ -44,5 +44,5 @@ void ValidateProgressWidget::setupFileProgressBar( TQString text, int maxvalue )
     TQString t = text[0].upper()+text.mid(1)+":";
     
     _currentAction->setText(t);
-    _currentAction->tqrepaint();
+    _currentAction->repaint();
 }
diff --git a/kbabel/catalogmanager/validationoptions.ui b/kbabel/catalogmanager/validationoptions.ui
index 23c3cb71..88169f7a 100644
--- a/kbabel/catalogmanager/validationoptions.ui
+++ b/kbabel/catalogmanager/validationoptions.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index 00c9491d..7470ad87 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -31,13 +31,13 @@
   your version.
   
 **************************************************************************** */
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
 #include <tqstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqdatetime.h>
 
 #include <kconfig.h>
@@ -497,7 +497,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
    }
 
    temp="X-Generator: KBabel %1\\n";
-   temp=temp.tqarg(VERSION);
+   temp=temp.arg(VERSION);
    found=false;
 
    for( it = headerList.begin(); it != headerList.end(); ++it )
@@ -533,7 +533,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
 
 
    temp="Plural-Forms: %1\\n";
-   temp=temp.tqarg(identityOptions.gnuPluralFormHeader);
+   temp=temp.arg(identityOptions.gnuPluralFormHeader);
    found=false;
 
    // update plural form header
@@ -578,12 +578,12 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
     		if( saveOptions.FSFCopyright == ProjectSettingsBase::Remove) 
 		    (*it).remove(" YEAR Free Software Foundation, Inc");
 		else 
-		    (*it).replace("YEAR", TQDate::tqcurrentDate().toString("yyyy"));
+		    (*it).replace("YEAR", TQDate::currentDate().toString("yyyy"));
 	    } else
 	    if( saveOptions.FSFCopyright == ProjectSettingsBase::Update )
 	    {
 		    //update years
-		    TQString cy = TQDate::tqcurrentDate().toString("yyyy");
+		    TQString cy = TQDate::currentDate().toString("yyyy");
 		    if( !(*it).contains( TQRegExp(cy)) ) // is the year already included?
 		    {
 			int index = (*it).findRev( TQRegExp("[\\d]+[\\d\\-, ]*") );
@@ -674,7 +674,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
         {
             temp+=(" <"+identityOptions.authorEmail+">");
         }
-        temp+=", "+TQDate::tqcurrentDate().toString("yyyy")+".";
+        temp+=", "+TQDate::currentDate().toString("yyyy")+".";
 
         // ### TODO: it would be nice if the entry could start with "COPYRIGHT" and have the "(C)" symbol (both not mandatory)
         TQRegExp regexpAuthorYear( "^#.*(<.+@.+>)?,\\s*([\\d]+[\\d\\-, ]*|YEAR)" );
@@ -721,7 +721,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const
             found = false;
             bool foundAuthor = false;
     
-            const TQString cy = TQDate::tqcurrentDate().toString("yyyy");
+            const TQString cy = TQDate::currentDate().toString("yyyy");
 
             ait = foundAuthors.end();
             for( it = foundAuthors.begin() ; it!=foundAuthors.end(); ++it )
@@ -816,7 +816,7 @@ void Catalog::setFuzzy(uint index, bool on)
 
 }
 
-void Catalog::removeFuzzytqStatus(uint index)
+void Catalog::removeFuzzyStatus(uint index)
 {
     setFuzzy(index,false);
 }
@@ -888,10 +888,10 @@ TQString Catalog::encoding() const
     return encodingStr;
 }
 
-ConversiontqStatus Catalog::openURL(const KURL& url, const TQString& package)
+ConversionStatus Catalog::openURL(const KURL& url, const TQString& package)
 {
    TQString target;
-   ConversiontqStatus error = OK;
+   ConversionStatus error = OK;
 
    if(KIO::NetAccess::download(url, target, NULL))
    {
@@ -992,10 +992,10 @@ ConversiontqStatus Catalog::openURL(const KURL& url, const TQString& package)
    }
 }
 
-ConversiontqStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package)
+ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package)
 {
    TQString target;
-   ConversiontqStatus error = OK;
+   ConversionStatus error = OK;
 
    if(KIO::NetAccess::download(openUrl, target, NULL))
    {
@@ -1093,7 +1093,7 @@ ConversiontqStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, co
    }
 }
 
-Msgfmt::tqStatus Catalog::checkSyntax(TQString& output, bool clearErrors)
+Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors)
 {
    if( !d->_mimeTypes.contains( "application/x-gettext" ) )
 	return Msgfmt::Unsupported;
@@ -1112,7 +1112,7 @@ Msgfmt::tqStatus Catalog::checkSyntax(TQString& output, bool clearErrors)
    }
 
    Msgfmt msgfmt;
-   Msgfmt::tqStatus result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific );
+   Msgfmt::Status result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific );
 
    if( clearErrors) clearErrorList();
 
@@ -1185,7 +1185,7 @@ void Catalog::removeFromErrorList(uint index)
 	}
 }
 
-TQStringList Catalog::itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck)
+TQStringList Catalog::itemStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck)
 {
     if (  d->_entries.isEmpty() )
         return TQStringList();
@@ -1207,7 +1207,7 @@ TQStringList Catalog::itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool
 	return item.errors();
 }
 
-TQStringList Catalog::itemtqStatus(uint index)
+TQStringList Catalog::itemStatus(uint index)
 {
        if (  d->_entries.isEmpty() )
         return TQStringList();
@@ -1800,7 +1800,7 @@ int Catalog::findPrevInList(const TQValueList<uint>& list,uint index) const
 
 TQString Catalog::dateTime() const
 {
-    const TQDateTime dt = TQDateTime::tqcurrentDateTime();
+    const TQDateTime dt = TQDateTime::currentDateTime();
     TQString dateTimeString;
     
     const SaveSettings options = d->_project->saveSettings();
@@ -1936,7 +1936,7 @@ TQString Catalog::dateTime() const
 }
 
 
-ConversiontqStatus Catalog::saveFile()
+ConversionStatus Catalog::saveFile()
 {
    if(d->_url.isEmpty())
    {
@@ -1947,11 +1947,11 @@ ConversiontqStatus Catalog::saveFile()
    return saveFileAs(d->_url,true);
 }
 
-ConversiontqStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
+ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite)
 {
    if( d->_active ) return BUSY;
 
-   ConversiontqStatus status=OK;
+   ConversionStatus status=OK;
 
    bool newName=false;
    KURL targetURL=d->_url;
@@ -2043,7 +2043,7 @@ TQString Catalog::saveTempFile()
 }
 
 
-ConversiontqStatus Catalog::writeFile(TQString localFile , bool overwrite)
+ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite)
 {
    TQFileInfo info(localFile);
 
@@ -2066,7 +2066,7 @@ ConversiontqStatus Catalog::writeFile(TQString localFile , bool overwrite)
       }
    }
 
-    ConversiontqStatus error = OK;
+    ConversionStatus error = OK;
     CatalogExportPlugin* filter=0;
 
     // gimme plugin for this MIME type
@@ -2549,7 +2549,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le
         int contextInfoPos = -1;
 		TQString targetStr;
 
-		kapp->tqprocessEvents(10);
+		kapp->processEvents(10);
 
 		if( d->_stop || endReached)
 		{
@@ -2798,7 +2798,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le
         int contextInfoPos = -1;
 		TQString targetStr;
 
-		kapp->tqprocessEvents(10);
+		kapp->processEvents(10);
 
 		if( d->_stop || beginReached)
 		{
@@ -3155,7 +3155,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result)
                 bestId = (*it);
             }
 
-            kapp->tqprocessEvents(10);
+            kapp->processEvents(10);
 
 	    if( d->_stop )
 	    {
@@ -3232,7 +3232,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list)
         {
             oldPercent = percent;
             emit signalProgress(percent);
-            kapp->tqprocessEvents(10);
+            kapp->processEvents(10);
         }
 
         TQString id = (*it).msgid;
diff --git a/kbabel/common/catalog.h b/kbabel/common/catalog.h
index dd8c3a30..a034375e 100644
--- a/kbabel/common/catalog.h
+++ b/kbabel/common/catalog.h
@@ -226,7 +226,7 @@ public:
     * @return the list of errors found for a given item index
     * @param index index of the item to check
     */
-   TQStringList itemtqStatus(uint index);
+   TQStringList itemStatus(uint index);
 
    /**
     * @return the list of errors found for a given item index
@@ -234,7 +234,7 @@ public:
     * @param recheck flag, if the item status should be checked now
     * @param whatToCheck what checks to do (a list of tools to be used
     */
-   TQStringList itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck);
+   TQStringList itemStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck);
 
    /**
    * replaces msgstr in catalog item at index index with msgstr
@@ -253,7 +253,7 @@ public:
    bool setHeader(CatalogItem header);
 
    /** removes string ", fuzzy" from comment */
-   void removeFuzzytqStatus(uint index);
+   void removeFuzzyStatus(uint index);
 
    /** sets or unsets fuzzy status of entry index */
    void setFuzzy(uint index, bool on);
@@ -297,19 +297,19 @@ public:
    * opens file url by using KDE's network downlad and calls
    * openFile with a local filename
    */
-   ConversiontqStatus openURL(const KURL& url, const TQString& package=TQString());
+   ConversionStatus openURL(const KURL& url, const TQString& package=TQString());
 
    /**
    * opens file openURL by using KDE's network downlad and calls
    * openFile with a local filename
    * sets current URL to saveURL
    */
-   ConversiontqStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString());
+   ConversionStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString());
 
    /** save the file under the old filename */
-   ConversiontqStatus saveFile();
+   ConversionStatus saveFile();
    /** saves the file under a new filename */
-   ConversiontqStatus saveFileAs(const KURL& url,bool overwrite=false);
+   ConversionStatus saveFileAs(const KURL& url,bool overwrite=false);
 
    /**
    * saves the current catalog in a temporary file and
@@ -342,7 +342,7 @@ public:
     * @param clearError should the errors be cleared before running msgfmt
     * @return the file codec used for the current catalog
     */
-   Msgfmt::tqStatus checkSyntax(TQString& output, bool clearErrors=true);
+   Msgfmt::Status checkSyntax(TQString& output, bool clearErrors=true);
 
    /**
     * checks using an external tool. The tool must provide the "validate" command
@@ -484,7 +484,7 @@ public:
    * the search in po-files. This way, I can easily find the first
    * catalog entry in the textstream
    */
-//   static ConversiontqStatus readHeader(TQTextStream& stream,CatalogItem& header);
+//   static ConversionStatus readHeader(TQTextStream& stream,CatalogItem& header);
 
 
    void registerView(CatalogView* view);
@@ -612,7 +612,7 @@ private:
    void processCommand(EditCommand* cmd, CatalogView* view2exclude=0, bool undo=false);
 
    /** do the actual file write using plugin */
-   ConversiontqStatus writeFile(TQString localfile, bool overwrite=false);
+   ConversionStatus writeFile(TQString localfile, bool overwrite=false);
 
    /**
    * generates  lists that contain indexes of all fuzzy and untranslated entries
diff --git a/kbabel/common/catalogfileplugin.h b/kbabel/common/catalogfileplugin.h
index d4e72a76..631a94b3 100644
--- a/kbabel/common/catalogfileplugin.h
+++ b/kbabel/common/catalogfileplugin.h
@@ -50,7 +50,7 @@ class CatalogExportPluginPrivate;
 /**
  * Result of the conversion
  */
-enum ConversiontqStatus { 
+enum ConversionStatus { 
     OK,
     NOT_IMPLEMENTED,
     NO_FILE,
@@ -97,7 +97,7 @@ public:
      * @param catalog  the catalog to be filled
      * @return result of the operation
      */
-    ConversiontqStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog);
+    ConversionStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog);
     
     /**
     * Reimplement this method to load the local file passed as an argument.
@@ -109,7 +109,7 @@ public:
     * @param file file to be loaded
     * @param mimetype the expected MIME type (the type used for plugin selection
     */
-    virtual ConversiontqStatus load(const TQString& file, const TQString& mimetype) = 0;
+    virtual ConversionStatus load(const TQString& file, const TQString& mimetype) = 0;
     /**
     * Reimplement this method to return unique identification of your plugin
     */
@@ -183,7 +183,7 @@ class KDE_EXPORT CatalogExportPlugin: public TQObject
 public:
     CatalogExportPlugin(TQObject* parent, const char* name);
     virtual ~CatalogExportPlugin();
-    virtual ConversiontqStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0;
+    virtual ConversionStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0;
 
     static TQStringList availableExportMimeTypes();
 
diff --git a/kbabel/common/catalogitem.cpp b/kbabel/common/catalogitem.cpp
index 234637d1..0dd1a9ae 100644
--- a/kbabel/common/catalogitem.cpp
+++ b/kbabel/common/catalogitem.cpp
@@ -40,8 +40,8 @@
 
 #include "regexpextractor.h"
 
-#include <tqtextstream.h>
-#include <tqtextcodec.h>
+#include <textstream.h>
+#include <textcodec.h>
 #include <tqdom.h>
 
 using namespace KBabel;
diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp
index 24d469ec..4dc9cca1 100644
--- a/kbabel/common/catalogsettings.cpp
+++ b/kbabel/common/catalogsettings.cpp
@@ -44,7 +44,7 @@
 #include <stdlib.h>
 
 #include <tqfile.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqregexp.h>
 
 #include <stdlib.h>
diff --git a/kbabel/common/importplugin.cpp b/kbabel/common/importplugin.cpp
index ed6d15ef..e75deca7 100644
--- a/kbabel/common/importplugin.cpp
+++ b/kbabel/common/importplugin.cpp
@@ -99,13 +99,13 @@ void CatalogImportPlugin::setMimeTypes( const TQString& mimetypes )
     d->_mimeTypes=mimetypes;
 }
 
-ConversiontqStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog)
+ConversionStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog)
 {
     d->_stopped=false;
     d->_catalog=catalog;
     startTransaction();
     
-    ConversiontqStatus result = load(file, mimetype);
+    ConversionStatus result = load(file, mimetype);
     if( d->_stopped ) 
     {
 	d->_started=false;
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index 90f61256..18c679b1 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -103,7 +103,7 @@ void KBabelMailer::sendOneFile( const KURL& url)
       kapp->invokeMailer("", "", "", "", "", "", fileName);
     else
     {
-      KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").tqarg( url.prettyURL() ) );
+      KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").arg( url.prettyURL() ) );
     }
   }
   else
@@ -190,7 +190,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
 #endif
     TQString poTempName;
     if ( !KIO::NetAccess::download( url, poTempName, m_parent ) ) {
-      KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").tqarg( url.prettyURL() ) );
+      KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").arg( url.prettyURL() ) );
       continue;
     }
 
@@ -205,7 +205,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
       poArchFileName.remove( TQRegExp( "^" + TQRegExp::escape( _poBaseDir ) + "/?" ) );
     if ( !archive.addLocalFile( poTempName, poArchFileName ) ) 
     {
-      KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").tqarg( url.prettyURL() ) );
+      KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").arg( url.prettyURL() ) );
     }
    
     KIO::NetAccess::removeTempFile(poTempName);
diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp
index f91f25f9..6a2f9d2b 100644
--- a/kbabel/common/msgfmt.cpp
+++ b/kbabel/common/msgfmt.cpp
@@ -39,7 +39,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 
 #include <stdlib.h>
@@ -51,9 +51,9 @@ Msgfmt::Msgfmt(TQObject* parent,const char* name)
 {
 }
 
-Msgfmt::tqStatus Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
+Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
 {
-   tqStatus stat=Ok;
+   Status stat=Ok;
    // this method does not return the right retrun values at the moment :-(
 
    KProcess proc;
@@ -92,9 +92,9 @@ Msgfmt::tqStatus Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
    return stat;
 }
 
-Msgfmt::tqStatus Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output)
+Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output)
 {
-   tqStatus stat=Ok;
+   Status stat=Ok;
 
    // this method does not return the right return values at the moment :-(
    KProcess proc;
diff --git a/kbabel/common/msgfmt.h b/kbabel/common/msgfmt.h
index 025a2fdd..c711cf48 100644
--- a/kbabel/common/msgfmt.h
+++ b/kbabel/common/msgfmt.h
@@ -47,11 +47,11 @@ class KDE_EXPORT Msgfmt : private TQObject
    Q_OBJECT
   TQ_OBJECT
 public:
-   enum tqStatus{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported};
+   enum Status{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported};
    Msgfmt(TQObject* parent=0,const char* name=0);
 
-   tqStatus checkSyntax(TQString file,TQString& output, bool gnu = false);
-   tqStatus checkSyntaxInDir(TQString dir,TQString regexp,TQString& output);
+   Status checkSyntax(TQString file,TQString& output, bool gnu = false);
+   Status checkSyntaxInDir(TQString dir,TQString regexp,TQString& output);
 
 private slots:
    void addToOutput(KProcess*,char *buffer, int buflen);
diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp
index 63a01d38..3ab33287 100644
--- a/kbabel/common/poinfo.cpp
+++ b/kbabel/common/poinfo.cpp
@@ -48,7 +48,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include "libgettext/pofiles.h"
 #include "libgettext/tokens.h"
@@ -350,12 +350,12 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem)
 }
 
 
-ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive)
+ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive)
 {
     return PoInfo::info( url, info, wordList, updateWordList, interactive, true);
 }
 
-ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt)
+ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt)
 {
    stopStaticRead = false;
 
@@ -372,7 +372,7 @@ ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList
             // First check file with msgfmt to be sure, it is syntactically correct
             Msgfmt msgfmt;
             TQString output;
-            Msgfmt::tqStatus stat = msgfmt.checkSyntax( target , output );
+            Msgfmt::Status stat = msgfmt.checkSyntax( target , output );
             if(stat == Msgfmt::SyntaxError)
             {
                 KIO::NetAccess::removeTempFile(target);
@@ -395,11 +395,11 @@ ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList
 	   lexer->yylex();
 	   
            // now parse the rest of the file
-           ConversiontqStatus success=OK;
+           ConversionStatus success=OK;
 	   
            while( lexer->lastToken != T_EOF && success==OK)
            {
-               if( interactive ) kapp->tqprocessEvents(10);
+               if( interactive ) kapp->processEvents(10);
 	       
 	       if( stopStaticRead )
 	       {
@@ -532,7 +532,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
            // first read header
 	   CatalogItem temp;
 	   
-	   ConversiontqStatus status = fastRead( temp, lexer, true );
+	   ConversionStatus status = fastRead( temp, lexer, true );
 	   if( status != OK || !temp.msgid().first().isEmpty() ) 
 	   {
 		delete lexer;
@@ -639,7 +639,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
 		   }
 		   case T_MSGID: 
 		   case T_MSGIDPLURAL: {
-	    		kapp->tqprocessEvents(10);
+	    		kapp->processEvents(10);
 			
 			// if stopped, return not found
 			if( stopStaticRead ) 
@@ -666,7 +666,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options )
 }
 
 // this does not like any incorrect files
-ConversiontqStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText)
+ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText)
 {
    item.clear();
    _gettextPluralForm = false;
diff --git a/kbabel/common/poinfo.h b/kbabel/common/poinfo.h
index 58e0bc66..70ba652a 100644
--- a/kbabel/common/poinfo.h
+++ b/kbabel/common/poinfo.h
@@ -105,7 +105,7 @@ public:
     *        being parsed?
     * @since KBabel 1.11 (KDE 3.5)
     */
-   static ConversiontqStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt);
+   static ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt);
 
    /** 
     * @brief Get information about the PO file
@@ -121,7 +121,7 @@ public:
     *       KBabel 1.11.1 (KDE 3.5.1)
     * @note This function always call Gettext's mgfmt before parsing each file
     */
-   static ConversiontqStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive = true);
+   static ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive = true);
 
    static PoInfo headerInfo(const CatalogItem&);
    static bool findInFile(const TQString& url, FindOptions options );
@@ -147,7 +147,7 @@ private:
     */
    static void cacheRead();
 
-   static ConversiontqStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText );
+   static ConversionStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText );
    
    static bool _gettextPluralForm;
 };
diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp
index df8ce38a..77abf661 100644
--- a/kbabel/commonui/cmdedit.cpp
+++ b/kbabel/commonui/cmdedit.cpp
@@ -35,7 +35,7 @@
 #include <tqlistbox.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
 #include <klocale.h>
@@ -45,38 +45,38 @@
 CmdEdit::CmdEdit(TQWidget* parent, const char* name)
        : TQWidget(parent,name)
 {
-    TQGridLayout* tqlayout = new TQGridLayout( this , 1 , 1 );
-    tqlayout->setSpacing( KDialog::spacingHint() );
+    TQGridLayout* layout = new TQGridLayout( this , 1 , 1 );
+    layout->setSpacing( KDialog::spacingHint() );
 
     TQLabel* nameLabel = new TQLabel( i18n("Command &Label:"), this);
     TQLabel* cmdLabel = new TQLabel( i18n("Co&mmand:"), this);
-    tqlayout->addWidget( nameLabel, 0 , 0 );
-    tqlayout->addWidget( cmdLabel, 0 , 1 );
+    layout->addWidget( nameLabel, 0 , 0 );
+    layout->addWidget( cmdLabel, 0 , 1 );
 
     _cmdNameEdit = new TQLineEdit( this , "cmdNameEdit" );
     _cmdNameEdit->setMaxLength(20);
     nameLabel->setBuddy(_cmdNameEdit);
-    tqlayout->addWidget( _cmdNameEdit , 1 , 0 );
+    layout->addWidget( _cmdNameEdit , 1 , 0 );
 
     _cmdEdit = new TQLineEdit( this , "cmdEdit" );
     cmdLabel->setBuddy(_cmdEdit);
-    tqlayout->addWidget( _cmdEdit , 1 , 1 );
+    layout->addWidget( _cmdEdit , 1 , 1 );
 
 
     _addButton = new TQPushButton( i18n("&Add"), this );
     _addButton->setEnabled(false);
-    tqlayout->addWidget( _addButton , 1 , 2 );
+    layout->addWidget( _addButton , 1 , 2 );
 
     _editButton = new TQPushButton( i18n("&Edit"), this );
     _editButton->setEnabled(false);
-    tqlayout->addWidget( _editButton , 3 , 2 );
+    layout->addWidget( _editButton , 3 , 2 );
 
     _removeButton = new TQPushButton( i18n("&Remove"), this );
     _removeButton->setEnabled(false);
-    tqlayout->addWidget( _removeButton , 4 , 2 );
+    layout->addWidget( _removeButton , 4 , 2 );
 
     TQHBoxLayout* hbox = new TQHBoxLayout();
-    tqlayout->addLayout(hbox,5,2);
+    layout->addLayout(hbox,5,2);
 
     _upButton = new TQToolButton(UpArrow,this);
     _upButton->setFixedSize(20,20);
@@ -90,21 +90,21 @@ CmdEdit::CmdEdit(TQWidget* parent, const char* name)
 
     _commandNames = new TQListBox( this , "commandNamesBox" );
     _commandNames->setMinimumSize(100, 100);
-    tqlayout->addMultiCellWidget( _commandNames , 3 , 6 , 0 , 0);
+    layout->addMultiCellWidget( _commandNames , 3 , 6 , 0 , 0);
 
     _commands = new TQListBox( this , "commandsBox" );
     _commands->setMinimumSize(160, 100);
-    tqlayout->addMultiCellWidget( _commands , 3 , 6 , 1 ,1 );
+    layout->addMultiCellWidget( _commands , 3 , 6 , 1 ,1 );
 
 
-    tqlayout->setColStretch(0,1);
-    tqlayout->setColStretch(1,2);
-    tqlayout->setColStretch(2,0);
+    layout->setColStretch(0,1);
+    layout->setColStretch(1,2);
+    layout->setColStretch(2,0);
 
-    tqlayout->addRowSpacing(2, KDialog::spacingHint());
-    tqlayout->addRowSpacing(6, KDialog::spacingHint());
+    layout->addRowSpacing(2, KDialog::spacingHint());
+    layout->addRowSpacing(6, KDialog::spacingHint());
 
-    setMinimumSize(tqlayout->tqsizeHint());
+    setMinimumSize(layout->sizeHint());
 
 
     connect(_addButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(addCmd()) ) ;
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index cb54e884..338506f9 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -39,7 +39,7 @@
 #include <tqframe.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
diff --git a/kbabel/commonui/diffpreferences.ui b/kbabel/commonui/diffpreferences.ui
index c52e3c27..a1bfd757 100644
--- a/kbabel/commonui/diffpreferences.ui
+++ b/kbabel/commonui/diffpreferences.ui
@@ -72,7 +72,7 @@ in KBabel's main window.&lt;/p&gt;&lt;/qt&gt;</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -116,7 +116,7 @@ the database are used for diffing.&lt;/p&gt;&lt;/qt&gt;</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index 980f9802..3205c062 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -39,7 +39,7 @@
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqwhatsthis.h>
 
@@ -57,15 +57,15 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
 		, _regExpEditDialog(0), _replaceDlg(forReplace)
 {
 	TQWidget* page = new TQWidget(this);
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(page, 0, spacingHint());
 
 	TQLabel *label = new TQLabel(i18n("&Find:"),page);
-	tqlayout->addWidget(label);
+	layout->addWidget(label);
 
 	_findCombo = new KComboBox(true, page, "findCombo");
 	_findCombo->setMaxCount(10);
 	_findCombo->setInsertionPolicy(KComboBox::AtTop);
-	tqlayout->addWidget(_findCombo);
+	layout->addWidget(_findCombo);
 	label->setBuddy(_findCombo);
 
 	TQString msg=i18n("<qt><p><b>Find text</b></p>"
@@ -82,11 +82,11 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
                 setButtonOK(i18n("&Replace"));
 
 		_replaceLabel = new TQLabel(i18n("&Replace with:"),page);
-		tqlayout->addWidget(_replaceLabel);
+		layout->addWidget(_replaceLabel);
 		_replaceCombo = new KComboBox(true, page, "replaceCombo");
 		_replaceCombo->setMaxCount(10);
 		_replaceCombo->setInsertionPolicy(KComboBox::AtTop);
-		tqlayout->addWidget(_replaceCombo);
+		layout->addWidget(_replaceCombo);
 		_replaceLabel->setBuddy(_replaceCombo);
 
 	    	msg=i18n("<qt><p><b>Replace text</b></p>"
@@ -107,7 +107,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
 
 	_buttonGrp = new TQButtonGroup(3, Qt::Horizontal, i18n("Where to Search"), page);
 	connect(_buttonGrp,TQT_SIGNAL(clicked(int)), this, TQT_SLOT(inButtonsClicked(int)));
-	tqlayout->addWidget(_buttonGrp);
+	layout->addWidget(_buttonGrp);
 
 	_inMsgid = new TQCheckBox(i18n("&Msgid"),_buttonGrp);
 	_inMsgstr = new TQCheckBox(i18n("M&sgstr"),_buttonGrp);
@@ -119,7 +119,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
 
 
 	TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("Options"), page);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 
 	_caseSensitive = new TQCheckBox(i18n("C&ase sensitive"),box);
 	_wholeWords = new TQCheckBox(i18n("O&nly whole words"),box);
@@ -536,10 +536,10 @@ ReplaceDialog::ReplaceDialog(TQWidget* parent)
                    , true,false,i18n("&Replace"),i18n("&Goto Next"),i18n("R&eplace All"))
 {
 	TQWidget* page = plainPage();
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(page, 0, spacingHint());
 
 	TQLabel *label = new TQLabel(i18n("Replace this string?"),page);
-	tqlayout->addWidget(label);
+	layout->addWidget(label);
 
 	connect(this,TQT_SIGNAL(user1Clicked()),this,TQT_SIGNAL(replace()));
 	connect(this,TQT_SIGNAL(user2Clicked()),this,TQT_SIGNAL(next()));
diff --git a/kbabel/commonui/kactionselector.cpp b/kbabel/commonui/kactionselector.cpp
index 9e5d3e79..3f23b24d 100644
--- a/kbabel/commonui/kactionselector.cpp
+++ b/kbabel/commonui/kactionselector.cpp
@@ -38,7 +38,7 @@
 #include <tqlistbox.h>
 #include <tqtoolbutton.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqevent.h>
 #include <tqwhatsthis.h>
 #include <tqapplication.h>
diff --git a/kbabel/commonui/klisteditor.ui b/kbabel/commonui/klisteditor.ui
index b31497b4..4b7eeb0d 100644
--- a/kbabel/commonui/klisteditor.ui
+++ b/kbabel/commonui/klisteditor.ui
@@ -97,7 +97,7 @@
                                     <property name="name">
                                         <cstring>_list</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>200</width>
                                             <height>200</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>
diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp
index f34d2cc2..9994b514 100644
--- a/kbabel/commonui/projectpref.cpp
+++ b/kbabel/commonui/projectpref.cpp
@@ -37,7 +37,7 @@
 #include "diffpreferences.h"
 #include "kbprojectsettings.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
 
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 163b4eeb..e10ba1bf 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -58,7 +58,7 @@
 #include <kurldrag.h>
 #include <kurlrequester.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
@@ -71,7 +71,7 @@
 #include <tqcombobox.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqwhatsthis.h>
 
 using namespace KBabel;
@@ -79,9 +79,9 @@ using namespace KBabel;
 static TQSize sizeHintForWidget(const TQWidget* widget)
 {
   //
-  // The size is computed by adding the tqsizeHint().height() of all
-  // widget tqchildren and taking the width of the widest child and adding
-  // tqlayout()->margin() and tqlayout()->spacing()
+  // The size is computed by adding the sizeHint().height() of all
+  // widget children and taking the width of the widest child and adding
+  // layout()->margin() and layout()->spacing()
   //
 
   TQSize size;
@@ -97,7 +97,7 @@ static TQSize sizeHintForWidget(const TQWidget* widget)
       numChild += 1;
       TQWidget *w=((TQWidget*)o);
 
-      TQSize s = w->tqsizeHint();
+      TQSize s = w->sizeHint();
       if( s.isEmpty() == true )
       {
           s = TQSize( 50, 100 ); // Default size
@@ -109,8 +109,8 @@ static TQSize sizeHintForWidget(const TQWidget* widget)
 
   if( numChild > 0 )
   {
-    size.setHeight( size.height() + widget->tqlayout()->spacing()*(numChild-1) );
-    size += TQSize( widget->tqlayout()->margin()*2, widget->tqlayout()->margin()*2 + 1 );
+    size.setHeight( size.height() + widget->layout()->spacing()*(numChild-1) );
+    size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 );
   }
   else
   {
@@ -127,12 +127,12 @@ SavePreferences::SavePreferences(TQWidget *parent)
     :  KTabCtl(parent)
 {
     TQWidget* page = new TQWidget(this);
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     box->setMargin(KDialog::marginHint());
     _updateButton = new TQCheckBox(i18n("&Update header when saving"),box, "kcfg_AutoUpdate");
@@ -141,7 +141,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     _saveObsoleteButton = new TQCheckBox(i18n("Save &obsolete entries"),box, "kcfg_SaveObsolete");
     
     TQGroupBox* descBox=new TQGroupBox(1,Qt::Horizontal,i18n("De&scription"),page);
-    tqlayout->addWidget(descBox);
+    layout->addWidget(descBox);
     
     descBox->setMargin(KDialog::marginHint());
     _descriptionEdit = new TQLineEdit(descBox, "kcfg_DescriptionString");
@@ -149,7 +149,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     TQGroupBox* encodingBox = new TQGroupBox(1,Qt::Horizontal,i18n("Encoding")
                                   ,page);
     encodingBox->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(encodingBox);
+    layout->addWidget(encodingBox);
     TQHBox *b = new TQHBox(encodingBox);
 
     TQLabel* tempLabel=new TQLabel(i18n("Default:"),b);
@@ -177,23 +177,23 @@ SavePreferences::SavePreferences(TQWidget *parent)
 
     _autoSaveBox = new TQGroupBox( 1, Qt::Horizontal, i18n( "Automatic Saving" ), page );
     _autoSaveBox->setMargin( KDialog::marginHint( ) );
-    tqlayout->addWidget( _autoSaveBox );
+    layout->addWidget( _autoSaveBox );
     _autoSaveDelay = new KIntNumInput( _autoSaveBox, "kcfg_AutoSaveDelay" );
     _autoSaveDelay->setRange( 0, 60 );
     _autoSaveDelay->setSuffix( i18n( "Short for minutes", " min" ) );
     _autoSaveDelay->setSpecialValueText( i18n( "No autosave" ) );
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
     addTab(page, i18n("&General"));
     
     page = new TQWidget(this);
-    tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* gridBox = new TQGroupBox(2,Qt::Horizontal,i18n("Fields to Update"),page);
-    tqlayout->addWidget(gridBox);
+    layout->addWidget(gridBox);
     gridBox->setMargin(KDialog::marginHint());
 
     _revisionButton = new TQCheckBox(i18n("Re&vision-Date"),gridBox, "kcfg_UpdateRevisionDate");
@@ -204,7 +204,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     _projectButton = new TQCheckBox(i18n("Pro&ject"),gridBox, "kcfg_UpdateProject");
 
     TQButtonGroup* dateBox = new TQButtonGroup(2,Qt::Horizontal,i18n("Format of Revision-Date"),page, "kcfg_DateFormat");
-    tqlayout->addWidget(dateBox);
+    layout->addWidget(dateBox);
     box->setMargin(KDialog::marginHint());
 
     // we remove/insert default date button to correctly map TQt::DateFormat to our Ids
@@ -225,7 +225,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     TQGroupBox* projectBox = new TQGroupBox(1,Qt::Horizontal,i18n("Project String")
                                   ,page);
     projectBox->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(projectBox);
+    layout->addWidget(projectBox);
     b = new TQHBox(projectBox);
 
     tempLabel=new TQLabel(i18n("Project-Id:"),b);
@@ -234,31 +234,31 @@ SavePreferences::SavePreferences(TQWidget *parent)
     b->setSpacing(KDialog::spacingHint());
     tempLabel->setBuddy(_projectEdit);
     
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
     addTab(page, i18n("&Header"));
     
     page = new TQWidget(this);
-    tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* translatorCopyrightBox = new TQGroupBox(1,Qt::Horizontal, page);
     translatorCopyrightBox->setMargin(KDialog::marginHint());
     _translatorCopyrightButton = 
 	new TQCheckBox(i18n("Update &translator copyright")
 	    ,translatorCopyrightBox, "kcfg_UpdateTranslatorCopyright");
-    tqlayout->addWidget(translatorCopyrightBox);
+    layout->addWidget(translatorCopyrightBox);
 
     TQGroupBox* fsfBox=new TQButtonGroup(1,Qt::Horizontal,i18n("Free Software Foundation Copyright"),page, "kcfg_FSFCopyright");
-    tqlayout->addWidget(fsfBox);
+    layout->addWidget(fsfBox);
 
     fsfBox->setMargin(KDialog::marginHint());
     _removeFSFButton = new TQRadioButton(i18n("&Remove copyright if empty"),fsfBox);
     _updateFSFButton = new TQRadioButton(i18n("&Update copyright"),fsfBox);
     _nochangeFSFButton = new TQRadioButton(i18n("Do &not change"),fsfBox);
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
     addTab(page, i18n("Cop&yright"));
 
@@ -289,7 +289,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
 "<ul><li><b>%1</b>: this is the encoding that fits the character "
 "set of your system language.</li>"
 "<li><b>%2</b>: uses Unicode (UTF-8) encoding.</li>"
-"</ul></qt>").tqarg(defaultName).tqarg(utf8Name) );
+"</ul></qt>").arg(defaultName).arg(utf8Name) );
 
 
     TQWhatsThis::add(_oldEncodingButton
@@ -323,7 +323,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
 "in the online help.</p>"
 "</qt>") );
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 
@@ -402,18 +402,18 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
          : TQWidget(parent)
 {
     TQWidget* page = this;
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     if( !project.isEmpty() )
     {
 	// show the project name in the widget at the top
-	tqlayout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").tqarg(project),page));
+	layout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").arg(project),page));
     }
 
     TQGroupBox* group = new TQGroupBox(2,Qt::Horizontal,page);
-    tqlayout->addWidget(group);
+    layout->addWidget(group);
     group->setMargin(KDialog::marginHint());
     
     TQLabel* tempLabel=new TQLabel(i18n("&Name:"),group);
@@ -443,12 +443,12 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
 
     tempLabel=new TQLabel(i18n("&Language mailing list:"),group);
     _listEdit = new TQLineEdit(group, "kcfg_Mailinglist");
-    _listEdit->setMinimumSize(100,_listEdit->tqsizeHint().height());
+    _listEdit->setMinimumSize(100,_listEdit->sizeHint().height());
     tempLabel->setBuddy(_listEdit);
  
     tempLabel=new TQLabel(i18n("&Timezone:"), group);
     _timezoneEdit = new TQLineEdit(group, "kcfg_Timezone");
-    _timezoneEdit->setMinimumSize(100,_timezoneEdit->tqsizeHint().height());
+    _timezoneEdit->setMinimumSize(100,_timezoneEdit->sizeHint().height());
     tempLabel->setBuddy(_timezoneEdit);
 
 
@@ -462,7 +462,7 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
 
 
     group = new TQGroupBox(1,Qt::Horizontal,page);
-    tqlayout->addWidget(group);
+    layout->addWidget(group);
     group->setMargin(KDialog::marginHint());
 
     hbox = new TQHBox(group);
@@ -534,11 +534,11 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
 	    "GNU gettext tools for currently set language; just press the <b>Lookup</b> "
 	    "button.</p></qt>"));
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 
     _mailEdit->installEventFilter(this);
     _listEdit->installEventFilter(this);
@@ -619,12 +619,12 @@ void IdentityPreferences::testPluralForm()
                 "of singular/plural forms automatically for the "
                 "language code \"%1\".\n"
                 "Do you have tdelibs.po installed for this language?\n"
-                "Please set the correct number manually.").tqarg(lang);
+                "Please set the correct number manually.").arg(lang);
     }
     else
     {
         msg = i18n("The number of singular/plural forms found for "
-                "the language code \"%1\" is %2.").tqarg(lang).tqarg(number);
+                "the language code \"%1\" is %2.").arg(lang).arg(number);
     }
 
     if(!msg.isEmpty())
@@ -663,13 +663,13 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
     box->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     TQHBox *hbox = new TQHBox(box);
     hbox->setSpacing(KDialog::spacingHint());
@@ -715,7 +715,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
     vbgroup->setTitle(i18n("Compression Method for Mail Attachments"));
     vbgroup->setRadioButtonExclusive(true);
     vbgroup->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(vbgroup);
+    layout->addWidget(vbgroup);
 
     bzipButton = new TQRadioButton(i18n("tar/&bzip2"), vbgroup, "kcfg_BZipCompression");
     gzipButton = new TQRadioButton(i18n("tar/&gzip"), vbgroup);
@@ -723,7 +723,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
     compressSingle = new TQCheckBox(i18n("&Use compression when sending "
 					"a single file"), vbgroup, "kcfg_CompressSingleFile");
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
 }
 
@@ -794,30 +794,30 @@ SpellPreferences::SpellPreferences(TQWidget* parent)
          : TQWidget(parent)
 {
     TQWidget* page = this;
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
 
     onFlyBtn = new TQCheckBox(i18n("On the &fly spellchecking"),page, "kcfg_OnFlySpellCheck");
-    tqlayout->addWidget(onFlyBtn);
+    layout->addWidget(onFlyBtn);
 
     TQWhatsThis::add(onFlyBtn, i18n("<qt><p><b>On the fly spellchecking</b></p>"
         "<p>Activate this to let KBabel spell check the text "
 	"as you type. Mispelled words will be colored by the error color.</p></qt>"));
 	
     spellConfig = new KSpellConfig(page,"spellConfigWidget",0,false);
-    tqlayout->addWidget(spellConfig);
+    layout->addWidget(spellConfig);
     remIgnoredBtn = new TQCheckBox(i18n("&Remember ignored words"),page, "kcfg_RememberIgnored");
-    tqlayout->addWidget(remIgnoredBtn);
+    layout->addWidget(remIgnoredBtn);
     
     connect( spellConfig, TQT_SIGNAL( configChanged() )
 	, this, TQT_SIGNAL ( settingsChanged() ) );
 
     TQLabel *tempLabel = new TQLabel(i18n("F&ile to store ignored words:"),page);
-    tqlayout->addWidget(tempLabel);
+    layout->addWidget(tempLabel);
     ignoreURLEdit = new KURLRequester(page, "kcfg_IgnoreURL");
-    tqlayout->addWidget(ignoreURLEdit);
+    layout->addWidget(ignoreURLEdit);
     tempLabel->setBuddy(ignoreURLEdit);
 
     connect(remIgnoredBtn,TQT_SIGNAL(toggled(bool)),ignoreURLEdit
@@ -833,11 +833,11 @@ SpellPreferences::SpellPreferences(TQWidget* parent)
     TQWhatsThis::add(tempLabel,msg);
     TQWhatsThis::add(ignoreURLEdit,msg);
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 
@@ -879,13 +879,13 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
     box->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     TQLabel* label=new TQLabel(i18n("&Base folder of PO files:"),box);
     TQHBox* hbox = new TQHBox(box);
@@ -896,7 +896,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 												
     _poDirEdit = new KURLRequester(hbox, "kcfg_PoBaseDir");
     _poDirEdit->setMode( mode );
-    _poDirEdit->setMinimumSize(250,_poDirEdit->tqsizeHint().height());
+    _poDirEdit->setMinimumSize(250,_poDirEdit->sizeHint().height());
     label->setBuddy(_poDirEdit);
 
 
@@ -906,7 +906,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 
     _potDirEdit = new KURLRequester(hbox, "kcfg_PotBaseDir");
     _potDirEdit->setMode( mode );
-    _potDirEdit->setMinimumSize(250,_potDirEdit->tqsizeHint().height());
+    _potDirEdit->setMinimumSize(250,_potDirEdit->sizeHint().height());
     label->setBuddy(_potDirEdit);
 
 
@@ -919,7 +919,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 
     box=new TQGroupBox(1,Qt::Horizontal,page);
     box->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     _openWindowButton = new TQCheckBox(i18n("O&pen files in new window"),box, "kcfg_OpenWindow");
 
@@ -956,11 +956,11 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
         "so invalid PO files could be shown as good ones, "
         "even if Gettext tools would reject such files.</p></qt>") );
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 
@@ -981,13 +981,13 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box = new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Folders") , page );
     box->setMargin( KDialog::marginHint() );
-    tqlayout->addWidget( box );
+    layout->addWidget( box );
 
     _dirCmdEdit = new CmdEdit( box );
     new TQLabel( i18n("Replaceables:\n@PACKAGE@, @PODIR@, @POTDIR@\n"
@@ -1010,10 +1010,10 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent)
 
 
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 
@@ -1044,13 +1044,13 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Files") , page );
     box->setMargin( KDialog::marginHint() );
-    tqlayout->addWidget( box );
+    layout->addWidget( box );
 
     _fileCmdEdit = new CmdEdit( box );
     new TQLabel( i18n("Replaceables:\n"
@@ -1074,10 +1074,10 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent)
 
 
 
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 
@@ -1107,13 +1107,13 @@ ViewPreferences::ViewPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(2, Qt::Horizontal,i18n("Shown Columns"),page);
     box->setMargin(KDialog::marginHint());
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 
     _flagColumnCheckbox = new TQCheckBox( i18n("Fla&g"), box, "kcfg_ShowFlagColumn" );
     _fuzzyColumnCheckbox = new TQCheckBox( i18n("&Fuzzy"), box, "kcfg_ShowFuzzyColumn" );
@@ -1126,11 +1126,11 @@ ViewPreferences::ViewPreferences(TQWidget* parent)
     TQWhatsThis::add(box,i18n("<qt><p><b>Shown columns</b></p>\n"
      "<p></p></qt>"));
      
-    tqlayout->addStretch(1);
+    layout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 
@@ -1148,9 +1148,9 @@ void ViewPreferences::defaults(const CatManSettings& _settings)
 SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(parent)
 {
     TQWidget* page = this;
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
-    tqlayout->setSpacing(KDialog::spacingHint());
-    tqlayout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* layout=new TQVBoxLayout(page);
+    layout->setSpacing(KDialog::spacingHint());
+    layout->setMargin(KDialog::marginHint());
     
     TQHBox* box = new TQHBox(page);
     box->setSpacing(KDialog::spacingHint());
@@ -1159,21 +1159,21 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p
     const KFile::Mode mode = static_cast<KFile::Mode>( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
     _coderootEdit = new KURLRequester ( box, "kcfg_CodeRoot" );
     _coderootEdit->setMode( mode );
-    _coderootEdit->setMinimumSize( 250, _coderootEdit->tqsizeHint().height() );
+    _coderootEdit->setMinimumSize( 250, _coderootEdit->sizeHint().height() );
     tempLabel->setBuddy( _coderootEdit );
-    tqlayout->addWidget(box);
+    layout->addWidget(box);
 												
     // FIXME: use KConfigXT    
     _pathsEditor = new KListEditor(page);
     _pathsEditor->setTitle(i18n("Path Patterns"));
-    tqlayout->addWidget(_pathsEditor);
+    layout->addWidget(_pathsEditor);
     
     connect ( _pathsEditor, TQT_SIGNAL (itemsChanged ())
 	, this, TQT_SIGNAL (itemsChanged ()));
     
     _pathsEditor->installEventFilter(this);
 				    
-    setMinimumSize(tqsizeHint());
+    setMinimumSize(sizeHint());
 }
 
 SourceContextPreferences::~SourceContextPreferences()
diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp
index 00a88631..31b4ab86 100644
--- a/kbabel/commonui/projectwizard.cpp
+++ b/kbabel/commonui/projectwizard.cpp
@@ -138,7 +138,7 @@ void ProjectWizard::next()
     if( file.exists() )
     {
 	if (KMessageBox::warningContinueCancel(0, i18n("The file '%1' already exists.\n"
-	    "Do you want to replace it?").tqarg(url()), i18n("File Exists"), i18n("Replace") ) == KMessageBox::Cancel)
+	    "Do you want to replace it?").arg(url()), i18n("File Exists"), i18n("Replace") ) == KMessageBox::Cancel)
 		return;
     }
 
diff --git a/kbabel/commonui/projectwizardwidget.ui b/kbabel/commonui/projectwizardwidget.ui
index c9329be7..8fae37ec 100644
--- a/kbabel/commonui/projectwizardwidget.ui
+++ b/kbabel/commonui/projectwizardwidget.ui
@@ -40,7 +40,7 @@ and also a type of the translation project.
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kbabel/commonui/projectwizardwidget2.ui b/kbabel/commonui/projectwizardwidget2.ui
index 97030b94..ef1fb414 100644
--- a/kbabel/commonui/projectwizardwidget2.ui
+++ b/kbabel/commonui/projectwizardwidget2.ui
@@ -46,7 +46,7 @@ will not work.</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -88,7 +88,7 @@ will not work.</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -138,7 +138,7 @@ will not work.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>100</height>
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index 57fb21d0..7f671d43 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -44,7 +44,7 @@
 #include <tqcheckbox.h>
 #include <tqhbuttongroup.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqtimer.h>
 #include <tqvgroupbox.h>
@@ -187,9 +187,9 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat
     progressbar = new KProgress(mw,"progressbar");
     progressbar->setTextEnabled(true);
     progressbar->setFormat("%v/%m (%p%)");
-    TQHBoxLayout* pbtqlayout= new TQHBoxLayout(mainLayout);
-    pbtqlayout->add(label);
-    pbtqlayout->add(progressbar);
+    TQHBoxLayout* pblayout= new TQHBoxLayout(mainLayout);
+    pblayout->add(label);
+    pblayout->add(progressbar);
 
     transButton->setChecked(config->readBoolEntry("Translated",false));
     untransButton->setChecked(config->readBoolEntry("Untranslated",true));
@@ -278,7 +278,7 @@ void RoughTransDlg::translate()
     for(int i = 0; i < total; i++)
     {
         progressbar->setProgress(i+1);
-        kapp->tqprocessEvents(100);
+        kapp->processEvents(100);
 
         if(stop || cancel) break;
 
@@ -673,13 +673,13 @@ void RoughTransDlg::showStatistics()
             "Exact translations: %2 (%3%)\n"
             "Approximate translations: %4 (%5%)\n"
             "Nothing found: %6 (%7%)")
-            .tqarg( locale->formatNumber(totalTried,0) )
-            .tqarg( locale->formatNumber(exactTransCounter,0) )
-            .tqarg( locale->formatNumber( ((double)(10000*exactTransCounter/TQMAX(totalTried,1)))/100) )
-            .tqarg( locale->formatNumber(partTransCounter,0) )
-            .tqarg( locale->formatNumber(((double)(10000*partTransCounter/TQMAX(totalTried,1)))/100) )
-            .tqarg( locale->formatNumber(nothing,0) )
-            .tqarg( locale->formatNumber(((double)(10000*nothing/TQMAX(totalTried,1)))/100) );
+            .arg( locale->formatNumber(totalTried,0) )
+            .arg( locale->formatNumber(exactTransCounter,0) )
+            .arg( locale->formatNumber( ((double)(10000*exactTransCounter/TQMAX(totalTried,1)))/100) )
+            .arg( locale->formatNumber(partTransCounter,0) )
+            .arg( locale->formatNumber(((double)(10000*partTransCounter/TQMAX(totalTried,1)))/100) )
+            .arg( locale->formatNumber(nothing,0) )
+            .arg( locale->formatNumber(((double)(10000*nothing/TQMAX(totalTried,1)))/100) );
 
     KMessageBox::information(this, statMsg
             , i18n("Rough Translation Statistics"));
diff --git a/kbabel/datatools/regexp/main.cc b/kbabel/datatools/regexp/main.cc
index 3a40eac1..eca0be81 100644
--- a/kbabel/datatools/regexp/main.cc
+++ b/kbabel/datatools/regexp/main.cc
@@ -55,7 +55,7 @@ RegExpTool::RegExpTool( TQObject* parent, const char* name, const TQStringList &
 	i18n("which check found errors","translation has inconsistent length");
 	loadExpressions();
 	if ( ! _error.isNull() )
-		KMessageBox::error( (TQWidget*)parent, i18n( "Error loading data (%1)" ).tqarg( _error ) );
+		KMessageBox::error( (TQWidget*)parent, i18n( "Error loading data (%1)" ).arg( _error ) );
 }
 
 bool RegExpTool::run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype )
diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp
index 31cca29f..1543afc8 100644
--- a/kbabel/filters/gettext/gettextexport.cpp
+++ b/kbabel/filters/gettext/gettextexport.cpp
@@ -41,7 +41,7 @@
 #include "kbprojectsettings.h"
 
 #include <tqfile.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -56,7 +56,7 @@ GettextExportPlugin::GettextExportPlugin(TQObject* parent, const char* name, con
 {
 }
 
-ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog)
+ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog)
 {
    // check, whether we know how to handle the extra data
    if( catalog->importPluginID() != "GNU gettext") 
@@ -164,7 +164,7 @@ ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const T
             
             stream << "\n";
 
-	 kapp->tqprocessEvents(10);
+	 kapp->processEvents(10);
 	 if( isStopped() )
 	 {
 	    return STOPPED;
@@ -181,7 +181,7 @@ ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const T
     	  {
               stream << (*oit) << "\n\n";
 
-	      kapp->tqprocessEvents(10);
+	      kapp->processEvents(10);
 	      if( isStopped() )
 	      {
 		  return STOPPED;
@@ -196,7 +196,7 @@ ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const T
    }
    else
    {
-      //emit signalError(i18n("Wasn't able to open file %1").tqarg(filename.ascii()));
+      //emit signalError(i18n("Wasn't able to open file %1").arg(filename.ascii()));
       return OS_ERROR;
    }
 
diff --git a/kbabel/filters/gettext/gettextexport.h b/kbabel/filters/gettext/gettextexport.h
index 695105d2..9732ac73 100644
--- a/kbabel/filters/gettext/gettextexport.h
+++ b/kbabel/filters/gettext/gettextexport.h
@@ -54,7 +54,7 @@ class GettextExportPlugin: public KBabel::CatalogExportPlugin
 {
 public:
     GettextExportPlugin(TQObject* parent, const char* name, const TQStringList &);
-    virtual KBabel::ConversiontqStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog);
+    virtual KBabel::ConversionStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog);
     
 private:
     /**
diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp
index a48e327b..e087490b 100644
--- a/kbabel/filters/gettext/gettextimport.cpp
+++ b/kbabel/filters/gettext/gettextimport.cpp
@@ -42,7 +42,7 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -57,7 +57,7 @@ GettextImportPlugin::GettextImportPlugin(TQObject* parent, const char* name, con
 {
 }
 
-ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQString&)
+ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQString&)
 {
    kdDebug( KBABEL ) << k_funcinfo << endl;
    
@@ -106,7 +106,7 @@ ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQS
       //recoveredErrorInHeader = true;
    }
    
-   TQIODevice *dev = stream.tqdevice();
+   TQIODevice *dev = stream.device();
    int fileSize = dev->size();
 
    // if somethings goes wrong with the parsing, we don't have deleted the old contents
@@ -117,7 +117,7 @@ ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQS
    kdDebug(KBABEL) << "start parsing..." << endl;
 
    // first read header
-   const ConversiontqStatus status = readHeader(stream);
+   const ConversionStatus status = readHeader(stream);
 
 
    if ( status == RECOVERED_PARSE_ERROR )
@@ -173,13 +173,13 @@ ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQS
 
    while( !stream.eof() )
    {
-      kapp->tqprocessEvents(10);
+      kapp->processEvents(10);
       if( isStopped() )
       {
          return STOPPED;
       }
 
-      const ConversiontqStatus success=readEntry(stream);
+      const ConversionStatus success=readEntry(stream);
 
       if(success==OK)
       {
@@ -302,7 +302,7 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod
    stream.setEncoding( TQTextStream::Latin1 );
 
    // first read header
-   ConversiontqStatus status = readHeader(stream);
+   ConversionStatus status = readHeader(stream);
    if(status!=OK && status != RECOVERED_PARSE_ERROR)
    {
        kdDebug(KBABEL) << "wasn't able to read header" << endl;
@@ -360,18 +360,18 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod
    return codec;
 }
 
-ConversiontqStatus GettextImportPlugin::readHeader(TQTextStream& stream)
+ConversionStatus GettextImportPlugin::readHeader(TQTextStream& stream)
 {
    CatalogItem temp;
-   int filePos=stream.tqdevice()->at();
-   ConversiontqStatus status=readEntry(stream);
+   int filePos=stream.device()->at();
+   ConversionStatus status=readEntry(stream);
 
    if(status==OK || status==RECOVERED_PARSE_ERROR)
    {
       // test if this is the header
       if(!_msgid.first().isEmpty())
       {
-         stream.tqdevice()->at(filePos);
+         stream.device()->at(filePos);
       }
 
       return status;
@@ -380,7 +380,7 @@ ConversiontqStatus GettextImportPlugin::readHeader(TQTextStream& stream)
    return PARSE_ERROR;
 }
 
-ConversiontqStatus GettextImportPlugin::readEntry(TQTextStream& stream)
+ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream)
 {
    //kdDebug( KBABEL ) << k_funcinfo << " START" << endl;
    enum {Begin,Comment,Msgctxt,Msgid,Msgstr} part=Begin;
@@ -402,7 +402,7 @@ ConversiontqStatus GettextImportPlugin::readEntry(TQTextStream& stream)
    
    while( !stream.eof() )
    {
-       const int pos=stream.tqdevice()->at();
+       const int pos=stream.device()->at();
 
        line=stream.readLine();
 
@@ -761,7 +761,7 @@ ConversiontqStatus GettextImportPlugin::readEntry(TQTextStream& stream)
             else if((line.find(TQRegExp("^\\s*msgid")) != -1) || (line.find(TQRegExp("^\\s*#")) != -1))
             {
                // We have read successfully one entry, so end loop.
-               stream.tqdevice()->at(pos);// reset position in stream to beginning of this line
+               stream.device()->at(pos);// reset position in stream to beginning of this line
                break;
             }
             else if(line.startsWith("msgstr"))
diff --git a/kbabel/filters/gettext/gettextimport.h b/kbabel/filters/gettext/gettextimport.h
index fa20aa62..e5f81679 100644
--- a/kbabel/filters/gettext/gettextimport.h
+++ b/kbabel/filters/gettext/gettextimport.h
@@ -50,13 +50,13 @@ class GettextImportPlugin: public KBabel::CatalogImportPlugin
 {
 public:
     GettextImportPlugin(TQObject* parent, const char* name, const TQStringList &);
-    virtual KBabel::ConversiontqStatus load(const TQString& file, const TQString& mimetype);
+    virtual KBabel::ConversionStatus load(const TQString& file, const TQString& mimetype);
     virtual const TQString id() { return "GNU gettext"; }
 
 private:
     TQTextCodec* codecForArray(TQByteArray& arary, bool* hadCodec);
-    KBabel::ConversiontqStatus readHeader(TQTextStream& stream);
-    KBabel::ConversiontqStatus readEntry(TQTextStream& stream);
+    KBabel::ConversionStatus readHeader(TQTextStream& stream);
+    KBabel::ConversionStatus readEntry(TQTextStream& stream);
     
     // description of the last read entry
     TQString _msgctxt;
diff --git a/kbabel/filters/linguist/linguistexport.cpp b/kbabel/filters/linguist/linguistexport.cpp
index 10fc37e2..29a9788e 100644
--- a/kbabel/filters/linguist/linguistexport.cpp
+++ b/kbabel/filters/linguist/linguistexport.cpp
@@ -40,7 +40,7 @@
 #include "tqregexp.h"
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kgenericfactory.h>
 
@@ -58,7 +58,7 @@ LinguistExportPlugin::LinguistExportPlugin( TQObject * parent, const char * name
 {
 }
 
-ConversiontqStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
+ConversionStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
 {
   // Check whether we know how to handle the extra data.
   if ( catalog->importPluginID( ) != "TQt translation source" )
diff --git a/kbabel/filters/linguist/linguistexport.h b/kbabel/filters/linguist/linguistexport.h
index d468fce4..18b52460 100644
--- a/kbabel/filters/linguist/linguistexport.h
+++ b/kbabel/filters/linguist/linguistexport.h
@@ -52,7 +52,7 @@ class LinguistExportPlugin : public KBabel::CatalogExportPlugin
 {
   public:
     LinguistExportPlugin( TQObject * parent, const char * name, const TQStringList& );
-    virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
+    virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
     
   private:
     const TQString extractComment( TQDomDocument& doc, const TQString& s, bool& fuzzy );
diff --git a/kbabel/filters/linguist/linguistimport.cpp b/kbabel/filters/linguist/linguistimport.cpp
index 6d8dda81..b4476d52 100644
--- a/kbabel/filters/linguist/linguistimport.cpp
+++ b/kbabel/filters/linguist/linguistimport.cpp
@@ -60,7 +60,7 @@ LinguistImportPlugin::LinguistImportPlugin( TQObject * parent, const char * name
 {
 }
 
-ConversiontqStatus LinguistImportPlugin::load( const TQString& filename, const TQString& )
+ConversionStatus LinguistImportPlugin::load( const TQString& filename, const TQString& )
 {
   if ( filename.isEmpty( ) ) {
     kdDebug( ) << "fatal error: empty filename to open" << endl;
diff --git a/kbabel/filters/linguist/linguistimport.h b/kbabel/filters/linguist/linguistimport.h
index b0bc51d9..11b5c6d1 100644
--- a/kbabel/filters/linguist/linguistimport.h
+++ b/kbabel/filters/linguist/linguistimport.h
@@ -52,7 +52,7 @@ class LinguistImportPlugin : public KBabel::CatalogImportPlugin
   public:
     LinguistImportPlugin( TQObject * parent, const char * name, const TQStringList& );
     
-    virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype );
+    virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype );
     virtual const TQString id( ) { return "TQt translation source"; }
     
   private:
diff --git a/kbabel/filters/xliff/xliffexport.cpp b/kbabel/filters/xliff/xliffexport.cpp
index c633e8b1..ad0a9f33 100644
--- a/kbabel/filters/xliff/xliffexport.cpp
+++ b/kbabel/filters/xliff/xliffexport.cpp
@@ -40,7 +40,7 @@
 #include "tqregexp.h"
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kgenericfactory.h>
 
@@ -58,7 +58,7 @@ XLIFFExportPlugin::XLIFFExportPlugin( TQObject * parent, const char * name, cons
 {
 }
 
-ConversiontqStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
+ConversionStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog )
 {
   // Check whether we know how to handle the extra data.
   if ( catalog->importPluginID( ) != "XLIFF 1.1" )
diff --git a/kbabel/filters/xliff/xliffexport.h b/kbabel/filters/xliff/xliffexport.h
index eccc311c..ac550ccc 100644
--- a/kbabel/filters/xliff/xliffexport.h
+++ b/kbabel/filters/xliff/xliffexport.h
@@ -52,7 +52,7 @@ class XLIFFExportPlugin : public KBabel::CatalogExportPlugin
 {
   public:
     XLIFFExportPlugin( TQObject * parent, const char * name, const TQStringList& );
-    virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
+    virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog );
     
   private:
     TQDomElement extractComment( TQDomDocument& doc, const TQString& s );
diff --git a/kbabel/filters/xliff/xliffimport.cpp b/kbabel/filters/xliff/xliffimport.cpp
index 246b8c24..807a624d 100644
--- a/kbabel/filters/xliff/xliffimport.cpp
+++ b/kbabel/filters/xliff/xliffimport.cpp
@@ -73,7 +73,7 @@ XLIFFImportPlugin::XLIFFImportPlugin( TQObject * parent, const char * name, cons
 {
 }
 
-ConversiontqStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& )
+ConversionStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& )
 {
   if ( filename.isEmpty( ) ) {
     kdDebug( KDEBUG_AREA ) << "fatal error: empty filename to open" << endl;
diff --git a/kbabel/filters/xliff/xliffimport.h b/kbabel/filters/xliff/xliffimport.h
index a32a686b..8901afd2 100644
--- a/kbabel/filters/xliff/xliffimport.h
+++ b/kbabel/filters/xliff/xliffimport.h
@@ -52,7 +52,7 @@ class XLIFFImportPlugin : public KBabel::CatalogImportPlugin
   public:
     XLIFFImportPlugin( TQObject * parent, const char * name, const TQStringList& );
     
-    virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype );
+    virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype );
     virtual const TQString id( ) { return "XLIFF 1.1"; }
     
   private:
diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp
index 9a19e5ec..cd7454c7 100644
--- a/kbabel/kbabel/charselectview.cpp
+++ b/kbabel/kbabel/charselectview.cpp
@@ -33,7 +33,7 @@
 
 #include "charselectview.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
@@ -52,14 +52,14 @@ using namespace KBabel;
 CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
+    layout->setResizeMode( TQLayout::Minimum );
 
-    tqlayout->setSpacing( KDialog::spacingHint() );
+    layout->setSpacing( KDialog::spacingHint() );
     
     TQHBox* bar = new TQHBox(this);
     bar->setSpacing( KDialog::spacingHint() );
-    tqlayout->addWidget (bar);
+    layout->addWidget (bar);
     
     TQLabel *lTable = new TQLabel( i18n( "Table:" ), bar );
     _tableNum = new TQSpinBox( 0, 255, 1, bar );
@@ -72,7 +72,7 @@ CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent
     _table->setNumRows(16);
     
     scroll->addChild(_table);
-    tqlayout->addWidget (scroll);
+    layout->addWidget (scroll);
     
     connect( _table, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( emitChar() ) );
     connect( _tableNum, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( setTab(int) ));
diff --git a/kbabel/kbabel/colorpreferences.ui b/kbabel/kbabel/colorpreferences.ui
index ae8e57fe..63a0dcf1 100644
--- a/kbabel/kbabel/colorpreferences.ui
+++ b/kbabel/kbabel/colorpreferences.ui
@@ -164,7 +164,7 @@ phrases.&lt;/qt&gt;</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp
index 44a049dc..e8a2e286 100644
--- a/kbabel/kbabel/commentview.cpp
+++ b/kbabel/kbabel/commentview.cpp
@@ -35,11 +35,11 @@
 
 #include "commentview.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqdragobject.h>
-#include <tqtextview.h>
+#include <textview.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
@@ -67,7 +67,7 @@ CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje
 {
     setAcceptDrops(true);
 
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(this);
+    TQVBoxLayout* layout=new TQVBoxLayout(this);
 
     commentEdit = new MsgMultiLineEdit(0, 0, this);
     commentEdit->setMinimumHeight(50);
@@ -77,12 +77,12 @@ CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje
 
     TQLabel* label=new TQLabel(commentEdit,i18n("&Comment:"),this);
 
-    TQHBoxLayout* hb=new TQHBoxLayout(tqlayout);
+    TQHBoxLayout* hb=new TQHBoxLayout(layout);
     hb->addSpacing(KDialog::marginHint());
     hb->addWidget(label);
 
-    tqlayout->addWidget(commentEdit);
-    tqlayout->setStretchFactor(commentEdit,1);
+    layout->addWidget(commentEdit);
+    layout->setStretchFactor(commentEdit,1);
 
     TQWhatsThis::add(this,
        i18n("<qt><p><b>Comment Editor</b></p>\n\
diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp
index 11d8434a..4af2881e 100644
--- a/kbabel/kbabel/contextview.cpp
+++ b/kbabel/kbabel/contextview.cpp
@@ -35,8 +35,8 @@
 
 #include "contextview.h"
 
-#include <tqlayout.h>
-#include <tqtextview.h>
+#include <layout.h>
+#include <textview.h>
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
@@ -50,14 +50,14 @@ using namespace KBabel;
 ContextView::ContextView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
+    layout->setResizeMode( TQLayout::Minimum );
 
     _textview = new TQTextView (this, "context textview");
     KCursor::setAutoHideCursor(_textview->viewport(),true);
     _textview->setReadOnly(true);
     
-    tqlayout->addWidget (_textview);
+    layout->addWidget (_textview);
 
     TQWhatsThis::add(this,
         i18n("<qt><p><b>PO Context</b></p>"
@@ -137,7 +137,7 @@ void ContextView::updateView()
 		temp = "";
 		for( TQStringList::Iterator i=tempList.begin() ; i != tempList.end() ; ++i)
 		{
-		    temp += i18n("Plural %1: %2\n").tqarg(counter++).tqarg(*i);
+		    temp += i18n("Plural %1: %2\n").arg(counter++).arg(*i);
 		}
 	    }
             temp = TQStyleSheet::convertFromPlainText(temp);
diff --git a/kbabel/kbabel/editordiffpreferences.ui b/kbabel/kbabel/editordiffpreferences.ui
index 33460635..7aa23aad 100644
--- a/kbabel/kbabel/editordiffpreferences.ui
+++ b/kbabel/kbabel/editordiffpreferences.ui
@@ -152,7 +152,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -170,7 +170,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui
index 15498f32..77c64683 100644
--- a/kbabel/kbabel/editorpreferences.ui
+++ b/kbabel/kbabel/editorpreferences.ui
@@ -133,7 +133,7 @@ activated, you will still see a message in the statusbar.
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>21</height>
@@ -206,10 +206,10 @@ activated, you will still see a message in the statusbar.
                             <cstring>buttonGroup1</cstring>
                         </property>
                         <property name="title">
-                            <string>tqStatus LEDs</string>
+                            <string>Status LEDs</string>
                         </property>
                         <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;&lt;p&gt;&lt;b&gt;tqStatus LEDs&lt;/b&gt;&lt;/p&gt;
+                            <string>&lt;qt&gt;&lt;p&gt;&lt;b&gt;Status LEDs&lt;/b&gt;&lt;/p&gt;
 &lt;p&gt;Choose here where the status LEDs are displayed and what color they have.&lt;/p&gt;&lt;/qt&gt;</string>
                         </property>
                         <hbox>
@@ -245,7 +245,7 @@ activated, you will still see a message in the statusbar.
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>51</width>
                                         <height>20</height>
@@ -283,7 +283,7 @@ activated, you will still see a message in the statusbar.
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>29</height>
diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp
index 719798d3..ef8c8008 100644
--- a/kbabel/kbabel/errorlistview.cpp
+++ b/kbabel/kbabel/errorlistview.cpp
@@ -35,8 +35,8 @@
 
 #include "errorlistview.h"
 
-#include <tqlayout.h>
-#include <tqtextview.h>
+#include <layout.h>
+#include <textview.h>
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
@@ -50,14 +50,14 @@ using namespace KBabel;
 ErrorListView::ErrorListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
-	tqlayout->setResizeMode( TQLayout::Minimum );
+	TQVBoxLayout* layout = new TQVBoxLayout( this );
+	layout->setResizeMode( TQLayout::Minimum );
 
 	_textview = new TQTextView (this);
 	KCursor::setAutoHideCursor(_textview->viewport(),true);
 	_textview->setReadOnly(true);
 
-	tqlayout->addWidget(_textview);
+	layout->addWidget(_textview);
 
 	TQWhatsThis::add(this, i18n( "<qt><p><b>Error List</b></p>"
 			"<p>This window shows the list of errors found by validator tools "
@@ -70,7 +70,7 @@ void ErrorListView::updateView()
 	if( _catalog->numberOfEntries() == 0 )
 		return;
 
-	_textview->setText( _catalog->itemtqStatus( _currentIndex ).join( "\n---\n" ) );
+	_textview->setText( _catalog->itemStatus( _currentIndex ).join( "\n---\n" ) );
 }
 
 #include "errorlistview.moc"
diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp
index 553724bc..62275cdd 100644
--- a/kbabel/kbabel/headereditor.cpp
+++ b/kbabel/kbabel/headereditor.cpp
@@ -108,7 +108,7 @@ bool HeaderEditor::isModified()
 
 void HeaderEditor::readHeader(bool readOnly)
 {
-   setCaption(i18n("Header Editor for %1").tqarg(_catalog->currentURL().prettyURL()));
+   setCaption(i18n("Header Editor for %1").arg(_catalog->currentURL().prettyURL()));
 
    _editor->headerEdit->setReadOnly(readOnly);
    _editor->commentEdit->setReadOnly(readOnly);
diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp
index 3d0b128a..a3dcb3c3 100644
--- a/kbabel/kbabel/hidingmsgedit.cpp
+++ b/kbabel/kbabel/hidingmsgedit.cpp
@@ -177,9 +177,9 @@ void HidingMsgEdit::setNumberOfPlurals( uint numberOfPlurals )
   MsgMultiLineEdit* pl;
   for(uint i=0 ; i< _numberOfPlurals ; i++)
   {
-     pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").tqarg(i).local8Bit());
+     pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").arg(i).local8Bit());
      _allEdits.append(pl);
-     _multipleEdit->addTab( pl, i18n("Plural %1").tqarg(i+1));
+     _multipleEdit->addTab( pl, i18n("Plural %1").arg(i+1));
      if( _eventFilter )
         pl->installEventFilter(_eventFilter);
   }
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 24c3eae9..c98ccf59 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -54,7 +54,7 @@
 #include <tqhbox.h>
 #include <tqwhatsthis.h>
 #include <tqsize.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqtooltip.h>
 #include <tqtimer.h>
 
@@ -115,9 +115,9 @@ class MyKProgress: public KProgress
 public:
     MyKProgress( TQWidget *parent, const char *name ) : KProgress( parent, name )
     {
-        tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
+        setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
     }
-    TQSize tqsizeHint() const { return TQSize( 1, 1);}
+    TQSize sizeHint() const { return TQSize( 1, 1);}
 };
 
 KBabelMW::KBabelMW(TQString projectFile)
@@ -129,7 +129,7 @@ KBabelMW::KBabelMW(TQString projectFile)
     
     if ( _project == NULL ) // FIXME should not happen anymore
     {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile)
             , i18n("Project File Error"));
 	_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
     }
@@ -147,7 +147,7 @@ KBabelMW::KBabelMW(KBCatalog* catalog, TQString projectFile)
 
     if ( _project == NULL )
     {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile)
             , i18n("Project File Error"));
 	_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
     }
@@ -333,7 +333,7 @@ void KBabelMW::init(KBCatalog* catalog)
                    "The minimum requirement is to fill out the Identity page.\n"
                    "Also check the encoding on the Save page, which is currently "
                    "set to %1. You may want to change this setting "
-                   "according to the settings of your language team.").tqarg(encodingStr));
+                   "according to the settings of your language team.").arg(encodingStr));
 
       TQTimer::singleShot(1,TQT_TQOBJECT(this),TQT_SLOT(projectConfigure()));
     }
@@ -455,7 +455,7 @@ void KBabelMW::setupActions()
                    ,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr");
 
    a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view)
-                 , TQT_SLOT(removeFuzzytqStatus()), actionCollection(), "edit_toggle_fuzzy");
+                 , TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy");
    action = new KAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()),
          actionCollection(), "edit_edit_header");
 
@@ -724,7 +724,7 @@ void KBabelMW::setupStatusBar()
        _errorLed->setFixedSize(15,12);
        new TQLabel(i18n("faulty")+" ",statusBox);
 
-       statusBox->setFixedWidth(statusBox->tqsizeHint().width());
+       statusBox->setFixedWidth(statusBox->sizeHint().width());
        statusBar()->addWidget(statusBox);
     }
 
@@ -732,7 +732,7 @@ void KBabelMW::setupStatusBar()
 
     statusBar()->insertItem(i18n("RW"),ID_STATUS_READONLY);
 
-    statusBar()->insertItem(i18n("Line: %1 Col: %2").tqarg(1).tqarg(1)
+    statusBar()->insertItem(i18n("Line: %1 Col: %2").arg(1).arg(1)
             ,ID_STATUS_CURSOR);
 
     TQHBox* progressBox = new TQHBox(statusBar(),"progressBox");
@@ -743,7 +743,7 @@ void KBabelMW::setupStatusBar()
     progressBox->setStretchFactor(_progressBar,1);
 
     statusBar()->addWidget(progressBox,1);
-    statusBar()->setMinimumHeight(progressBox->tqsizeHint().height());
+    statusBar()->setMinimumHeight(progressBox->sizeHint().height());
 
     TQWhatsThis::add(statusBar(),
        i18n("<qt><p><b>Statusbar</b></p>\n\
@@ -999,7 +999,7 @@ void KBabelMW::openRecent(const KURL& url)
    KBabelView *view = KBabelView::viewForURL(url,TQString());
    if(view)
    {
-       KWin::activateWindow(view->tqtopLevelWidget()->winId());
+       KWin::activateWindow(view->topLevelWidget()->winId());
        return;
    }
 
@@ -1019,7 +1019,7 @@ void KBabelMW::open(const KURL& url, const TQString package, bool newWindow)
    if(view)
    {
         kdDebug(KBABEL) << "there is a such view" << endl;
-       KWin::activateWindow(view->tqtopLevelWidget()->winId());
+       KWin::activateWindow(view->topLevelWidget()->winId());
        return;
    }
 
@@ -1361,23 +1361,23 @@ void KBabelMW::faultyDisplayed(bool flag)
 
 void KBabelMW::displayedEntryChanged(const KBabel::DocPosition& pos)
 {
-   statusBar()->changeItem(i18n("Current: %1").tqarg(pos.item+1),ID_STATUS_CURRENT);
+   statusBar()->changeItem(i18n("Current: %1").arg(pos.item+1),ID_STATUS_CURRENT);
   _currentIndex = pos.item;
 }
 
 void KBabelMW::setNumberOfTotal(uint number)
 {
-   statusBar()->changeItem(i18n("Total: %1").tqarg(number),ID_STATUS_TOTAL);
+   statusBar()->changeItem(i18n("Total: %1").arg(number),ID_STATUS_TOTAL);
 }
 
 void KBabelMW::setNumberOfFuzzies(uint number)
 {
-   statusBar()->changeItem(i18n("Fuzzy: %1").tqarg(number),ID_STATUS_FUZZY);
+   statusBar()->changeItem(i18n("Fuzzy: %1").arg(number),ID_STATUS_FUZZY);
 }
 
 void KBabelMW::setNumberOfUntranslated(uint number)
 {
-   statusBar()->changeItem(i18n("Untranslated: %1").tqarg(number),ID_STATUS_UNTRANS);
+   statusBar()->changeItem(i18n("Untranslated: %1").arg(number),ID_STATUS_UNTRANS);
 }
 
 void KBabelMW::hasFuzzyAfterwards(bool flag)
@@ -1566,7 +1566,7 @@ void KBabelMW::gettextHelp()
     if(!error.isEmpty())
     {
         KMessageBox::sorry(this,i18n("An error occurred while "
-                "trying to open the gettext info page:\n%1").tqarg(error));
+                "trying to open the gettext info page:\n%1").arg(error));
     }
 }
 
@@ -1602,7 +1602,7 @@ void KBabelMW::buildDictMenus()
 
 void KBabelMW::updateCursorPosition(int line, int col)
 {
-    statusBar()->changeItem(i18n("Line: %1 Col: %2").tqarg(line+1).tqarg(col+1)
+    statusBar()->changeItem(i18n("Line: %1 Col: %2").arg(line+1).arg(col+1)
             ,ID_STATUS_CURSOR);
 }
 
@@ -1751,7 +1751,7 @@ void KBabelMW::projectOpen(const TQString& file)
     }
     else 
     {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(file)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(file)
             , i18n("Project File Error"));
 	_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
 	m_view->useProject(_project);
diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp
index 785943d8..848d506f 100644
--- a/kbabel/kbabel/kbabelsplash.cpp
+++ b/kbabel/kbabel/kbabelsplash.cpp
@@ -53,9 +53,9 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
 
   picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised);
 
-  // Set tqgeometry, with support for Xinerama systems
+  // Set geometry, with support for Xinerama systems
   TQRect r;
-  r.setSize(tqsizeHint());
+  r.setSize(sizeHint());
   int ps = TQApplication::desktop()->primaryScreen();
   r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() );
   setGeometry(r);
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index 4c50a7e9..c4f84b2c 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -39,7 +39,7 @@
 #include "kbabelsettings.h"
 #include "kbprojectsettings.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <tqlabel.h>
 #include <tqframe.h>
@@ -48,10 +48,10 @@
 #include <tqwhatsthis.h>
 #include <tqdragobject.h>
 #include <tqpopupmenu.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqtabwidget.h>
-#include <tqtextview.h>
-#include <tqtextstream.h>
+#include <textview.h>
+#include <textstream.h>
 #include <tqtimer.h>
 #include <tqvbox.h>
 
@@ -307,7 +307,7 @@ void KBabelView::initDockWidgets()
     TQWidget *tempWidget=new TQWidget(this,"msgidWidget");
     tempWidget->setMinimumSize(350,150);
 
-    TQVBoxLayout *tqlayout=new TQVBoxLayout(tempWidget);
+    TQVBoxLayout *layout=new TQVBoxLayout(tempWidget);
 
     msgidLabel = new HidingMsgEdit(2, this, 0, tempWidget,"msgidLabel");
     msgidLabel->installEventFilter(this);
@@ -328,16 +328,16 @@ void KBabelView::initDockWidgets()
 "and the behavior of KBabel and to Stephan Kulow, who always\n"
 "lends me a helping hand.\n\n"
 "Many good ideas, especially for the Catalog Manager, are taken\n"
-"from KTranslator by Andrea Rizzi.").tqarg(VERSION).tqarg(2006));
+"from KTranslator by Andrea Rizzi.").arg(VERSION).arg(2006));
 
     TQLabel *label=new TQLabel(msgidLabel,i18n("O&riginal string (msgid):"),tempWidget);
 
-    TQHBoxLayout* hb=new TQHBoxLayout(tqlayout);
+    TQHBoxLayout* hb=new TQHBoxLayout(layout);
     hb->addSpacing(KDialog::marginHint());
     hb->addWidget(label);
 
-    tqlayout->addWidget(msgidLabel);
-    tqlayout->setStretchFactor(msgidLabel,1);
+    layout->addWidget(msgidLabel);
+    layout->setStretchFactor(msgidLabel,1);
 
     TQWhatsThis::add(tempWidget,
        i18n("<qt><p><b>Original String</b></p>\n\
@@ -382,7 +382,7 @@ of the currently displayed entry.</p></qt>"));
     tempWidget=new TQWidget(this,"msgstrWidget");
     tempWidget->setMinimumSize(350,150);
 
-    tqlayout=new TQVBoxLayout(tempWidget);
+    layout=new TQVBoxLayout(tempWidget);
 
     // if undefined number of plural forms, use 1
     int pf = _catalog->defaultNumberOfPluralForms();
@@ -395,7 +395,7 @@ of the currently displayed entry.</p></qt>"));
 
     label=new TQLabel(msgstrEdit,i18n("Trans&lated string (msgstr):"),tempWidget);
 
-    hb=new TQHBoxLayout(tqlayout);
+    hb=new TQHBoxLayout(layout);
     hb->setSpacing(KDialog::spacingHint());
 
     hb->addSpacing(KDialog::marginHint());
@@ -443,8 +443,8 @@ of the currently displayed entry.</p></qt>"));
        TQWhatsThis::add(_errorLed,ledMsg);
     }
 
-    tqlayout->addWidget(msgstrEdit);
-    tqlayout->setStretchFactor(msgstrEdit,1);
+    layout->addWidget(msgstrEdit);
+    layout->setStretchFactor(msgstrEdit,1);
 
     TQWhatsThis::add(tempWidget,
        i18n("<qt><p><b>Translation Editor</b></p>\n\
@@ -685,7 +685,7 @@ void KBabelView::readSettings(KConfig* config)
    if(KBabelSettings::autoUnsetFuzzy())
    {
       connect(msgstrEdit,TQT_SIGNAL(textChanged())
-		  ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+		  ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
    }
 
    setupAutoCheckTools();
@@ -788,7 +788,7 @@ void KBabelView::readProject(Project::Ptr project)
    {
     // turn off spellchecker
     msgstrEdit->setSpellChecker(0);
-    // tqinvalidate the current settings, to make sure they are updated when needed
+    // invalidate the current settings, to make sure they are updated when needed
     _spellcheckSettings.valid = false;
    }
 
@@ -854,12 +854,12 @@ void KBabelView::updateSettings()
     }
 
     disconnect(msgstrEdit,TQT_SIGNAL(textChanged())
-			 ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+			 ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
 
    if(KBabelSettings::autoUnsetFuzzy())
    {
          connect(msgstrEdit,TQT_SIGNAL(textChanged())
-			 ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+			 ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
    }
 
    msgstrEdit->setCleverEditing(KBabelSettings::cleverEditing());
@@ -1116,7 +1116,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
    cu.cleanPath();
    if(checkIfModified && !url.isEmpty() && cu==url)
    {
-       KWin::activateWindow(tqtopLevelWidget()->winId());
+       KWin::activateWindow(topLevelWidget()->winId());
        return;
    }
 
@@ -1155,12 +1155,12 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
 		return;
 	   }
 	   else {
-	        KWin::activateWindow(v->tqtopLevelWidget()->winId());
+	        KWin::activateWindow(v->topLevelWidget()->winId());
         	return;
 	   }
        }
 
-       ConversiontqStatus stat=_catalog->openURL(url, package);
+       ConversionStatus stat=_catalog->openURL(url, package);
 
        switch(stat)
        {
@@ -1180,14 +1180,14 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
           {
               KMessageBox::error(this
                  ,i18n("Error while trying to read file:\n %1\n"
-                       "Maybe it is not a valid PO file.").tqarg(url.prettyURL()));
+                       "Maybe it is not a valid PO file.").arg(url.prettyURL()));
               break;
           }
           case NO_ENTRY_ERROR:
           {
               KMessageBox::error(this
                   ,i18n("Error while reading the file:\n %1\n"
-                  "No entry found.").tqarg(url.prettyURL()));
+                  "No entry found.").arg(url.prettyURL()));
               break;
           }
           case RECOVERED_PARSE_ERROR:
@@ -1204,25 +1204,25 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
           case NO_PERMISSIONS:
           {
              KMessageBox::error(this,i18n(
-               "You do not have permissions to read file:\n %1").tqarg(url.prettyURL()));
+               "You do not have permissions to read file:\n %1").arg(url.prettyURL()));
              break;
           }
           case NO_FILE:
           {
              KMessageBox::error(this,i18n(
-                 "You have not specified a valid file:\n %1").tqarg(url.prettyURL()));
+                 "You have not specified a valid file:\n %1").arg(url.prettyURL()));
              break;
           }
 	  case NO_PLUGIN:
 	  {
              KMessageBox::error(this,i18n(
-                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL()));
+                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL()));
              break;
 	  }
 	  case UNSUPPORTED_TYPE:
 	  {
              KMessageBox::error(this,i18n(
-                 "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL()));
+                 "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL()));
              break;
 	  }
 	  case STOPPED:
@@ -1230,7 +1230,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
           default:
           {
              KMessageBox::error(this,i18n(
-                  "Error while trying to open file:\n %1").tqarg(url.prettyURL()));
+                  "Error while trying to open file:\n %1").arg(url.prettyURL()));
              break;
           }
 
@@ -1282,7 +1282,7 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
        setCursor(KCursor::waitCursor());*/
 
 
-       ConversiontqStatus stat=_catalog->openURL(openURL,saveURL);
+       ConversionStatus stat=_catalog->openURL(openURL,saveURL);
 
        switch(stat)
        {
@@ -1295,21 +1295,21 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
                // For a template, recoverable errors are disqualifying
                 KMessageBox::sorry(this,
                     i18n("There was an error while reading the file header of file:\n %1")
-                    .tqarg(openURL.prettyURL()));
+                    .arg(openURL.prettyURL()));
                 break;
            }
            case PARSE_ERROR:
            {
                KMessageBox::error(this
                        ,i18n("Error while trying to read file:\n %1\n"
-                       "Maybe it is not a valid PO file.").tqarg(openURL.prettyURL()));
+                       "Maybe it is not a valid PO file.").arg(openURL.prettyURL()));
                break;
            }
            case NO_ENTRY_ERROR:
            {
                KMessageBox::error(this
                     ,i18n("Error while reading the file:\n %1\n"
-                       "No entry found.").tqarg(openURL.prettyURL()));
+                       "No entry found.").arg(openURL.prettyURL()));
                break;
            }
            case RECOVERED_PARSE_ERROR:
@@ -1317,36 +1317,36 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
                // For a template, recoverable errors are disqualifying
                KMessageBox::sorry(this,
                    i18n("Minor syntax errors were found while reading file:\n %1")
-                   .tqarg(openURL.prettyURL()));
+                   .arg(openURL.prettyURL()));
                break;
 	  }
 	  case NO_PERMISSIONS:
 	  {
-	      KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").tqarg(openURL.prettyURL()));
+	      KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").arg(openURL.prettyURL()));
 	      break;
 	  }
 	  case NO_FILE:
 	  {
-	      KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").tqarg(openURL.prettyURL()));
+	      KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").arg(openURL.prettyURL()));
 	     break;
 	  }
 	  case NO_PLUGIN:
 	  {
              KMessageBox::error(this,i18n(
-                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(openURL.prettyURL()));
+                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(openURL.prettyURL()));
              break;
 	  }
 	  case UNSUPPORTED_TYPE:
 	  {
              KMessageBox::error(this,i18n(
-                 "The import plugin cannot handle this type of the file:\n %1").tqarg(openURL.prettyURL()));
+                 "The import plugin cannot handle this type of the file:\n %1").arg(openURL.prettyURL()));
              break;
 	  }
           case STOPPED:
             break;
 	  default:
 	  {
-	     KMessageBox::error(this,i18n("Error while trying to open file:\n %1").tqarg(openURL.prettyURL()));
+	     KMessageBox::error(this,i18n("Error while trying to open file:\n %1").arg(openURL.prettyURL()));
 	     break;
 	  }
 
@@ -1368,7 +1368,7 @@ bool KBabelView::saveFile(bool syntaxCheck)
    }
    else
    {
-      ConversiontqStatus stat=_catalog->saveFile();
+      ConversionStatus stat=_catalog->saveFile();
 
       int whatToDo = -1;
 
@@ -1386,20 +1386,20 @@ bool KBabelView::saveFile(bool syntaxCheck)
 	 {
 	    whatToDo=KMessageBox::warningContinueCancel(this,
 	     i18n("You do not have permission to write to file:\n%1\n"
-		  "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()),
+		  "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()),
 	     i18n("Error"),KStdGuiItem::save());
 	     break;
 	 }
 	 case NO_PLUGIN:
 	 {
              KMessageBox::error(this,i18n(
-                 "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").tqarg(_catalog->currentURL().prettyURL()));
+                 "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").arg(_catalog->currentURL().prettyURL()));
              break;
 	 }
 	 case UNSUPPORTED_TYPE:
 	 {
              KMessageBox::error(this,i18n(
-                 "The export plugin cannot handle this type of file:\n %1").tqarg(_catalog->currentURL().prettyURL()));
+                 "The export plugin cannot handle this type of file:\n %1").arg(_catalog->currentURL().prettyURL()));
              break;
 	 }
 	 case BUSY:
@@ -1415,7 +1415,7 @@ bool KBabelView::saveFile(bool syntaxCheck)
 	 {
 	    whatToDo=KMessageBox::warningContinueCancel(this,
 	     i18n("An error occurred while trying to write to file:\n%1\n"
-		  "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()),
+		  "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()),
 	     i18n("Error"),KStdGuiItem::save());
 	     break;
 	 }
@@ -1448,8 +1448,8 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 
    if (KIO::NetAccess::exists(url, false, this))
    {
-       if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
-						       "Do you want to overwrite it?").tqarg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
+       if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
+						       "Do you want to overwrite it?").arg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
       {
 	 return false;
       }
@@ -1458,7 +1458,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 
    bool wasReadOnly=_catalog->isReadOnly();
 
-   ConversiontqStatus stat=_catalog->saveFileAs(url,true);
+   ConversionStatus stat=_catalog->saveFileAs(url,true);
 
 
    // if the file was not saved sucessfully ask for saving to another file
@@ -1474,30 +1474,30 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 	      case NO_PERMISSIONS:
 	      {
 		  message=i18n("You do not have permission to write to file:\n%1\n"
-			       "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
+			       "Do you want to save to another file or cancel?").arg(url.prettyURL());
 		 break;
 	      }
 	      case NO_FILE:
 	      {
 		 message=i18n("You have specified a folder:\n%1\n"
-			      "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
+			      "Do you want to save to another file or cancel?").arg(url.prettyURL());
 		 break;
 	      }
 	      case NO_PLUGIN:
 	      {
-	         message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL());
+	         message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL());
                  break;
 	      }
 	      case UNSUPPORTED_TYPE:
 	      {
                  message=i18n(
-                    "The export plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL());
+                    "The export plugin cannot handle this type of the file:\n %1").arg(url.prettyURL());
                  break;
 	      }
 	      default:
 	      {
 		  message=i18n("An error occurred while trying to write to file:\n%1\n"
-			       "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
+			       "Do you want to save to another file or cancel?").arg(url.prettyURL());
 		  break;
 	      }
 	  }
@@ -1518,7 +1518,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 		if (KIO::NetAccess::exists(url, false, this))
 		{
 		    if(KMessageBox::warningContinueCancel(this,i18n("The file %1 already exists.\n"
-								    "Do you want to overwrite it?").tqarg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue)
+								    "Do you want to overwrite it?").arg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue)
 		   {
 		      stat=_catalog->saveFileAs(url);
 		      if(stat!=OK)
@@ -1625,7 +1625,7 @@ bool KBabelView::checkSyntax(bool msgOnlyAtError,bool question)
    bool returnCode=true;
    TQString output;
 
-   Msgfmt::tqStatus result=_catalog->checkSyntax( output );
+   Msgfmt::Status result=_catalog->checkSyntax( output );
 
    const TQStringList outputLines = TQStringList::split("\n",output);
    
@@ -1831,20 +1831,20 @@ void KBabelView::updateEditor(int form, bool delay)
 
    if(KBabelSettings::autoUnsetFuzzy() && !msgstrEdit->isModified())
    {
-       disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+       disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
    }
 
    msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex));
-   msgidLabel->tqrepaint();
+   msgidLabel->repaint();
 
    msgstrEdit->setText(_catalog->msgstr(_currentIndex));
    msgstrEdit->showForm( form );
-   msgstrEdit->tqrepaint();
+   msgstrEdit->repaint();
    m_cataloglistview->setSelectedItem(_currentIndex);
 
    if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex))
    {
-      connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+      connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
    }
 
    msgstrEdit->blockSignals(false);
@@ -2615,7 +2615,7 @@ void KBabelView::replaceAll()
 
 	while(success)
 	{
-		kapp->tqprocessEvents(100);
+		kapp->processEvents(100);
 
 		_replacesTotal++;
 
@@ -3159,7 +3159,7 @@ void KBabelView::forwardHistory()
    }
 }
 
-void KBabelView::removeFuzzytqStatus()
+void KBabelView::removeFuzzyStatus()
 {
    bool newState =  !_catalog->isFuzzy(_currentIndex);
    _catalog->setFuzzy(_currentIndex,newState);
@@ -3302,12 +3302,12 @@ void KBabelView::emitEntryState()
          TQPalette palette=msgstrEdit->palette();
          palette.setColor( TQColorGroup::Text, red );
 
-	 if( _catalog->itemtqStatus(_currentIndex).contains("syntax error"))
+	 if( _catalog->itemStatus(_currentIndex).contains("syntax error"))
          {
              msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor );
          }
          else
-	 if( !_catalog->itemtqStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError())
+	 if( !_catalog->itemStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError())
          {
              msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor );
          }
@@ -3332,12 +3332,12 @@ void KBabelView::checkUntranslated()
    emit signalUntranslatedInFront(_catalog->hasUntranslatedInFront(_currentIndex));
 }
 
-void KBabelView::autoRemoveFuzzytqStatus()
+void KBabelView::autoRemoveFuzzyStatus()
 {
    // only at first text change remove fuzzy status
-   disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
+   disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
 
-   //removeFuzzytqStatus();
+   //removeFuzzyStatus();
 }
 
 void KBabelView::toggleFuzzyLed(bool on)
@@ -3541,7 +3541,7 @@ void KBabelView::forwardMsgstrEditCmd(EditCommand* cmd)
 
       _catalog->applyBeginCommand(_currentIndex,Msgstr,this);
 
-      removeFuzzytqStatus();
+      removeFuzzyStatus();
    }
 
    cmd->setPart(Msgstr);
@@ -3576,13 +3576,13 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
 {
    if( !_autocheckTools.isEmpty() )
    {
-        TQStringList oldtqStatus = _catalog->itemtqStatus(_currentIndex);
+        TQStringList oldStatus = _catalog->itemStatus(_currentIndex);
 
-	TQStringList status = _catalog->itemtqStatus( _currentIndex,true, _autocheckTools );
+	TQStringList status = _catalog->itemStatus( _currentIndex,true, _autocheckTools );
 
 	// if there is more than one view, the status changes only in
 	// one view, so we have to update always.
-	if(_catalog->isLastView() && onlyWhenChanged && oldtqStatus == status)
+	if(_catalog->isLastView() && onlyWhenChanged && oldStatus == status)
 		return;
 
 	if( !status.isEmpty() )
@@ -3598,8 +3598,8 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
 		else msg += ", "+locale->translate("what check found errors",(*it).utf8());
 	    }
 
-	    //i18n: translators: tqStatus bar text that automatic checks have found some errors
-	    emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).tqarg(msg));
+	    //i18n: translators: Status bar text that automatic checks have found some errors
+	    emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).arg(msg));
 	    emit signalFaultyDisplayed(true);
 
 	    if(KBabelSettings::autoCheckColorError())
@@ -3611,7 +3611,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
 	    {
 		if(onlyWhenChanged)
 		{
-		    if(oldtqStatus != status && oldtqStatus.isEmpty() )
+		    if(oldStatus != status && oldStatus.isEmpty() )
 		    {
 			KNotifyClient::beep();
 		    }
@@ -3622,7 +3622,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
 		}
 	    }
 	}
-	else if( _catalog->itemtqStatus(_currentIndex).isEmpty() )
+	else if( _catalog->itemStatus(_currentIndex).isEmpty() )
 	{
 	    _catalog->removeFromErrorList(_currentIndex);
 
@@ -3888,7 +3888,7 @@ void KBabelView::spellcheck()
 	    if(emitProgress)
 	    {
 		emit signalResetProgressBar(i18n("Preparing spell check"),100);
-		kapp->tqprocessEvents(100);
+		kapp->processEvents(100);
 	    }
 
 	    uint total=last-first+1;
@@ -3900,7 +3900,7 @@ void KBabelView::spellcheck()
 		    lastPercent++;
 		    emit signalProgress(lastPercent);
 
-		    kapp->tqprocessEvents(100);
+		    kapp->processEvents(100);
 		}
 
 		TQStringList msgs=_catalog->msgstr(i);
@@ -4004,7 +4004,7 @@ void KBabelView::spellStart(KSpell *)
 				KMessageBox::sorry(this,
 				            i18n("Error opening the file that contains words "
 				            "to ignore during spell checking:\n"
-							"%1").tqarg(file.name()));
+							"%1").arg(file.name()));
 			}
 		}
 		else
@@ -4012,13 +4012,13 @@ void KBabelView::spellStart(KSpell *)
 			KMessageBox::sorry(this,
 			            i18n("Only local files are allowed for saving "
 			                 "ignored words to during spell checking:\n"
-							 "%1").tqarg(urlString));
+							 "%1").arg(urlString));
 		}
 
 		if(spell.ignoreList.count() > 0)
 		{
 			emit signalResetProgressBar(i18n("Preparing spell check"),100);
-			kapp->tqprocessEvents(100);
+			kapp->processEvents(100);
 
 			uint total = spell.ignoreList.count();
 			uint oldPercent=0;
@@ -4031,7 +4031,7 @@ void KBabelView::spellStart(KSpell *)
 				{
 					oldPercent++;
 					emit signalProgress(oldPercent);
-					kapp->tqprocessEvents(100);
+					kapp->processEvents(100);
 				}
 
 				spell.kspell->ignore(*it);
diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h
index 3398457d..af7fff86 100644
--- a/kbabel/kbabel/kbabelview.h
+++ b/kbabel/kbabel/kbabelview.h
@@ -268,7 +268,7 @@ public slots:
     void skipToTagFromTool(int index);
     void wordCount();
 
-    void removeFuzzytqStatus();
+    void removeFuzzyStatus();
     /** opens the header editor for the po-file */
     void editHeader();
 
@@ -451,7 +451,7 @@ protected slots:
 
 private slots:
    void msgstrPluralFormChanged (uint index);
-   void autoRemoveFuzzytqStatus();
+   void autoRemoveFuzzyStatus();
 
    /** connected to the catalog. it is called when a new file is opened*/
    void newFileOpened(bool readOnly);
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index c70b42e7..2458d3dc 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -45,7 +45,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmessagebox.h>
 #include <tqpopupmenu.h>
 #include <tqvbox.h>
@@ -537,7 +537,7 @@ void KBabelView::diffInternal(bool autoDf)
     	            KMessageBox::sorry(this
         	        ,i18n("An error occurred while trying to get the list "
                         "of messages for this file from the database:\n"
-                        "%1").tqarg(error));
+                        "%1").arg(error));
 
             	    _diffing=false;
                     _diffEnabled=false;
@@ -709,7 +709,7 @@ bool KBabelView::openDiffFile(bool autoDiff)
     connect(&cat,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(signalProgress(int)));
     emit signalResetProgressBar(i18n("loading file for diff"),100);
 
-    ConversiontqStatus stat = cat.openURL(url);
+    ConversionStatus stat = cat.openURL(url);
 
     emit signalClearProgressBar();
 
@@ -722,40 +722,40 @@ bool KBabelView::openDiffFile(bool autoDiff)
             {
                 KMessageBox::sorry(this
                     ,i18n("Error while trying to read file:\n %1\n"
-                   "Maybe it is not a valid PO file.").tqarg(url.prettyURL()));
+                   "Maybe it is not a valid PO file.").arg(url.prettyURL()));
                 break;
             }
             case NO_PERMISSIONS:
             {
                 KMessageBox::sorry(this,i18n(
                 "You do not have permissions to read file:\n %1")
-                        .tqarg(url.prettyURL()));
+                        .arg(url.prettyURL()));
                 break;
             }
             case NO_FILE:
             {
                  KMessageBox::sorry(this,i18n(
                  "You have not specified a valid file:\n %1")
-                         .tqarg(url.prettyURL()));
+                         .arg(url.prettyURL()));
                 break;
             }
 	    case NO_PLUGIN:
 	    {
 	         KMessageBox::error(this,i18n(
-	              "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL()));
+	              "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL()));
 	         break;
 	    }
 	    case UNSUPPORTED_TYPE:
 	    {
 	          KMessageBox::error(this,i18n(
-	               "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL()));
+	               "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL()));
                   break;
 	    }
             default:
             {
                  KMessageBox::sorry(this,i18n(
                   "Error while trying to open file:\n %1")
-                         .tqarg(url.prettyURL()));
+                         .arg(url.prettyURL()));
                  break;
             }
 
@@ -802,8 +802,8 @@ void KBabelView::showTryLaterMessageBox()
 	         "However, the string might be found "
 		 "in the files being searched at the moment.\n"
 		 "Please try later."), contents);
-    label2->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak );
-    label2->setMinimumSize(label2->tqsizeHint());
+    label2->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak );
+    label2->setMinimumSize(label2->sizeHint());
     lay->add( label2 );
     lay->addStretch(1);
 
@@ -1020,6 +1020,6 @@ void KBabelView::wordCount()
     KMessageBox::information( this
 	, i18n("Total words: %1\n\n"
 "Words in untranslated messages: %2\n\n"
-"Words in fuzzy messages: %3").tqarg(total).tqarg(untranslated).tqarg(fuzzy)
+"Words in fuzzy messages: %3").arg(total).arg(untranslated).arg(fuzzy)
 	, i18n("Word Count") );
 }
diff --git a/kbabel/kbabel/kbbookmarkhandler.cpp b/kbabel/kbabel/kbbookmarkhandler.cpp
index d9f080cb..488a4281 100644
--- a/kbabel/kbabel/kbbookmarkhandler.cpp
+++ b/kbabel/kbabel/kbbookmarkhandler.cpp
@@ -94,7 +94,7 @@ void KBabelBookmarkHandler::addBookmark(KBabelBookmark* b)
 
   // if it's okay then add the bookmark
   _list.append(b);
-  _menu->insertItem(TQString("#%1 - %2").tqarg(b->msgindex()).tqarg(b->msgtext()),
+  _menu->insertItem(TQString("#%1 - %2").arg(b->msgindex()).arg(b->msgtext()),
     this, TQT_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex());
 }
 
diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp
index cd48f274..3b98d355 100644
--- a/kbabel/kbabel/kbcataloglistview.cpp
+++ b/kbabel/kbabel/kbcataloglistview.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <klistview.h>
 #include <tqcolor.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kglobalsettings.h>
 
 using namespace KBabel;
@@ -38,7 +38,7 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe
  : TQWidget(parent)
 {
     m_catalog= catalog;
-    TQVBoxLayout* tqlayout=new TQVBoxLayout(this);
+    TQVBoxLayout* layout=new TQVBoxLayout(this);
     
     m_listview = new KListView(this, "catalogListView");
     m_listview->addColumn(i18n("Id"));
@@ -49,8 +49,8 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe
     m_listview->setAllColumnsShowFocus(true);
     m_listview->resize(this->size());
 
-    tqlayout->addWidget(m_listview);
-    tqlayout->setStretchFactor(m_listview,1);
+    layout->addWidget(m_listview);
+    layout->setStretchFactor(m_listview,1);
     
     connect(m_listview,TQT_SIGNAL(selectionChanged(TQListViewItem *)), this,TQT_SLOT(selectionChanged(TQListViewItem *)));
 }
diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp
index dd14221c..4bbc3049 100644
--- a/kbabel/kbabel/kbcataloglistviewitem.cpp
+++ b/kbabel/kbabel/kbcataloglistviewitem.cpp
@@ -38,14 +38,14 @@ void KBCatalogListViewItem::setMsgId(const TQString& st)
 {
     m_msgid = st;
     setup();
-    tqrepaint();
+    repaint();
 }
 
 void KBCatalogListViewItem::setMsgStr(const TQString& st)
 {
     m_msgstr = st;
     setup();
-    tqrepaint();
+    repaint();
 }
 
 uint KBCatalogListViewItem::getId()
@@ -57,7 +57,7 @@ void KBCatalogListViewItem::setId(const uint id)
 {
     m_id = id;
     setup();
-    tqrepaint();
+    repaint();
 }
 
 TQString KBCatalogListViewItem::key ( int column, bool ascending ) const{
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index c67d56a7..d9e7daaa 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -37,7 +37,7 @@
 #include <tqcolor.h>
 #include <tqregexp.h>
 #include <tqstring.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 #include "kapplication.h"
 #include <kconfig.h>
@@ -300,7 +300,7 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell )
             this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int)));
 
 	// wait for KSpell to startup correctly
-	kapp->tqprocessEvents(500);
+	kapp->processEvents(500);
     }    
     
     highlight();
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index f36a0b94..85158efa 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -242,7 +242,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
     KBabelMW *kb = KBabelMW::winForURL(u,project);
     if(kb)
     {
-        KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+        KWin::activateWindow(kb->topLevelWidget()->winId());
     }
     else
     {
@@ -255,7 +255,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
 	    if( mw->inherits("KBabelMW") && mw->winId() == window)
     	    {
         	kb = static_cast<KBabelMW*>(mw);
-        	KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+        	KWin::activateWindow(kb->topLevelWidget()->winId());
         	kb->open(u, TQString::fromUtf8(package),newWindow);
 
 		kdDebug () << "Resuming DCOP" << endl;
@@ -272,7 +272,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
 	{
 	    // here, we don't care about "open in new window", because
 	    // it's empty
-    	    KWin::setActiveWindow(kb->tqtopLevelWidget()->winId());
+    	    KWin::setActiveWindow(kb->topLevelWidget()->winId());
 	    kb->projectOpen(projectFile);
     	    kb->open(u,TQString::fromUtf8(package),false);
 
@@ -289,7 +289,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
 	    if( mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project)
     	    {
         	kb = static_cast<KBabelMW*>(mw);
-        	KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+        	KWin::activateWindow(kb->topLevelWidget()->winId());
         	kb->open(u, TQString::fromUtf8(package),newWindow);
 
 		kdDebug () << "Resuming DCOP" << endl;
@@ -305,7 +305,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
 	    kb = new KBabelMW(project);
     	    kb->show();
 	} else kb = static_cast<KBabelMW*>(mw);
-        KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+        KWin::activateWindow(kb->topLevelWidget()->winId());
         kb->open(u,TQString::fromUtf8(package),newWindow);
     }
     
@@ -331,7 +331,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
     KBabelMW *kb = KBabelMW::winForURL(u, project);
     if(kb)
     {
-        KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+        KWin::activateWindow(kb->topLevelWidget()->winId());
     }
     else
     {
@@ -342,7 +342,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
         if(mw && mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project)
         {
             kb = static_cast<KBabelMW*>(mw);
-            KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+            KWin::activateWindow(kb->topLevelWidget()->winId());
 	    kb->projectOpen(projectFile);
             kb->openTemplate(t,u,TQString::fromUtf8(package),newWindow);
         }
@@ -350,7 +350,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
         {
             kb = new KBabelMW(project);
             kb->show();
-            KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+            KWin::activateWindow(kb->topLevelWidget()->winId());
             kb->openTemplate(t,u,TQString::fromUtf8(package));
         }
     }
@@ -505,7 +505,7 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec
 
 	if(kb)
 	{
-    	    KWin::activateWindow(kb->tqtopLevelWidget()->winId());
+    	    KWin::activateWindow(kb->topLevelWidget()->winId());
 	}
     }
 
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index af824fdd..cc84b3c3 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -46,7 +46,7 @@
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqapplication.h>
 #include <tqdragobject.h>
 //#include <private/tqrichtext_p.h>
@@ -120,7 +120,7 @@ void MyMultiLineEdit::processCommand(EditCommand* cmd, bool undo)
 
   TQPalette _visibleHighlight( palette() );
   TQPalette _invisibleHighlight( palette() );
-  TQColorGroup newcg( tqcolorGroup() );
+  TQColorGroup newcg( colorGroup() );
   newcg.setColor( TQColorGroup::HighlightedText, newcg.text() );
   newcg.setColor( TQColorGroup::Highlight, newcg.base() );
   if( hasFocus() ) _invisibleHighlight.setActive( newcg );
@@ -362,7 +362,7 @@ void MyMultiLineEdit::insert( const TQString & text, bool indent, bool checkNewL
    
    TQPalette _visibleHighlight( palette() );
    TQPalette _invisibleHighlight( palette() );
-   TQColorGroup newcg( tqcolorGroup() );
+   TQColorGroup newcg( colorGroup() );
    newcg.setColor( TQColorGroup::HighlightedText, newcg.text() );
    newcg.setColor( TQColorGroup::Highlight, newcg.base() );
    if( hasFocus() ) _invisibleHighlight.setActive( newcg );
@@ -598,7 +598,7 @@ MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const
                 _cleverEditing(false),
                 _highlightBg(false),
                 _spacePoints(false),
-                _bgColor(tqcolorGroup().base().dark(110)),
+                _bgColor(colorGroup().base().dark(110)),
 		_textColor(KGlobalSettings::textColor()),
 		_errorColor(TQt::red),
 		_currentColor(KGlobalSettings::textColor()),
@@ -885,7 +885,7 @@ void MsgMultiLineEdit::setFont(const TQFont& font)
    _wsOffsetX = TQMAX(fm.width(' ')/2-2,1);
    _wsOffsetY = TQMAX(fm.height()/2-1,0);
    
-   tqrepaint();
+   repaint();
 }
 
 void MsgMultiLineEdit::setDiffDisplayMode(bool addUnderline, bool delStrikeOut)
@@ -910,7 +910,7 @@ void MsgMultiLineEdit::setDiffColors(const TQColor& addColor
 void MsgMultiLineEdit::setTextColor(const TQColor &color )
 {
   TQPalette p( palette() );
-  TQColorGroup newcg( tqcolorGroup() );
+  TQColorGroup newcg( colorGroup() );
   newcg.setColor( TQColorGroup::Text, color );
   if( hasFocus() ) p.setActive( newcg );
   else p.setInactive( newcg );
@@ -992,7 +992,7 @@ void MsgMultiLineEdit::paintSpacePoints()
             int i = s.find( " " );
             while( (i >= 0) && (i < (int)s.length()-1) ) // -1 because text will end by EOLN
             {
-                TQPixmap* pm = ( s.tqat(i).tqunicode() == 0x00A0U ) ? wsnb : ws;
+                TQPixmap* pm = ( s.at(i).unicode() == 0x00A0U ) ? wsnb : ws;
                 TQRect r = mapToView( curpara, i );
                 r.moveBy( r.width()/2, (r.height() - fm.descent())/2 );
                 r.moveBy( -pm->rect().width()/2, -pm->rect().height()/2-1 );
@@ -1141,10 +1141,10 @@ void MsgMultiLineEdit::paintSpacePoints()
     }
 }
 
-void MsgMultiLineEdit::tqrepaint()
+void MsgMultiLineEdit::repaint()
 {
     highlight();
-    MyMultiLineEdit::tqrepaint();
+    MyMultiLineEdit::repaint();
 }
 
 void MsgMultiLineEdit::forceUpdate()
@@ -1152,7 +1152,7 @@ void MsgMultiLineEdit::forceUpdate()
     _firstChangedLine=0;
     _lastChangedLine=paragraphs()-1;
     highlighter->highlight();
-    MyMultiLineEdit::tqrepaint();
+    MyMultiLineEdit::repaint();
 }
 
 void MsgMultiLineEdit::ensureCursorVisible()
@@ -1167,7 +1167,7 @@ void MsgMultiLineEdit::highlight()
     
     TQColor bg;
     if( _highlightBg ) bg = _bgColor;
-    else bg = tqcolorGroup().base(); 
+    else bg = colorGroup().base(); 
 
     for( int i = 0 ; i < paragraphs() ; i++ )
 	    setParagraphBackgroundColor( i, bg );
diff --git a/kbabel/kbabel/mymultilineedit.h b/kbabel/kbabel/mymultilineedit.h
index 272878da..ba6a96e6 100644
--- a/kbabel/kbabel/mymultilineedit.h
+++ b/kbabel/kbabel/mymultilineedit.h
@@ -229,7 +229,7 @@ public slots:
    /**
    *  reimplemented to call highlight()
    */
-   void tqrepaint(); 
+   void repaint(); 
    void forceUpdate();
    void emittedTextChanged();
    
diff --git a/kbabel/kbabel/searchpreferences.ui b/kbabel/kbabel/searchpreferences.ui
index c00e537f..e5177523 100644
--- a/kbabel/kbabel/searchpreferences.ui
+++ b/kbabel/kbabel/searchpreferences.ui
@@ -51,7 +51,7 @@ in the toolbar pressed for a while.&lt;/p&gt;&lt;/qt&gt;</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -96,7 +96,7 @@ the desired dictionary from &lt;b&gt;Settings-&gt;Configure Dictionary&lt;/b&gt;
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>91</height>
diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp
index 33b0d27b..7a2965ac 100644
--- a/kbabel/kbabel/sourceview.cpp
+++ b/kbabel/kbabel/sourceview.cpp
@@ -34,7 +34,7 @@
 #include "sourceview.h"
 #include "context.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
@@ -48,11 +48,11 @@ using namespace KBabel;
 SourceView::SourceView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
+    layout->setResizeMode( TQLayout::Minimum );
 
     _contextView = new SourceContext (this, project);
-    tqlayout->addWidget (_contextView);
+    layout->addWidget (_contextView);
     
     connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool)));
 }
diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp
index 62d4eba5..751a2701 100644
--- a/kbabel/kbabel/taglistview.cpp
+++ b/kbabel/kbabel/taglistview.cpp
@@ -33,7 +33,7 @@
 
 #include "taglistview.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
@@ -47,12 +47,12 @@ using namespace KBabel;
 TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
-    tqlayout->setResizeMode( TQLayout::Minimum );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
+    layout->setResizeMode( TQLayout::Minimum );
 
     _tagBox = new KListBox (this, "taglist textview");
     
-    tqlayout->addWidget (_tagBox);
+    layout->addWidget (_tagBox);
     
     connect(_tagBox,TQT_SIGNAL(selected(const TQString&))
             , this, TQT_SIGNAL(signalTagSelected(const TQString&)));
diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp
index d3b8df63..d0353d04 100644
--- a/kbabel/kbabeldict/dictchooser.cpp
+++ b/kbabel/kbabeldict/dictchooser.cpp
@@ -36,7 +36,7 @@
 #include "resources.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <kconfig.h>
 #include <klistbox.h>
@@ -52,18 +52,18 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
     tempConfig.setAutoDelete(true);
 
     dictList = box->moduleInfos();
-    TQGridLayout *tqlayout = new TQGridLayout(this);
-    tqlayout->setSpacing(KDialog::spacingHint());
+    TQGridLayout *layout = new TQGridLayout(this);
+    layout->setSpacing(KDialog::spacingHint());
 
 
     TQLabel *label = new TQLabel(i18n("dictionary to not use","Do not use:"),this);
-    tqlayout->addWidget(label,0,0);
+    layout->addWidget(label,0,0);
 
     label = new TQLabel(i18n("dictionary to use","Use:"),this);
-    tqlayout->addWidget(label,0,2);
+    layout->addWidget(label,0,2);
 
     unselectedBox = new KListBox(this,"unselectedBox");
-    tqlayout->addWidget(unselectedBox,1,0);
+    layout->addWidget(unselectedBox,1,0);
 
 
     TQVBoxLayout *bLayout = new TQVBoxLayout();
@@ -74,10 +74,10 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
     unselectBtn->setEnabled(false);
     bLayout->addWidget(unselectBtn);
     bLayout->addStretch();
-    tqlayout->addLayout(bLayout,1,1);
+    layout->addLayout(bLayout,1,1);
 
     selectedBox = new KListBox(this,"selectedBox");
-    tqlayout->addWidget(selectedBox,1,2);
+    layout->addWidget(selectedBox,1,2);
 
 
     bLayout = new TQVBoxLayout();
@@ -90,7 +90,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
     configureBtn = new TQPushButton(i18n("Con&figure..."), this);
     bLayout->addWidget(configureBtn);
     bLayout->addStretch();
-    tqlayout->addLayout(bLayout,1,3);
+    layout->addLayout(bLayout,1,3);
 
 
     dictList.setAutoDelete(true);
diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp
index d850f9a6..759468c9 100644
--- a/kbabel/kbabeldict/dictionarymenu.cpp
+++ b/kbabel/kbabeldict/dictionarymenu.cpp
@@ -112,11 +112,11 @@ void DictionaryMenu::add(const TQString& n, const TQString& moduleId
         TQString keyString=key;
         if(keyString.contains("%1"))
         {
-            keyString=key.tqarg(accel2id.count()+1);
+            keyString=key.arg(accel2id.count()+1);
     	}
         KShortcut k(keyString);
 
-    	KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.tqarg(moduleId).utf8() );
+    	KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() );
 	uint id = maxId++;
         dictionaryAction->plug(popup,id);
 
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index de0f747f..7e49402b 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -58,14 +58,14 @@
 #include <ktrader.h>
 #include <twin.h>
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqdir.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpopupmenu.h>
 #include <tqpushbutton.h>
-#include <tqtextview.h>
-#include <tqstylesheet.h>
+#include <textview.h>
+#include <stylesheet.h>
 #include <tqtoolbutton.h>
 #include <tqwhatsthis.h>
 #include <tqtimer.h>
@@ -324,10 +324,10 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent,  const char* name, WFlags fl )
    mainLayout->addLayout(hbox);
    
    totalResultsLabel->setNum(100000);
-   totalResultsLabel->setFixedSize(totalResultsLabel->tqsizeHint());
+   totalResultsLabel->setFixedSize(totalResultsLabel->sizeHint());
    totalResultsLabel->setNum(0);
    currentLabel->setNum(100000);
-   currentLabel->setFixedSize(currentLabel->tqsizeHint());
+   currentLabel->setFixedSize(currentLabel->sizeHint());
    currentLabel->setNum(0);
 
    setRMBMenu(new TQPopupMenu(this));
@@ -1007,7 +1007,7 @@ void KBabelDictBox::showResult(TQListViewItem *item)
                 if(!info->filePath.isEmpty())
                 {
                     rmbPopup->changeItem(editFileIndex
-                        ,i18n("Edit File %1").tqarg(info->location));
+                        ,i18n("Edit File %1").arg(info->location));
                     rmbPopup->setItemEnabled(editFileIndex,true);
                 }
                 else
@@ -1182,7 +1182,7 @@ void KBabelDictBox::nextInfo()
             if(!info->filePath.isEmpty())
             {
                 rmbPopup->changeItem(editFileIndex
-                        ,i18n("Edit File %1").tqarg(info->location));
+                        ,i18n("Edit File %1").arg(info->location));
                 rmbPopup->setItemEnabled(editFileIndex,true);
             }
             else
@@ -1255,7 +1255,7 @@ void KBabelDictBox::about()
          if(aboutData->bugAddress() != "submit@bugs.kde.org")
          {
             text += "\n" + i18n("Send bugs to %1")
-                  .tqarg(aboutData->bugAddress()) +"\n";
+                  .arg(aboutData->bugAddress()) +"\n";
          }
 
          TQLabel *label = new TQLabel(text,0);
@@ -1410,7 +1410,7 @@ void KBabelDictBox::copy()
    }
    else
    {
-      TQClipboard *cb = KApplication::tqclipboard();
+      TQClipboard *cb = KApplication::clipboard();
       cb->setText(translation());
    }
 }
@@ -1502,7 +1502,7 @@ void KBabelDictBox::configure(const TQString& id, bool modal)
    {
       if(e->id() == id)
       {
-         TQString caption = i18n("Configure Dictionary %1").tqarg(e->name());
+         TQString caption = i18n("Configure Dictionary %1").arg(e->name());
          KDialogBase *dialog = new KDialogBase(this,"prefDialog"
                    , modal, caption
                    , KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel|
@@ -1696,7 +1696,7 @@ void KBabelDictBox::editFile()
                  {
                      KMessageBox::sorry(this
                              ,i18n("There was an error starting KBabel:\n%1")
-                                    .tqarg(error));
+                                    .arg(error));
                      return;
                  }
              }
diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp
index 18bb20ac..d8dc90f9 100644
--- a/kbabel/kbabeldict/kbabeldictview.cpp
+++ b/kbabel/kbabeldict/kbabeldictview.cpp
@@ -41,7 +41,7 @@
 #include <tqgroupbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqptrlist.h>
 #include <tqpushbutton.h>
 #include <tqstringlist.h>
diff --git a/kbabel/kbabeldict/kbabelsplash.cpp b/kbabel/kbabeldict/kbabelsplash.cpp
index a62cec5f..56c5e3a8 100644
--- a/kbabel/kbabeldict/kbabelsplash.cpp
+++ b/kbabel/kbabeldict/kbabelsplash.cpp
@@ -53,9 +53,9 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
 
   picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised);
 
-  // Set tqgeometry, with support for Xinerama systems
+  // Set geometry, with support for Xinerama systems
   TQRect r;
-  r.setSize(tqsizeHint());
+  r.setSize(sizeHint());
   int ps = TQApplication::desktop()->primaryScreen();
   r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() );
   setGeometry(r);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 4c79bacd..a3b20183 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -28,7 +28,7 @@
  *   your version.                                                         *
 */
 
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqprogressdialog.h>
 
 #include <tqinputdialog.h>
@@ -474,7 +474,7 @@ KDBSearchEngine::messagesForFilter (const SearchFilter * filter,
 	  if (count % step == 0)
 	    {
 		emit progress (100 * count / totalRecord);
-		kapp->tqprocessEvents (100);
+		kapp->processEvents (100);
 	    }
 	  if (stopNow)
 	    {
@@ -582,7 +582,7 @@ KDBSearchEngine::repeat ()
 	  if (count % step == 0)
 	    {
 		emit progress (100 * count / totalRecord);
-		kapp->tqprocessEvents (100);
+		kapp->processEvents (100);
 	    }
 	  if (stopNow)
 	    {
@@ -755,7 +755,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
 	step = 100;
 
     emit progress (0);
-    kapp->tqprocessEvents (100);
+    kapp->processEvents (100);
     if (stopNow)
     {
 	stopNow = false;
@@ -775,7 +775,7 @@ KDBSearchEngine::startSearchNow (int searchmode)
 	    {
 		emit progress (100 * count / /*TQMAX( */
 			       totalprogress /*,1) */ );
-		kapp->tqprocessEvents (100);
+		kapp->processEvents (100);
 
 		if (stopNow)
 		{
@@ -1715,7 +1715,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase,
 				  {
 				      emit
 				      progress (100 * count / totalprogress);
-				      kapp->tqprocessEvents (100);
+				      kapp->processEvents (100);
 				  }
 				  if (stopNow)
 				  {
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 95ec19dd..699e3530 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -703,7 +703,7 @@ DataBaseManager::cursorGet (uint32 flags)
     else
       {
 	  kdDebug (KBABEL_SEARCH) << TQString ("...cursor getting...%1").
-	      tqarg (ret) << endl;
+	      arg (ret) << endl;
 
 	  return DataBaseItem ();
       }
@@ -782,7 +782,7 @@ DataBaseManager::createDataBase (TQString directory,
 
     rename (filename.local8Bit (), filename.local8Bit () + ",old");
 
-//kdDebug(0) << TQString("Creating %1").tqarg(filename) << endl;
+//kdDebug(0) << TQString("Creating %1").arg(filename) << endl;
 
     iAmOk = true;
 
@@ -861,7 +861,7 @@ DataBaseManager::createDataBase (TQString directory,
 	loadInfo ();
     else
 	kdDebug (KBABEL_SEARCH) << TQString ("I am NOT  ok : %1").
-	    tqarg (ret) << endl;
+	    arg (ret) << endl;
 
 //THIS IS WRONG, rewrite the error handling. 
     return iAmOk;
@@ -889,7 +889,7 @@ DataBaseManager::getCatalogInfo (int n)
 	  return InfoItem ();
       }
 
-// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl;
+// kdDebug(0) << TQString("Trad %1").arg(ret) << endl;
 
     InfoItem it ((char *) data.data, language);
 //free(data.data);  // Read docu for this!!!!
@@ -1324,7 +1324,7 @@ DataBaseManager::appendKey (TQString _key)
     else
 	ret = *(uint32 *) key.data;
 
-//kdDebug(0) << TQString("Append result %1,err = %1").tqarg(ret).tqarg(err) << endl;
+//kdDebug(0) << TQString("Append result %1,err = %1").arg(ret).arg(err) << endl;
 
 
     free (data.data);
@@ -1353,7 +1353,7 @@ DataBaseManager::getKey (uint32 n)
 
     return TQString::fromUtf8 ((char *) data.data);
 
-// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl;
+// kdDebug(0) << TQString("Trad %1").arg(ret) << endl;
 
 }
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
index 2969a9df..47bc8fa9 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp
@@ -57,7 +57,7 @@ if (!called)
 { pb=true; count=0;}
 called=true;
  
-kdDebug(0) << TQString("cat: %1, %2").tqarg(pathName).tqarg(pattern) << endl;
+kdDebug(0) << TQString("cat: %1, %2").arg(pathName).arg(pattern) << endl;
 
 if(pb)
 {emit patternStarted();
@@ -128,7 +128,7 @@ emit fileLoading(0);
 
 KURL u(fileName);
 
-ConversiontqStatus rr=catalog->openURL(u);
+ConversionStatus rr=catalog->openURL(u);
 if(rr != OK && rr !=RECOVERED_PARSE_ERROR )
 {
         delete catalog;
@@ -149,7 +149,7 @@ tot=catalog->numberOfEntries();
 bool fuzzy;
 bool untra;
 
-//kdDebug(0) << TQString("Tot: %1").tqarg(tot) << endl;
+//kdDebug(0) << TQString("Tot: %1").arg(tot) << endl;
 
 for (i=0;i<tot;i++)  //Skip header        = ????
 {
@@ -159,7 +159,7 @@ for (i=0;i<tot;i++)  //Skip header        = ????
   { 
    emit fileProgress(100*i/tot);
    emit added(count);
-   kapp->tqprocessEvents(100);
+   kapp->processEvents(100);
   }
 
   fuzzy=catalog->isFuzzy(i);
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
index b457bf74..7833bef3 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
@@ -179,7 +179,7 @@ It also substitutes groups of more than one space character with only one space
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>20</height>
@@ -245,7 +245,7 @@ It also substitutes groups of more than one space character with only one space
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -262,7 +262,7 @@ It also substitutes groups of more than one space character with only one space
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -332,7 +332,7 @@ It also substitutes groups of more than one space character with only one space
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -384,7 +384,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -415,7 +415,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -487,7 +487,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
                                         <property name="text">
                                             <string>[A-Za-z0-9_%</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter|AlignRight</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
index a2c8c289..23ac1cd5 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
@@ -3,7 +3,7 @@
 #include <tqspinbox.h>  
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <kurlrequester.h>
@@ -17,15 +17,15 @@
 PreferencesWidget::PreferencesWidget(TQWidget *parent, const char* name)
 		: PrefWidget(parent,name)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 //	TQLabel *label = new TQLabel(i18n("Settings for KDE database search engine"),this);
-//	tqlayout->addWidget(label);
+//	layout->addWidget(label);
 
 	dbpw = new DBSearchEnginePref(this);
 	dbpw->dirInput->setMode(KFile::Directory | KFile::LocalOnly);
 	
-	tqlayout->addWidget(dbpw);
-	resize(TQSize(200,200).expandedTo(tqminimumSizeHint()));
+	layout->addWidget(dbpw);
+	resize(TQSize(200,200).expandedTo(minimumSizeHint()));
 
 //    connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1()));
 
@@ -99,12 +99,12 @@ TQString defaultDir;
 
 void PreferencesWidget::setName(TQString n)
 {
-dbpw->filenameLB->setText(i18n("Scanning file: %1").tqarg(n));
+dbpw->filenameLB->setText(i18n("Scanning file: %1").arg(n));
 }
 
 void PreferencesWidget::setEntries(int i)
 {
-dbpw->entriesLB->setText(i18n("Entries added: %1").tqarg(i));
+dbpw->entriesLB->setText(i18n("Entries added: %1").arg(i));
 
 }
 
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
index 23f0b7d2..923d9897 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp
@@ -138,7 +138,7 @@ if (!called)
 { pb=true; count=0;}
 called=true;
  
-kdDebug(0) << TQString("Scanning: %1, %2").tqarg(pathName).tqarg(pattern) << endl;
+kdDebug(0) << TQString("Scanning: %1, %2").arg(pathName).arg(pattern) << endl;
 
 if(pb)
 {
@@ -212,7 +212,7 @@ emit fileLoading(0);
 
 bool error;
 
-ConversiontqStatus rr=catalog->openURL(u);
+ConversionStatus rr=catalog->openURL(u);
 if(rr != OK && rr !=RECOVERED_PARSE_ERROR )
 {
         delete catalog;
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui
index 285319e5..685e86bd 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui
@@ -109,7 +109,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -147,7 +147,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -380,7 +380,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -496,7 +496,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -669,7 +669,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>40</height>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
index 64a74b8a..e3ef3776 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
@@ -182,7 +182,7 @@ It also substitutes groups of more than one space character with only one space
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>20</height>
@@ -248,7 +248,7 @@ It also substitutes groups of more than one space character with only one space
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -265,7 +265,7 @@ It also substitutes groups of more than one space character with only one space
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -335,7 +335,7 @@ It also substitutes groups of more than one space character with only one space
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -387,7 +387,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -418,7 +418,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -490,7 +490,7 @@ If you search for &lt;em&gt;My name is Andrea&lt;/em&gt; and you have activated
                                         <property name="text">
                                             <string>[A-Za-z0-9_%</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter|AlignRight</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
index ff767436..995f3b05 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
@@ -3,7 +3,7 @@
 #include <tqspinbox.h>  
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <kurlrequester.h>
@@ -18,14 +18,14 @@
 KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *parent, const char* name)
 		: PrefWidget(parent,name) 
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 //	TQLabel *label = new TQLabel(i18n("Settings for KDE Database Search Engine"),this);
-//	tqlayout->addWidget(label);
+//	layout->addWidget(label);
 
 	dbpw = new DBSearchEnginePrefWidget(this);
 	dbpw->dbDirectory->setMode(KFile::Directory | KFile::LocalOnly);
 	dbpw->show();	
-	tqlayout->addWidget(dbpw);
+	layout->addWidget(dbpw);
 	setMinimumSize(300,300);
 
 	standard();
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui
index 39e1f2ac..a34953df 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -72,7 +72,7 @@
                     </rect>
                 </property>
                 <property name="text">
-                    <string>tqStatus: </string>
+                    <string>Status: </string>
                 </property>
             </widget>
             <widget class="KLineEdit">
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
index 9025d716..9fc74519 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
@@ -39,7 +39,7 @@
 
 #include <tqregexp.h>
 #include <tqtimer.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 #include "poauxiliary.h"
 #include "preferenceswidget.h"
@@ -182,7 +182,7 @@ bool PoAuxiliary::startSearch(const TQString& t, uint pluralForm, const SearchFi
 
     clearResults();
    
-    kapp->tqprocessEvents(100);
+    kapp->processEvents(100);
 
     text.replace("\n","");
     
@@ -255,7 +255,7 @@ bool PoAuxiliary::startSearchInTranslation(const TQString& text)
 
     clearResults();
    
-    kapp->tqprocessEvents(100);
+    kapp->processEvents(100);
 
     Entry *entry = msgstrDict[text];
     if(entry)
@@ -393,7 +393,7 @@ void PoAuxiliary::loadAuxiliary()
             {
                 TQString dir=directory(editedFile,number);
                 TQString s("@DIR%1@");
-                path.replace(s.tqarg(number),dir);
+                path.replace(s.arg(number),dir);
 
                 pos+=dir.length();
             }
@@ -427,7 +427,7 @@ void PoAuxiliary::loadAuxiliary()
     connect(catalog, TQT_SIGNAL(signalProgress(int))
                         , this, TQT_SIGNAL(progress(int)));
       
-    ConversiontqStatus stat = catalog->openURL(u);
+    ConversionStatus stat = catalog->openURL(u);
     if( stat != OK && stat != RECOVERED_PARSE_ERROR)
     {
         kdDebug(KBABEL_SEARCH) << "error while opening file " << u.prettyURL() << endl;
@@ -436,7 +436,7 @@ void PoAuxiliary::loadAuxiliary()
 	{
     	    error = true;
     	    errorMsg = i18n("Error while trying to open file for PO Auxiliary module:\n%1")
-                        .tqarg(u.prettyURL());
+                        .arg(u.prettyURL());
     	    emit hasError(errorMsg);
 	}
     }
@@ -455,7 +455,7 @@ void PoAuxiliary::loadAuxiliary()
             if( (100*(i+1))%total < 100 )
             {
                 emit progress((100*(i+1))/total);
-                kapp->tqprocessEvents(100);
+                kapp->processEvents(100);
             }
 
             Entry *e = new Entry;
diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
index 873c07b6..930af5aa 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
@@ -32,7 +32,7 @@
 **************************************************************************** */
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kfiledialog.h>
 #include <tqpushbutton.h>
@@ -47,10 +47,10 @@ AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *parent, const c
         : PrefWidget(parent,name)
         , changed(false)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
         
     prefWidget = new PWidget(this);
-    tqlayout->addWidget(prefWidget);
+    layout->addWidget(prefWidget);
 
 
     connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&))
diff --git a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
index b91f98e5..f345eebb 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
+++ b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui
@@ -7,7 +7,7 @@
         <cstring>PWidget</cstring>
     </property>
     <property stdset="1">
-        <name>tqgeometry</name>
+        <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -92,14 +92,14 @@ The following variables will be replaced in the path if available:
                 <enum>Expanding</enum>
             </property>
             <property>
-                <name>tqsizeHint</name>
+                <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
             <property>
-                <name>tqsizeHint</name>
+                <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
index e6565e54..d346bcf5 100644
--- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
@@ -79,7 +79,7 @@ bool CompendiumData::load(KURL url)
     emit progressStarts(i18n("Loading PO compendium"));
     connect(_catalog, TQT_SIGNAL(signalProgress(int)), this, TQT_SIGNAL(progress(int)));
 
-    ConversiontqStatus stat=_catalog->openURL(url);
+    ConversionStatus stat=_catalog->openURL(url);
         
     disconnect(_catalog, TQT_SIGNAL(signalProgress(int))
             , this, TQT_SIGNAL(progress(int)));
@@ -91,7 +91,7 @@ bool CompendiumData::load(KURL url)
                 
         _error = true;
         _errorMsg = i18n("Error while trying to read file for PO Compendium module:\n%1")
-            .tqarg(url.prettyURL());
+            .arg(url.prettyURL());
 
         emit progressEnds();
 
@@ -109,7 +109,7 @@ bool CompendiumData::load(KURL url)
         if( (100*(i+1))%total < 100 )
         {
             emit progress((100*(i+1))/total);
-            kapp->tqprocessEvents(100);
+            kapp->processEvents(100);
         }
 
 	// FIXME: shoudl care about plural forms
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index 60de6a4f..fb9171ed 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -42,7 +42,7 @@
 #include <kio/netaccess.h>
 
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 
 #include "resources.h"
@@ -369,7 +369,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr
                     emit progress( (50*checkCounter+1)/catalogInfo.total);
                 }
             
-                kapp->tqprocessEvents(100);
+                kapp->processEvents(100);
 
                 TQString origStr = data->catalog()->msgid(*it).first();
                 origStr = CompendiumData::simplify(origStr);
@@ -537,7 +537,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr
             continue;
         }
        
-        kapp->tqprocessEvents(100);
+        kapp->processEvents(100);
 
         TQString origStr = data->catalog()->msgid(i).first();
         origStr = CompendiumData::simplify(origStr);
diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
index 74321121..0c4064fc 100644
--- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
@@ -32,7 +32,7 @@
 **************************************************************************** */
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kfiledialog.h>
 #include <tqpushbutton.h>
@@ -48,10 +48,10 @@ CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *parent, const
 		: PrefWidget(parent,name)
 		, changed(false)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 		
 	prefWidget = new CompendiumPWidget(this);
-	tqlayout->addWidget(prefWidget);
+	layout->addWidget(prefWidget);
 
 	connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool))
 					, this, TQT_SLOT(setChanged()));
diff --git a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
index f9558dc3..db8de91e 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
+++ b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
@@ -8,7 +8,7 @@
         <cstring>PWidget</cstring>
     </property>
     <property stdset="1">
-        <name>tqgeometry</name>
+        <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -236,14 +236,14 @@
                 <enum>Expanding</enum>
             </property>
             <property>
-                <name>tqsizeHint</name>
+                <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
             <property>
-                <name>tqsizeHint</name>
+                <name>sizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
index 7aed4474..380b8908 100644
--- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
@@ -34,7 +34,7 @@
 **************************************************************************** */
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kfiledialog.h>
 #include <tqpushbutton.h>
@@ -50,10 +50,10 @@ TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *parent,
 		: PrefWidget(parent,name)
 		, changed(false)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 		
 	prefWidget = new TmxCompendiumPWidget(this);
-	tqlayout->addWidget(prefWidget);
+	layout->addWidget(prefWidget);
 
 	connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool))
 					, this, TQT_SLOT(setChanged()));
diff --git a/kbabel/kbabeldict/modules/tmx/pwidget.ui b/kbabel/kbabeldict/modules/tmx/pwidget.ui
index 9d0d4281..875e744f 100644
--- a/kbabel/kbabeldict/modules/tmx/pwidget.ui
+++ b/kbabel/kbabeldict/modules/tmx/pwidget.ui
@@ -171,7 +171,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 9163d7cb..965b7a27 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -41,7 +41,7 @@
 #include <kinstance.h>
 #include <kio/netaccess.h>
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 
 #include "tmxcompendiumdata.h"
@@ -337,7 +337,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
                     emit progress( (100*(checkCounter+1))/data->numberOfEntries());
                 }
             
-                kapp->tqprocessEvents(100);
+                kapp->processEvents(100);
 
                 TQString origStr = data->msgid(*it);
                 origStr = TmxCompendiumData::simplify(origStr);
@@ -484,7 +484,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
                  continue;
             }
        
-            kapp->tqprocessEvents(100);
+            kapp->processEvents(100);
 
             if(i >= data->numberOfEntries())
             {
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 8646806e..0c186b57 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -117,7 +117,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
         _errorMsg = i18n("Error while trying to read file for TMX Compendium module:\n"
 	    "%1\n"
 	    "Reason: %2")
-            .tqarg(url.prettyURL()).tqarg(_errorMsg);
+            .arg(url.prettyURL()).arg(_errorMsg);
 
         kdDebug(KBABEL_SEARCH) << "Error:  " << _errorMsg << endl;
 
@@ -146,7 +146,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
         if( (100*(i+1))%total < 100 )
         {
             emit progress((100*(i+1))/total);
-            kapp->tqprocessEvents(100);
+            kapp->processEvents(100);
         }
 	
     	TQDomNodeList tuvTags = tuTags.item(i).toElement().elementsByTagName("tuv");
diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h
index c5b28ad5..cafebd1f 100644
--- a/kbabel/kbabeldict/searchengine.h
+++ b/kbabel/kbabeldict/searchengine.h
@@ -91,7 +91,7 @@ public:
     TQString projectContext;
     
     /**
-     * tqStatus of the translation, for example "approved", "spellchecked", "unknown"
+     * Status of the translation, for example "approved", "spellchecked", "unknown"
      */
     TQString status;
 
@@ -173,7 +173,7 @@ public:
 	, _translators()
 	, _projectKeywords()
 	, _projectContexts()
-	, _translationtqStatus()
+	, _translationStatus()
     {}
     
     virtual ~SearchFilter() {}
@@ -213,10 +213,10 @@ public:
     void setProjectContext( const TQStringList& projectContexts) { _projectContexts = projectContexts; }
     
     /**
-     * tqStatus of the translation, for example "approved", "spellchecked", "unknown"
+     * Status of the translation, for example "approved", "spellchecked", "unknown"
      */
-    void settqStatus( const TQString& translationtqStatus) { _translationtqStatus = translationtqStatus; }
-    void settqStatus( const TQStringList& translationStati) { _translationtqStatus = translationStati; }
+    void setStatus( const TQString& translationStatus) { _translationStatus = translationStatus; }
+    void setStatus( const TQStringList& translationStati) { _translationStatus = translationStati; }
 
     /**
      *  The key method of the class - check, if the argument
@@ -232,7 +232,7 @@ private:
     TQStringList _translators;
     TQStringList _projectKeywords ;
     TQStringList _projectContexts;
-    TQStringList _translationtqStatus;
+    TQStringList _translationStatus;
 };
 
 /**
diff --git a/kbugbuster/backend/bug.cpp b/kbugbuster/backend/bug.cpp
index c2328122..ec249ef7 100644
--- a/kbugbuster/backend/bug.cpp
+++ b/kbugbuster/backend/bug.cpp
@@ -56,16 +56,16 @@ TQString Bug::severityLabel( Bug::Severity s )
 TQString Bug::severityToString( Bug::Severity s )
 {
   switch ( s ) {
-    case Critical: return TQString::tqfromLatin1( "critical" );
-    case Grave: return TQString::tqfromLatin1( "grave" );
-    case Major: return TQString::tqfromLatin1( "major" );
-    case Crash: return TQString::tqfromLatin1( "crash" );
-    case Normal: return TQString::tqfromLatin1( "normal" );
-    case Minor: return TQString::tqfromLatin1( "minor" );
-    case Wishlist: return TQString::tqfromLatin1( "wishlist" );
+    case Critical: return TQString::fromLatin1( "critical" );
+    case Grave: return TQString::fromLatin1( "grave" );
+    case Major: return TQString::fromLatin1( "major" );
+    case Crash: return TQString::fromLatin1( "crash" );
+    case Normal: return TQString::fromLatin1( "normal" );
+    case Minor: return TQString::fromLatin1( "minor" );
+    case Wishlist: return TQString::fromLatin1( "wishlist" );
     default:
       kdWarning() << "Bug::severityToString invalid severity " << s << endl;
-      return TQString::tqfromLatin1( "<invalid>" );
+      return TQString::fromLatin1( "<invalid>" );
    }
 }
 
@@ -95,7 +95,7 @@ TQValueList<Bug::Severity> Bug::severities()
     return s;
 }
 
-TQString Bug::statusLabel( Bug::tqStatus s )
+TQString Bug::statusLabel( Bug::Status s )
 {
     switch ( s )
     {
@@ -109,21 +109,21 @@ TQString Bug::statusLabel( Bug::tqStatus s )
     }
 }
 
-TQString Bug::statusToString( Bug::tqStatus s )
+TQString Bug::statusToString( Bug::Status s )
 {
   switch ( s ) {
-    case Unconfirmed: return TQString::tqfromLatin1( "unconfirmed" );
-    case New: return TQString::tqfromLatin1( "new" );
-    case Assigned: return TQString::tqfromLatin1( "assigned" );
-    case Reopened: return TQString::tqfromLatin1( "reopened" );
-    case Closed: return TQString::tqfromLatin1( "closed" );
+    case Unconfirmed: return TQString::fromLatin1( "unconfirmed" );
+    case New: return TQString::fromLatin1( "new" );
+    case Assigned: return TQString::fromLatin1( "assigned" );
+    case Reopened: return TQString::fromLatin1( "reopened" );
+    case Closed: return TQString::fromLatin1( "closed" );
     default:
       kdWarning() << "Bug::statusToString invalid status " << s << endl;
-      return TQString::tqfromLatin1( "<invalid>" );
+      return TQString::fromLatin1( "<invalid>" );
    }
 }
 
-Bug::tqStatus Bug::stringTotqStatus( const TQString &s, bool *ok )
+Bug::Status Bug::stringToStatus( const TQString &s, bool *ok )
 {
    if ( ok )
       *ok = true;
@@ -207,7 +207,7 @@ Bug::BugMergeList Bug::mergedWith() const
 }
 
 
-Bug::tqStatus Bug::status() const
+Bug::Status Bug::status() const
 {
     if ( !m_impl )
         return StatusUndefined;
diff --git a/kbugbuster/backend/bug.h b/kbugbuster/backend/bug.h
index e60b0e98..406179c8 100644
--- a/kbugbuster/backend/bug.h
+++ b/kbugbuster/backend/bug.h
@@ -17,7 +17,7 @@ public:
 
     enum Severity { SeverityUndefined, Critical, Grave, Major, Crash, Normal,
                     Minor, Wishlist };
-    enum tqStatus { StatusUndefined, Unconfirmed, New, Assigned, Reopened,
+    enum Status { StatusUndefined, Unconfirmed, New, Assigned, Reopened,
                   Closed };
 
     Bug();
@@ -55,23 +55,23 @@ public:
     BugMergeList mergedWith() const;
 
     /**
-     * tqStatus of a bug. Currently open or closed.
+     * Status of a bug. Currently open or closed.
      * TODO: Should we add a status 'deleted' here ?
      */
-    tqStatus status() const;
-    void settqStatus( tqStatus newtqStatus );
+    Status status() const;
+    void setStatus( Status newStatus );
 
-    static TQString statusLabel( tqStatus s );
+    static TQString statusLabel( Status s );
     /**
       Return string representation of status. This function is symmetric to
-      stringTotqStatus().
+      stringToStatus().
     */
-    static TQString statusToString( tqStatus s );
+    static TQString statusToString( Status s );
     /**
       Return status code of string representation. This function is symmetric
       to statusToString().
     */
-    static tqStatus stringTotqStatus( const TQString &, bool *ok = 0 );
+    static Status stringToStatus( const TQString &, bool *ok = 0 );
 
     bool operator==( const Bug &rhs );
     bool operator<( const Bug &rhs ) const;
diff --git a/kbugbuster/backend/bugcache.cpp b/kbugbuster/backend/bugcache.cpp
index 66f59eb5..ce325a31 100644
--- a/kbugbuster/backend/bugcache.cpp
+++ b/kbugbuster/backend/bugcache.cpp
@@ -137,7 +137,7 @@ Bug::List BugCache::loadBugList( const Package &pkg, const TQString &component,
             if ( !title.isEmpty() ) // dunno how I ended up with an all empty bug in the cache
             {
                 Person submitter = readPerson( m_cacheBugs, "Submitter" );
-                Bug::tqStatus status = Bug::stringTotqStatus( m_cacheBugs->readEntry("Status") );
+                Bug::Status status = Bug::stringToStatus( m_cacheBugs->readEntry("Status") );
                 Bug::Severity severity = Bug::stringToSeverity( m_cacheBugs->readEntry("Severity") );
                 Person developerTODO = readPerson( m_cacheBugs, "TODO" );
                 Bug::BugMergeList mergedWith = m_cacheBugs->readIntListEntry( "MergedWith" );
diff --git a/kbugbuster/backend/bugcommand.h b/kbugbuster/backend/bugcommand.h
index bb53cdb4..9f68fb2e 100644
--- a/kbugbuster/backend/bugcommand.h
+++ b/kbugbuster/backend/bugcommand.h
@@ -51,7 +51,7 @@ class BugCommandClose : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("Close"); }
+    TQString type() const { return TQString::fromLatin1("Close"); }
 
     void save( KConfig * );
 
@@ -68,7 +68,7 @@ class BugCommandCloseSilently : public BugCommand {
 
     TQString name();
 
-    TQString type() const { return TQString::tqfromLatin1("CloseSilently"); }
+    TQString type() const { return TQString::fromLatin1("CloseSilently"); }
 
     void save( KConfig * );
 };
@@ -82,7 +82,7 @@ class BugCommandReopen : public BugCommand {
 
     TQString name();
 
-    TQString type() const { return TQString::tqfromLatin1("Reopen"); }
+    TQString type() const { return TQString::fromLatin1("Reopen"); }
 
     void save( KConfig * );
 };
@@ -97,7 +97,7 @@ class BugCommandRetitle : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("Retitle"); }
+    TQString type() const { return TQString::fromLatin1("Retitle"); }
 
     void save( KConfig * );
 
@@ -115,7 +115,7 @@ class BugCommandMerge : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("Merge"); }
+    TQString type() const { return TQString::fromLatin1("Merge"); }
 
     void save( KConfig * );
 
@@ -130,7 +130,7 @@ class BugCommandUnmerge : public BugCommand {
 
     TQString name();
 
-    TQString type() const { return TQString::tqfromLatin1("Unmerge"); }
+    TQString type() const { return TQString::fromLatin1("Unmerge"); }
 
     void save( KConfig * );
 
@@ -148,7 +148,7 @@ class BugCommandReply : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("Reply"); }
+    TQString type() const { return TQString::fromLatin1("Reply"); }
 
     void save( KConfig * );
 
@@ -169,7 +169,7 @@ class BugCommandReplyPrivate : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("ReplyPrivate"); }
+    TQString type() const { return TQString::fromLatin1("ReplyPrivate"); }
 
     void save( KConfig * );
 
@@ -186,7 +186,7 @@ class BugCommandSeverity : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("Severity"); }
+    TQString type() const { return TQString::fromLatin1("Severity"); }
 
     TQString controlString() const;
 
@@ -204,7 +204,7 @@ class BugCommandReassign : public BugCommand {
     TQString name();
     TQString details() const;
 
-    TQString type() const { return TQString::tqfromLatin1("Reassign"); }
+    TQString type() const { return TQString::fromLatin1("Reassign"); }
 
     TQString controlString() const;
 
diff --git a/kbugbuster/backend/bugdetails.cpp b/kbugbuster/backend/bugdetails.cpp
index 6c153e2c..6b0ded58 100644
--- a/kbugbuster/backend/bugdetails.cpp
+++ b/kbugbuster/backend/bugdetails.cpp
@@ -79,7 +79,7 @@ int BugDetails::age() const
    if ( !m_impl )
        return 0;
 
-   return submissionDate().daysTo( TQDateTime::tqcurrentDateTime() );
+   return submissionDate().daysTo( TQDateTime::currentDateTime() );
 }
 
 BugDetailsPart::List BugDetails::parts() const
@@ -241,7 +241,7 @@ TQValueList<BugDetails::Attachment> BugDetails::extractAttachments( const TQStri
                     KCodecs::base64Decode( contents.local8Bit(), a.contents /*out*/ );
                 else
                     //KCodecs::uudecode( contents.local8Bit(), a.contents /*out*/ );
-                    KMessageBox::information( 0, i18n("Attachment %1 could not be decoded.\nEncoding: %2").tqarg(filename).tqarg(encoding) );
+                    KMessageBox::information( 0, i18n("Attachment %1 could not be decoded.\nEncoding: %2").arg(filename).arg(encoding) );
 #ifdef DEBUG_EXTRACT
                 kdDebug() << "Result: ***\n" << TQCString( a.contents.data(), a.contents.size()+1 ) << "\n*+*" << endl;
 #endif
diff --git a/kbugbuster/backend/bugdetailsjob.cpp b/kbugbuster/backend/bugdetailsjob.cpp
index 22ee31c7..1218023d 100644
--- a/kbugbuster/backend/bugdetailsjob.cpp
+++ b/kbugbuster/backend/bugdetailsjob.cpp
@@ -36,8 +36,8 @@ void BugDetailsJob::process( const TQByteArray &data )
     KBB::Error err = server()->processor()->parseBugDetails( data, bugDetails );
 
     if ( err ) {
-        emit error( i18n("Bug %1: %2").tqarg( m_bug.number() )
-                                      .tqarg( err.message() ) );
+        emit error( i18n("Bug %1: %2").arg( m_bug.number() )
+                                      .arg( err.message() ) );
     } else {
         emit bugDetailsAvailable( m_bug, bugDetails );
     }
diff --git a/kbugbuster/backend/bugimpl.h b/kbugbuster/backend/bugimpl.h
index b1d94b2d..7fefc53d 100644
--- a/kbugbuster/backend/bugimpl.h
+++ b/kbugbuster/backend/bugimpl.h
@@ -12,7 +12,7 @@ struct BugImpl : public KShared
 public:
     BugImpl( const TQString &_title, const Person &_submitter, TQString _number,
         uint _age, Bug::Severity _severity, Person _developerTODO,
-        Bug::tqStatus _status, const Bug::BugMergeList& _mergedWith  )
+        Bug::Status _status, const Bug::BugMergeList& _mergedWith  )
     : age( _age ), title( _title ), submitter( _submitter ), number( _number ),
         severity( _severity ), developerTODO( _developerTODO ),
         status( _status ), mergedWith( _mergedWith )
@@ -25,7 +25,7 @@ public:
     TQString number;
     Bug::Severity severity;
     Person developerTODO;
-    Bug::tqStatus status;
+    Bug::Status status;
 
     Bug::BugMergeList mergedWith;
 };
diff --git a/kbugbuster/backend/buglistjob.cpp b/kbugbuster/backend/buglistjob.cpp
index 01910ea2..419b7956 100644
--- a/kbugbuster/backend/buglistjob.cpp
+++ b/kbugbuster/backend/buglistjob.cpp
@@ -60,8 +60,8 @@ void BugListJob::process( const TQByteArray &data )
     KBB::Error err = server()->processor()->parseBugList( data, bugs );
 
     if ( err ) {
-      emit error( i18n("Package %1: %2").tqarg( m_package.name() )
-                                        .tqarg( err.message() ) );
+      emit error( i18n("Package %1: %2").arg( m_package.name() )
+                                        .arg( err.message() ) );
     } else {
       emit bugListAvailable( m_package, m_component, bugs );
     }
diff --git a/kbugbuster/backend/bugmybugsjob.cpp b/kbugbuster/backend/bugmybugsjob.cpp
index 869b0827..cd8c3005 100644
--- a/kbugbuster/backend/bugmybugsjob.cpp
+++ b/kbugbuster/backend/bugmybugsjob.cpp
@@ -67,7 +67,7 @@ void BugMyBugsJob::process( const TQByteArray &data )
     delete processor;
 
     if ( err )
-        emit error( i18n( "My Bugs: %2" ).tqarg( err.message() ) );
+        emit error( i18n( "My Bugs: %2" ).arg( err.message() ) );
     else
         emit bugListAvailable( i18n( "My Bugs" ), bugs );
 }
diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp
index a1863f58..6c8aa6fb 100644
--- a/kbugbuster/backend/bugserver.cpp
+++ b/kbugbuster/backend/bugserver.cpp
@@ -152,7 +152,7 @@ KURL BugServer::attachmentEditLink( const TQString &id )
   return url;
 }
 
-Bug::tqStatus BugServer::bugtqStatus( const TQString &str )
+Bug::Status BugServer::bugStatus( const TQString &str )
 {
   if ( str == "UNCONFIRMED" ) {
     return Bug::Unconfirmed;
@@ -318,9 +318,9 @@ TQStringList BugServer::listCommands() const
         for ( ; cmdIt.current() ; ++cmdIt ) {
             BugCommand* cmd = cmdIt.current();
             if (!cmd->controlString().isNull())
-                result.append( i18n("Control command: %1").tqarg(cmd->controlString()) );
+                result.append( i18n("Control command: %1").arg(cmd->controlString()) );
             else
-                result.append( i18n("Mail to %1").tqarg(cmd->mailAddress()) );
+                result.append( i18n("Mail to %1").arg(cmd->mailAddress()) );
         }
     }
     return result;
diff --git a/kbugbuster/backend/bugserver.h b/kbugbuster/backend/bugserver.h
index b865450f..c76b565a 100644
--- a/kbugbuster/backend/bugserver.h
+++ b/kbugbuster/backend/bugserver.h
@@ -64,7 +64,7 @@ class BugServer
     KURL attachmentViewLink( const TQString &id );
     KURL attachmentEditLink( const TQString &id );
     
-    Bug::tqStatus bugtqStatus( const TQString & );
+    Bug::Status bugStatus( const TQString & );
 
     Bug::Severity bugSeverity( const TQString & );
 
diff --git a/kbugbuster/backend/domprocessor.cpp b/kbugbuster/backend/domprocessor.cpp
index e7b1e49c..2ce57d63 100644
--- a/kbugbuster/backend/domprocessor.cpp
+++ b/kbugbuster/backend/domprocessor.cpp
@@ -24,7 +24,7 @@
 #include "domprocessor.h"
 
 #include <tqregexp.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 #include <kdebug.h>
 #include <kmdcodec.h>
@@ -170,7 +170,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement,
     TQString submitterName;
     TQString submitterEmail;
     TQString bugNr;
-    Bug::tqStatus status = Bug::StatusUndefined;
+    Bug::Status status = Bug::StatusUndefined;
     Bug::Severity severity = Bug::SeverityUndefined;
     Person developerTodo;
     Bug::BugMergeList mergedList;
@@ -184,7 +184,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement,
       if ( e.tagName() == "bugid" )
         bugNr = e.text();
       else if ( e.tagName() == "status" )
-        status = server()->bugtqStatus( e.text() );
+        status = server()->bugStatus( e.text() );
       else if ( e.tagName() == "descr" )
         title = e.text();
       else if ( e.tagName() == "reporter" )
@@ -194,7 +194,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement,
       else if ( e.tagName() == "severity" )
         severity = Bug::stringToSeverity( e.text() );
       else if ( e.tagName() == "creationdate" )
-        age = ( TQDateTime::fromString( e.text(), Qt::ISODate ) ).daysTo( TQDateTime::tqcurrentDateTime() );
+        age = ( TQDateTime::fromString( e.text(), Qt::ISODate ) ).daysTo( TQDateTime::currentDateTime() );
     }
 
     Person submitter( submitterName, submitterEmail );
diff --git a/kbugbuster/backend/htmlparser.cpp b/kbugbuster/backend/htmlparser.cpp
index 4daa3d1d..15a61084 100644
--- a/kbugbuster/backend/htmlparser.cpp
+++ b/kbugbuster/backend/htmlparser.cpp
@@ -30,7 +30,7 @@
 
 #include <tqbuffer.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 KBB::Error HtmlParser::parseBugList( const TQByteArray &data, Bug::List &bugs )
 {
diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp
index 2a5ae930..93b74eff 100644
--- a/kbugbuster/backend/mailsender.cpp
+++ b/kbugbuster/backend/mailsender.cpp
@@ -39,7 +39,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
 {
   TQString from( fromName );
   if ( !fromEmail.isEmpty() )
-    from += TQString::tqfromLatin1( " <%2>" ).tqarg( fromEmail );
+    from += TQString::fromLatin1( " <%2>" ).arg( fromEmail );
   kdDebug() << "MailSender::sendMail():\nFrom: " << from << "\nTo: " << to
             << "\nbccflag:" << bcc
             << "\nRecipient:" << recipient
@@ -53,18 +53,18 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
 
     bool needHeaders = true;
 
-    TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"),
-        TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib"));
-    if (!command.isNull()) command += TQString::tqfromLatin1(" -oi -t");
+    TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"),
+        TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib"));
+    if (!command.isNull()) command += TQString::fromLatin1(" -oi -t");
     else {
-      command = KStandardDirs::findExe(TQString::tqfromLatin1("mail"));
+      command = KStandardDirs::findExe(TQString::fromLatin1("mail"));
       if (command.isNull()) return false; // give up
 
-      command.append(TQString::tqfromLatin1(" -s "));
+      command.append(TQString::fromLatin1(" -s "));
       command.append(KProcess::quote(subject));
 
       if (bcc) {
-        command.append(TQString::tqfromLatin1(" -b "));
+        command.append(TQString::fromLatin1(" -b "));
         command.append(KProcess::quote(from));
       }
 
@@ -85,11 +85,11 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
     TQString textComplete;
     if (needHeaders)
     {
-      textComplete += TQString::tqfromLatin1("From: ") + from + '\n';
-      textComplete += TQString::tqfromLatin1("To: ") + to + '\n';
-      if (bcc) textComplete += TQString::tqfromLatin1("Bcc: ") + from + '\n';
-      textComplete += TQString::tqfromLatin1("Subject: ") + subject + '\n';
-      textComplete += TQString::tqfromLatin1("X-Mailer: KBugBuster") + '\n';
+      textComplete += TQString::fromLatin1("From: ") + from + '\n';
+      textComplete += TQString::fromLatin1("To: ") + to + '\n';
+      if (bcc) textComplete += TQString::fromLatin1("Bcc: ") + from + '\n';
+      textComplete += TQString::fromLatin1("Subject: ") + subject + '\n';
+      textComplete += TQString::fromLatin1("X-Mailer: KBugBuster") + '\n';
     }
     textComplete += '\n'; // end of headers
     textComplete += body;
@@ -121,11 +121,11 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T
     else
         recipients << to;
 
-    TQString message = TQString::tqfromLatin1( "From: " ) + from +
-                      TQString::tqfromLatin1( "\nTo: " ) + to +
-                      TQString::tqfromLatin1( "\nSubject: " ) + subject +
-                      TQString::tqfromLatin1( "\nX-Mailer: KBugBuster" ) +
-                      TQString::tqfromLatin1( "\n\n" ) + body;
+    TQString message = TQString::fromLatin1( "From: " ) + from +
+                      TQString::fromLatin1( "\nTo: " ) + to +
+                      TQString::fromLatin1( "\nSubject: " ) + subject +
+                      TQString::fromLatin1( "\nX-Mailer: KBugBuster" ) +
+                      TQString::fromLatin1( "\n\n" ) + body;
 
     Smtp *smtp = new Smtp( fromEmail, recipients, message, m_smtpServer );
     connect( smtp, TQT_SIGNAL( status( const TQString & ) ),
@@ -173,7 +173,7 @@ void MailSender::smtpError(const TQString &_command, const TQString &_response)
   KMessageBox::error( TQT_TQWIDGET(tqApp->activeWindow()),
                       i18n( "Error during SMTP transfer.\n"
                             "command: %1\n"
-                            "response: %2" ).tqarg( command ).tqarg( response ) );
+                            "response: %2" ).arg( command ).arg( response ) );
 
   emit finished();
   TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) );
diff --git a/kbugbuster/backend/person.cpp b/kbugbuster/backend/person.cpp
index 8f73c512..40cf72b7 100644
--- a/kbugbuster/backend/person.cpp
+++ b/kbugbuster/backend/person.cpp
@@ -53,9 +53,9 @@ Person Person::parseFromString( const TQString &_str )
     }
    
     int atPos = str.find( '@' );
-    int spacedAtPos = str.find( TQString::tqfromLatin1( " at " ) );
+    int spacedAtPos = str.find( TQString::fromLatin1( " at " ) );
     if ( atPos == -1 && spacedAtPos != -1 )
-        str.replace( spacedAtPos, 4, TQString::tqfromLatin1( "@" ) );
+        str.replace( spacedAtPos, 4, TQString::fromLatin1( "@" ) );
 
     int spacePos = str.find( ' ' );
     while ( spacePos != -1 )
diff --git a/kbugbuster/backend/processor.cpp b/kbugbuster/backend/processor.cpp
index b6023442..c227b8cd 100644
--- a/kbugbuster/backend/processor.cpp
+++ b/kbugbuster/backend/processor.cpp
@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 #include <kdebug.h>
 #include <kmdcodec.h>
diff --git a/kbugbuster/backend/rdfprocessor.cpp b/kbugbuster/backend/rdfprocessor.cpp
index 3beed42f..578b330d 100644
--- a/kbugbuster/backend/rdfprocessor.cpp
+++ b/kbugbuster/backend/rdfprocessor.cpp
@@ -54,7 +54,7 @@ KBB::Error RdfProcessor::parseDomBugList( const TQDomElement &element,
     TQString title;
     Person submitter;
     TQString bugNr;
-    Bug::tqStatus status = Bug::StatusUndefined;
+    Bug::Status status = Bug::StatusUndefined;
     Bug::Severity severity = Bug::SeverityUndefined;
     Person developerTodo;
     Bug::BugMergeList mergedList;
@@ -68,7 +68,7 @@ KBB::Error RdfProcessor::parseDomBugList( const TQDomElement &element,
       if ( e.tagName() == "bz:id" ) {
         bugNr = e.text();
       } else if ( e.tagName() == "bz:status" ) {
-        status = server()->bugtqStatus( e.text() );
+        status = server()->bugStatus( e.text() );
       } else if ( e.tagName() == "bz:severity" ) {
         severity = server()->bugSeverity( e.text() );
       } else if ( e.tagName() == "bz:summary" ) {
diff --git a/kbugbuster/backend/smtp.cpp b/kbugbuster/backend/smtp.cpp
index df31131b..da63f926 100644
--- a/kbugbuster/backend/smtp.cpp
+++ b/kbugbuster/backend/smtp.cpp
@@ -9,7 +9,7 @@
 
 #include "smtp.h"
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqsocket.h>
 #include <tqtimer.h>
 #include <kapplication.h>
@@ -37,7 +37,7 @@ Smtp::Smtp( const TQString &from, const TQStringList &to,
     state = smtpInit;
     command = "";
 
-    emit status( i18n( "Connecting to %1" ).tqarg( server ) );
+    emit status( i18n( "Connecting to %1" ).arg( server ) );
 
     mSocket->connectToHost( server, port );
     t = new TQTextStream( mSocket );
@@ -79,7 +79,7 @@ void Smtp::quit()
 
 void Smtp::connected()
 {
-    emit status( i18n( "Connected to %1" ).tqarg( mSocket->peerName() ) );
+    emit status( i18n( "Connected to %1" ).arg( mSocket->peerName() ) );
 }
 
 void Smtp::socketError(int errorCode)
diff --git a/kbugbuster/gui/buglvi.cpp b/kbugbuster/gui/buglvi.cpp
index f4643b8d..18d7c064 100644
--- a/kbugbuster/gui/buglvi.cpp
+++ b/kbugbuster/gui/buglvi.cpp
@@ -45,7 +45,7 @@ BugLVI::BugLVI( KListView *parent , const Bug &bug )
 
     Person developer = bug.developerTODO();
     if ( !developer.name.isEmpty() )
-        setText( 3, i18n( "%1 (%2)" ).tqarg( Bug::statusLabel( bug.status() ), developer.name ) );
+        setText( 3, i18n( "%1 (%2)" ).arg( Bug::statusLabel( bug.status() ), developer.name ) );
 }
 
 BugLVI::~BugLVI()
diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp
index 9a747367..f1658aa0 100644
--- a/kbugbuster/gui/centralwidget.cpp
+++ b/kbugbuster/gui/centralwidget.cpp
@@ -17,7 +17,7 @@
 #include <tqsplitter.h>
 #include <tqpushbutton.h>
 #include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdialog.h>
 #include <kdebug.h>
@@ -52,11 +52,11 @@ CentralWidget::CentralWidget( const TQCString &initialPackage,
                               const char * name )
   : TQWidget( parent, name )
 {
-    // Master tqlayout
+    // Master layout
     ( new TQVBoxLayout( this, 0,
                        KDialog::spacingHint() ) )->setAutoAdd( true );
 
-    // Create TQSplitter tqchildren
+    // Create TQSplitter children
     m_vertSplitter = new TQSplitter( Qt::Vertical, this );
     m_listPane     = new CWBugListContainer( m_vertSplitter );
     m_horSplitter  = new TQSplitter( Qt::Horizontal,m_vertSplitter );
@@ -67,7 +67,7 @@ CentralWidget::CentralWidget( const TQCString &initialPackage,
     m_searchPane->hide();
 //    m_listPane->hide();
 
-    m_searchPane->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+    m_searchPane->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
                                                     TQSizePolicy::Minimum ) );
     m_horSplitter->setResizeMode( m_searchPane, TQSplitter::FollowSizeHint );
 
diff --git a/kbugbuster/gui/cwbugdetails.cpp b/kbugbuster/gui/cwbugdetails.cpp
index f0e07cb2..134c23d7 100644
--- a/kbugbuster/gui/cwbugdetails.cpp
+++ b/kbugbuster/gui/cwbugdetails.cpp
@@ -14,7 +14,7 @@
     *************************************************************************
 */
 
-#include <tqtextview.h>
+#include <textview.h>
 #include <tqlineedit.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
@@ -30,8 +30,8 @@
 #include <kglobal.h>
 #include <krun.h>
 
-#include <tqlayout.h>
-#include <tqpalette.h>
+#include <layout.h>
+#include <palette.h>
 
 using namespace KBugBusterMainWindow;
 
@@ -53,7 +53,7 @@ CWBugDetails::~CWBugDetails()
 
 void CWBugDetails::setBug( const Bug &bug, const BugDetails &details )
 {
-    TQColorGroup cg = m_bugDesc->view()->tqpalette().active();
+    TQColorGroup cg = m_bugDesc->view()->palette().active();
     TQString text =
         "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"
         "<html><head><title></title></head>\n"
@@ -65,25 +65,25 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details )
                  "td.helpBod { border-bottom: 1px solid #9CF; border-top: 0px; border-left: 1px solid #9CF; border-right: 0px; text-align: center; text-indent: 10px; font-family: Verdana, sans-serif, Arial; font-weight: normal; font-size: 11px; color: #404040; background-color: #000000; }\n"
                  "table.sofT { text-align: center; font-family: Verdana; font-weight: normal; font-size: 11px; color: #404040; width: 100%; background-color: #fafafa; border: 1px #000000 solid; border-collapse: collapse; border-spacing: 0px; }\n"
                  "</style>\n" )
-        .tqarg( cg.highlight().name() )
-        .tqarg( cg.highlightedText().name() ) );
+        .arg( cg.highlight().name() )
+        .arg( cg.highlightedText().name() ) );
 
     text.append( "<body style=\"margin: 0px\">\n" );
 
     TQString highlightStyle = TQString( "background: %1; color: %2; " )
-                                      .tqarg( cg.highlight().name() )
-                                      .tqarg( cg.highlightedText().name() );
+                                      .arg( cg.highlight().name() )
+                                      .arg( cg.highlightedText().name() );
     TQString borderBottomStyle = TQString( "border-bottom: solid %1 1px; " )
-                                         .tqarg( cg.foreground().name() );
+                                         .arg( cg.foreground().name() );
     TQString borderTopStyle = TQString( "border-top: solid %1 1px; " )
-                                      .tqarg( cg.foreground().name() );
+                                      .arg( cg.foreground().name() );
 
     TQString submitter = bug.submitter().fullName( true );
     int age = details.age();
     text.append( "<div style=\"" + highlightStyle + "padding: 8px; float: left\">" );
     text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url()
                  + "\">" + i18n("Bug Report</a> from <b>%1</b> " )
-                 .tqarg( submitter ) );
+                 .arg( submitter ) );
     int replies = details.parts().count() - 1;
     if ( replies >= 1 ) text += i18n( "(1 reply)", "(%n replies)", replies );
     text += "</div>";
@@ -97,8 +97,8 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details )
                  "border-bottom: solid %3 1px; "
                  "padding: 4px\">"
                  "<table cellspacing=\"0\" cellpadding=\"4\" width=\"100%\">" )
-                 .tqarg( cg.background().name() )
-                 .tqarg( cg.foreground().name() ) );
+                 .arg( cg.background().name() )
+                 .arg( cg.foreground().name() ) );
     text.append( textBugDetailsAttribute( details.version(), i18n("Version") ) );
     text.append( textBugDetailsAttribute( details.source(), i18n("Source") ) );
     text.append( textBugDetailsAttribute( details.compiler(), i18n("Compiler") ) );
@@ -121,11 +121,11 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details )
             if ( ++it2 == bdp.end() )
                 text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url()
                              + "\">" + i18n("Bug Report</a> from <b>%1</b>")
-                             .tqarg( sender ) );
+                             .arg( sender ) );
             else {
-                text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + TQString("#c%1").tqarg( replies )
+                text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + TQString("#c%1").arg( replies )
 			     + "\">" + i18n("Reply #%1</a> from <b>%2</b>")
-                             .tqarg( replies ).tqarg( sender ) );
+                             .arg( replies ).arg( sender ) );
                 replies--;
             }
             text.append( "</div>\n" );
@@ -148,16 +148,16 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details )
     if ( atts.count() > 0 ) {
         text.append( "<table summary=\"Attachment data table\" class=\"sofT\" cellspacing=\"0\">" );
         text.append( TQString( "<tr> <td colspan=\"4\" class=\"helpHed\">%1</td> </tr>")
-                     .tqarg( i18n( "Attachment List") ) );
+                     .arg( i18n( "Attachment List") ) );
         text.append( TQString("<tr> <td class=\"helpHed\">%1</td> <td class=\"helpHed\">%2</td> <td class=\"helpHed\">%3</td> <td class=\"helpHed\">%4</td> </tr>")
-                     .tqarg( i18n("Description") )
-                     .tqarg( i18n("Date") )
-                     .tqarg( i18n("View") )
-                     .tqarg( i18n("Edit") ) );
+                     .arg( i18n("Description") )
+                     .arg( i18n("Date") )
+                     .arg( i18n("View") )
+                     .arg( i18n("Edit") ) );
         TQValueList<BugDetailsImpl::AttachmentDetails>::iterator it;
         for ( it = atts.begin() ; it != atts.end() ; ++it ) {
-            text.append( TQString("<tr><td>%1</td>").tqarg( (*it).description ) ) ;
-            text.append( TQString("<td>%1</td>").tqarg( (*it).date ) );
+            text.append( TQString("<tr><td>%1</td>").arg( (*it).description ) ) ;
+            text.append( TQString("<td>%1</td>").arg( (*it).date ) );
             text.append( "<td><a href=\"" +
                          BugSystem::self()->server()->attachmentViewLink( (*it).id ).url() +
                          "\">" + i18n("View") + "</a></td>" );
diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp
index ef8fc8ef..d6b0ac83 100644
--- a/kbugbuster/gui/cwbugdetailscontainer.cpp
+++ b/kbugbuster/gui/cwbugdetailscontainer.cpp
@@ -16,7 +16,7 @@
 
 #include <tqpushbutton.h>
 #include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 
 #include <kiconloader.h>
@@ -121,17 +121,17 @@ void CWBugDetailsContainer::setBug( const Bug &bug, const BugDetails &details )
        list.truncate( list.length()-2 ); //Strip off the last ", "
 
        labelText  = i18n("bug #number [Merged with: a list of bugs] (severity): title","Bug #%1 [Merged with: %2] (%3): %4")
-                             .tqarg( bug.number() )
-                             .tqarg( list )
-                             .tqarg( bug.severityAsString() )
-                             .tqarg( bug.title() );
+                             .arg( bug.number() )
+                             .arg( list )
+                             .arg( bug.severityAsString() )
+                             .arg( bug.title() );
 
     }
     else
     {
        labelText  = i18n("bug #number (severity): title","Bug #%1 (%2): %3")
-                             .tqarg( bug.number() ).tqarg( bug.severityAsString() )
-                             .tqarg( bug.title() );
+                             .arg( bug.number() ).arg( bug.severityAsString() )
+                             .arg( bug.title() );
     }
 
     m_bugLabel->setText( KStringHandler::tagURLs( labelText ) );
@@ -158,7 +158,7 @@ void CWBugDetailsContainer::showCommands( const Bug& bug )
             if (!first)
                 cmdText += "  |  "; // separator in case of multiple commands
             first = false;
-            cmdText += TQString("<b>%1</b>").tqarg( cmd->name() );
+            cmdText += TQString("<b>%1</b>").arg( cmd->name() );
             if (!cmdDetails.isEmpty())
                 cmdDetails += "  |  ";  // separator in case of multiple commands
             cmdDetails += cmd->details();
@@ -212,7 +212,7 @@ void CWBugDetailsContainer::setLoading( const Bug &bug )
     showCommands( bug );
 
     m_bugLoading->setText(i18n( "Retrieving Details for Bug %1\n\n(%2)" )
-                          .tqarg( bug.number() ).tqarg( bug.title() ) );
+                          .arg( bug.number() ).arg( bug.title() ) );
     m_bugStack->raiseWidget( 1 );
 }
 
@@ -224,11 +224,11 @@ void CWBugDetailsContainer::setCacheMiss( const Bug &bug )
     TQString msg;
     if( BugSystem::self()->disconnected() )
         msg = i18n( "Bug #%1 (%2) is not available offline." ).
-              tqarg( bug.number() ).tqarg( bug.title() );
+              arg( bug.number() ).arg( bug.title() );
     else
         msg = i18n( "Retrieving details for bug #%1\n"
                     "(%2)" ).
-              tqarg( bug.number() ).tqarg( bug.title() );
+              arg( bug.number() ).arg( bug.title() );
     m_bugLoading->setText( msg );
     m_bugStack->raiseWidget( 1 );
 }
diff --git a/kbugbuster/gui/cwbugdetailscontainer_base.ui b/kbugbuster/gui/cwbugdetailscontainer_base.ui
index 338a0b7b..5f6db167 100644
--- a/kbugbuster/gui/cwbugdetailscontainer_base.ui
+++ b/kbugbuster/gui/cwbugdetailscontainer_base.ui
@@ -61,7 +61,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>20</height>
diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp
index 98124dda..778dade1 100644
--- a/kbugbuster/gui/cwbuglistcontainer.cpp
+++ b/kbugbuster/gui/cwbuglistcontainer.cpp
@@ -16,7 +16,7 @@
 
 #include <tqpushbutton.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidgetstack.h>
 
 #include <kapplication.h>
@@ -143,7 +143,7 @@ void CWBugListContainer::setBugList( const TQString &label, const Bug::List &bug
         }
     }
 
-    m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).tqarg( label ).tqarg( noBugs ).tqarg( noWishes ) );
+    m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).arg( label ).arg( noBugs ).arg( noWishes ) );
     m_listStack->raiseWidget( 0 );
 }
 
@@ -153,13 +153,13 @@ void CWBugListContainer::setBugList( const Package &package, const TQString &com
     if ( component.isEmpty() )
     {
         if ( package.components().count() > 1 )
-            listLabel = i18n( "Product '%1', all components" ).tqarg( package.name() );
+            listLabel = i18n( "Product '%1', all components" ).arg( package.name() );
         else
-            listLabel = i18n( "Product '%1'" ).tqarg( package.name() );
+            listLabel = i18n( "Product '%1'" ).arg( package.name() );
     }
     else
     {
-        listLabel = i18n( "Product '%1', component '%2'" ).tqarg( package.name(), component );
+        listLabel = i18n( "Product '%1', component '%2'" ).arg( package.name(), component );
     }
 
     setBugList( listLabel, bugs );
@@ -208,9 +208,9 @@ void CWBugListContainer::setNoList()
 void CWBugListContainer::setLoading( const Package &package, const TQString &component )
 {
     if ( component.isEmpty() )
-        setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).tqarg( package.name() ) );
+        setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).arg( package.name() ) );
     else
-        setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).tqarg( package.name(), component ) );
+        setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).arg( package.name(), component ) );
 }
 
 void CWBugListContainer::setLoading( const TQString &label )
@@ -221,12 +221,12 @@ void CWBugListContainer::setLoading( const TQString &label )
 
 void CWBugListContainer::setCacheMiss( const Package &package )
 {
-    setCacheMiss( i18n( "Package '%1'" ).tqarg( package.name() ) );
+    setCacheMiss( i18n( "Package '%1'" ).arg( package.name() ) );
 }
 
 void CWBugListContainer::setCacheMiss( const TQString &label )
 {
-    m_listLoading->setText( i18n( "%1 is not available offline." ).tqarg( label ) );
+    m_listLoading->setText( i18n( "%1 is not available offline." ).arg( label ) );
     m_listStack->raiseWidget( 1 );
 }
 
diff --git a/kbugbuster/gui/cwloadingwidget.cpp b/kbugbuster/gui/cwloadingwidget.cpp
index 6e8a9852..f2a62573 100644
--- a/kbugbuster/gui/cwloadingwidget.cpp
+++ b/kbugbuster/gui/cwloadingwidget.cpp
@@ -107,7 +107,7 @@ void CWLoadingWidget::setText( const TQString &text )
 {
     m_text = text;
     updatePixmap();
-    tqrepaint();
+    repaint();
 }
 
 void CWLoadingWidget::updatePixmap()
diff --git a/kbugbuster/gui/cwloadingwidget.h b/kbugbuster/gui/cwloadingwidget.h
index b0536b09..744c7951 100644
--- a/kbugbuster/gui/cwloadingwidget.h
+++ b/kbugbuster/gui/cwloadingwidget.h
@@ -37,7 +37,7 @@ class CWLoadingWidget : public TQFrame
 
 public:
     /**
-     * Use WidgetMode to specify the tqlayout for the background images
+     * Use WidgetMode to specify the layout for the background images
      * TopFrame loads and uses the logo and horizontal bars,
      * BottomFrame loads the tools and the translucent block.
      */
diff --git a/kbugbuster/gui/cwsearchwidget.cpp b/kbugbuster/gui/cwsearchwidget.cpp
index 5a075bb8..79c011d7 100644
--- a/kbugbuster/gui/cwsearchwidget.cpp
+++ b/kbugbuster/gui/cwsearchwidget.cpp
@@ -18,7 +18,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <tqlineedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kcombobox.h>
 #include <tqlabel.h>
 
diff --git a/kbugbuster/gui/kbbbookmarkmanager.h b/kbugbuster/gui/kbbbookmarkmanager.h
index 23763300..af58a461 100644
--- a/kbugbuster/gui/kbbbookmarkmanager.h
+++ b/kbugbuster/gui/kbbbookmarkmanager.h
@@ -10,7 +10,7 @@ public:
     static KBookmarkManager * self() {
         if ( !s_bookmarkManager )
         {
-            TQString bookmarksFile = locateLocal("data", TQString::tqfromLatin1("kbugbuster/bookmarks.xml"));
+            TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("kbugbuster/bookmarks.xml"));
             s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
         }
         return s_bookmarkManager;
diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp
index 3c57c6eb..419ba479 100644
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@@ -17,11 +17,11 @@
 #include "kbbmainwindow.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmultilineedit.h>
 #include <tqprogressbar.h>
 #include <tqpushbutton.h>
-#include <tqtextview.h>
+#include <textview.h>
 #include <tqwidgetstack.h>
 
 #include <kaction.h>
diff --git a/kbugbuster/gui/kbbmainwindow.h b/kbugbuster/gui/kbbmainwindow.h
index 71d621ec..a98edc0e 100644
--- a/kbugbuster/gui/kbbmainwindow.h
+++ b/kbugbuster/gui/kbbmainwindow.h
@@ -120,7 +120,7 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner
     KToggleAction *m_disconnectedAction;
 
     /**
-     * tqStatus bar label. We need this, because the default TQt version doesn't
+     * Status bar label. We need this, because the default TQt version doesn't
      * support rich text in the messages
      */
     TQLabel *m_statusLabel;
diff --git a/kbugbuster/gui/loadallbugsdlg.cpp b/kbugbuster/gui/loadallbugsdlg.cpp
index 72212ccd..d6203c07 100644
--- a/kbugbuster/gui/loadallbugsdlg.cpp
+++ b/kbugbuster/gui/loadallbugsdlg.cpp
@@ -26,7 +26,7 @@ LoadAllBugsDlg::LoadAllBugsDlg(  const Package& pkg, const TQString &component )
     m_bugLoadingProgress = new KIO::DefaultProgress( this );
     connect( m_bugLoadingProgress, TQT_SIGNAL( stopped() ),
              this, TQT_SLOT( slotStopped() ) );
-    setCaption( i18n( "Loading All Bugs for Product %1" ).tqarg( pkg.name() ) );
+    setCaption( i18n( "Loading All Bugs for Product %1" ).arg( pkg.name() ) );
     connect( BugSystem::self(),
              TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ),
              TQT_SLOT( slotBugDetailsAvailable( const Bug &, const BugDetails & ) ) );
@@ -45,7 +45,7 @@ LoadAllBugsDlg::LoadAllBugsDlg(  const Package& pkg, const TQString &component )
 void LoadAllBugsDlg::slotBugDetailsAvailable( const Bug &bug, const BugDetails & )
 {
     kdDebug() << "LoadAllBugsDlg::slotBugDetailsAvailable " << bug.number() << endl;
-    m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).tqarg(bug.number()) );
+    m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).arg(bug.number()) );
     loadNextBug();
 }
 
diff --git a/kbugbuster/gui/messageeditor.cpp b/kbugbuster/gui/messageeditor.cpp
index 54d56ea6..dca6bc2a 100644
--- a/kbugbuster/gui/messageeditor.cpp
+++ b/kbugbuster/gui/messageeditor.cpp
@@ -1,7 +1,7 @@
 #include <tqcombobox.h>
 #include <ktextedit.h>
 #include <kinputdialog.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 #include <klocale.h>
@@ -79,7 +79,7 @@ void MessageEditor::addButton()
 void MessageEditor::removeButton()
 {
   int result = KMessageBox::warningContinueCancel(this,
-      i18n("Remove the button %1?").tqarg(mSelectionCombo->currentText()),
+      i18n("Remove the button %1?").arg(mSelectionCombo->currentText()),
       i18n("Remove"), KGuiItem( i18n("Delete"), "editdelete") );
 
   if (result == KMessageBox::Continue) {
diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp
index 388a02df..11f05d4f 100644
--- a/kbugbuster/gui/msginputdialog.cpp
+++ b/kbugbuster/gui/msginputdialog.cpp
@@ -2,7 +2,7 @@
 // (c) 2001, Cornelius Schumacher
 
 #include <ktextedit.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -29,7 +29,7 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug,
 {
   switch ( mType ) {
     case Close:
-      setCaption( i18n("Close Bug %1").tqarg( mBug.number() ) );
+      setCaption( i18n("Close Bug %1").arg( mBug.number() ) );
       break;
     case Reply:
       setCaption( i18n("Reply to Bug") );
@@ -51,23 +51,23 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug,
 
   if ( mType == Reply ) {
     TQWidget *r = new TQWidget( w );
-    TQHBoxLayout* rtqlayout = new TQHBoxLayout( r );
+    TQHBoxLayout* rlayout = new TQHBoxLayout( r );
 
     TQLabel *rlabel = new TQLabel( i18n("&Recipient:"),r );
     TQFont f = r->font();
     f.setBold( true );
     r->setFont( f );
-    rtqlayout->add( rlabel );
+    rlayout->add( rlabel );
 
     mRecipient = new TQComboBox( r );
     mRecipient->insertItem( i18n("Normal (bugs.kde.org & Maintainer & kde-bugs-dist)"), BugCommand::Normal );
     mRecipient->insertItem( i18n("Maintonly (bugs.kde.org & Maintainer)"), BugCommand::Maintonly );
     mRecipient->insertItem( i18n("Quiet (bugs.kde.org only)"), BugCommand::Quiet );
     rlabel->setBuddy( mRecipient );
-    rtqlayout->add( mRecipient );
+    rlayout->add( mRecipient );
 
     TQSpacerItem *rspacer= new TQSpacerItem( 1,1,TQSizePolicy::Expanding );
-    rtqlayout->addItem( rspacer );
+    rlayout->addItem( rspacer );
 
     // Reply currently only replies to the bug tracking system
     r->hide();
diff --git a/kbugbuster/gui/packageselectdialog.cpp b/kbugbuster/gui/packageselectdialog.cpp
index 4d3e72ac..3b84b9e9 100644
--- a/kbugbuster/gui/packageselectdialog.cpp
+++ b/kbugbuster/gui/packageselectdialog.cpp
@@ -1,5 +1,5 @@
 #include <tqlistview.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 
 #include <kdebug.h>
diff --git a/kbugbuster/gui/preferencesdialog.cpp b/kbugbuster/gui/preferencesdialog.cpp
index 2c1a845c..6acb3385 100644
--- a/kbugbuster/gui/preferencesdialog.cpp
+++ b/kbugbuster/gui/preferencesdialog.cpp
@@ -2,7 +2,7 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqbuttongroup.h>
 #include <tqlistview.h>
@@ -79,15 +79,15 @@ void PreferencesDialog::setupServerPage()
   TQFrame *topFrame = addPage( i18n("Servers"), 0,
                                 DesktopIcon( "gohome", KIcon::SizeMedium ) );
 
-  TQBoxLayout *tqlayout = new TQVBoxLayout( topFrame );
-  tqlayout->setSpacing( spacingHint() );
+  TQBoxLayout *layout = new TQVBoxLayout( topFrame );
+  layout->setSpacing( spacingHint() );
 
   mServerList = new ServerListView( topFrame );
-  tqlayout->addWidget( mServerList );
+  layout->addWidget( mServerList );
 
   TQHBox *buttonBox = new TQHBox( topFrame );
   buttonBox->setSpacing( spacingHint() );
-  tqlayout->addWidget( buttonBox );
+  layout->addWidget( buttonBox );
 
   TQPushButton *addButton = new TQPushButton( i18n("Add Server..."), buttonBox );
   connect( addButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addServer() ) );
@@ -100,7 +100,7 @@ void PreferencesDialog::setupServerPage()
 
   TQPushButton *button = new TQPushButton( i18n("Select Server From List..."),
                                          topFrame );
-  tqlayout->addWidget( button );
+  layout->addWidget( button );
   connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( selectServer() ) );
   connect( mServerList, TQT_SIGNAL( doubleClicked ( TQListViewItem *)), this, TQT_SLOT( editServer()));
 }
@@ -110,34 +110,34 @@ void PreferencesDialog::setupAdvancedPage()
   TQFrame *topFrame = addPage( i18n("Advanced"), 0,
                                 DesktopIcon( "misc", KIcon::SizeMedium ) );
 
-  TQBoxLayout *tqlayout = new TQVBoxLayout( topFrame );
-  tqlayout->setSpacing( spacingHint() );
+  TQBoxLayout *layout = new TQVBoxLayout( topFrame );
+  layout->setSpacing( spacingHint() );
 
   TQButtonGroup *mailGroup = new TQButtonGroup( 1,Qt::Horizontal,
                                               i18n( "Mail Client" ), topFrame );
-  tqlayout->addWidget( mailGroup );
+  layout->addWidget( mailGroup );
 
   mKMailButton = new TQRadioButton( i18n( "&KMail" ), mailGroup );
   mDirectButton = new TQRadioButton( i18n( "D&irect" ), mailGroup );
   mSendmailButton = new TQRadioButton( i18n( "&Sendmail" ), mailGroup );
 
   mShowClosedCheckBox = new TQCheckBox( i18n( "Show closed bugs" ), topFrame );
-  tqlayout->addWidget( mShowClosedCheckBox );
+  layout->addWidget( mShowClosedCheckBox );
 
   mShowWishesCheckBox = new TQCheckBox( i18n( "Show wishes" ), topFrame );
-  tqlayout->addWidget( mShowWishesCheckBox );
+  layout->addWidget( mShowWishesCheckBox );
 
   mShowVotedCheckBox = new TQCheckBox(  i18n( "Show bugs with number of votes greater than:" ), topFrame );
-  tqlayout->addWidget( mShowVotedCheckBox );
+  layout->addWidget( mShowVotedCheckBox );
 
   mMinVotesInput = new KIntNumInput( topFrame );
   mMinVotesInput->setMinValue( 0 );
   connect( mShowVotedCheckBox, TQT_SIGNAL(toggled(bool)),
            mMinVotesInput, TQT_SLOT(setEnabled(bool)) );
-  tqlayout->addWidget( mMinVotesInput );
+  layout->addWidget( mMinVotesInput );
 
   mSendBccCheckBox = new TQCheckBox( i18n( "Send BCC to myself" ), topFrame );
-  tqlayout->addWidget( mSendBccCheckBox );
+  layout->addWidget( mSendBccCheckBox );
 }
 
 void PreferencesDialog::setDefaults()
diff --git a/kbugbuster/gui/serverconfigdialog.cpp b/kbugbuster/gui/serverconfigdialog.cpp
index feaab83d..8cf91f5d 100644
--- a/kbugbuster/gui/serverconfigdialog.cpp
+++ b/kbugbuster/gui/serverconfigdialog.cpp
@@ -6,7 +6,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
diff --git a/kbugbuster/gui/severityselectdialog.cpp b/kbugbuster/gui/severityselectdialog.cpp
index bef2640b..66eac388 100644
--- a/kbugbuster/gui/severityselectdialog.cpp
+++ b/kbugbuster/gui/severityselectdialog.cpp
@@ -1,4 +1,4 @@
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
diff --git a/kbugbuster/kresources/kcalresource.cpp b/kbugbuster/kresources/kcalresource.cpp
index dd858f18..5af8b8be 100644
--- a/kbugbuster/kresources/kcalresource.cpp
+++ b/kbugbuster/kresources/kcalresource.cpp
@@ -212,7 +212,7 @@ void KCalResource::slotBugListAvailable( const Package &, const TQString &,
       newTodo = new KCal::Todo;
       newTodo->setUid( uid );
       TQString uri = "http://bugs.kde.org/show_bug.cgi?id=%1";
-      newTodo->addAttachment( new KCal::Attachment( uri.tqarg( bug.number() ) ) );
+      newTodo->addAttachment( new KCal::Attachment( uri.arg( bug.number() ) ) );
       todo = newTodo;
     }
 
diff --git a/kbugbuster/kresources/kcalresourceconfig.cpp b/kbugbuster/kresources/kcalresourceconfig.cpp
index 58466642..2b4a7457 100644
--- a/kbugbuster/kresources/kcalresourceconfig.cpp
+++ b/kbugbuster/kresources/kcalresourceconfig.cpp
@@ -22,7 +22,7 @@
 #include <typeinfo>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/kcachegrind/converters/hotshot2calltree b/kcachegrind/converters/hotshot2calltree
index e5c886a2..4eb8f7de 100644
--- a/kcachegrind/converters/hotshot2calltree
+++ b/kcachegrind/converters/hotshot2calltree
@@ -136,7 +136,7 @@ def return_from_call(caller_stack, call_dict, cost_now):
     call_dict[called[0]] = per_file_dict
 
 
-def updatetqStatus(filecount):
+def updateStatus(filecount):
     sys.stdout.write("reading File #%d    \r" % filecount)
     sys.stdout.flush()
 def convertProfFiles(output, inputfilenames):
@@ -153,7 +153,7 @@ def convertProfFiles(output, inputfilenames):
     filecount = 1
     number_of_files = len(inputfilenames)
     for inputfilename in inputfilenames:
-        updatetqStatus(filecount)
+        updateStatus(filecount)
         cost, filecount = convertHandleFilename(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount)
         total_cost += cost
         if (file_limit > 0) and (filecount > file_limit):
@@ -164,7 +164,7 @@ def convertProfFiles(output, inputfilenames):
     dumpResults(output, call_dict, total_cost, cost_per_pos, cost_per_function)
 
 def convertHandleFilename(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount):
-    updatetqStatus(filecount)
+    updateStatus(filecount)
     if not ((file_limit > 0) and (filecount > file_limit)):
         if os.path.isdir(inputfilename):
             cost, filecount = convertProfDir(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount)
diff --git a/kcachegrind/converters/memprof2calltree b/kcachegrind/converters/memprof2calltree
index a04eaa38..e82d6e85 100755
--- a/kcachegrind/converters/memprof2calltree
+++ b/kcachegrind/converters/memprof2calltree
@@ -13,8 +13,8 @@ while(<>) {
     print "\nfn=$1\n";
     next;
   }
-  if (/^  tqchildren:/) {
-    $next = 1; #tqchildren
+  if (/^  children:/) {
+    $next = 1; #children
     next;
   }
   if (/^  inherited:/) {
diff --git a/kcachegrind/kcachegrind/cachegrindloader.cpp b/kcachegrind/kcachegrind/cachegrindloader.cpp
index 761830fc..4fe57d34 100644
--- a/kcachegrind/kcachegrind/cachegrindloader.cpp
+++ b/kcachegrind/kcachegrind/cachegrindloader.cpp
@@ -181,8 +181,8 @@ bool CachegrindLoader::loadTrace(TracePart* p)
   CachegrindLoader l;
 
   /* emit progress signals via the singleton loader */
-  connect(&l, TQT_SIGNAL(updatetqStatus(TQString, int)),
-	  this, TQT_SIGNAL(updatetqStatus(TQString, int)));
+  connect(&l, TQT_SIGNAL(updateStatus(TQString, int)),
+	  this, TQT_SIGNAL(updateStatus(TQString, int)));
 
   return l.loadTraceInternal(p);
 }
@@ -735,9 +735,9 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part)
     return false;
   }
   kdDebug() << "Loading " << _filename << " ..." << endl;
-  TQString statusMsg = i18n("Loading %1").tqarg(_filename);
+  TQString statusMsg = i18n("Loading %1").arg(_filename);
   int statusProgress = 0;
-  emit updatetqStatus(statusMsg,statusProgress);
+  emit updateStatus(statusMsg,statusProgress);
 
 
 #if USE_FIXCOST
@@ -815,7 +815,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part)
 		 * "long operations" (like file loading) are in progress,
 		 * this can temporarly switch to another operation.
 		 */
-		emit updatetqStatus(statusMsg,statusProgress);
+		emit updateStatus(statusMsg,statusProgress);
 	      }
 
 	      continue;
@@ -1308,9 +1308,9 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part)
   }
 
 
-  emit updatetqStatus(statusMsg,100);
+  emit updateStatus(statusMsg,100);
 
-  _part->tqinvalidate();
+  _part->invalidate();
   if (!totalsSet) {
     _part->totals()->clear();
     _part->totals()->addCost(_part);
diff --git a/kcachegrind/kcachegrind/callgraphview.cpp b/kcachegrind/kcachegrind/callgraphview.cpp
index 5fc8dbb3..f9d06e68 100644
--- a/kcachegrind/kcachegrind/callgraphview.cpp
+++ b/kcachegrind/kcachegrind/callgraphview.cpp
@@ -25,7 +25,7 @@
 
 #include <tqtooltip.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqwhatsthis.h>
 #include <tqcanvas.h>
 #include <tqwmatrix.h>
@@ -303,8 +303,8 @@ GraphEdge::GraphEdge()
 TQString GraphEdge::prettyName()
 {
     if (_c) return _c->prettyName();
-    if (_from) return i18n("Call(s) from %1").tqarg(_from->prettyName());
-    if (_to) return i18n("Call(s) to %1").tqarg(_to->prettyName());
+    if (_from) return i18n("Call(s) from %1").arg(_from->prettyName());
+    if (_to) return i18n("Call(s) to %1").arg(_to->prettyName());
     return i18n("(unknown call)");
 }
 
@@ -376,7 +376,7 @@ TQString GraphOptions::layoutString(Layout l)
     return TQString("TopDown");
 }
 
-GraphOptions::Layout GraphOptions::tqlayout(TQString s)
+GraphOptions::Layout GraphOptions::layout(TQString s)
 {
     if (s == TQString("Circular")) return Circular;
     if (s == TQString("LeftRight")) return LeftRight;
@@ -562,10 +562,10 @@ void GraphExporter::writeDot()
 
   *stream << "digraph \"callgraph\" {\n";
 
-  if (_go->tqlayout() == LeftRight) {
+  if (_go->layout() == LeftRight) {
       *stream << TQString("  rankdir=LR;\n");
   }
-  else if (_go->tqlayout() == Circular) {
+  else if (_go->layout() == Circular) {
     TraceFunction *f = 0;
     switch(_item->type()) {
     case TraceItem::Function:
@@ -579,7 +579,7 @@ void GraphExporter::writeDot()
       break;
     }
     if (f)
-      *stream << TQString("  center=F%1;\n").tqarg((long)f, 0, 16);
+      *stream << TQString("  center=F%1;\n").arg((long)f, 0, 16);
     *stream << TQString("  overlap=false;\n  splines=true;\n");
   }
 
@@ -619,7 +619,7 @@ void GraphExporter::writeDot()
 	iabr = iabr.left(Configuration::maxSymbolLength()) + "...";
 
       *stream << TQString("subgraph \"cluster%1\" { label=\"%2\";\n")
-	.tqarg(cluster).tqarg(iabr);
+	.arg(cluster).arg(iabr);
     }
 
     GraphNode* np;
@@ -630,17 +630,17 @@ void GraphExporter::writeDot()
       if ((int)abr.length() > Configuration::maxSymbolLength())
 	abr = abr.left(Configuration::maxSymbolLength()) + "...";
       
-      *stream << TQString("  F%1 [").tqarg((long)f, 0, 16);
+      *stream << TQString("  F%1 [").arg((long)f, 0, 16);
       if (_useBox) {
 	// make label 3 lines for CallGraphView
-	*stream << TQString("tqshape=box,label=\"** %1 **\\n**\\n%2\"];\n")
-	  .tqarg(abr)
-	  .tqarg(SubCost(np->incl).pretty());
+	*stream << TQString("shape=box,label=\"** %1 **\\n**\\n%2\"];\n")
+	  .arg(abr)
+	  .arg(SubCost(np->incl).pretty());
       }
       else
 	*stream << TQString("label=\"%1\\n%2\"];\n")
-	  .tqarg(abr)
-	  .tqarg(SubCost(np->incl).pretty());
+	  .arg(abr)
+	  .arg(SubCost(np->incl).pretty());
     }
 
     if (_go->clusterGroups() && i)
@@ -675,17 +675,17 @@ void GraphExporter::writeDot()
     to.callerSet.remove(&e);
 
     *stream << TQString("  F%1 -> F%2 [weight=%3")
-      .tqarg((long)e.from(), 0, 16)
-      .tqarg((long)e.to(), 0, 16)
-      .tqarg((long)log(log(e.cost)));
+      .arg((long)e.from(), 0, 16)
+      .arg((long)e.to(), 0, 16)
+      .arg((long)log(log(e.cost)));
 
     if (_go->detailLevel() ==1)
 	*stream << TQString(",label=\"%1\"")
-	    .tqarg(SubCost(e.cost).pretty());
+	    .arg(SubCost(e.cost).pretty());
     else if (_go->detailLevel() ==2)
 	*stream << TQString(",label=\"%3\\n%4 x\"")
-	    .tqarg(SubCost(e.cost).pretty())
-	    .tqarg(SubCost(e.count).pretty());
+	    .arg(SubCost(e.cost).pretty())
+	    .arg(SubCost(e.count).pretty());
 
     *stream << TQString("];\n");
   }
@@ -713,14 +713,14 @@ void GraphExporter::writeDot()
 	      e->cost = costSum;
 	      e->count = countSum;
 
-	      *stream << TQString("  R%1 [tqshape=point,label=\"\"];\n")
-		  .tqarg((long)n.function(), 0, 16);
+	      *stream << TQString("  R%1 [shape=point,label=\"\"];\n")
+		  .arg((long)n.function(), 0, 16);
 	      *stream << TQString("  R%1 -> F%2 [label=\"%3\\n%4 x\",weight=%5];\n")
-		  .tqarg((long)n.function(), 0, 16)
-		  .tqarg((long)n.function(), 0, 16)
-		  .tqarg(SubCost(costSum).pretty())
-		  .tqarg(SubCost(countSum).pretty())
-		  .tqarg((int)log(costSum));
+		  .arg((long)n.function(), 0, 16)
+		  .arg((long)n.function(), 0, 16)
+		  .arg(SubCost(costSum).pretty())
+		  .arg(SubCost(countSum).pretty())
+		  .arg((int)log(costSum));
 	  }
 
 	  costSum = countSum = 0.0;
@@ -736,14 +736,14 @@ void GraphExporter::writeDot()
 	      e->cost = costSum;
 	      e->count = countSum;
 
-	      *stream << TQString("  S%1 [tqshape=point,label=\"\"];\n")
-		  .tqarg((long)n.function(), 0, 16);
+	      *stream << TQString("  S%1 [shape=point,label=\"\"];\n")
+		  .arg((long)n.function(), 0, 16);
 	      *stream << TQString("  F%1 -> S%2 [label=\"%3\\n%4 x\",weight=%5];\n")
-		  .tqarg((long)n.function(), 0, 16)
-		  .tqarg((long)n.function(), 0, 16)
-		  .tqarg(SubCost(costSum).pretty())
-		  .tqarg(SubCost(countSum).pretty())
-		  .tqarg((int)log(costSum));
+		  .arg((long)n.function(), 0, 16)
+		  .arg((long)n.function(), 0, 16)
+		  .arg(SubCost(costSum).pretty())
+		  .arg(SubCost(countSum).pretty())
+		  .arg((int)log(costSum));
 	  }
       }
   }
@@ -1062,7 +1062,7 @@ CanvasNode::CanvasNode(CallGraphView* v, GraphNode* n,
     double inclP  = 100.0 * n->incl / total;
     if (_view->topLevel()->showPercentage())
 	setText(1, TQString("%1 %")
-		.tqarg(inclP, 0, 'f', Configuration::percentPrecision()));
+		.arg(inclP, 0, 'f', Configuration::percentPrecision()));
     else
 	setText(1, SubCost(n->incl).pretty());
     setPixmap(1, percentagePixmap(25,10,(int)(inclP+.5), TQt::blue, true));
@@ -1096,7 +1096,7 @@ void CanvasNode::drawShape(TQPainter& p)
 
   if (StoredDrawParams::selected() && _view->hasFocus()) {
     _view->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r,
-				  _view->tqcolorGroup());
+				  _view->colorGroup());
   }
 
   // draw afterwards to always get a frame even when zoomed
@@ -1121,7 +1121,7 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce,
     if (!e) return;
 
     setPosition(1, DrawParams::TopCenter);
-    setText(1, TQString("%1 x").tqarg(SubCost(e->count).pretty()));
+    setText(1, TQString("%1 x").arg(SubCost(e->count).pretty()));
 
     setPosition(0, DrawParams::BottomCenter);
 
@@ -1142,7 +1142,7 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce,
     double inclP  = 100.0 * e->cost / total;
     if (_view->topLevel()->showPercentage())
         setText(0, TQString("%1 %")
-		.tqarg(inclP, 0, 'f', Configuration::percentPrecision()));
+		.arg(inclP, 0, 'f', Configuration::percentPrecision()));
     else
         setText(0, SubCost(e->cost).pretty());
     setPixmap(0, percentagePixmap(25,10,(int)(inclP+.5), TQt::blue, true));
@@ -1331,7 +1331,7 @@ void CallGraphTip::maybeTip( const TQPoint& pos )
       if (0) qDebug("CallGraphTip: Mouse on Node '%s'",
 		    n->function()->prettyName().ascii());
 
-      TQString tipStr = TQString("%1 (%2)").tqarg(cn->text(0)).tqarg(cn->text(1));
+      TQString tipStr = TQString("%1 (%2)").arg(cn->text(0)).arg(cn->text(1));
       TQPoint vPosTL = cgv->contentsToViewport(i->boundingRect().topLeft());
       TQPoint vPosBR = cgv->contentsToViewport(i->boundingRect().bottomRight());
       tip(TQRect(vPosTL, vPosBR), tipStr);
@@ -1356,7 +1356,7 @@ void CallGraphTip::maybeTip( const TQPoint& pos )
 	  tipStr = e->prettyName();
       else
 	  tipStr = TQString("%1 (%2)")
-	      .tqarg(ce->label()->text(0)).tqarg(ce->label()->text(1));
+	      .arg(ce->label()->text(0)).arg(ce->label()->text(1));
       tip(TQRect(pos.x()-5,pos.y()-5,pos.x()+5,pos.y()+5), tipStr);
   }
 }
@@ -1589,7 +1589,7 @@ void CallGraphView::keyPressEvent(TQKeyEvent* e)
 	TraceFunction* f = 0;
 	TraceCall* c = 0;
 
-	// rotate arrow key meaning for LeftRight tqlayout
+	// rotate arrow key meaning for LeftRight layout
 	int key = e->key();
 	if (_layout == LeftRight) {
 	    switch(key) {
@@ -1745,7 +1745,7 @@ void CallGraphView::doUpdate(int changeType)
   }
 
   if (changeType & dataChanged) {
-      // tqinvalidate old selection and graph part
+      // invalidate old selection and graph part
     _exporter.reset(_data, _activeItem, _costType, _groupType);
       _selectedNode = 0;
       _selectedEdge = 0;
@@ -1792,8 +1792,8 @@ void CallGraphView::showRenderWarning()
     s = i18n("Layouting stopped.\n");
   
   s.append(i18n("The call graph has %1 nodes and %2 edges.\n")
-	   .tqarg(_exporter.nodeCount())
-	   .tqarg(_exporter.edgeCount()));
+	   .arg(_exporter.nodeCount())
+	   .arg(_exporter.edgeCount()));
 
   showText(s);
 }
@@ -1866,7 +1866,7 @@ void CallGraphView::refresh()
   if ( !_renderProcess->start() ) {
     TQString e = i18n("No call graph is available because the following\n"
 		     "command cannot be run:\n'%1'\n")
-      .tqarg(_renderProcess->arguments().join(" "));
+      .arg(_renderProcess->arguments().join(" "));
     e += i18n("Please check that 'dot' is installed (package GraphViz).");
     showText(e);
 
@@ -2206,7 +2206,7 @@ void CallGraphView::dotExited()
     TQString s = i18n("There is no call graph available for function\n"
 		     "\t'%1'\n"
 		     "because it has no cost of the selected event type.");
-    TQCanvasText* t = new TQCanvasText(s.tqarg(_activeItem->name()), _canvas);
+    TQCanvasText* t = new TQCanvasText(s.arg(_activeItem->name()), _canvas);
     //    t->setTextFlags(TQt::AlignHCenter | TQt::AlignVCenter);
     t->move(5,5);
     t->show();
@@ -2394,10 +2394,10 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
 
       TQString name = f->prettyName();
       popup.insertItem(i18n("Go to '%1'")
-		     .tqarg(Configuration::shortenSymbol(name)), 93);
+		     .arg(Configuration::shortenSymbol(name)), 93);
       if (cycle && (cycle != f)) {
 	name = Configuration::shortenSymbol(cycle->prettyName());
-	popup.insertItem(i18n("Go to '%1'").tqarg(name), 94);
+	popup.insertItem(i18n("Go to '%1'").arg(name), 94);
       }
       popup.insertSeparator();
     }
@@ -2416,7 +2416,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
       if (c) {
 	  TQString name = c->prettyName();
 	  popup.insertItem(i18n("Go to '%1'")
-			   .tqarg(Configuration::shortenSymbol(name)), 95);
+			   .arg(Configuration::shortenSymbol(name)), 95);
 
 	  popup.insertSeparator();
       }
@@ -2457,7 +2457,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
   case 10: gpopup1.setItemChecked(104,true); break;
   case 15: gpopup1.setItemChecked(105,true); break;
   default:
-    gpopup1.insertItem(i18n("< %1").tqarg(_maxCallerDepth), 106);
+    gpopup1.insertItem(i18n("< %1").arg(_maxCallerDepth), 106);
     gpopup1.setItemChecked(106,true); break;
   }
 
@@ -2480,7 +2480,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e)
   case 10: gpopup2.setItemChecked(114,true); break;
   case 15: gpopup2.setItemChecked(115,true); break;
   default:
-    gpopup2.insertItem(i18n("< %1").tqarg(_maxCallingDepth), 116);
+    gpopup2.insertItem(i18n("< %1").arg(_maxCallingDepth), 116);
     gpopup2.setItemChecked(116,true); break;
   }
 
@@ -2701,7 +2701,7 @@ void CallGraphView::readViewConfig(KConfig* c,
     _clusterGroups   = g->readBoolEntry("ClusterGroups",
 					DEFAULT_CLUSTERGROUPS);
     _detailLevel     = g->readNumEntry("DetailLevel", DEFAULT_DETAILLEVEL);
-    _layout          = GraphOptions::tqlayout(g->readEntry("Layout",
+    _layout          = GraphOptions::layout(g->readEntry("Layout",
 					   layoutString(DEFAULT_LAYOUT)));
     _zoomPosition    = zoomPos(g->readEntry("ZoomPosition",
 					    zoomPosString(DEFAULT_ZOOMPOS)));
diff --git a/kcachegrind/kcachegrind/callgraphview.h b/kcachegrind/kcachegrind/callgraphview.h
index 631c6a30..4db619db 100644
--- a/kcachegrind/kcachegrind/callgraphview.h
+++ b/kcachegrind/kcachegrind/callgraphview.h
@@ -167,10 +167,10 @@ class GraphOptions
     virtual bool expandCycles() = 0;
     virtual bool clusterGroups() = 0;
     virtual int detailLevel() = 0;
-    virtual Layout tqlayout() = 0;
+    virtual Layout layout() = 0;
 
     static TQString layoutString(Layout);
-    static Layout tqlayout(TQString);
+    static Layout layout(TQString);
 };
 
 /* Graph Options Storage */
@@ -188,7 +188,7 @@ class StorableGraphOptions: public GraphOptions
     virtual bool expandCycles() { return _expandCycles; }
     virtual bool clusterGroups() { return _clusterGroups; }
     virtual int detailLevel() { return _detailLevel; }
-    virtual Layout tqlayout() { return _layout; }
+    virtual Layout layout() { return _layout; }
 
     // setters
     void setMaxCallerDepth(int d) { _maxCallerDepth = d; }
diff --git a/kcachegrind/kcachegrind/callitem.cpp b/kcachegrind/kcachegrind/callitem.cpp
index 3a3a7266..ebca4903 100644
--- a/kcachegrind/kcachegrind/callitem.cpp
+++ b/kcachegrind/kcachegrind/callitem.cpp
@@ -110,7 +110,7 @@ void CallItem::updateCost()
 
 	if (_view->topLevel()->showPercentage())
 	    setText(0, TQString("%1")
-		    .tqarg(sum, 0, 'f', Configuration::percentPrecision()));
+		    .arg(sum, 0, 'f', Configuration::percentPrecision()));
 	else
 	    setText(0, _call->prettySubCost(ct));
 
@@ -134,7 +134,7 @@ void CallItem::updateCost()
 	
 	if (_view->topLevel()->showPercentage())
 	  setText(1, TQString("%1")
-		  .tqarg(sum, 0, 'f', Configuration::percentPrecision()));
+		  .arg(sum, 0, 'f', Configuration::percentPrecision()));
 	else
 	  setText(1, _call->prettySubCost(ct2));
 
diff --git a/kcachegrind/kcachegrind/callmapview.cpp b/kcachegrind/kcachegrind/callmapview.cpp
index 3f363f29..0e4d5e38 100644
--- a/kcachegrind/kcachegrind/callmapview.cpp
+++ b/kcachegrind/kcachegrind/callmapview.cpp
@@ -115,12 +115,12 @@ TQString CallMapView::whatsThis() const
              "choose 'Hide incorrect borders'. As this mode can be "
              "<em>very</em> time consuming, you may want to limit "
              "the maximum drawn nesting level before. "
-             "'Best' determinates the split direction for tqchildren "
+             "'Best' determinates the split direction for children "
              "from the aspect ratio of the parent. "
              "'Always Best' decides on remaining space for each "
              "sibling. "
              "'Ignore Proportions' takes space for function name "
-             "drawing <em>before</em> drawing tqchildren. Note that "
+             "drawing <em>before</em> drawing children. Note that "
              "size proportions can get <em>heavily</em> wrong.</p>"
 
              "<p>This is a <em>TreeMap</em> widget. "
@@ -196,13 +196,13 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p)
   if (i) {
     l1popup.insertSeparator();
     l1popup.insertItem(i18n("Depth of '%1' (%2)")
-                       .tqarg(shortCurrentName).tqarg(i->depth()), 55);
+                       .arg(shortCurrentName).arg(i->depth()), 55);
     l1popup.setItemChecked(55, maxDepth == i->depth());
   }
   if (maxDepth>0) {
     l1popup.insertSeparator();
-    l1popup.insertItem(i18n("Decrement Depth (to %1)").tqarg(maxDepth-1), 56);
-    l1popup.insertItem(i18n("Increment Depth (to %1)").tqarg(maxDepth+1), 57);
+    l1popup.insertItem(i18n("Decrement Depth (to %1)").arg(maxDepth-1), 56);
+    l1popup.insertItem(i18n("Increment Depth (to %1)").arg(maxDepth+1), 57);
   }
 
   l2popup.setCheckable(true);
@@ -256,15 +256,15 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p)
     currentArea = i->width() * i->height();
     l3popup.insertSeparator();
     l3popup.insertItem(i18n("Area of '%1' (%2)")
-                       .tqarg(shortCurrentName).tqarg(currentArea), 67);
+                       .arg(shortCurrentName).arg(currentArea), 67);
     l3popup.setItemChecked(67, mArea == currentArea);
   }
   if (mArea>0) {
     l3popup.insertSeparator();
     l3popup.insertItem(i18n("Double Area Limit (to %1)")
-                       .tqarg(mArea*2), 68);
+                       .arg(mArea*2), 68);
     l3popup.insertItem(i18n("Half Area Limit (to %1)")
-                       .tqarg(mArea/2), 69);
+                       .arg(mArea/2), 69);
   }
 
   popup.insertSeparator();
@@ -428,7 +428,7 @@ void CallMapView::selectedSlot(TreeMapItem* item, bool kbd)
   if (item->text(0).isEmpty()) return;
 
   if (kbd) {
-      TQString msg = i18n("Call Map: Current is '%1'").tqarg(item->text(0));
+      TQString msg = i18n("Call Map: Current is '%1'").arg(item->text(0));
       if (_topLevel)
 	  _topLevel->showMessage(msg, 5000);
   }
@@ -531,7 +531,7 @@ void CallMapView::doUpdate(int changeType)
 TQColor CallMapView::groupColor(TraceFunction* f) const
 {
   if (!f)
-    return tqcolorGroup().button();
+    return colorGroup().button();
 
   return Configuration::functionColor(_groupType, f);
 }
@@ -618,7 +618,7 @@ TQString CallMapBaseItem::text(int textNo) const
 	  sum = 100.0 * _f->inclusive()->subCost(ct) / total;
 
       return TQString("%1 %")
-	  .tqarg(sum, 0, 'f', Configuration::percentPrecision());
+	  .arg(sum, 0, 'f', Configuration::percentPrecision());
   }
   return _f->inclusive()->prettySubCost(ct);
 }
@@ -663,7 +663,7 @@ bool CallMapBaseItem::isMarked(int) const
     return ((CallMapView*)widget())->selectedItem() == _f;
 }
 
-TreeMapItemList* CallMapBaseItem::tqchildren()
+TreeMapItemList* CallMapBaseItem::children()
 {
   if (_f && !initialized()) {
     CallMapView* w = (CallMapView*)widget();
@@ -706,7 +706,7 @@ TreeMapItemList* CallMapBaseItem::tqchildren()
     setSorting(-2, false);
   }
 
-  return _tqchildren;
+  return _children;
 }
 
 TQColor CallMapBaseItem::backColor() const
@@ -756,7 +756,7 @@ TQString CallMapCallingItem::text(int textNo) const
     TraceCost* t = ((CallMapView*)widget())->totalCost();
     double p  = 100.0 * _factor * _c->subCost(ct) / t->subCost(ct);
     return TQString("%1 %")
-      .tqarg(p, 0, 'f', Configuration::percentPrecision());
+      .arg(p, 0, 'f', Configuration::percentPrecision());
   }
   return val.pretty();
 }
@@ -792,7 +792,7 @@ bool CallMapCallingItem::isMarked(int) const
 }
 
 
-TreeMapItemList* CallMapCallingItem::tqchildren()
+TreeMapItemList* CallMapCallingItem::children()
 {
   if (!initialized()) {
     if (0) qDebug("Create Calling subitems (%s)", path(0).join("/").ascii());
@@ -832,7 +832,7 @@ TreeMapItemList* CallMapCallingItem::tqchildren()
     setSorting(-2, false);
   }
 
-  return _tqchildren;
+  return _children;
 }
 
 
@@ -872,7 +872,7 @@ TQString CallMapCallerItem::text(int textNo) const
     TraceCost* t = ((CallMapView*)widget())->totalCost();
     double p  = 100.0 * _factor * _c->subCost(ct) / t->subCost(ct);
     return TQString("%1 %")
-      .tqarg(p, 0, 'f', Configuration::percentPrecision());
+      .arg(p, 0, 'f', Configuration::percentPrecision());
   }
   return val.pretty();
 }
@@ -904,7 +904,7 @@ bool CallMapCallerItem::isMarked(int) const
 }
 
 
-TreeMapItemList* CallMapCallerItem::tqchildren()
+TreeMapItemList* CallMapCallerItem::children()
 {
   if (!initialized()) {
     //qDebug("Create Caller subitems (%s)", name().ascii());
@@ -939,7 +939,7 @@ TreeMapItemList* CallMapCallerItem::tqchildren()
     setSorting(-2, false);
   }
 
-  return _tqchildren;
+  return _children;
 }
 
 TQColor CallMapCallerItem::backColor() const
diff --git a/kcachegrind/kcachegrind/callmapview.h b/kcachegrind/kcachegrind/callmapview.h
index 1ee45258..860743fe 100644
--- a/kcachegrind/kcachegrind/callmapview.h
+++ b/kcachegrind/kcachegrind/callmapview.h
@@ -78,7 +78,7 @@ public:
   bool isMarked(int) const;
   TQString text(int) const;
   TQPixmap pixmap(int) const;
-  TreeMapItemList* tqchildren();
+  TreeMapItemList* children();
   TQColor backColor() const;
 
 private:
@@ -99,7 +99,7 @@ public:
   bool isMarked(int) const;
   TQString text(int) const;
   TQPixmap pixmap(int) const;
-  TreeMapItemList* tqchildren();
+  TreeMapItemList* children();
   TQColor backColor() const;
 
 private:
@@ -118,7 +118,7 @@ public:
   bool isMarked(int) const;
   TQString text(int) const;
   TQPixmap pixmap(int) const;
-  TreeMapItemList* tqchildren();
+  TreeMapItemList* children();
   TQColor backColor() const;
 
 private:
diff --git a/kcachegrind/kcachegrind/callview.cpp b/kcachegrind/kcachegrind/callview.cpp
index 2eb08f68..317d137b 100644
--- a/kcachegrind/kcachegrind/callview.cpp
+++ b/kcachegrind/kcachegrind/callview.cpp
@@ -121,11 +121,11 @@ void CallView::context(TQListViewItem* i, const TQPoint & p, int col)
     cycle = f->cycle();
 
     popup.insertItem(i18n("Go to '%1'")
-		     .tqarg(Configuration::shortenSymbol(name)), 93);
+		     .arg(Configuration::shortenSymbol(name)), 93);
 
     if (cycle) {
 	name = Configuration::shortenSymbol(cycle->prettyName());
-	popup.insertItem(i18n("Go to '%1'").tqarg(name), 94);
+	popup.insertItem(i18n("Go to '%1'").arg(name), 94);
     }
 
     popup.insertSeparator();
diff --git a/kcachegrind/kcachegrind/configdlg.cpp b/kcachegrind/kcachegrind/configdlg.cpp
index 7e56c686..e0b45470 100644
--- a/kcachegrind/kcachegrind/configdlg.cpp
+++ b/kcachegrind/kcachegrind/configdlg.cpp
@@ -210,7 +210,7 @@ bool ConfigDlg::configure(Configuration* c, TraceData* d, TQWidget* p)
       TQMessageBox::warning(p, i18n("KCachegrind Configuration"),
                            i18n("The Maximum Number of List Items should be below 500."
                                 "The previous set value (%1) will still be used.")
-                           .tqarg(TQString::number(c->_maxListCount)),
+                           .arg(TQString::number(c->_maxListCount)),
                            TQMessageBox::Ok, 0);
 
     c->_maxSymbolCount = dlg.symbolCount->text().toInt();
diff --git a/kcachegrind/kcachegrind/configdlgbase.ui b/kcachegrind/kcachegrind/configdlgbase.ui
index 9e5c0b59..dc0ee9ec 100644
--- a/kcachegrind/kcachegrind/configdlgbase.ui
+++ b/kcachegrind/kcachegrind/configdlgbase.ui
@@ -42,7 +42,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout10</cstring>
+                            <cstring>layout10</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -108,7 +108,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
@@ -186,7 +186,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -203,7 +203,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
@@ -228,7 +228,7 @@
                                         <property name="name">
                                             <cstring>classCombo</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>300</width>
                                                 <height>32767</height>
@@ -330,7 +330,7 @@
                                         <property name="name">
                                             <cstring>fileCombo</cstring>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>300</width>
                                                 <height>32767</height>
@@ -352,7 +352,7 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>300</width>
                                                 <height>32767</height>
@@ -381,7 +381,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout8</cstring>
+                            <cstring>layout8</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -425,7 +425,7 @@
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -441,7 +441,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
@@ -469,7 +469,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="0" column="2">
                                 <property name="name">
-                                    <cstring>tqlayout10</cstring>
+                                    <cstring>layout10</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -493,7 +493,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>49</height>
@@ -520,7 +520,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -570,7 +570,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>210</width>
                             <height>0</height>
diff --git a/kcachegrind/kcachegrind/configuration.cpp b/kcachegrind/kcachegrind/configuration.cpp
index 66abd563..02d5c096 100644
--- a/kcachegrind/kcachegrind/configuration.cpp
+++ b/kcachegrind/kcachegrind/configuration.cpp
@@ -132,9 +132,9 @@ void Configuration::saveOptions(KConfig* kconfig)
   int count = 1;
   for( ; it.current(); ++it ) {
     if ( !(*it)->automatic ) {
-      colorConfig.writeEntry( TQString("Name%1").tqarg(count),
+      colorConfig.writeEntry( TQString("Name%1").arg(count),
                               it.currentKey());
-      colorConfig.writeEntry( TQString("Color%1").tqarg(count),
+      colorConfig.writeEntry( TQString("Color%1").arg(count),
                               (*it)->color);
       //qDebug("Written Color %s (%d)", it.currentKey().ascii(), count);
 
@@ -149,9 +149,9 @@ void Configuration::saveOptions(KConfig* kconfig)
   TQDictIterator<TQStringList> it2( c->_objectSourceDirs );
   count = 1;
   for( ; it2.current(); ++it2 ) {
-    sourceConfig.writeEntry( TQString("Object%1").tqarg(count),
+    sourceConfig.writeEntry( TQString("Object%1").arg(count),
 			     it2.currentKey());
-    sourceConfig.writeEntry( TQString("Dirs%1").tqarg(count),
+    sourceConfig.writeEntry( TQString("Dirs%1").arg(count),
 			     *(*it2), ':');
     count++;
   }
@@ -176,15 +176,15 @@ void Configuration::saveOptions(KConfig* kconfig)
   ctConfig.writeEntry( "Count", ctCount);
   for (int i=0; i<ctCount; i++) {
     TraceCostType* t = TraceCostType::knownType(i);
-    ctConfig.writeEntry( TQString("Name%1").tqarg(i+1), t->name());
+    ctConfig.writeEntry( TQString("Name%1").arg(i+1), t->name());
 
     // Use localized key
     TraceItemView::writeConfigEntry(&ctConfig,
-                                    TQString("Longname%1").tqarg(i+1).ascii(),
+                                    TQString("Longname%1").arg(i+1).ascii(),
                                     t->longName(),
                                     knownLongName(t->name()).utf8().data() /*, true */ );
     TraceItemView::writeConfigEntry(&ctConfig,
-                                    TQString("Formula%1").tqarg(i+1).ascii(),
+                                    TQString("Formula%1").arg(i+1).ascii(),
                                     t->formula(), knownFormula(t->name()).utf8().data());
   }
 }
@@ -217,8 +217,8 @@ void Configuration::readOptions(KConfig* kconfig)
   KConfigGroup colorConfig(kconfig, TQCString("CostColors"));
   count = colorConfig.readNumEntry("Count", 0);
   for (i=1;i<=count;i++) {
-    TQString n = colorConfig.readEntry(TQString("Name%1").tqarg(i));
-    TQColor color = colorConfig.readColorEntry(TQString("Color%1").tqarg(i));
+    TQString n = colorConfig.readEntry(TQString("Name%1").arg(i));
+    TQColor color = colorConfig.readColorEntry(TQString("Color%1").arg(i));
 
     if (n.isEmpty()) continue;
 
@@ -241,8 +241,8 @@ void Configuration::readOptions(KConfig* kconfig)
   c->_objectSourceDirs.clear();
   if (count>17) c->_objectSourceDirs.resize(count);
   for (i=1;i<=count;i++) {
-    TQString n = sourceConfig.readEntry(TQString("Object%1").tqarg(i));
-    dirs = sourceConfig.readListEntry(TQString("Dirs%1").tqarg(i), ':');
+    TQString n = sourceConfig.readEntry(TQString("Object%1").arg(i));
+    dirs = sourceConfig.readListEntry(TQString("Dirs%1").arg(i), ':');
 
     if (n.isEmpty() || (dirs.count()==0)) continue;
 
@@ -271,10 +271,10 @@ void Configuration::readOptions(KConfig* kconfig)
     int ctCount = ctConfig.readNumEntry("Count", 0);
     if (ctCount>0) {
       for (int i=1;i<=ctCount;i++) {
-        TQString n = ctConfig.readEntry(TQString("Name%1").tqarg(i));
-        TQString l = ctConfig.readEntry(TQString("Longname%1").tqarg(i));
+        TQString n = ctConfig.readEntry(TQString("Name%1").arg(i));
+        TQString l = ctConfig.readEntry(TQString("Longname%1").arg(i));
 	if (l.isEmpty()) l = knownLongName(n);
-        TQString f = ctConfig.readEntry(TQString("Formula%1").tqarg(i));
+        TQString f = ctConfig.readEntry(TQString("Formula%1").arg(i));
 	if (f.isEmpty()) f = knownFormula(n);
 
         TraceCostType::add(new TraceCostType(n, l, f));
@@ -316,7 +316,7 @@ TQColor Configuration::costTypeColor(TraceCostType* t)
    if (!t)
      n = TQString("CostType-default");
    else
-     n = TQString("CostType-%1").tqarg(t->name());
+     n = TQString("CostType-%1").arg(t->name());
 
    return color(n)->color;
 }
diff --git a/kcachegrind/kcachegrind/costlistitem.cpp b/kcachegrind/kcachegrind/costlistitem.cpp
index 3129838a..1e777b05 100644
--- a/kcachegrind/kcachegrind/costlistitem.cpp
+++ b/kcachegrind/kcachegrind/costlistitem.cpp
@@ -71,7 +71,7 @@ void CostListItem::updateName()
   if (!_costItem) return;
 
   TQString n = _costItem->prettyName();
-  if (_groupSize>=0) n += TQString(" (%1)").tqarg(_groupSize);
+  if (_groupSize>=0) n += TQString(" (%1)").arg(_groupSize);
 
   setText(1, n);
 }
@@ -98,13 +98,13 @@ void CostListItem::update()
   double pure  = 100.0 * _pure / total;
   TQString str;
   if (Configuration::showPercentage())
-    str = TQString("%1").tqarg(pure, 0, 'f', Configuration::percentPrecision());
+    str = TQString("%1").arg(pure, 0, 'f', Configuration::percentPrecision());
   else
     str = _costItem->prettySubCost(_costType);
 
   if (_skipped) {
     // special handling for skip entries...
-    setText(0, TQString("< %1").tqarg(str));
+    setText(0, TQString("< %1").arg(str));
     return;
   }
 
diff --git a/kcachegrind/kcachegrind/costtypeitem.cpp b/kcachegrind/kcachegrind/costtypeitem.cpp
index df5bf35a..dc35cb2b 100644
--- a/kcachegrind/kcachegrind/costtypeitem.cpp
+++ b/kcachegrind/kcachegrind/costtypeitem.cpp
@@ -104,7 +104,7 @@ void CostTypeItem::update()
   double pure  = 100.0 * _pure / selfTotal;
   if (Configuration::showPercentage()) {
     setText(2, TQString("%1")
-            .tqarg(pure, 0, 'f', Configuration::percentPrecision()));
+            .arg(pure, 0, 'f', Configuration::percentPrecision()));
   }
   else
     setText(2, _costItem->prettySubCost(_costType));
@@ -121,7 +121,7 @@ void CostTypeItem::update()
   double sum  = 100.0 * _sum / total;
   if (Configuration::showPercentage()) {
     setText(1, TQString("%1")
-            .tqarg(sum, 0, 'f', Configuration::percentPrecision()));
+            .arg(sum, 0, 'f', Configuration::percentPrecision()));
   }
   else
     setText(1, _sum.pretty());
diff --git a/kcachegrind/kcachegrind/costtypeview.cpp b/kcachegrind/kcachegrind/costtypeview.cpp
index d4087eba..3f5417e9 100644
--- a/kcachegrind/kcachegrind/costtypeview.cpp
+++ b/kcachegrind/kcachegrind/costtypeview.cpp
@@ -146,13 +146,13 @@ void CostTypeView::context(TQListViewItem* i, const TQPoint & p, int)
   else if (r == 97) {
     int i = 1;
     while(1) {
-      if (!TraceCostType::knownVirtualType(i18n("New%1").tqarg(i)))
+      if (!TraceCostType::knownVirtualType(i18n("New%1").arg(i)))
 	break;
       i++;
     }
     // add same new cost type to this mapping and to known types
-    TQString shortName = i18n("New%1").tqarg(i);
-    TQString longName  = i18n("New Cost Type %1").tqarg(i);
+    TQString shortName = i18n("New%1").arg(i);
+    TQString longName  = i18n("New Cost Type %1").arg(i);
     TraceCostType::add(new TraceCostType(shortName, longName, "0"));
     _data->mapping()->add(new TraceCostType(shortName, longName, "0"));
     refresh();
diff --git a/kcachegrind/kcachegrind/coverage.cpp b/kcachegrind/kcachegrind/coverage.cpp
index dc4a9764..86e6f7ff 100644
--- a/kcachegrind/kcachegrind/coverage.cpp
+++ b/kcachegrind/kcachegrind/coverage.cpp
@@ -81,7 +81,7 @@ int Coverage::selfMedian()
 TraceFunctionList Coverage::coverage(TraceFunction* f, CoverageMode m,
                                       TraceCostType* ct)
 {
-  tqinvalidate(f->data(), Coverage::Rtti);
+  invalidate(f->data(), Coverage::Rtti);
 
   _costType = ct;
 
diff --git a/kcachegrind/kcachegrind/coverageitem.cpp b/kcachegrind/kcachegrind/coverageitem.cpp
index 569359a8..26e5b36e 100644
--- a/kcachegrind/kcachegrind/coverageitem.cpp
+++ b/kcachegrind/kcachegrind/coverageitem.cpp
@@ -97,12 +97,12 @@ void CallerCoverageItem::update()
   _sum = SubCost(realSum * _coverage->inclusive());
   TQString str;
   if (Configuration::showPercentage())
-    str = TQString("%1").tqarg(_pSum, 0, 'f', Configuration::percentPrecision());
+    str = TQString("%1").arg(_pSum, 0, 'f', Configuration::percentPrecision());
   else
     str = _sum.pretty();
 
   if (_skipped) {
-    setText(0, TQString("< %1").tqarg(str));
+    setText(0, TQString("< %1").arg(str));
     return;
   }
 
@@ -121,9 +121,9 @@ void CallerCoverageItem::update()
     distString = TQString::number(_distance);
   else
     distString = TQString("%1-%2 (%3)")
-                 .tqarg(_coverage->minDistance())
-                 .tqarg(_coverage->maxDistance())
-                 .tqarg(_distance);
+                 .arg(_coverage->minDistance())
+                 .arg(_coverage->maxDistance())
+                 .arg(_distance);
   setText(1, distString);
 }
 
@@ -242,12 +242,12 @@ void CalleeCoverageItem::update()
 
   TQString str;
   if (Configuration::showPercentage())
-    str = TQString("%1").tqarg(_pSum, 0, 'f', Configuration::percentPrecision());
+    str = TQString("%1").arg(_pSum, 0, 'f', Configuration::percentPrecision());
   else
     str = _sum.pretty();
 
   if (_skipped) {
-    str = TQString("< %1").tqarg(str);
+    str = TQString("< %1").arg(str);
     setText(0, str);
     setText(1, str);
     return;
@@ -259,7 +259,7 @@ void CalleeCoverageItem::update()
 
  if (Configuration::showPercentage()) {
     setText(1, TQString("%1")
-            .tqarg(_pSelf, 0, 'f', Configuration::percentPrecision()));
+            .arg(_pSelf, 0, 'f', Configuration::percentPrecision()));
   }
   else {
     setText(1, _self.pretty());
@@ -285,12 +285,12 @@ void CalleeCoverageItem::update()
     if (_distance == sMed)
       med = TQString::number(_distance);
     else
-      med = TQString("%1/%2").tqarg(_distance).tqarg(sMed);
+      med = TQString("%1/%2").arg(_distance).arg(sMed);
 
     distString = TQString("%1-%2 (%3)")
-                 .tqarg(_coverage->minDistance())
-                 .tqarg(_coverage->maxDistance())
-                 .tqarg(med);
+                 .arg(_coverage->minDistance())
+                 .arg(_coverage->maxDistance())
+                 .arg(med);
   }
   setText(2, distString);
 }
diff --git a/kcachegrind/kcachegrind/coverageview.cpp b/kcachegrind/kcachegrind/coverageview.cpp
index 6243d8af..6657e923 100644
--- a/kcachegrind/kcachegrind/coverageview.cpp
+++ b/kcachegrind/kcachegrind/coverageview.cpp
@@ -163,7 +163,7 @@ void CoverageView::context(TQListViewItem* i, const TQPoint & p, int c)
     TQString name = f->name();
     if ((int)name.length()>Configuration::maxSymbolLength())
 	name = name.left(Configuration::maxSymbolLength()) + "...";
-    popup.insertItem(i18n("Go to '%1'").tqarg(name), 93);
+    popup.insertItem(i18n("Go to '%1'").arg(name), 93);
     popup.insertSeparator();
   }
 
diff --git a/kcachegrind/kcachegrind/dumpselectionbase.ui b/kcachegrind/kcachegrind/dumpselectionbase.ui
index 0643eed7..b8ad1b0c 100644
--- a/kcachegrind/kcachegrind/dumpselectionbase.ui
+++ b/kcachegrind/kcachegrind/dumpselectionbase.ui
@@ -477,7 +477,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -493,7 +493,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>21</width>
                                             <height>20</height>
@@ -586,7 +586,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout7</cstring>
+                                <cstring>layout7</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -602,7 +602,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>50</width>
                                             <height>20</height>
@@ -642,7 +642,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -868,7 +868,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -962,7 +962,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -986,7 +986,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -1031,7 +1031,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -1055,7 +1055,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>21</width>
                                             <height>20</height>
diff --git a/kcachegrind/kcachegrind/functionitem.cpp b/kcachegrind/kcachegrind/functionitem.cpp
index 9df7e651..3b694ddf 100644
--- a/kcachegrind/kcachegrind/functionitem.cpp
+++ b/kcachegrind/kcachegrind/functionitem.cpp
@@ -103,7 +103,7 @@ void  FunctionItem::setGroupType(TraceCost::CostType gt)
 
 #if 0
   _groupPixValid = false;
-  viewList()->tqrepaint();
+  viewList()->repaint();
 #else
   TQColor c = Configuration::functionColor(_groupType, _function);
   setPixmap(3, colorPixmap(10, 10, c));
@@ -141,7 +141,7 @@ void FunctionItem::update()
     _sum  = _function->inclusive()->subCost(_costType);
     double incl  = 100.0 * _sum / inclTotal;
     if (Configuration::showPercentage())
-      str = TQString("%1").tqarg(incl, 0, 'f', Configuration::percentPrecision());
+      str = TQString("%1").arg(incl, 0, 'f', Configuration::percentPrecision());
     else
       str = _function->inclusive()->prettySubCost(_costType);
     str = "< " + str;
@@ -171,7 +171,7 @@ void FunctionItem::update()
       double incl  = 100.0 * _sum / inclTotal;
       if (Configuration::showPercentage())
 	  setText(0, TQString("%1")
-		  .tqarg(incl, 0, 'f', Configuration::percentPrecision()));
+		  .arg(incl, 0, 'f', Configuration::percentPrecision()));
       else
 	  setText(0, _function->inclusive()->prettySubCost(_costType));
 
@@ -189,7 +189,7 @@ void FunctionItem::update()
 
       if (Configuration::showPercentage())
 	  setText(1, TQString("%1")
-		  .tqarg(self, 0, 'f', Configuration::percentPrecision()));
+		  .arg(self, 0, 'f', Configuration::percentPrecision()));
       else
 	  setText(1, _function->prettySubCost(_costType));
 
diff --git a/kcachegrind/kcachegrind/functionselection.cpp b/kcachegrind/kcachegrind/functionselection.cpp
index 437a17bf..c5646dd6 100644
--- a/kcachegrind/kcachegrind/functionselection.cpp
+++ b/kcachegrind/kcachegrind/functionselection.cpp
@@ -173,7 +173,7 @@ void FunctionSelection::functionContext(TQListViewItem* i,
   if (i) {
       f = ((FunctionItem*) i)->function();
       if (f) {
-	  popup.insertItem(i18n("Go to %1").tqarg(f->prettyName()), 93);
+	  popup.insertItem(i18n("Go to %1").arg(f->prettyName()), 93);
 	  popup.insertSeparator();
       }
   }
@@ -417,7 +417,7 @@ void FunctionSelection::refresh()
     if (!_data || _data->parts().count()==0) {
 	functionList->clear();
 	groupList->setUpdatesEnabled(true);
-	groupList->tqrepaint();
+	groupList->repaint();
 
 	// this clears all other lists
 	functionList->setSelected(functionList->firstChild(), true);
@@ -547,9 +547,9 @@ void FunctionSelection::refresh()
 	functionList->clearSelection();
 
       //functionList->setUpdatesEnabled(true);
-      //functionList->tqrepaint();
+      //functionList->repaint();
       groupList->setUpdatesEnabled(true);
-      groupList->tqrepaint();
+      groupList->repaint();
       return;
     }
   }
@@ -581,7 +581,7 @@ void FunctionSelection::refresh()
     groupList->clearSelection();
 
   groupList->setUpdatesEnabled(true);
-  groupList->tqrepaint();
+  groupList->repaint();
 }
 
 
@@ -628,7 +628,7 @@ void FunctionSelection::groupSelected(TQListViewItem* i)
 #if 0
   if (total == 0.0) {
       functionList->setUpdatesEnabled(true);
-      functionList->tqrepaint();
+      functionList->repaint();
       return;
   }
 #endif
@@ -668,7 +668,7 @@ void FunctionSelection::groupSelected(TQListViewItem* i)
   }
 
   //functionList->setUpdatesEnabled(true);
-  //functionList->tqrepaint();
+  //functionList->repaint();
 
   // Don't emit signal if cost item was changed programatically
   if (!_inSetGroup) {
diff --git a/kcachegrind/kcachegrind/functionselectionbase.ui b/kcachegrind/kcachegrind/functionselectionbase.ui
index 3ab3378d..eec019db 100644
--- a/kcachegrind/kcachegrind/functionselectionbase.ui
+++ b/kcachegrind/kcachegrind/functionselectionbase.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -90,7 +90,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>32767</width>
                     <height>150</height>
diff --git a/kcachegrind/kcachegrind/instritem.cpp b/kcachegrind/kcachegrind/instritem.cpp
index 81341672..ce5e81bb 100644
--- a/kcachegrind/kcachegrind/instritem.cpp
+++ b/kcachegrind/kcachegrind/instritem.cpp
@@ -107,7 +107,7 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
   else
     templ += i18n("%n call to '%1'", "%n calls to '%1'", cc);
 
-  TQString callStr = templ.tqarg(_instrCall->call()->calledName());
+  TQString callStr = templ.arg(_instrCall->call()->calledName());
   TraceFunction* calledF = _instrCall->call()->called();
   calledF->addPrettyLocation(callStr);
 
@@ -135,13 +135,13 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr,
   TQString jStr;
   if (_instrJump->isCondJump())
       jStr = i18n("Jump %1 of %2 times to 0x%3")
-	  .tqarg(_instrJump->followedCount().pretty())
-	  .tqarg(_instrJump->executedCount().pretty())
-	  .tqarg(_instrJump->instrTo()->addr().toString());
+	  .arg(_instrJump->followedCount().pretty())
+	  .arg(_instrJump->executedCount().pretty())
+	  .arg(_instrJump->instrTo()->addr().toString());
   else
       jStr = i18n("Jump %1 times to 0x%2")
-	  .tqarg(_instrJump->executedCount().pretty())
-	  .tqarg(_instrJump->instrTo()->addr().toString());
+	  .arg(_instrJump->executedCount().pretty())
+	  .arg(_instrJump->instrTo()->addr().toString());
 
   setText(6, jStr);
 
@@ -209,7 +209,7 @@ void InstrItem::updateCost()
 
     if (Configuration::showPercentage())
       setText(1, TQString("%1")
-	      .tqarg(pure, 0, 'f', Configuration::percentPrecision()));
+	      .arg(pure, 0, 'f', Configuration::percentPrecision()));
     else
       setText(1, _pure.pretty());
     
@@ -228,7 +228,7 @@ void InstrItem::updateCost()
 
     if (Configuration::showPercentage())
       setText(2, TQString("%1")
-	      .tqarg(pure, 0, 'f', Configuration::percentPrecision()));
+	      .arg(pure, 0, 'f', Configuration::percentPrecision()));
     else
       setText(2, _pure2.pretty());
     
@@ -297,7 +297,7 @@ int InstrItem::compare(TQListViewItem * i, int col, bool ascending ) const
 }
 
 void InstrItem::paintCell( TQPainter *p, const TQColorGroup &cg,
-			   int column, int width, int tqalignment )
+			   int column, int width, int alignment )
 {
   TQColorGroup _cg( cg );
 
@@ -309,7 +309,7 @@ void InstrItem::paintCell( TQPainter *p, const TQColorGroup &cg,
   if (column == 3)
     paintArrows(p, _cg, width);
   else
-    TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+    TQListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 void InstrItem::setJumpArray(const TQMemArray<TraceInstrJump*>& a)
@@ -326,7 +326,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
   const BackgroundMode bgmode = lv->viewport()->backgroundMode();
   const TQColorGroup::ColorRole crole
     = TQPalette::backgroundRoleFromMode( bgmode );
-  if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
+  if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) )
     p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
   else
     iv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
@@ -373,7 +373,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
 	  p->fillRect( marg + 6*i-2, (y1==0) ? y1: y1-2,
 		       8, (y2-y1==height())? y2:y2+2,
 		       cg.brush( TQColorGroup::Highlight ) );
-	  c = lv->tqcolorGroup().highlightedText();
+	  c = lv->colorGroup().highlightedText();
       }
 #endif
       p->fillRect( marg + 6*i, y1, 4, y2, c);
@@ -388,7 +388,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
   if (start >= 0) {
 #if 0
       if (_jump[start] == ((TraceItemView*)_view)->selectedItem()) {	  
-	  c = lv->tqcolorGroup().highlightedText();
+	  c = lv->colorGroup().highlightedText();
       }
 #endif
       c = _jump[start]->isCondJump() ? red : blue;
@@ -416,13 +416,13 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
       p->drawConvexPolygon(a);
 
       p->setPen(c.light());
-      p->tqdrawPolyline(a, 0, 5);
+      p->drawPolyline(a, 0, 5);
       p->setPen(c.dark());
-      p->tqdrawPolyline(a, 4, 2);
+      p->drawPolyline(a, 4, 2);
       p->setPen(c.light());
-      p->tqdrawPolyline(a, 5, 2);
+      p->drawPolyline(a, 5, 2);
       p->setPen(c.dark());
-      p->tqdrawPolyline(a, 6, 2);
+      p->drawPolyline(a, 6, 2);
   }
 
   // draw inner vertical line for start/stop
diff --git a/kcachegrind/kcachegrind/instritem.h b/kcachegrind/kcachegrind/instritem.h
index e521ebe0..2bbce71f 100644
--- a/kcachegrind/kcachegrind/instritem.h
+++ b/kcachegrind/kcachegrind/instritem.h
@@ -58,7 +58,7 @@ public:
   int compare(TQListViewItem * i, int col, bool ascending ) const;
 
   void paintCell(TQPainter *p, const TQColorGroup &cg,
-                 int column, int width, int tqalignment );
+                 int column, int width, int alignment );
   int width( const TQFontMetrics& fm,
              const TQListView* lv, int c ) const;
 
diff --git a/kcachegrind/kcachegrind/instrview.cpp b/kcachegrind/kcachegrind/instrview.cpp
index 39bd9b0b..3df16793 100644
--- a/kcachegrind/kcachegrind/instrview.cpp
+++ b/kcachegrind/kcachegrind/instrview.cpp
@@ -188,11 +188,11 @@ void InstrView::context(TQListViewItem* i, const TQPoint & p, int c)
     TQString name = f->name();
     if ((int)name.length()>Configuration::maxSymbolLength())
       name = name.left(Configuration::maxSymbolLength()) + "...";
-    popup.insertItem(i18n("Go to '%1'").tqarg(name), 93);
+    popup.insertItem(i18n("Go to '%1'").arg(name), 93);
     popup.insertSeparator();
   }
   else if (instr) {
-    popup.insertItem(i18n("Go to Address %1").tqarg(instr->name()), 93);
+    popup.insertItem(i18n("Go to Address %1").arg(instr->name()), 93);
     popup.insertSeparator();
   }
 
@@ -618,8 +618,8 @@ bool InstrView::fillInstrRange(TraceFunction* function,
     objfile = objfile.replace(TQRegExp("[\"']"), ""); // security...
     popencmd = TQString("objdump -C -d "
                        "--start-address=0x%1 --stop-address=0x%2 \"%3\"")
-	.tqarg(dumpStartAddr.toString()).tqarg(dumpEndAddr.toString())
-	.tqarg(objfile);
+	.arg(dumpStartAddr.toString()).arg(dumpEndAddr.toString())
+	.arg(objfile);
     if (1) qDebug("Running '%s'...", popencmd.ascii());
 
     // and run...
@@ -875,7 +875,7 @@ bool InstrView::fillInstrRange(TraceFunction* function,
                            "There are %n cost lines without assembler code.", noAssLines));
 	new InstrItem(this, this, 2,
 		      i18n("This happens because the code of"));
-	new InstrItem(this, this, 3, TQString("        %1").tqarg(objfile));
+	new InstrItem(this, this, 3, TQString("        %1").arg(objfile));
 	new InstrItem(this, this, 4,
 		      i18n("does not seem to match the profile data file."));
 	new InstrItem(this, this, 5, "");
diff --git a/kcachegrind/kcachegrind/loader.h b/kcachegrind/kcachegrind/loader.h
index ee374054..f79f13d0 100644
--- a/kcachegrind/kcachegrind/loader.h
+++ b/kcachegrind/kcachegrind/loader.h
@@ -67,7 +67,7 @@ public:
   TQString description() const { return _description; }
 
 signals:
-  void updatetqStatus(TQString, int);
+  void updateStatus(TQString, int);
 
 private:
   TQString _name, _description;
diff --git a/kcachegrind/kcachegrind/multiview.cpp b/kcachegrind/kcachegrind/multiview.cpp
index 18148927..4288e2df 100644
--- a/kcachegrind/kcachegrind/multiview.cpp
+++ b/kcachegrind/kcachegrind/multiview.cpp
@@ -65,7 +65,7 @@ void MultiView::appendView()
     int n = _views.count()+1;
 
     TabView* tv = new TabView(this, this,
-			      TQString("TabView-%1").tqarg(n).ascii());
+			      TQString("TabView-%1").arg(n).ascii());
     connect(tv, TQT_SIGNAL(activated(TabView*)),
 	    this, TQT_SLOT(tabActivated(TabView*)) );
     _views.append(tv);
@@ -187,7 +187,7 @@ void MultiView::readViewConfig(KConfig* c,
   TabView* tv, *activeTV = 0;
   for(tv=_views.first();tv;tv=_views.next()) {
     if (tv->name() == active) activeTV=tv;
-    tv->readViewConfig(c, TQString("%1-%2").tqarg(prefix).tqarg(tv->name()),
+    tv->readViewConfig(c, TQString("%1-%2").arg(prefix).arg(tv->name()),
 		       postfix, withOptions);
   }
 
@@ -216,7 +216,7 @@ void MultiView::saveViewConfig(KConfig* c,
 
   TabView* tv;
   for(tv=_views.first();tv;tv=_views.next())
-    tv->saveViewConfig(c, TQString("%1-%2").tqarg(prefix).tqarg(tv->name()),
+    tv->saveViewConfig(c, TQString("%1-%2").arg(prefix).arg(tv->name()),
 		       postfix, withOptions);
 }
 
diff --git a/kcachegrind/kcachegrind/partgraph.cpp b/kcachegrind/kcachegrind/partgraph.cpp
index 47bda4c9..a20f53dc 100644
--- a/kcachegrind/kcachegrind/partgraph.cpp
+++ b/kcachegrind/kcachegrind/partgraph.cpp
@@ -90,7 +90,7 @@ void PartAreaWidget::refreshParts()
 {
   // rebuild only subparts to keep part selection state
   TreeMapItem* i;
-  TreeMapItemList* l = base()->tqchildren();
+  TreeMapItemList* l = base()->children();
   if (l)
     for (i=l->first();i;i=l->next())
       i->refresh();
@@ -115,7 +115,7 @@ void PartAreaWidget::setGroupType(TraceCost::CostType gt)
   // rebuild hierarchy below parts.
   // thus, selected parts stay selected
   TreeMapItem* i;
-  TreeMapItemList* l = base()->tqchildren();
+  TreeMapItemList* l = base()->children();
   if (l)
     for (i=l->first();i;i=l->next())
       i->refresh();
@@ -131,7 +131,7 @@ bool PartAreaWidget::isHidden(TracePart* part) const
 TQColor PartAreaWidget::groupColor(TraceFunction* f) const
 {
   if (!f)
-    return tqcolorGroup().button();
+    return colorGroup().button();
 
   return Configuration::functionColor(_groupType, f);
 }
@@ -164,7 +164,7 @@ TQString PartAreaWidget::tipString(TreeMapItem* i) const
   while (i && i->rtti()==3) i = i->parent();
 
   if (i && i->rtti()==2) {
-    itemTip = i18n("Profile Part %1").tqarg(i->text(0));
+    itemTip = i18n("Profile Part %1").arg(i->text(0));
     if (!i->text(1).isEmpty())
         itemTip += " (" + i->text(1) + ")";
 
@@ -201,9 +201,9 @@ void BasePartItem::setData(TraceData* data)
   refresh();
 }
 
-TreeMapItemList* BasePartItem::tqchildren()
+TreeMapItemList* BasePartItem::children()
 {
-  if (!_data) return _tqchildren;
+  if (!_data) return _children;
 
   if (!initialized()) {
 //    qDebug("Create Parts (%s)", name().ascii());
@@ -216,7 +216,7 @@ TreeMapItemList* BasePartItem::tqchildren()
         addItem(new PartItem(part));
   }
 
-  return _tqchildren;
+  return _children;
 }
 
 TQString BasePartItem::text(int textNo) const
@@ -234,7 +234,7 @@ TQString BasePartItem::text(int textNo) const
 
 TQColor BasePartItem::backColor() const
 {
-  return widget()->tqcolorGroup().base();
+  return widget()->colorGroup().base();
 }
 
 double BasePartItem::value() const
@@ -276,7 +276,7 @@ TQString PartItem::text(int textNo) const
     TraceCost* t = _p->data()->totals();
     double p  = 100.0 * v / t->subCost(ct);
     return TQString("%1 %")
-      .tqarg(p, 0, 'f', Configuration::percentPrecision());
+      .arg(p, 0, 'f', Configuration::percentPrecision());
   }
   return v.pretty();
 }
@@ -324,9 +324,9 @@ double PartItem::sum() const
   return 0.0;
 }
 
-TreeMapItemList* PartItem::tqchildren()
+TreeMapItemList* PartItem::children()
 {
-  if (initialized()) return _tqchildren;
+  if (initialized()) return _children;
 
   TraceCost* c;
 //    qDebug("Create Part subitems (%s)", name().ascii());
@@ -339,7 +339,7 @@ TreeMapItemList* PartItem::tqchildren()
       if (c) addItem(new SubPartItem(c));
     }
 
-    return _tqchildren;
+    return _children;
   }
 
 
@@ -397,7 +397,7 @@ TreeMapItemList* PartItem::tqchildren()
     break;
   }
 
-  return _tqchildren;
+  return _children;
 }
 
 
@@ -443,7 +443,7 @@ TQString SubPartItem::text(int textNo) const
 	_partCostItem->part() : _partCostItem->part()->data()->totals();
     double p  = 100.0 * v / t->subCost(ct);
     return TQString("%1 %")
-      .tqarg(p, 0, 'f', Configuration::percentPrecision());
+      .arg(p, 0, 'f', Configuration::percentPrecision());
   }
   return v.pretty();
 }
@@ -491,7 +491,7 @@ double SubPartItem::sum() const
   return 0.0;
 }
 
-TreeMapItemList* SubPartItem::tqchildren()
+TreeMapItemList* SubPartItem::children()
 {
   if (!initialized()) {
 //    qDebug("Create Part sub-subitems (%s)", name().ascii());
@@ -499,7 +499,7 @@ TreeMapItemList* SubPartItem::tqchildren()
     PartAreaWidget* w = (PartAreaWidget*)widget();
 
     if (depth()-2 > w->callLevels())
-      return _tqchildren;
+      return _children;
 
     if (w->visualisation() == PartAreaWidget::Inclusive) {
       TracePartCall* call;
@@ -517,7 +517,7 @@ TreeMapItemList* SubPartItem::tqchildren()
     }
   }
 
-  return _tqchildren;
+  return _children;
 }
 
 
diff --git a/kcachegrind/kcachegrind/partgraph.h b/kcachegrind/kcachegrind/partgraph.h
index f8ad4ccd..f28f12eb 100644
--- a/kcachegrind/kcachegrind/partgraph.h
+++ b/kcachegrind/kcachegrind/partgraph.h
@@ -83,7 +83,7 @@ public:
   double value() const;
   TQString text(int) const;
   int borderWidth() const { return 0; }
-  TreeMapItemList* tqchildren();
+  TreeMapItemList* children();
   TQColor backColor() const;
 
 private:
@@ -101,7 +101,7 @@ public:
   int borderWidth() const { return 0; }
   TQString text(int) const;
   TQPixmap pixmap(int) const;
-  TreeMapItemList* tqchildren();
+  TreeMapItemList* children();
   TQColor backColor() const;
 
 private:
@@ -120,7 +120,7 @@ public:
   SplitMode splitMode() const { return Vertical; }
   TQString text(int) const;
   TQPixmap pixmap(int) const;
-  TreeMapItemList* tqchildren();
+  TreeMapItemList* children();
   TQColor backColor() const;
 
 private:
diff --git a/kcachegrind/kcachegrind/partlistitem.cpp b/kcachegrind/kcachegrind/partlistitem.cpp
index debea16a..40c2db36 100644
--- a/kcachegrind/kcachegrind/partlistitem.cpp
+++ b/kcachegrind/kcachegrind/partlistitem.cpp
@@ -46,7 +46,7 @@ PartListItem::PartListItem(TQListView* parent, TraceCostItem* costItem,
 #if 0
   TQString partName = TQString::number(part->partNumber());
   if (part->data()->maxThreadID() >1)
-      partName += i18n(" (Thread %1)").tqarg(part->threadID());
+      partName += i18n(" (Thread %1)").arg(part->threadID());
   setText(0, partName);
 #else
   setText(0, _part->prettyName());
@@ -107,7 +107,7 @@ void PartListItem::update()
     double pure  = 100.0 * _pure / selfTotal;
     if (Configuration::showPercentage()) {
       setText(2, TQString("%1")
-              .tqarg(pure, 0, 'f', Configuration::percentPrecision()));
+              .arg(pure, 0, 'f', Configuration::percentPrecision()));
     }
     else
       setText(2, _partCostItem->prettySubCost(_costType));
@@ -123,7 +123,7 @@ void PartListItem::update()
     double sum  = 100.0 * _sum / total;
     if (Configuration::showPercentage()) {
       setText(1, TQString("%1")
-              .tqarg(sum, 0, 'f', Configuration::percentPrecision()));
+              .arg(sum, 0, 'f', Configuration::percentPrecision()));
     }
     else
       setText(1, _sum.pretty());
diff --git a/kcachegrind/kcachegrind/partselection.cpp b/kcachegrind/kcachegrind/partselection.cpp
index c501702d..f385e62e 100644
--- a/kcachegrind/kcachegrind/partselection.cpp
+++ b/kcachegrind/kcachegrind/partselection.cpp
@@ -27,7 +27,7 @@
 #include <tqcombobox.h>
 #include <tqlineedit.h>
 #include <tqpopupmenu.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kconfig.h>
@@ -148,7 +148,7 @@ void PartSelection::currentChangedSlot(TreeMapItem* i, bool kbd)
   TQString str = i->text(0);
   if (!i->text(1).isEmpty())
     str += " (" + i->text(1) + ")";
-  TQString msg = i18n("Profile Part Overview: Current is '%1'").tqarg(str);
+  TQString msg = i18n("Profile Part Overview: Current is '%1'").arg(str);
   emit showMessage(msg, 5000);
 
   if (_showInfo) fillInfo();
@@ -203,7 +203,7 @@ void PartSelection::selectionChanged()
   TracePart* part;
 
   // if nothing is selected, activate all parts
-  TreeMapItemList* list = partAreaWidget->base()->tqchildren();
+  TreeMapItemList* list = partAreaWidget->base()->children();
   if (!list) return;
 
   for (i=list->first();i;i=list->next())
@@ -235,7 +235,7 @@ void PartSelection::activePartsChangedSlot(const TracePartList& list)
   kdDebug() << "Entering PartSelection::activePartsChangedSlot" << endl;
 
   TreeMapItem* i;
-  TreeMapItemList l = *partAreaWidget->base()->tqchildren();
+  TreeMapItemList l = *partAreaWidget->base()->children();
   // first deselect inactive, then select active (makes current active)
   for (i=l.first();i;i=l.next()) {
     TracePart* part = ((PartItem*)i)->part();
@@ -381,7 +381,7 @@ void PartSelection::contextMenuRequested(TreeMapItem* i,
   case 2:
     // select all parts
   {
-    TreeMapItemList list = *partAreaWidget->base()->tqchildren();
+    TreeMapItemList list = *partAreaWidget->base()->children();
     partAreaWidget->setRangeSelection(list.first(), list.last(), true);
   }
   break;
diff --git a/kcachegrind/kcachegrind/partselectionbase.ui b/kcachegrind/kcachegrind/partselectionbase.ui
index 5ee69746..53320d5b 100644
--- a/kcachegrind/kcachegrind/partselectionbase.ui
+++ b/kcachegrind/kcachegrind/partselectionbase.ui
@@ -37,7 +37,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>50</height>
diff --git a/kcachegrind/kcachegrind/partview.cpp b/kcachegrind/kcachegrind/partview.cpp
index 853e9928..3f344bbc 100644
--- a/kcachegrind/kcachegrind/partview.cpp
+++ b/kcachegrind/kcachegrind/partview.cpp
@@ -103,8 +103,8 @@ void PartView::context(TQListViewItem* i, const TQPoint & pos, int)
   TracePart* p = i ? ((PartListItem*) i)->part() : 0;
 
   if (p) {
-    popup.insertItem(i18n("Select '%1'").tqarg(p->name()), 93);
-    popup.insertItem(i18n("Hide '%1'").tqarg(p->name()), 94);
+    popup.insertItem(i18n("Select '%1'").arg(p->name()), 93);
+    popup.insertItem(i18n("Hide '%1'").arg(p->name()), 94);
     popup.insertSeparator();
   }
 
diff --git a/kcachegrind/kcachegrind/sourceitem.cpp b/kcachegrind/kcachegrind/sourceitem.cpp
index 9556c038..305b8244 100644
--- a/kcachegrind/kcachegrind/sourceitem.cpp
+++ b/kcachegrind/kcachegrind/sourceitem.cpp
@@ -87,7 +87,7 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent,
   else
     templ += i18n("%n call to '%1'", "%n calls to '%1'", cc);
 
-  TQString callStr = templ.tqarg(_lineCall->call()->calledName());
+  TQString callStr = templ.arg(_lineCall->call()->calledName());
   TraceFunction* calledF = _lineCall->call()->called();
   calledF->addPrettyLocation(callStr);
 
@@ -123,13 +123,13 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent,
   TQString jStr;
   if (_lineJump->isCondJump())
       jStr = i18n("Jump %1 of %2 times to %3")
-	  .tqarg(_lineJump->followedCount().pretty())
-	  .tqarg(_lineJump->executedCount().pretty())
-	  .tqarg(to);
+	  .arg(_lineJump->followedCount().pretty())
+	  .arg(_lineJump->executedCount().pretty())
+	  .arg(to);
   else
       jStr = i18n("Jump %1 times to %2")
-	  .tqarg(_lineJump->executedCount().pretty())
-	  .tqarg(to);
+	  .arg(_lineJump->executedCount().pretty())
+	  .arg(to);
 
   setText(4, jStr);
 }
@@ -193,7 +193,7 @@ void SourceItem::updateCost()
 
     if (Configuration::showPercentage())
       setText(1, TQString("%1")
-	      .tqarg(pure, 0, 'f', Configuration::percentPrecision()));
+	      .arg(pure, 0, 'f', Configuration::percentPrecision()));
     else
       setText(1, _pure.pretty());
 
@@ -212,7 +212,7 @@ void SourceItem::updateCost()
 
     if (Configuration::showPercentage())
       setText(2, TQString("%1")
-	      .tqarg(pure2, 0, 'f', Configuration::percentPrecision()));
+	      .arg(pure2, 0, 'f', Configuration::percentPrecision()));
     else
       setText(2, _pure2.pretty());
 
@@ -285,7 +285,7 @@ int SourceItem::compare(TQListViewItem * i, int col, bool ascending ) const
 }
 
 void SourceItem::paintCell( TQPainter *p, const TQColorGroup &cg,
-                            int column, int width, int tqalignment )
+                            int column, int width, int alignment )
 {
   TQColorGroup _cg( cg );
 
@@ -297,7 +297,7 @@ void SourceItem::paintCell( TQPainter *p, const TQColorGroup &cg,
   if (column == 3)
       paintArrows(p, _cg, width);
   else
-      TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+      TQListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 void SourceItem::setJumpArray(const TQMemArray<TraceLineJump*>& a)
@@ -314,7 +314,7 @@ void SourceItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
   const BackgroundMode bgmode = lv->viewport()->backgroundMode();
   const TQColorGroup::ColorRole crole
     = TQPalette::backgroundRoleFromMode( bgmode );
-  if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) )
+  if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) )
     p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
   else
     sv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
@@ -391,13 +391,13 @@ void SourceItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width)
       p->drawConvexPolygon(a);
 
       p->setPen(c.light());
-      p->tqdrawPolyline(a, 0, 5);
+      p->drawPolyline(a, 0, 5);
       p->setPen(c.dark());
-      p->tqdrawPolyline(a, 4, 2);
+      p->drawPolyline(a, 4, 2);
       p->setPen(c.light());
-      p->tqdrawPolyline(a, 5, 2);
+      p->drawPolyline(a, 5, 2);
       p->setPen(c.dark());
-      p->tqdrawPolyline(a, 6, 2);
+      p->drawPolyline(a, 6, 2);
   }
 
   // draw inner vertical line for start/stop
diff --git a/kcachegrind/kcachegrind/sourceitem.h b/kcachegrind/kcachegrind/sourceitem.h
index 30589835..925e575b 100644
--- a/kcachegrind/kcachegrind/sourceitem.h
+++ b/kcachegrind/kcachegrind/sourceitem.h
@@ -57,7 +57,7 @@ public:
   int compare(TQListViewItem * i, int col, bool ascending ) const;
 
   void paintCell( TQPainter *p, const TQColorGroup &cg,
-                  int column, int width, int tqalignment );
+                  int column, int width, int alignment );
   int width( const TQFontMetrics& fm,
              const TQListView* lv, int c ) const;
   void updateGroup();
diff --git a/kcachegrind/kcachegrind/sourceview.cpp b/kcachegrind/kcachegrind/sourceview.cpp
index 64b3e995..dde291ea 100644
--- a/kcachegrind/kcachegrind/sourceview.cpp
+++ b/kcachegrind/kcachegrind/sourceview.cpp
@@ -113,11 +113,11 @@ void SourceView::context(TQListViewItem* i, const TQPoint & p, int c)
     TQString name = f->name();
     if ((int)name.length()>Configuration::maxSymbolLength())
       name = name.left(Configuration::maxSymbolLength()) + "...";
-    popup.insertItem(i18n("Go to '%1'").tqarg(name), 93);
+    popup.insertItem(i18n("Go to '%1'").arg(name), 93);
     popup.insertSeparator();
   }
   else if (line) {
-    popup.insertItem(i18n("Go to Line %1").tqarg(line->name()), 93);
+    popup.insertItem(i18n("Go to Line %1").arg(line->name()), 93);
     popup.insertSeparator();
   }
 
@@ -513,7 +513,7 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
 	  new SourceItem(this, this, fileno, 1, false,
 			 i18n("with any source line of this function in file"));
 	  new SourceItem(this, this, fileno, 2, false,
-			 TQString("    '%1'").tqarg(sf->function()->prettyName()));
+			 TQString("    '%1'").arg(sf->function()->prettyName()));
 	  new SourceItem(this, this, fileno, 3, false,
 			 i18n("Thus, no annotated source can be shown."));
 	  return;
@@ -550,13 +550,13 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
   // do it here, because the source directory could have been set before
   if (childCount()==0) {
     setColumnText(4, validSourceFile ?
-                  i18n("Source ('%1')").tqarg(filename) :
+                  i18n("Source ('%1')").arg(filename) :
                   i18n("Source (unknown)"));
   }
   else {
     new SourceItem(this, this, fileno, 0, true,
                    validSourceFile ?
-                   i18n("--- Inlined from '%1' ---").tqarg(filename) :
+                   i18n("--- Inlined from '%1' ---").arg(filename) :
                    i18n("--- Inlined from unknown source ---"));
   }
 
@@ -564,7 +564,7 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
     new SourceItem(this, this, fileno, 0, false,
                    i18n("There is no source available for the following function:"));
     new SourceItem(this, this, fileno, 1, false,
-                   TQString("    '%1'").tqarg(sf->function()->prettyName()));
+                   TQString("    '%1'").arg(sf->function()->prettyName()));
     if (sf->file()->name().isEmpty()) {
       new SourceItem(this, this, fileno, 2, false,
                      i18n("This is because no debug information is present."));
@@ -575,14 +575,14 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno)
                        i18n("The function is located in this ELF object:"));
         new SourceItem(this, this, fileno, 5, false,
                        TQString("    '%1'")
-                       .tqarg(sf->function()->object()->prettyName()));
+                       .arg(sf->function()->object()->prettyName()));
       }
     }
     else {
       new SourceItem(this, this, fileno, 2, false,
                      i18n("This is because its source file cannot be found:"));
       new SourceItem(this, this, fileno, 3, false,
-                     TQString("    '%1'").tqarg(sf->file()->name()));
+                     TQString("    '%1'").arg(sf->file()->name()));
       new SourceItem(this, this, fileno, 4, false,
                      i18n("Add the folder of this file to the source folder list."));
       new SourceItem(this, this, fileno, 5, false,
diff --git a/kcachegrind/kcachegrind/stackitem.cpp b/kcachegrind/kcachegrind/stackitem.cpp
index af0499ba..e3763ab4 100644
--- a/kcachegrind/kcachegrind/stackitem.cpp
+++ b/kcachegrind/kcachegrind/stackitem.cpp
@@ -85,7 +85,7 @@ void StackItem::updateCost()
 
     if (Configuration::showPercentage())
       setText(0, TQString("%1")
-	      .tqarg(sum, 0, 'f', Configuration::percentPrecision()));
+	      .arg(sum, 0, 'f', Configuration::percentPrecision()));
     else
       setText(0, _call->prettySubCost(ct));
     
@@ -107,7 +107,7 @@ void StackItem::updateCost()
 
     if (Configuration::showPercentage())
       setText(1, TQString("%1")
-	      .tqarg(sum, 0, 'f', Configuration::percentPrecision()));
+	      .arg(sum, 0, 'f', Configuration::percentPrecision()));
     else
       setText(1, _call->prettySubCost(ct2));
     
diff --git a/kcachegrind/kcachegrind/tabview.cpp b/kcachegrind/kcachegrind/tabview.cpp
index 52f728b5..d00e1527 100644
--- a/kcachegrind/kcachegrind/tabview.cpp
+++ b/kcachegrind/kcachegrind/tabview.cpp
@@ -24,7 +24,7 @@
 #include <tqobjectlist.h>
 #include <tqsplitter.h>
 #include <tqtabwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
 
@@ -419,7 +419,7 @@ void TabView::updateVisibility()
   s.append(100);
 
 
-  // tqchildren of mainSplitter
+  // children of mainSplitter
   if (_rightTW->isHidden() != (r == 0)) {
     if (r == 0) {
       _rightTW->hide();
@@ -441,7 +441,7 @@ void TabView::updateVisibility()
       _leftSplitter->show();
   }
 
-  // tqchildren of leftSplitter
+  // children of leftSplitter
   if (_topTW->isHidden() != (t == 0)) {
     if (t == 0) {
       _topTW->hide();
@@ -463,7 +463,7 @@ void TabView::updateVisibility()
       _bottomSplitter->show();
   }
 
-  // tqchildren of bottomSplitter
+  // children of bottomSplitter
   if (_bottomTW->isHidden() != (b == 0)) {
     if (b == 0) {
       _bottomTW->hide();
@@ -700,7 +700,7 @@ void TabView::resizeEvent(TQResizeEvent* e)
 
 void TabView::selected(TraceItemView*, TraceItem* s)
 {
-    // we set selected item for our own tqchildren
+    // we set selected item for our own children
     select(s);
     updateView();
 
@@ -771,7 +771,7 @@ void TabView::readViewConfig(KConfig* c,
 
       if (withOptions)
 	v->readViewConfig(c, TQString("%1-%2")
-			  .tqarg(prefix).tqarg(v->widget()->name()),
+			  .arg(prefix).arg(v->widget()->name()),
 			  postfix, true);
     }
     if (activeTop)   _topTW->showPage(activeTop->widget());
@@ -883,8 +883,8 @@ void TabView::saveViewConfig(KConfig* c,
 
     if (withOptions)
       for (v=_tabs.first();v;v=_tabs.next())
-	v->saveViewConfig(c, TQString("%1-%2").tqarg(prefix)
-			  .tqarg(v->widget()->name()), postfix, true);
+	v->saveViewConfig(c, TQString("%1-%2").arg(prefix)
+			  .arg(v->widget()->name()), postfix, true);
 }
 
 #include "tabview.moc"
diff --git a/kcachegrind/kcachegrind/tabview.h b/kcachegrind/kcachegrind/tabview.h
index 221e6e08..b9b40269 100644
--- a/kcachegrind/kcachegrind/tabview.h
+++ b/kcachegrind/kcachegrind/tabview.h
@@ -55,7 +55,7 @@ class TabBar : public TQTabBar
 
 /**
  * Own Splitter:
- * Call checkVisiblity for all TabWidget tqchildren of the splitter
+ * Call checkVisiblity for all TabWidget children of the splitter
  * on a MoveEvent. This typically is produced when collapsing the widget
  * inside of another splitter.
  */
diff --git a/kcachegrind/kcachegrind/toplevel.cpp b/kcachegrind/kcachegrind/toplevel.cpp
index 44165742..31fce077 100644
--- a/kcachegrind/kcachegrind/toplevel.cpp
+++ b/kcachegrind/kcachegrind/toplevel.cpp
@@ -29,7 +29,7 @@
 #include <tqtimer.h>
 #include <tqwhatsthis.h>
 #include <tqlineedit.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqsizepolicy.h>
 #include <tqprogressbar.h>
 #include <tqfile.h>
@@ -100,8 +100,8 @@ TopLevel::TopLevel(const char *name)
 #if 0
   // how to do avoid main window resizing on large statusbar label?
   TQSizePolicy p(TQSizePolicy::Fixed, TQSizePolicy::Expanding);
-  _statusLabel->tqsetSizePolicy(p);
-  _statusbar->tqsetSizePolicy(p);
+  _statusLabel->setSizePolicy(p);
+  _statusbar->setSizePolicy(p);
 #endif
   _statusbar->addWidget(_statusLabel, 1);
 
@@ -226,21 +226,21 @@ void TopLevel::saveTraceSettings()
   TQString key = traceKey();
 
   KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions"));
-  pConfig.writeEntry(TQString("CostType%1").tqarg(key),
+  pConfig.writeEntry(TQString("CostType%1").arg(key),
                      _costType ? _costType->name() : TQString("?"));
-  pConfig.writeEntry(TQString("CostType2%1").tqarg(key),
+  pConfig.writeEntry(TQString("CostType2%1").arg(key),
                      _costType2 ? _costType2->name() : TQString("?"));
-  pConfig.writeEntry(TQString("GroupType%1").tqarg(key),
+  pConfig.writeEntry(TQString("GroupType%1").arg(key),
                      TraceItem::typeName(_groupType));
 
   if (!_data) return;
 
   KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts"));
-  aConfig.writeEntry(TQString("Count%1").tqarg(key), _layoutCount);
-  aConfig.writeEntry(TQString("Current%1").tqarg(key), _layoutCurrent);
+  aConfig.writeEntry(TQString("Count%1").arg(key), _layoutCount);
+  aConfig.writeEntry(TQString("Current%1").arg(key), _layoutCurrent);
 
   saveCurrentState(key);
-  pConfig.writeEntry(TQString("Group%1").tqarg(key),
+  pConfig.writeEntry(TQString("Group%1").arg(key),
                      _group ? _group->name() : TQString());
 }
 
@@ -452,14 +452,14 @@ void TopLevel::createLayoutActions()
                         TQT_TQOBJECT(this), TQT_SLOT(layoutDuplicate()),
                         actionCollection(), "layout_duplicate" );
   hint = i18n("<b>Duplicate Current Layout</b>"
-              "<p>Make a copy of the current tqlayout.</p>");
+              "<p>Make a copy of the current layout.</p>");
   action->setWhatsThis( hint );
 
   action = new KAction( i18n( "&Remove" ), KShortcut(),
                         TQT_TQOBJECT(this), TQT_SLOT(layoutRemove()),
                         actionCollection(), "layout_remove" );
   hint = i18n("<b>Remove Current Layout</b>"
-              "<p>Delete current tqlayout and make the previous active.</p>");
+              "<p>Delete current layout and make the previous active.</p>");
   action->setWhatsThis( hint );
 
   action = new KAction( i18n( "&Go to Next" ),
@@ -1137,7 +1137,7 @@ void TopLevel::exportGraph()
   ge.writeDot();
 
   TQString cmd = TQString("(dot %1 -Tps > %2.ps; kghostview %3.ps)&")
-                .tqarg(n).tqarg(n).tqarg(n);
+                .arg(n).arg(n).arg(n);
   system(TQFile::encodeName( cmd ));
 }
 
@@ -1725,9 +1725,9 @@ void TopLevel::restoreTraceTypes()
   KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions"));
 
   TQString groupType, costType, costType2;
-  groupType =  pConfig.readEntry(TQString("GroupType%1").tqarg(key));
-  costType  =  pConfig.readEntry(TQString("CostType%1").tqarg(key));
-  costType2 =  pConfig.readEntry(TQString("CostType2%1").tqarg(key));
+  groupType =  pConfig.readEntry(TQString("GroupType%1").arg(key));
+  costType  =  pConfig.readEntry(TQString("CostType%1").arg(key));
+  costType2 =  pConfig.readEntry(TQString("CostType2%1").arg(key));
 
   if (groupType.isEmpty()) groupType = cConfig.readEntry("GroupType");
   if (costType.isEmpty()) costType = cConfig.readEntry("CostType");
@@ -1742,8 +1742,8 @@ void TopLevel::restoreTraceTypes()
       costTypeSelected(_saCost->items().first());
 
   KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts"));
-  _layoutCount = aConfig.readNumEntry(TQString("Count%1").tqarg(key), 0);
-  _layoutCurrent = aConfig.readNumEntry(TQString("Current%1").tqarg(key), 0);
+  _layoutCount = aConfig.readNumEntry(TQString("Count%1").arg(key), 0);
+  _layoutCurrent = aConfig.readNumEntry(TQString("Current%1").arg(key), 0);
   if (_layoutCount == 0) layoutRestore();
   updateLayoutActions();
 }
@@ -1761,7 +1761,7 @@ void TopLevel::restoreTraceSettings()
   TQString key = traceKey();
 
   KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions"));
-  TQString group = pConfig.readEntry(TQString("Group%1").tqarg(key));
+  TQString group = pConfig.readEntry(TQString("Group%1").arg(key));
   if (!group.isEmpty()) setGroup(group);
 
   restoreCurrentState(key);
@@ -1782,7 +1782,7 @@ void TopLevel::layoutDuplicate()
 {
   // save current and allocate a new slot
   _multiView->saveViewConfig(KGlobal::config(),
-			     TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+			     TQString("Layout%1-MainView").arg(_layoutCurrent),
 			     traceKey(), false);
   _layoutCurrent = _layoutCount;
   _layoutCount++;
@@ -1800,7 +1800,7 @@ void TopLevel::layoutRemove()
   if (_layoutCurrent == from) { _layoutCurrent--; from--; }
   // restore from last and decrement count
   _multiView->readViewConfig(KGlobal::config(),
-			     TQString("Layout%1-MainView").tqarg(from),
+			     TQString("Layout%1-MainView").arg(from),
 			     traceKey(), false);
   _layoutCount--;
 
@@ -1815,13 +1815,13 @@ void TopLevel::layoutNext()
   TQString key = traceKey();
 
   _multiView->saveViewConfig(config,
-			     TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+			     TQString("Layout%1-MainView").arg(_layoutCurrent),
 			     key, false);
   _layoutCurrent++;
   if (_layoutCurrent == _layoutCount) _layoutCurrent = 0;
 
   _multiView->readViewConfig(config,
-			     TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+			     TQString("Layout%1-MainView").arg(_layoutCurrent),
 			     key, false);
 
   if (0) kdDebug() << "TopLevel::layoutNext: current "
@@ -1836,13 +1836,13 @@ void TopLevel::layoutPrevious()
   TQString key = traceKey();
 
   _multiView->saveViewConfig(config,
-			     TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+			     TQString("Layout%1-MainView").arg(_layoutCurrent),
 			     key, false);
   _layoutCurrent--;
   if (_layoutCurrent <0) _layoutCurrent = _layoutCount-1;
 
   _multiView->readViewConfig(config,
-			     TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+			     TQString("Layout%1-MainView").arg(_layoutCurrent),
 			     key, false);
 
   if (0) kdDebug() << "TopLevel::layoutPrevious: current "
@@ -1855,20 +1855,20 @@ void TopLevel::layoutSave()
   TQString key = traceKey();
 
   _multiView->saveViewConfig(config,
-			     TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+			     TQString("Layout%1-MainView").arg(_layoutCurrent),
 			     key, false);
 
   for(int i=0;i<_layoutCount;i++) {
     _multiView->readViewConfig(config,
-			       TQString("Layout%1-MainView").tqarg(i),
+			       TQString("Layout%1-MainView").arg(i),
 			       key, false);
     _multiView->saveViewConfig(config,
-			       TQString("Layout%1-MainView").tqarg(i),
+			       TQString("Layout%1-MainView").arg(i),
 			       TQString(), false);
   }
 
   _multiView->readViewConfig(config,
-			     TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+			     TQString("Layout%1-MainView").arg(_layoutCurrent),
 			     key, false);
 
   KConfigGroup aConfig(config, TQCString("Layouts"));
@@ -1890,15 +1890,15 @@ void TopLevel::layoutRestore()
   TQString key = traceKey();
   for(int i=0;i<_layoutCount;i++) {
     _multiView->readViewConfig(config,
-			       TQString("Layout%1-MainView").tqarg(i),
+			       TQString("Layout%1-MainView").arg(i),
 			       TQString(), false);
     _multiView->saveViewConfig(config,
-			       TQString("Layout%1-MainView").tqarg(i),
+			       TQString("Layout%1-MainView").arg(i),
 			       key, false);
   }
 
   _multiView->readViewConfig(config,
-			     TQString("Layout%1-MainView").tqarg(_layoutCurrent),
+			     TQString("Layout%1-MainView").arg(_layoutCurrent),
 			     key, false);
 
   updateLayoutActions();
@@ -1918,7 +1918,7 @@ void TopLevel::updateLayoutActions()
   ka = actionCollection()->action("layout_remove");
   if (ka) ka->setEnabled(_layoutCount>1);
 
-  _statusbar->message(i18n("Layout Count: %1").tqarg(_layoutCount), 1000);
+  _statusbar->message(i18n("Layout Count: %1").arg(_layoutCount), 1000);
 }
 
 
@@ -1930,19 +1930,19 @@ void TopLevel::updateStatusBar()
   }
 
   TQString status = TQString("%1 [%2] - ")
-                   .tqarg(_data->shortTraceName())
-                   .tqarg(_data->activePartRange());
+                   .arg(_data->shortTraceName())
+                   .arg(_data->activePartRange());
 
   if (_costType) {
     status += i18n("Total %1 Cost: %2")
-      .tqarg(_costType->longName())
-      .tqarg(_data->prettySubCost(_costType));
+      .arg(_costType->longName())
+      .arg(_data->prettySubCost(_costType));
 
     /* this gets too long...
     if (_costType2 && (_costType2 != _costType))
       status += i18n(", %1 Cost: %2")
-	.tqarg(_costType2->longName())
-	.tqarg(_data->prettySubCost(_costType2));
+	.arg(_costType2->longName())
+	.arg(_data->prettySubCost(_costType2));
     */
   }
   else
@@ -1952,8 +1952,8 @@ void TopLevel::updateStatusBar()
   
   if (_groupType != TraceItem::Function) {
     status += TQString(" - %1 '%2'")
-              .tqarg(TraceItem::i18nTypeName(_groupType))
-              .tqarg(_group ? _group->prettyName() : i18n("(None)"));
+              .arg(TraceItem::i18nTypeName(_groupType))
+              .arg(_group ? _group->prettyName() : i18n("(None)"));
   }
   */
 
@@ -2048,7 +2048,7 @@ void TopLevel::configChanged()
   //qDebug("TopLevel::configChanged");
   //_showPercentage->setChecked(Configuration::showPercentage());
 
-  // tqinvalidate found/cached dirs of source files
+  // invalidate found/cached dirs of source files
   _data->resetSourceDirs();
 
   _partSelection->refresh();
@@ -2340,7 +2340,7 @@ void TopLevel::showMessage(const TQString& msg, int ms)
     _statusbar->message(msg, ms);
 }
 
-void TopLevel::showtqStatus(TQString msg, int progress)
+void TopLevel::showStatus(TQString msg, int progress)
 {
     static bool msgUpdateNeeded = true;
 
diff --git a/kcachegrind/kcachegrind/toplevel.h b/kcachegrind/kcachegrind/toplevel.h
index c437ceae..10e7cde5 100644
--- a/kcachegrind/kcachegrind/toplevel.h
+++ b/kcachegrind/kcachegrind/toplevel.h
@@ -196,7 +196,7 @@ public slots:
   void slotShowTip();
 
   // progress in status bar, empty message disables progress display
-  void showtqStatus(TQString msg, int progress);
+  void showStatus(TQString msg, int progress);
   void showMessage(const TQString&, int msec);
 
 private:
diff --git a/kcachegrind/kcachegrind/tracedata.cpp b/kcachegrind/kcachegrind/tracedata.cpp
index 526c1cb0..f129c2e5 100644
--- a/kcachegrind/kcachegrind/tracedata.cpp
+++ b/kcachegrind/kcachegrind/tracedata.cpp
@@ -226,7 +226,7 @@ TraceItem::CostType TraceItem::i18nCostType(TQString s)
 
 void TraceItem::clear()
 {
-    tqinvalidate();
+    invalidate();
 }
 
 
@@ -239,8 +239,8 @@ TQString TraceItem::name() const
 {
   if (part()) {
     return i18n("%1 from %2")
-      .tqarg(_dep->name())
-      .tqarg(part()->name());
+      .arg(_dep->name())
+      .arg(part()->name());
   }
 
   if (_dep)
@@ -259,21 +259,21 @@ TQString TraceItem::prettyName() const
 TQString TraceItem::fullName() const
 {
   return TQString("%1 %2")
-    .tqarg(typeName(type())).tqarg(prettyName());
+    .arg(typeName(type())).arg(prettyName());
 }
 
 TQString TraceItem::toString()
 {
-  return TQString("%1\n  [%3]").tqarg(fullName()).tqarg(costString(0));
+  return TQString("%1\n  [%3]").arg(fullName()).arg(costString(0));
 }
 
-void TraceItem::tqinvalidate()
+void TraceItem::invalidate()
 {
   if (_dirty) return;
   _dirty = true;
 
   if (_dep)
-    _dep->tqinvalidate();
+    _dep->invalidate();
 }
 
 void TraceItem::update()
@@ -360,7 +360,7 @@ void TraceCost::set(TraceSubMapping* sm, const char* s)
 	_count = maxIndex;
     }
     // a cost change has to be propagated (esp. in subclasses)
-    tqinvalidate();
+    invalidate();
 }
 
 void TraceCost::set(TraceSubMapping* sm, FixString & s)
@@ -391,7 +391,7 @@ void TraceCost::set(TraceSubMapping* sm, FixString & s)
 	    _cost[i] = 0;
 	_count = maxIndex+1;
     }
-    tqinvalidate();
+    invalidate();
 }
 
 
@@ -436,13 +436,13 @@ void TraceCost::addCost(TraceSubMapping* sm, const char* s)
     }
 
     // a cost change has to be propagated (esp. in subclasses)
-    tqinvalidate();
+    invalidate();
 
 #if TRACE_DEBUG
     _dirty = false; // don't recurse !
     qDebug("%s\n now %s", fullName().ascii(),
 	   TraceCost::costString(0).ascii());
-    _dirty = true; // because of tqinvalidate()
+    _dirty = true; // because of invalidate()
 #endif
 }
 
@@ -488,13 +488,13 @@ void TraceCost::addCost(TraceSubMapping* sm, FixString & s)
 	}
     }
 
-    tqinvalidate();
+    invalidate();
 
 #if TRACE_DEBUG
     _dirty = false; // don't recurse !
     qDebug("%s\n now %s", fullName().ascii(),
 	   TraceCost::costString(0).ascii());
-    _dirty = true; // because of tqinvalidate()
+    _dirty = true; // because of invalidate()
 #endif
 }
 
@@ -544,13 +544,13 @@ void TraceCost::maxCost(TraceSubMapping* sm, FixString & s)
 	}
     }
 
-    tqinvalidate();
+    invalidate();
 
 #if TRACE_DEBUG
     _dirty = false; // don't recurse !
     qDebug("%s\n now %s", fullName().ascii(),
 	   TraceCost::costString(0).ascii());
-    _dirty = true; // because of tqinvalidate()
+    _dirty = true; // because of invalidate()
 #endif
 }
 
@@ -578,14 +578,14 @@ void TraceCost::addCost(TraceCost* item)
     }
 
     // a cost change has to be propagated (esp. in subclasses)
-    tqinvalidate();
+    invalidate();
 
 #if TRACE_DEBUG
     _dirty = false; // don't recurse !
     qDebug("%s added cost item\n %s\n  now %s",
 	   fullName().ascii(), item->fullName().ascii(),
 	   TraceCost::costString(0).ascii());
-    _dirty = true; // because of tqinvalidate()
+    _dirty = true; // because of invalidate()
 #endif
 }
 
@@ -612,14 +612,14 @@ void TraceCost::maxCost(TraceCost* item)
     }
 
     // a cost change has to be propagated (esp. in subclasses)
-    tqinvalidate();
+    invalidate();
 
 #if TRACE_DEBUG
     _dirty = false; // don't recurse !
     qDebug("%s added cost item\n %s\n  now %s",
 	   fullName().ascii(), item->fullName().ascii(),
 	   TraceCost::costString(0).ascii());
-    _dirty = true; // because of tqinvalidate()
+    _dirty = true; // because of invalidate()
 #endif
 }
 
@@ -636,7 +636,7 @@ void TraceCost::addCost(int type, SubCost value)
     }
 
     // a cost change has to be propagated (esp. in subclasses)
-    tqinvalidate();
+    invalidate();
 }
 
 void TraceCost::maxCost(int type, SubCost value)
@@ -653,7 +653,7 @@ void TraceCost::maxCost(int type, SubCost value)
     }
 
     // a cost change has to be propagated (esp. in subclasses)
-    tqinvalidate();
+    invalidate();
 }
 
 
@@ -691,14 +691,14 @@ TQString TraceCost::costString(TraceCostMapping* m)
 }
 
 
-void TraceCost::tqinvalidate()
+void TraceCost::invalidate()
 {
   if (_dirty) return;
   _dirty = true;
   _cachedType = 0; // cached value is invalid, too
 
   if (_dep)
-    _dep->tqinvalidate();
+    _dep->invalidate();
 }
 
 void TraceCost::update()
@@ -767,8 +767,8 @@ TQString TraceJumpCost::costString(TraceCostMapping*)
   if (_dirty) update();
 
   return TQString("%1/%2")
-      .tqarg(_followedCount.pretty())
-      .tqarg(_executedCount.pretty());
+      .arg(_followedCount.pretty())
+      .arg(_executedCount.pretty());
 }
 
 void TraceJumpCost::clear()
@@ -913,7 +913,7 @@ TQString TraceCostType::parsedFormula()
     if (!t) continue;
 
     if (!t->name().isEmpty())
-      res += TQString(" * %1").tqarg(t->name());
+      res += TQString(" * %1").arg(t->name());
   }
 
   return res;
@@ -1362,8 +1362,8 @@ TraceCallCost::~TraceCallCost()
 TQString TraceCallCost::costString(TraceCostMapping* m)
 {
   return TQString("%1, Calls %2")
-      .tqarg(TraceCost::costString(m))
-      .tqarg(_callCount.pretty());
+      .arg(TraceCost::costString(m))
+      .arg(_callCount.pretty());
 }
 
 TQString TraceCallCost::prettyCallCount()
@@ -1388,7 +1388,7 @@ void TraceCallCost::addCallCount(SubCost c)
 {
   _callCount += c;
 
-  tqinvalidate();
+  invalidate();
 }
 
 
@@ -1404,8 +1404,8 @@ TraceInclusiveCost::~TraceInclusiveCost()
 TQString TraceInclusiveCost::costString(TraceCostMapping* m)
 {
   return TQString("%1, Inclusive %2")
-    .tqarg(TraceCost::costString(m))
-    .tqarg(_inclusive.costString(m));
+    .arg(TraceCost::costString(m))
+    .arg(_inclusive.costString(m));
 }
 
 void TraceInclusiveCost::clear()
@@ -1425,7 +1425,7 @@ void TraceInclusiveCost::addInclusive(TraceCost* c)
 {
   _inclusive.addCost(c);
 
-  tqinvalidate();
+  invalidate();
 }
 
 
@@ -1452,7 +1452,7 @@ void TraceListCost::addDep(TraceCost* dep)
 
   _deps.append(dep);
   _lastDep = dep;
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added\n %s (now %d)",
@@ -1526,7 +1526,7 @@ void TraceJumpListCost::addDep(TraceJumpCost* dep)
 
   _deps.append(dep);
   _lastDep = dep;
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added\n %s (now %d)",
@@ -1600,7 +1600,7 @@ void TraceCallListCost::addDep(TraceCallCost* dep)
 
   _deps.append(dep);
   _lastDep = dep;
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added\n %s (now %d)",
@@ -1679,7 +1679,7 @@ void TraceInclusiveListCost::addDep(TraceInclusiveCost* dep)
 
   _deps.append(dep);
   _lastDep = dep;
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added\n %s (now %d)",
@@ -1897,9 +1897,9 @@ TQString TracePartFunction::costString(TraceCostMapping* m)
 
   TQString res = TraceInclusiveCost::costString(m);
   res += TQString(", called from %1: %2")
-         .tqarg(_calledContexts).tqarg(prettyCalledCount());
+         .arg(_calledContexts).arg(prettyCalledCount());
   res += TQString(", calling from %1: %2")
-         .tqarg(_callingContexts).tqarg(prettyCallingCount());
+         .arg(_callingContexts).arg(prettyCallingCount());
 
   return res;
 }
@@ -1916,7 +1916,7 @@ void TracePartFunction::addPartInstr(TracePartInstr* ref)
 #endif
 
   _partInstr.append(ref);
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added\n %s (now %d)",
@@ -1937,7 +1937,7 @@ void TracePartFunction::addPartLine(TracePartLine* ref)
 #endif
 
   _partLines.append(ref);
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added\n %s (now %d)",
@@ -1958,7 +1958,7 @@ void TracePartFunction::addPartCaller(TracePartCall* ref)
 #endif
 
   _partCallers.append(ref);
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added Caller\n %s (now %d)",
@@ -1979,7 +1979,7 @@ void TracePartFunction::addPartCalling(TracePartCall* ref)
 #endif
 
   _partCallings.append(ref);
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added Calling\n %s (now %d)",
@@ -2136,8 +2136,8 @@ TracePartClass::~TracePartClass()
 TQString TracePartClass::prettyName() const
 {
   return TQString("%1 from %2")
-    .tqarg( _dep->name().isEmpty() ? TQString("(global)") : _dep->name())
-    .tqarg(part()->name());
+    .arg( _dep->name().isEmpty() ? TQString("(global)") : _dep->name())
+    .arg(part()->name());
 }
 
 //---------------------------------------------------
@@ -2233,8 +2233,8 @@ void TraceInstrJump::update()
 TQString TraceInstrJump::name() const
 {
   return TQString("jump at 0x%1 to 0x%2")
-    .tqarg(_instrFrom->addr().toString())
-    .tqarg(_instrTo->addr().toString());
+    .arg(_instrFrom->addr().toString())
+    .arg(_instrTo->addr().toString());
 }
 
 
@@ -2316,8 +2316,8 @@ TracePartLineJump* TraceLineJump::partLineJump(TracePart* part)
 TQString TraceLineJump::name() const
 {
   return TQString("jump at %1 to %2")
-      .tqarg(_lineFrom->prettyName())
-      .tqarg(_lineTo->prettyName());
+      .arg(_lineFrom->prettyName())
+      .arg(_lineTo->prettyName());
 }
 
 
@@ -2395,7 +2395,7 @@ TracePartInstrCall* TraceInstrCall::partInstrCall(TracePart* part,
 
 TQString TraceInstrCall::name() const
 {
-  return TQString("%1 at %2").tqarg(_call->name()).tqarg(_instr->name());
+  return TQString("%1 at %2").arg(_call->name()).arg(_instr->name());
 }
 
 
@@ -2431,7 +2431,7 @@ TracePartLineCall* TraceLineCall::partLineCall(TracePart* part,
 
 TQString TraceLineCall::name() const
 {
-  return TQString("%1 at %2").tqarg(_call->name()).tqarg(_line->name());
+  return TQString("%1 at %2").arg(_call->name()).arg(_line->name());
 }
 
 
@@ -2478,7 +2478,7 @@ TraceInstrCall* TraceCall::instrCall(TraceInstr* i)
     icall = new TraceInstrCall(this, i);
 
     _instrCalls.append(icall);
-    tqinvalidate();
+    invalidate();
 
 #if TRACE_DEBUG
     qDebug("Created %s [TraceCall::instrCall]", icall->fullName().ascii());
@@ -2500,7 +2500,7 @@ TraceLineCall* TraceCall::lineCall(TraceLine* l)
     lcall = new TraceLineCall(this, l);
 
     _lineCalls.append(lcall);
-    tqinvalidate();
+    invalidate();
 
 #if TRACE_DEBUG
     qDebug("Created %s [TraceCall::lineCall]", lcall->fullName().ascii());
@@ -2515,21 +2515,21 @@ void TraceCall::invalidateDynamicCost()
 {
   TraceLineCall* lc;
   for (lc=_lineCalls.first();lc;lc=_lineCalls.next())
-    lc->tqinvalidate();
+    lc->invalidate();
 
   TraceInstrCall* ic;
   for (ic=_instrCalls.first();ic;ic=_instrCalls.next())
-    ic->tqinvalidate();
+    ic->invalidate();
 
-  tqinvalidate();
+  invalidate();
 }
 
 
 TQString TraceCall::name() const
 {
   return TQString("%1 => %2")
-    .tqarg(_caller->name())
-    .tqarg(_called->name());
+    .arg(_caller->name())
+    .arg(_called->name());
 }
 
 int TraceCall::inCycle()
@@ -2587,7 +2587,7 @@ TQString TraceCall::callerName(bool skipCycle) const
       TraceFunctionCycle* c = _called->cycle();
       if (c && _caller && (_caller->cycle() != c)) {
 	  TQString via = _called->prettyName();
-	  return i18n("%1 via %2").tqarg(_caller->prettyName()).tqarg(via);
+	  return i18n("%1 via %2").arg(_caller->prettyName()).arg(via);
       }
   }
 
@@ -2606,7 +2606,7 @@ TQString TraceCall::calledName(bool skipCycle) const
 	  _called->setCycle(0);
 	  TQString via = _called->prettyName();
 	  _called->setCycle(c);
-	  return i18n("%1 via %2").tqarg(c->name()).tqarg(via);
+	  return i18n("%1 via %2").arg(c->name()).arg(via);
       }
   }
   return _called->prettyName();
@@ -2692,7 +2692,7 @@ void TraceInstr::addInstrCall(TraceInstrCall* instrCall)
 #endif
 
   _instrCalls.append(instrCall);
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added\n %s (now %d)",
@@ -2704,12 +2704,12 @@ void TraceInstr::addInstrCall(TraceInstrCall* instrCall)
 
 TQString TraceInstr::name() const
 {
-    return TQString("0x%1").tqarg(_addr.toString());
+    return TQString("0x%1").arg(_addr.toString());
 }
 
 TQString TraceInstr::prettyName() const
 {
-    return TQString("0x%1").tqarg(_addr.toString());
+    return TQString("0x%1").arg(_addr.toString());
 }
 
 
@@ -2807,7 +2807,7 @@ void TraceLine::addLineCall(TraceLineCall* lineCall)
   }
 
   _lineCalls.append(lineCall);
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added\n %s (now %d)",
@@ -2824,13 +2824,13 @@ TQString TraceLine::name() const
 	return i18n("(unknown)");
 
     return TQString("%1:%2")
-	.tqarg(fileShortName).tqarg(_lineno);
+	.arg(fileShortName).arg(_lineno);
 }
 
 TQString TraceLine::prettyName() const
 {
   return TQString("%1 [%2]")
-    .tqarg(name()).tqarg(_sourceFile->function()->prettyName());
+    .arg(name()).arg(_sourceFile->function()->prettyName());
 }
 
 //---------------------------------------------------
@@ -2869,7 +2869,7 @@ TraceFunctionSource::~TraceFunctionSource()
 
 TQString TraceFunctionSource::name() const
 {
-  return TQString("%1 for %2").tqarg(_file->name()).tqarg(_function->name());
+  return TQString("%1 for %2").arg(_file->name()).arg(_function->name());
 }
 
 uint TraceFunctionSource::firstLineno()
@@ -2952,10 +2952,10 @@ void TraceFunctionSource::invalidateDynamicCost()
     TraceLineMap::Iterator lit;
     for ( lit = _lineMap->begin();
           lit != _lineMap->end(); ++lit )
-      (*lit).tqinvalidate();
+      (*lit).invalidate();
   }
 
-  tqinvalidate();
+  invalidate();
 }
 
 TraceLineMap* TraceFunctionSource::lineMap()
@@ -3125,7 +3125,7 @@ void TraceAssoziation::clear(TraceData* d, int rtti)
     (*it).removeAssoziation(rtti);
 }
 
-void TraceAssoziation::tqinvalidate(TraceData* d, int rtti)
+void TraceAssoziation::invalidate(TraceData* d, int rtti)
 {
   TraceFunctionMap::Iterator it;
   for ( it = d->functionMap().begin();
@@ -3203,7 +3203,7 @@ void TraceFunction::invalidateAssoziation(int rtti)
   TraceAssoziation* a;
   for (a=_assoziations.first();a;a=_assoziations.next())
     if ((rtti==0) || (a->rtti() == rtti))
-      a->tqinvalidate();
+      a->invalidate();
 }
 
 TraceAssoziation* TraceFunction::assoziation(int rtti)
@@ -3254,9 +3254,9 @@ TQString TraceFunction::prettyName() const
   // cycle members
   if (_cycle) {
     if (_cycle != this)
-      res = TQString("%1 <cycle %2>").tqarg(res).tqarg(_cycle->cycleNo());
+      res = TQString("%1 <cycle %2>").arg(res).arg(_cycle->cycleNo());
     else
-      res = TQString("<cycle %2>").tqarg(_cycle->cycleNo());
+      res = TQString("<cycle %2>").arg(_cycle->cycleNo());
   }
 
 
@@ -3279,9 +3279,9 @@ TQString TraceFunction::location(int maxFiles) const
     uint to = lastAddress();
     if (from != 0 && to != 0) {
       if (from == to)
-        loc += TQString(" (0x%1)").tqarg(to, 0, 16);
+        loc += TQString(" (0x%1)").arg(to, 0, 16);
       else
-        loc += TQString(" (0x%1-0x%2)").tqarg(from, 0, 16).tqarg(to, 0, 16);
+        loc += TQString(" (0x%1-0x%2)").arg(from, 0, 16).arg(to, 0, 16);
     }
 #endif   
   }
@@ -3310,9 +3310,9 @@ TQString TraceFunction::location(int maxFiles) const
     to = sourceFile->lastLineno();
     if (from != 0 && to != 0) {
       if (from == to)
-        loc += TQString(" (%1)").tqarg(to);
+        loc += TQString(" (%1)").arg(to);
       else
-        loc += TQString(" (%1-%2)").tqarg(from).tqarg(to);
+        loc += TQString(" (%1-%2)").arg(from).arg(to);
     }
 #endif
   }
@@ -3334,7 +3334,7 @@ void TraceFunction::addPrettyLocation(TQString& s, int maxFiles) const
     TQString l = location(maxFiles);
     if (l.isEmpty()) return;
 
-    s += TQString(" (%1)").tqarg(l);
+    s += TQString(" (%1)").arg(l);
 }
 
 TQString TraceFunction::prettyNameWithLocation(int maxFiles) const
@@ -3342,17 +3342,17 @@ TQString TraceFunction::prettyNameWithLocation(int maxFiles) const
     TQString l = location(maxFiles);
     if (l.isEmpty()) return prettyName();
 
-    return TQString("%1 (%2)").tqarg(prettyName()).tqarg(l);
+    return TQString("%1 (%2)").arg(prettyName()).arg(l);
 }
 
 TQString TraceFunction::info() const
 {
     TQString l = location();
     if (l.isEmpty())
-	return TQString("Function %1").tqarg(name());
+	return TQString("Function %1").arg(name());
 
     return TQString("Function %1 (location %2)")
-	.tqarg(name()).tqarg(l);
+	.arg(name()).arg(l);
 }
 
 
@@ -3414,7 +3414,7 @@ void TraceFunction::addCaller(TraceCall* caller)
 #endif
 
   _callers.append(caller);
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added Caller\n %s (now %d)",
@@ -3435,8 +3435,8 @@ TraceCall* TraceFunction::calling(TraceFunction* called)
     _callingMap.insert(called, calling);
     _callings.append(calling);
 
-    // we have to tqinvalidate ourself so invalidations from item propagate up
-    tqinvalidate();
+    // we have to invalidate ourself so invalidations from item propagate up
+    invalidate();
 
 #if TRACE_DEBUG
     qDebug("Created %s [TraceFunction::calling]", calling->fullName().ascii());
@@ -3460,8 +3460,8 @@ TraceFunctionSource* TraceFunction::sourceFile(TraceFile* file,
 
     _sourceFiles.append(sourceFile);
 
-    // we have to tqinvalidate ourself so invalidations from item propagate up
-    tqinvalidate();
+    // we have to invalidate ourself so invalidations from item propagate up
+    invalidate();
 
 #if TRACE_DEBUG
     qDebug("Created SourceFile %s [TraceFunction::line]",
@@ -3601,10 +3601,10 @@ void TraceFunction::invalidateDynamicCost()
     TraceInstrMap::Iterator iit;
     for ( iit = _instrMap->begin();
           iit != _instrMap->end(); ++iit )
-      (*iit).tqinvalidate();
+      (*iit).invalidate();
   }
 
-  tqinvalidate();
+  invalidate();
 }
 
 void TraceFunction::update()
@@ -3951,7 +3951,7 @@ TraceFunctionCycle::TraceFunctionCycle(TraceFunction* f, int n)
   _cycle = this;
 
   setPosition(f->data());
-  setName(TQString("<cycle %1>").tqarg(n));
+  setName(TQString("<cycle %1>").arg(n));
 
   // reset to attributes of base function
   setFile(_base->file());
@@ -3967,7 +3967,7 @@ void TraceFunctionCycle::init()
   // this deletes all TraceCall's to members
   _callings.clear();
 
-  tqinvalidate();
+  invalidate();
 }
 
 void TraceFunctionCycle::add(TraceFunction* f)
@@ -3993,13 +3993,13 @@ void TraceFunctionCycle::setup()
 
     // the cycle has a call to each member
     call = new TraceCall(this, f);
-    call->tqinvalidate();
+    call->invalidate();
     _callings.append(call);
 
     // now do some faking...
     f->setCycle(this);
   }
-  tqinvalidate();
+  invalidate();
 }
 
 
@@ -4046,7 +4046,7 @@ void TraceClass::addFunction(TraceFunction* function)
 
   _functions.append(function);
 
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added\n %s (now %d)",
@@ -4093,7 +4093,7 @@ void TraceFile::addFunction(TraceFunction* function)
 
   _functions.append(function);
 
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added\n %s (now %d)",
@@ -4114,7 +4114,7 @@ void TraceFile::addSourceFile(TraceFunctionSource* sourceFile)
 
   _sourceFiles.append(sourceFile);
   // not truely needed, as we don't use the sourceFiles for cost update
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s \n added SourceFile %s (now %d)",
@@ -4211,7 +4211,7 @@ void TraceObject::addFunction(TraceFunction* function)
 
   _functions.append(function);
 
-  tqinvalidate();
+  invalidate();
 
 #if TRACE_DEBUG
   qDebug("%s added\n %s (now %d)",
@@ -4298,9 +4298,9 @@ TQString TracePart::shortName() const
 
 TQString TracePart::prettyName() const
 {
-    TQString name = TQString("%1.%2").tqarg(_pid).tqarg(_number);
+    TQString name = TQString("%1.%2").arg(_pid).arg(_number);
     if (data()->maxThreadID()>1)
-	name += TQString("-%3").tqarg(_tid);
+	name += TQString("-%3").arg(_tid);
     return name;
 }
 
@@ -4498,7 +4498,7 @@ void TraceData::load(const TQString& base)
     if ((str.length() > pos) && (str[pos] == '.')) {
 	pos++;
 	while(str.length()>pos) {
-	    if ((int)str.tqat(pos) < '0' || (int)str.tqat(pos) > '9') break;
+	    if ((int)str.at(pos) < '0' || (int)str.at(pos) > '9') break;
 	    n = 10*n + (str[pos++] - '0');
 	}
     }
@@ -4508,7 +4508,7 @@ void TraceData::load(const TQString& base)
     if ((str.length() > pos) && (str[pos] == '-')) {
 	pos++;
 	while(str.length()>pos) {
-	    if ((int)str.tqat(pos) < '0' || (int)str.tqat(pos) > '9') break;
+	    if ((int)str.at(pos) < '0' || (int)str.at(pos) > '9') break;
 	    t = 10*t + (str[pos++] - '0');
 	}
     }
@@ -4531,12 +4531,12 @@ void TraceData::load(const TQString& base)
   updateFunctionCycles();
 
   // clear loading messages from status bar
-  if (_topLevel) _topLevel->showtqStatus(TQString(), 0);
+  if (_topLevel) _topLevel->showStatus(TQString(), 0);
 }
 
 TracePart* TraceData::addPart(const TQString& dir, const TQString& name)
 {
-    TQString filename = TQString("%1/%2").tqarg(dir).tqarg(name);
+    TQString filename = TQString("%1/%2").arg(dir).arg(name);
 #if TRACE_DEBUG
   qDebug("TraceData::addPart('%s')", filename.ascii());
 #endif
@@ -4547,8 +4547,8 @@ TracePart* TraceData::addPart(const TQString& dir, const TQString& name)
   if (!l) return 0;
 
   if (_topLevel)
-      _topLevel->connect(l, TQT_SIGNAL(updatetqStatus(TQString, int)),
-			 TQT_SLOT(showtqStatus(TQString, int)));
+      _topLevel->connect(l, TQT_SIGNAL(updateStatus(TQString, int)),
+			 TQT_SLOT(showStatus(TQString, int)));
 
   TracePart* part = new TracePart(this, file);
 
@@ -4632,14 +4632,14 @@ TQString TraceData::activePartRange()
       else {
         if (!res.isEmpty()) res += ";";
         if (r1==r2) res += TQString::number(r1);
-        else res += TQString("%1-%2").tqarg(r1).tqarg(r2);
+        else res += TQString("%1-%2").arg(r1).arg(r2);
         r1 = r2 = count;
       }
     }
   if (r1>=0) {
     if (!res.isEmpty()) res += ";";
     if (r1==r2) res += TQString::number(r1);
-    else res += TQString("%1-%2").tqarg(r1).tqarg(r2);
+    else res += TQString("%1-%2").arg(r1).arg(r2);
   }
 
   return res;
@@ -4647,22 +4647,22 @@ TQString TraceData::activePartRange()
 
 void TraceData::invalidateDynamicCost()
 {
-  // tqinvalidate all dynamic costs
+  // invalidate all dynamic costs
 
   TraceObjectMap::Iterator oit;
   for ( oit = _objectMap.begin();
         oit != _objectMap.end(); ++oit )
-    (*oit).tqinvalidate();
+    (*oit).invalidate();
 
   TraceClassMap::Iterator cit;
   for ( cit = _classMap.begin();
         cit != _classMap.end(); ++cit )
-    (*cit).tqinvalidate();
+    (*cit).invalidate();
 
   TraceFileMap::Iterator fit;
   for ( fit = _fileMap.begin();
         fit != _fileMap.end(); ++fit )
-    (*fit).tqinvalidate();
+    (*fit).invalidate();
 
   TraceFunctionMap::Iterator it;
   for ( it = _functionMap.begin();
@@ -4670,7 +4670,7 @@ void TraceData::invalidateDynamicCost()
     (*it).invalidateDynamicCost();
   }
 
-  tqinvalidate();
+  invalidate();
 
 }
 
@@ -5015,7 +5015,7 @@ void TraceData::updateFunctionCycles()
 #if 0
   int fCount = _functionMap.size(), fNo = 0, progress=0, p;
   TQString msg = i18n("Recalculating Function Cycles...");
-  if (_topLevel) _topLevel->showtqStatus(msg,0);
+  if (_topLevel) _topLevel->showStatus(msg,0);
 #endif
 
   // DFS and collapse strong connected components (Tarjan)
@@ -5029,7 +5029,7 @@ void TraceData::updateFunctionCycles()
 	  p = 100*fNo/fCount;
 	  if (p> progress) {
 	      progress = p;
-	      _topLevel->showtqStatus(msg, p);
+	      _topLevel->showStatus(msg, p);
 	  }
       }
 #endif
@@ -5043,11 +5043,11 @@ void TraceData::updateFunctionCycles()
     cycle->setup();
 
   _inFunctionCycleUpdate = false;
-  // we have to tqinvalidate costs because cycles are now taken into account
+  // we have to invalidate costs because cycles are now taken into account
   invalidateDynamicCost();
 
 #if 0
-  if (0) if (_topLevel) _topLevel->showtqStatus(TQString(),0);
+  if (0) if (_topLevel) _topLevel->showStatus(TQString(),0);
 #endif
 }
 
diff --git a/kcachegrind/kcachegrind/tracedata.h b/kcachegrind/kcachegrind/tracedata.h
index cb97e623..8fab2b68 100644
--- a/kcachegrind/kcachegrind/tracedata.h
+++ b/kcachegrind/kcachegrind/tracedata.h
@@ -307,7 +307,7 @@ public:
    * other cost items. If only one item depends on the cost of this item,
    * it can by set with setDependant() without a need for overwriting.
    */
-  virtual void tqinvalidate();
+  virtual void invalidate();
 
   /**
    * Sets a dependant to be invalidated when this cost is invalidated.
@@ -388,7 +388,7 @@ public:
   void maxCost(int index, SubCost value);
   TraceCost diff(TraceCost* item);
 
-  virtual void tqinvalidate();
+  virtual void invalidate();
 
   /** Returns a sub cost. This automatically triggers
    * a call to update() if needed.
@@ -1549,7 +1549,7 @@ class TraceAssoziation
   bool setFunction(TraceFunction*);
   TraceFunction* function() { return _function; }
 
-  void tqinvalidate() { _valid = false; }
+  void invalidate() { _valid = false; }
   bool isValid() { return _valid; }
 
   /**
@@ -1562,7 +1562,7 @@ class TraceAssoziation
    * Invalidate all assoziations in TraceFunctions of data with
    * rtti runtime info. rtti = 0: Invalidate ALL assoziations.
    */
-  static void tqinvalidate(TraceData* data, int rtti);
+  static void invalidate(TraceData* data, int rtti);
 
  protected:
   TraceFunction* _function;
@@ -1590,7 +1590,7 @@ class TraceFunction: public TraceCostItem
   virtual CostType type() const { return Function; }
   virtual void update();
 
-  // this tqinvalidate all subcosts of function depending on
+  // this invalidate all subcosts of function depending on
   // active status of parts
   void invalidateDynamicCost();
 
@@ -1841,7 +1841,7 @@ class TraceData: public TraceCost
   void load(const TQString&);
 
   /** returns true if something changed. These do NOT
-   * tqinvalidate the dynamic costs on a activation change,
+   * invalidate the dynamic costs on a activation change,
    * i.e. all cost items dependend on active parts.
    * This has to be done by the caller when true is returned by
    * calling invalidateDynamicCost().
diff --git a/kcachegrind/kcachegrind/traceitemview.cpp b/kcachegrind/kcachegrind/traceitemview.cpp
index e2f5ee09..d11f02b6 100644
--- a/kcachegrind/kcachegrind/traceitemview.cpp
+++ b/kcachegrind/kcachegrind/traceitemview.cpp
@@ -178,7 +178,7 @@ void TraceItemView::setData(TraceData* d)
 {
   _newData = d;
 
-  // tqinvalidate all pointers to old data
+  // invalidate all pointers to old data
   _activeItem = _newActiveItem = 0;
   _selectedItem = _newSelectedItem = 0;
   _costType = _newCostType = 0;
diff --git a/kcachegrind/kcachegrind/treemap.cpp b/kcachegrind/kcachegrind/treemap.cpp
index c1f7f12b..797e3a5f 100644
--- a/kcachegrind/kcachegrind/treemap.cpp
+++ b/kcachegrind/kcachegrind/treemap.cpp
@@ -759,7 +759,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value)
   _parent = parent;
 
   _sum = 0;
-  _tqchildren = 0;
+  _children = 0;
   _widget = 0;
   _index = -1;
   _depth = -1; // not set
@@ -792,7 +792,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
   setText(0, text1);
 
   _sum = 0;
-  _tqchildren = 0;
+  _children = 0;
   _widget = 0;
   _index = -1;
   _depth = -1; // not set
@@ -804,7 +804,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value,
 
 TreeMapItem::~TreeMapItem()
 {
-  if (_tqchildren) delete _tqchildren;
+  if (_children) delete _children;
   if (_freeRects) delete _freeRects;
 
   // finally, notify widget about deletion
@@ -845,18 +845,18 @@ void TreeMapItem::redraw()
 
 void TreeMapItem::clear()
 {
-  if (_tqchildren) {
+  if (_children) {
     // delete selected items below this item from selection
     if (_widget) _widget->clearSelection(this);
 
-    delete _tqchildren;
-    _tqchildren = 0;
+    delete _children;
+    _children = 0;
   }
 }
 
 
-// invalidates current tqchildren and forces redraw
-// this is only usefull when tqchildren are created on demand in items()
+// invalidates current children and forces redraw
+// this is only usefull when children are created on demand in items()
 void TreeMapItem::refresh()
 {
   clear();
@@ -890,9 +890,9 @@ int TreeMapItem::depth() const
 
 bool TreeMapItem::initialized()
 {
-  if (!_tqchildren) {
-    _tqchildren = new TreeMapItemList;
-    _tqchildren->setAutoDelete(true);
+  if (!_children) {
+    _children = new TreeMapItemList;
+    _children->setAutoDelete(true);
     return false;
   }
   return true;
@@ -902,16 +902,16 @@ void TreeMapItem::addItem(TreeMapItem* i)
 {
   if (!i) return;
 
-  if (!_tqchildren) {
-    _tqchildren = new TreeMapItemList;
-    _tqchildren->setAutoDelete(true);
+  if (!_children) {
+    _children = new TreeMapItemList;
+    _children->setAutoDelete(true);
   }
   i->setParent(this);
 
   if (sorting(0) == -1)
-    _tqchildren->append(i); // preserve insertion order
+    _children->append(i); // preserve insertion order
   else
-    _tqchildren->inSort(i);
+    _children->inSort(i);
 }
 
 
@@ -977,17 +977,17 @@ void TreeMapItem::setSorting(int textNo, bool ascending)
     _sortAscending = ascending;
     _sortTextNo = textNo;
 
-    if (_tqchildren && _sortTextNo != -1) _tqchildren->sort();
+    if (_children && _sortTextNo != -1) _children->sort();
 }
 
 void TreeMapItem::resort(bool recursive)
 {
-  if (!_tqchildren) return;
+  if (!_children) return;
 
-  if (_sortTextNo != -1) _tqchildren->sort();
+  if (_sortTextNo != -1) _children->sort();
 
   if (recursive)
-    for (TreeMapItem* i=_tqchildren->first(); i; i=_tqchildren->next())
+    for (TreeMapItem* i=_children->first(); i; i=_children->next())
       i->resort(recursive);
 }
 
@@ -1005,13 +1005,13 @@ int TreeMapItem::rtti() const
   return 0;
 }
 
-TreeMapItemList* TreeMapItem::tqchildren()
+TreeMapItemList* TreeMapItem::children()
 {
-  if (!_tqchildren) {
-    _tqchildren = new TreeMapItemList;
-    _tqchildren->setAutoDelete(true);
+  if (!_children) {
+    _children = new TreeMapItemList;
+    _children->setAutoDelete(true);
   }
-  return _tqchildren;
+  return _children;
 }
 
 void TreeMapItem::clearItemRect()
@@ -1278,7 +1278,7 @@ void TreeMapWidget::setMaxDrawingDepth(int d)
 
 TQString TreeMapWidget::defaultFieldType(int f) const
 {
-  return i18n("Text %1").tqarg(f+1);
+  return i18n("Text %1").arg(f+1);
 }
 
 TQString TreeMapWidget::defaultFieldStop(int) const
@@ -1508,7 +1508,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
   if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl;
 
   while (1) {
-    TreeMapItemList* list = p->tqchildren();
+    TreeMapItemList* list = p->children();
     if (!list)
       i = 0;
     else {
@@ -1517,11 +1517,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
 
         if (DEBUG_DRAWING)
 	    kdDebug(90100) << "  Checking " << i->path(0).join("/") << " ("
-		      << i->tqitemRect().x() << "/" << i->tqitemRect().y()
-		      << "-" << i->tqitemRect().width() 
-		      << "x" << i->tqitemRect().height() << ")" << endl;
+		      << i->itemRect().x() << "/" << i->itemRect().y()
+		      << "-" << i->itemRect().width() 
+		      << "x" << i->itemRect().height() << ")" << endl;
 
-        if (i->tqitemRect().contains(x, y)) {
+        if (i->itemRect().contains(x, y)) {
 
 	    if (DEBUG_DRAWING) kdDebug(90100) << "  .. Got. Index " << idx << endl;
 
@@ -1539,7 +1539,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const
         if (DEBUG_DRAWING)
 	    kdDebug(90100) << "item(" << x << "," << y << "): Got " 
 		      << p->path(0).join("/") << " (Size " 
-		      << p->tqitemRect().width() << "x" << p->tqitemRect().height()
+		      << p->itemRect().width() << "x" << p->itemRect().height()
 		      << ", Val " << p->value() << ")" << endl;
       }
 
@@ -1568,16 +1568,16 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const
 {
   if (i) {
     /* Must have a visible area */
-    while(i && ((i->tqitemRect().width() <1) ||
-                (i->tqitemRect().height() <1))) {
+    while(i && ((i->itemRect().width() <1) ||
+                (i->itemRect().height() <1))) {
       TreeMapItem* p = i->parent();
       if (!p) break;
-      int idx = p->tqchildren()->findRef(i);
+      int idx = p->children()->findRef(i);
       idx--;
       if (idx<0)
         i = p;
       else
-        i = p->tqchildren()->at(idx);
+        i = p->children()->at(idx);
     }
   }
   return i;
@@ -1771,7 +1771,7 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1,
     i2 = i2->parent();
   if (!i2) return changed;
 
-  TreeMapItemList* list = commonParent->tqchildren();
+  TreeMapItemList* list = commonParent->children();
   if (!list) return changed;
 
   TreeMapItem* i = list->first();
@@ -1794,11 +1794,11 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e )
 {
   //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl;
 
-  if ( tqreceivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
+  if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) )
     e->accept();
 
   if ( e->reason() == TQContextMenuEvent::Keyboard ) {
-    TQRect r = (_current) ? _current->tqitemRect() : _base->tqitemRect();
+    TQRect r = (_current) ? _current->itemRect() : _base->itemRect();
     TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2);
     emit contextMenuRequested(_current, p);
   }
@@ -1962,14 +1962,14 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e )
 int nextVisible(TreeMapItem* i)
 {
   TreeMapItem* p = i->parent();
-  if (!p || p->tqitemRect().isEmpty()) return -1;
+  if (!p || p->itemRect().isEmpty()) return -1;
 
-  int idx = p->tqchildren()->findRef(i);
+  int idx = p->children()->findRef(i);
   if (idx<0) return -1;
 
-  while (idx < (int)p->tqchildren()->count()-1) {
+  while (idx < (int)p->children()->count()-1) {
     idx++;
-    TQRect r = p->tqchildren()->at(idx)->tqitemRect();
+    TQRect r = p->children()->at(idx)->itemRect();
     if (r.width()>1 && r.height()>1)
       return idx;
   }
@@ -1980,14 +1980,14 @@ int nextVisible(TreeMapItem* i)
 int prevVisible(TreeMapItem* i)
 {
   TreeMapItem* p = i->parent();
-  if (!p || p->tqitemRect().isEmpty()) return -1;
+  if (!p || p->itemRect().isEmpty()) return -1;
 
-  int idx = p->tqchildren()->findRef(i);
+  int idx = p->children()->findRef(i);
   if (idx<0) return -1;
 
   while (idx > 0) {
     idx--;
-    TQRect r = p->tqchildren()->at(idx)->tqitemRect();
+    TQRect r = p->children()->at(idx)->itemRect();
     if (r.width()>1 && r.height()>1)
       return idx;
   }
@@ -2068,24 +2068,24 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e )
     int newIdx = goBack ? nextVisible(_current) : prevVisible(_current);
     if (p && newIdx>=0) {
       p->setIndex(newIdx);
-      setCurrent(p->tqchildren()->at(newIdx), true);
+      setCurrent(p->children()->at(newIdx), true);
     }
   }
   else if (e->key() == Key_Right) {
     int newIdx = goBack ? prevVisible(_current) : nextVisible(_current);
     if (p && newIdx>=0) {
       p->setIndex(newIdx);
-      setCurrent(p->tqchildren()->at(newIdx), true);
+      setCurrent(p->children()->at(newIdx), true);
     }
   }
   else if (e->key() == Key_Down) {
-    if (_current->tqchildren() && _current->tqchildren()->count()>0) {
+    if (_current->children() && _current->children()->count()>0) {
       int newIdx = _current->index();
       if (newIdx<0)
-        newIdx = goBack ? (_current->tqchildren()->count()-1) : 0;
-      if (newIdx>=(int)_current->tqchildren()->count())
-        newIdx = _current->tqchildren()->count()-1;
-      newItem = visibleItem(_current->tqchildren()->at(newIdx));
+        newIdx = goBack ? (_current->children()->count()-1) : 0;
+      if (newIdx>=(int)_current->children()->count())
+        newIdx = _current->children()->count()-1;
+      newItem = visibleItem(_current->children()->at(newIdx));
       setCurrent(newItem, true);
     }
   }
@@ -2162,7 +2162,7 @@ void TreeMapWidget::drawTreeMap()
     }
     else {
       // only subitem
-      if (!_needsRefresh->tqitemRect().isValid()) return;
+      if (!_needsRefresh->itemRect().isValid()) return;
     }
 
     // reset cached font object; it could have been changed
@@ -2180,7 +2180,7 @@ void TreeMapWidget::drawTreeMap()
     TQPainter p(this);
     tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
                            TQRect(0, 0, TQWidget::width(), TQWidget::height()),
-                           tqcolorGroup() );
+                           colorGroup() );
   }
 }
 
@@ -2226,7 +2226,7 @@ void TreeMapWidget::drawItem(TQPainter* p,
   int dd = item->depth();
   if (isTransparent(dd)) return;
 
-  RectDrawing d(item->tqitemRect());
+  RectDrawing d(item->itemRect());
   item->setSelected(isSelected);
   item->setCurrent(isCurrent);
   item->setShaded(_shading);
@@ -2261,25 +2261,25 @@ void TreeMapWidget::drawItems(TQPainter* p,
 {
     if (DEBUG_DRAWING)
 	kdDebug(90100) << "+drawItems(" << item->path(0).join("/") << ", "
-		  << item->tqitemRect().x() << "/" << item->tqitemRect().y()
-		  << "-" << item->tqitemRect().width() << "x"
-		  << item->tqitemRect().height() << "), Val " << item->value()
+		  << item->itemRect().x() << "/" << item->itemRect().y()
+		  << "-" << item->itemRect().width() << "x"
+		  << item->itemRect().height() << "), Val " << item->value()
 		  << ", Sum " << item->sum() << endl;
 
   drawItem(p, item);
   item->clearFreeRects();
 
-  TQRect origRect = item->tqitemRect();
+  TQRect origRect = item->itemRect();
   int bw = item->borderWidth();
   TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw,
                   origRect.width()-2*bw, origRect.height()-2*bw);
 
-  TreeMapItemList* list = item->tqchildren();
+  TreeMapItemList* list = item->children();
   TreeMapItem* i;
 
   bool stopDrawing = false;
 
-  // only subdivide if there are tqchildren
+  // only subdivide if there are children
   if (!list || list->count()==0)
     stopDrawing = true;
 
@@ -2312,12 +2312,12 @@ void TreeMapWidget::drawItems(TQPainter* p,
 
   if (stopDrawing) {
     if (list) {
-      // tqinvalidate rects
+      // invalidate rects
       for (i=list->first();i;i=list->next())
         i->clearItemRect();
     }
     // tooltip apears on whole item rect
-    item->addFreeRect(item->tqitemRect());
+    item->addFreeRect(item->itemRect());
 
     // if we have space for text...
     if ((r.height() < _fontHeight) || (r.width() < _fontHeight)) return;
@@ -2428,7 +2428,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
       r.setRect(r.x(), r.y()+sr.height(), r.width(), r.height()-sr.height());
     }
 
-    // set selfRect (not occupied by tqchildren) for tooltip
+    // set selfRect (not occupied by children) for tooltip
     item->addFreeRect(sr);
 
     if (0) kdDebug(90100) << "Item " << item->path(0).join("/") << ": SelfR "
@@ -2566,7 +2566,7 @@ void TreeMapWidget::drawItems(TQPainter* p,
       kdDebug(90100) << "-drawItems(" << item->path(0).join("/") << ")" << endl;
 }
 
-// fills area with a pattern if to small to draw tqchildren
+// fills area with a pattern if to small to draw children
 void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r)
 {
   p->setBrush(TQt::Dense4Pattern);
@@ -2575,7 +2575,7 @@ void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r)
   i->addFreeRect(r);
 }
 
-// fills area with a pattern if to small to draw tqchildren
+// fills area with a pattern if to small to draw children
 void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r,
                              TreeMapItemListIterator it, int len, bool goBack)
 {
@@ -2874,10 +2874,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id)
   popup->insertItem(i18n("Border"), bpopup, id+1);
   bpopup->insertItem(i18n("Correct Borders Only"), id+2);
   bpopup->insertSeparator();
-  bpopup->insertItem(i18n("Width %1").tqarg(0), id+3);
-  bpopup->insertItem(i18n("Width %1").tqarg(1), id+4);
-  bpopup->insertItem(i18n("Width %1").tqarg(2), id+5);
-  bpopup->insertItem(i18n("Width %1").tqarg(3), id+6);
+  bpopup->insertItem(i18n("Width %1").arg(0), id+3);
+  bpopup->insertItem(i18n("Width %1").arg(1), id+4);
+  bpopup->insertItem(i18n("Width %1").arg(2), id+5);
+  bpopup->insertItem(i18n("Width %1").arg(3), id+6);
   bpopup->setItemChecked(id+2, skipIncorrectBorder());
   bpopup->setItemChecked(id+3, borderWidth()==0);
   bpopup->setItemChecked(id+4, borderWidth()==1);
@@ -2984,7 +2984,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup,
   connect(popup, TQT_SIGNAL(activated(int)),
           this, TQT_SLOT(fieldStopActivated(int)));
 
-  popup->insertItem(i18n("No %1 Limit").tqarg(fieldType(0)), id);
+  popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id);
   popup->setItemChecked(id, fieldStop(0).isEmpty());
   _menuItem = i;
   bool foundFieldStop = false;
@@ -3043,7 +3043,7 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
     int area = i->width() * i->height();
     popup->insertSeparator();
     popup->insertItem(i18n("Area of '%1' (%2)")
-                       .tqarg(i->text(0)).tqarg(area), id+1);
+                       .arg(i->text(0)).arg(area), id+1);
     if (area == minimalArea()) {
       popup->setItemChecked(id+1, true);
       foundArea = true;
@@ -3069,9 +3069,9 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup,
     }
 
     popup->insertItem(i18n("Double Area Limit (to %1)")
-                       .tqarg(minimalArea()*2), id+5);
+                       .arg(minimalArea()*2), id+5);
     popup->insertItem(i18n("Halve Area Limit (to %1)")
-                       .tqarg(minimalArea()/2), id+6);
+                       .arg(minimalArea()/2), id+6);
   }
 }
 
@@ -3105,7 +3105,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
     int d = i->depth();
     popup->insertSeparator();
     popup->insertItem(i18n("Depth of '%1' (%2)")
-                       .tqarg(i->text(0)).tqarg(d), id+1);
+                       .arg(i->text(0)).arg(d), id+1);
     if (d == maxDrawingDepth()) {
       popup->setItemChecked(id+1, true);
       foundDepth = true;
@@ -3115,14 +3115,14 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup,
   if (maxDrawingDepth()>1) {
     popup->insertSeparator();
     if (!foundDepth) {
-      popup->insertItem(i18n("Depth %1").tqarg(maxDrawingDepth()), id+10);
+      popup->insertItem(i18n("Depth %1").arg(maxDrawingDepth()), id+10);
       popup->setItemChecked(id+10, true);
     }
 
     popup->insertItem(i18n("Decrement (to %1)")
-                       .tqarg(maxDrawingDepth()-1), id+2);
+                       .arg(maxDrawingDepth()-1), id+2);
     popup->insertItem(i18n("Increment (to %1)")
-                       .tqarg(maxDrawingDepth()+1), id+3);
+                       .arg(maxDrawingDepth()+1), id+3);
   }
 }
 
@@ -3145,13 +3145,13 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix)
   int f, fCount = _attr.size();
   config->writeEntry(prefix+"FieldCount", fCount);
   for (f=0;f<fCount;f++) {
-    config->writeEntry(TQString(prefix+"FieldVisible%1").tqarg(f),
+    config->writeEntry(TQString(prefix+"FieldVisible%1").arg(f),
                        _attr[f].visible);
-    config->writeEntry(TQString(prefix+"FieldForced%1").tqarg(f),
+    config->writeEntry(TQString(prefix+"FieldForced%1").arg(f),
                        _attr[f].forced);
-    config->writeEntry(TQString(prefix+"FieldStop%1").tqarg(f),
+    config->writeEntry(TQString(prefix+"FieldStop%1").arg(f),
                        _attr[f].stop);
-    config->writeEntry(TQString(prefix+"FieldPosition%1").tqarg(f),
+    config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f),
                        fieldPositionString(f));
   }
 }
@@ -3195,18 +3195,18 @@ void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix)
 
   int f;
   for (f=0;f<num;f++) {
-    str = TQString(prefix+"FieldVisible%1").tqarg(f);
+    str = TQString(prefix+"FieldVisible%1").arg(f);
     if (config->hasKey(str))
       setFieldVisible(f, config->readBoolEntry(str));
 
-    str = TQString(prefix+"FieldForced%1").tqarg(f);
+    str = TQString(prefix+"FieldForced%1").arg(f);
     if (config->hasKey(str))
       setFieldForced(f, config->readBoolEntry(str));
 
-    str = config->readEntry(TQString(prefix+"FieldStop%1").tqarg(f));
+    str = config->readEntry(TQString(prefix+"FieldStop%1").arg(f));
     setFieldStop(f, str);
 
-    str = config->readEntry(TQString(prefix+"FieldPosition%1").tqarg(f));
+    str = config->readEntry(TQString(prefix+"FieldPosition%1").arg(f));
     if (!str.isEmpty()) setFieldPosition(f, str);
   }
 }
diff --git a/kcachegrind/kcachegrind/treemap.h b/kcachegrind/kcachegrind/treemap.h
index 1604a51c..422cd35c 100644
--- a/kcachegrind/kcachegrind/treemap.h
+++ b/kcachegrind/kcachegrind/treemap.h
@@ -222,7 +222,7 @@ typedef TQPtrListIterator<TreeMapItem> TreeMapItemListIterator;
  *
  * If you want more flexibility, reimplement TreeMapItem and
  * override the corresponding methods. For dynamic creation of child
- * items on demand, reimplement tqchildren().
+ * items on demand, reimplement children().
  */
 class TreeMapItem: public StoredDrawParams
 {
@@ -257,7 +257,7 @@ public:
   // force a redraw of this item
   void redraw();
 
-  // delete all tqchildren
+  // delete all children
   void clear();
 
   // force new child generation & refresh
@@ -297,7 +297,7 @@ public:
    */
   void setItemRect(const TQRect& r) { _rect = r; }
   void clearItemRect();
-  const TQRect& tqitemRect() const { return _rect; }
+  const TQRect& itemRect() const { return _rect; }
   int width() const { return _rect.width(); }
   int height() const { return _rect.height(); }
 
@@ -350,7 +350,7 @@ public:
    * For value() sorting, use <textNo> = -2
    *
    * For fast sorting, set this to -1 before child insertions and call
-   * again after inserting all tqchildren.
+   * again after inserting all children.
    */
   void setSorting(int textNo, bool ascending = true);
 
@@ -358,18 +358,18 @@ public:
    * Resort according to the already set sorting.
    *
    * This has to be done if the sorting base changes (e.g. text or values
-   * change). If this is only true for the tqchildren of this item, you can
+   * change). If this is only true for the children of this item, you can
    * set the recursive parameter to false.
    */
   void resort(bool recursive = true);
 
   virtual SplitMode splitMode() const;
   virtual int rtti() const;
-  // not const as this can create tqchildren on demand
-  virtual TreeMapItemList* tqchildren();
+  // not const as this can create children on demand
+  virtual TreeMapItemList* children();
 
 protected:
-  TreeMapItemList* _tqchildren;
+  TreeMapItemList* _children;
   double _sum, _value;
 
 private:
@@ -379,7 +379,7 @@ private:
   int _sortTextNo;
   bool _sortAscending;
 
-  // temporary tqlayout
+  // temporary layout
   TQRect _rect;
   TQPtrList<TQRect>* _freeRects;
   int _depth;
@@ -444,7 +444,7 @@ public:
   /**
    * Selects or unselects an item.
    * In multiselection mode, the constrain that a selected item
-   * has no selected tqchildren or parents stays true.
+   * has no selected children or parents stays true.
    */
   void setSelected(TreeMapItem*, bool selected = true);
 
@@ -460,7 +460,7 @@ public:
   void setMarked(int markNo = 1, bool redraw = true);
 
   /**
-   * Clear selection of all selected items which are tqchildren of
+   * Clear selection of all selected items which are children of
    * parent. When parent == 0, clears whole selection
    * Returns true if selection changed.
    */
@@ -472,7 +472,7 @@ public:
    * Range means for a hierarchical widget:
    * - select/unselect i1 and i2 according selected
    * - search common parent of i1 and i2, and select/unselect the
-   *   range of direct tqchildren between but excluding the child
+   *   range of direct children between but excluding the child
    *   leading to i1 and the child leading to i2.
    */
   void setRangeSelection(TreeMapItem* i1,
@@ -532,7 +532,7 @@ public:
   void setVisibleWidth(int width, bool reuseSpace = false);
 
   /**
-   * If a tqchildren value() is almost the parents sum(),
+   * If a children value() is almost the parents sum(),
    * it can happen that the border to be drawn for visibilty of
    * nesting relations takes to much space, and the
    * parent/child size relation can not be mapped to a correct
@@ -644,7 +644,7 @@ public:
   virtual TQString tipString(TreeMapItem* i) const;
 
   /**
-   * Redraws an item with all tqchildren.
+   * Redraws an item with all children.
    * This takes changed values(), sums(), colors() and text() into account.
    */
   void redraw(TreeMapItem*);
diff --git a/kcachegrind/kcachegrind/utils.h b/kcachegrind/kcachegrind/utils.h
index 06052a61..7256f054 100644
--- a/kcachegrind/kcachegrind/utils.h
+++ b/kcachegrind/kcachegrind/utils.h
@@ -86,7 +86,7 @@ class FixString {
     bool stripInt64(int64&, bool stripSpaces = true);
 
     operator TQString() const
-	{ return TQString::tqfromLatin1(_str,_len); }
+	{ return TQString::fromLatin1(_str,_len); }
 
  private:
     const char* _str;
diff --git a/kioslave/svn/ksvnd/commitdlg.ui b/kioslave/svn/ksvnd/commitdlg.ui
index 35b9a97e..fb45eda1 100644
--- a/kioslave/svn/ksvnd/commitdlg.ui
+++ b/kioslave/svn/ksvnd/commitdlg.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -42,7 +42,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -58,7 +58,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>220</width>
                                     <height>20</height>
diff --git a/kioslave/svn/ksvnd/ksvnd.cpp b/kioslave/svn/ksvnd/ksvnd.cpp
index fb96c9af..ddc7fb3e 100644
--- a/kioslave/svn/ksvnd/ksvnd.cpp
+++ b/kioslave/svn/ksvnd/ksvnd.cpp
@@ -196,7 +196,7 @@ bool KSvnd::anyValidWorkingCopy( const KURL::List& wclist ) {
 	return false;
 }
 
-int KSvnd::gettqStatus( const KURL::List& list ) {
+int KSvnd::getStatus( const KURL::List& list ) {
 	int result = 0;
 	uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0;
 	for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) {
@@ -214,7 +214,7 @@ int KSvnd::gettqStatus( const KURL::List& list ) {
 				external++;
 			}
 		}
-		if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ?
+		if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ?
 			parentshavesvn++;
 	}
 	if ( files > 0 ) 
@@ -256,18 +256,18 @@ bool KSvnd::isFolder( const KURL& url ) {
 
 TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
 	TQStringList result;
-	int listtqStatus = gettqStatus( list );
+	int listStatus = getStatus( list );
 
-	if ( !(listtqStatus & SomeAreInParentsEntries) &&
-	     !(listtqStatus & SomeAreExternalToParent) &&
-	     !(listtqStatus & SomeHaveSvn)) {
-		if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+	if ( !(listStatus & SomeAreInParentsEntries) &&
+	     !(listStatus & SomeAreExternalToParent) &&
+	     !(listStatus & SomeHaveSvn)) {
+		if( list.size() == 1 && listStatus & SomeAreFolders) {
 			result << "Checkout";
 			result << "Export";
 //			result << "CreateRepository";
 			result << "Import";
 		}
-	} else if ( (listtqStatus & AllAreInParentsEntries) ) {
+	} else if ( (listStatus & AllAreInParentsEntries) ) {
 		result << "Diff";
 		//In SVN
 //		result << "ShowLog";
@@ -277,7 +277,7 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
 //		result << "Update to revision..."
 		result << "Rename";
 		result << "Delete";
-		if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+		if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
 			result << "Revert";
 //			result << "Cleanup";
 		}
@@ -285,19 +285,19 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
 //		result << "BranchTag";
 		result << "Switch";
 		result << "Merge";	
-		if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) {
+		if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) {
 //			result << "Export";
 //			result << "Relocate";
 			result << "_SEPARATOR_";
 			result << "Add";		
 		}
 		result << "_SEPARATOR_";
-		if( listtqStatus & SomeAreFiles && !(listtqStatus & SomeAreFolders)) {
+		if( listStatus & SomeAreFiles && !(listStatus & SomeAreFolders)) {
 			result << "Blame";
 		}
 		result << "CreatePatch";
 		
-		if( list.size() == 1 && listtqStatus & SomeAreFolders) {
+		if( list.size() == 1 && listStatus & SomeAreFolders) {
 //			result << "ApplyPatchToFolder";
 		}
 	}
@@ -306,12 +306,12 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) {
 
 TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) {
 	TQStringList result;
-	int listtqStatus = gettqStatus( list );
+	int listStatus = getStatus( list );
 
 	
-	if ( ( listtqStatus & AllParentsHaveSvn &&
-			( ( listtqStatus & SomeAreExternalToParent ) || ( listtqStatus & SomeAreInParentsEntries ) ) 
-				|| ( listtqStatus & SomeHaveSvn ) )
+	if ( ( listStatus & AllParentsHaveSvn &&
+			( ( listStatus & SomeAreExternalToParent ) || ( listStatus & SomeAreInParentsEntries ) ) 
+				|| ( listStatus & SomeHaveSvn ) )
 		) {
 		result << "Update";
 		result << "Commit";
diff --git a/kioslave/svn/ksvnd/ksvnd.h b/kioslave/svn/ksvnd/ksvnd.h
index 78583e02..bf10429c 100644
--- a/kioslave/svn/ksvnd/ksvnd.h
+++ b/kioslave/svn/ksvnd/ksvnd.h
@@ -32,7 +32,7 @@ class KSvnd : public KDEDModule
 //  TQ_OBJECT
   K_DCOP
 
-  //note: InSVN means tqparent is added.  InRepos  means itself is added
+  //note: InSVN means parent is added.  InRepos  means itself is added
   enum { SomeAreFiles = 1, SomeAreFolders = 2,  SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 };
 public:
   KSvnd(const TQCString &);
@@ -56,7 +56,7 @@ k_dcop:
 k_dcop_signals:
   //emitted whenever something happens using subversion ;)
 //  void subversionNotify(const TQString&, int ,int, const TQString& , int , int, long int, const TQString&);
-//  void subversiontqStatus(const TQString&,int,int,int,int,long int);
+//  void subversionStatus(const TQString&,int,int,int,int,long int);
 
 public slots:
 
@@ -64,7 +64,7 @@ protected:
   bool isFileInSvnEntries ( const TQString filename, const TQString entfile );
   bool isFileInExternals ( const TQString filename, const TQString propfile );
   bool isFolder( const KURL& url );
-  int gettqStatus( const KURL::List& list );
+  int getStatus( const KURL::List& list );
 };
 
 #endif
diff --git a/kioslave/svn/svn.cpp b/kioslave/svn/svn.cpp
index 362852d3..9d06c516 100644
--- a/kioslave/svn/svn.cpp
+++ b/kioslave/svn/svn.cpp
@@ -232,7 +232,7 @@ void kio_svnProtocol::get(const KURL& url ){
 	kdDebug(7128) << "kio_svn::get(const KURL& url)" << endl ;
 
 	TQString remoteServer = url.host();
-	infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) );
+	infoMessage(i18n("Looking for %1...").arg( remoteServer ) );
 
 	apr_pool_t *subpool = svn_pool_create (pool);
 	kbaton *bt = (kbaton*)apr_pcalloc(subpool, sizeof(*bt));
@@ -1087,7 +1087,7 @@ void kio_svnProtocol::commit(const KURL::List& wc) {
 
 			TQString userstring = i18n ( "Nothing to commit." );
 			if ( SVN_IS_VALID_REVNUM( commit_info->revision ) )
-				userstring = i18n( "Committed revision %1." ).tqarg(commit_info->revision);
+				userstring = i18n( "Committed revision %1." ).arg(commit_info->revision);
 			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() );
 			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" ); 
 			setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" );
@@ -1349,41 +1349,41 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
 	switch ( action ) {
 		case svn_wc_notify_add : //add
 			if (mime_type && (svn_mime_type_is_binary (mime_type)))
-				userstring = i18n( "A (bin) %1" ).tqarg( path );
+				userstring = i18n( "A (bin) %1" ).arg( path );
 			else
-				userstring = i18n( "A %1" ).tqarg( path );
+				userstring = i18n( "A %1" ).arg( path );
 			break;
 		case svn_wc_notify_copy: //copy
 			break;
 		case svn_wc_notify_delete: //delete
 			nb->received_some_change = TRUE;
-			userstring = i18n( "D %1" ).tqarg( path );
+			userstring = i18n( "D %1" ).arg( path );
 			break;
 		case svn_wc_notify_restore : //restore
-			userstring=i18n( "Restored %1." ).tqarg( path );
+			userstring=i18n( "Restored %1." ).arg( path );
 			break;
 		case svn_wc_notify_revert : //revert
-			userstring=i18n( "Reverted %1." ).tqarg( path );
+			userstring=i18n( "Reverted %1." ).arg( path );
 			break;
 		case svn_wc_notify_failed_revert: //failed revert
-			userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path );
+			userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path );
 			break;
 		case svn_wc_notify_resolved: //resolved
-			userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path );
+			userstring=i18n( "Resolved conflicted state of %1." ).arg( path );
 			break;
 		case svn_wc_notify_skip: //skip
 			if ( content_state == svn_wc_notify_state_missing )
-				userstring=i18n("Skipped missing target %1.").tqarg( path );
+				userstring=i18n("Skipped missing target %1.").arg( path );
 			else 
-				userstring=i18n("Skipped  %1.").tqarg( path );
+				userstring=i18n("Skipped  %1.").arg( path );
 			break;
 		case svn_wc_notify_update_delete: //update_delete
 			nb->received_some_change = TRUE;
-			userstring=i18n( "D %1" ).tqarg( path );
+			userstring=i18n( "D %1" ).arg( path );
 			break;
 		case svn_wc_notify_update_add: //update_add
 			nb->received_some_change = TRUE;
-			userstring=i18n( "A %1" ).tqarg( path );
+			userstring=i18n( "A %1" ).arg( path );
 			break;
 		case svn_wc_notify_update_update: //update_update
 			{
@@ -1428,25 +1428,25 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
 					if (SVN_IS_VALID_REVNUM (revision)) {
 						if (nb->is_export) {
 							if ( nb->in_external ) 
-								userstring = i18n("Exported external at revision %1.").tqarg( revision );
+								userstring = i18n("Exported external at revision %1.").arg( revision );
 							else 
-								userstring = i18n("Exported revision %1.").tqarg( revision );
+								userstring = i18n("Exported revision %1.").arg( revision );
 						} else if (nb->is_checkout) {
 							if ( nb->in_external )
-								userstring = i18n("Checked out external at revision %1.").tqarg( revision );
+								userstring = i18n("Checked out external at revision %1.").arg( revision );
 							else
-								userstring = i18n("Checked out revision %1.").tqarg( revision);
+								userstring = i18n("Checked out revision %1.").arg( revision);
 						} else {
 							if (nb->received_some_change) {
 								if ( nb->in_external )
-									userstring=i18n("Updated external to revision %1.").tqarg( revision );
+									userstring=i18n("Updated external to revision %1.").arg( revision );
 								else 
-									userstring = i18n("Updated to revision %1.").tqarg( revision);
+									userstring = i18n("Updated to revision %1.").arg( revision);
 							} else {
 								if ( nb->in_external )
-									userstring = i18n("External at revision %1.").tqarg( revision );
+									userstring = i18n("External at revision %1.").arg( revision );
 								else
-									userstring = i18n("At revision %1.").tqarg( revision);
+									userstring = i18n("At revision %1.").arg( revision);
 							}
 						}
 					} else  /* no revision */ {
@@ -1474,30 +1474,30 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action
 			break;
 		case svn_wc_notify_update_external: //update_external
 			nb->in_external = TRUE;
-			userstring = i18n("Fetching external item into %1." ).tqarg( path );
+			userstring = i18n("Fetching external item into %1." ).arg( path );
 			break;
 		case svn_wc_notify_status_completed: //status_completed
 			if (SVN_IS_VALID_REVNUM (revision))
-				userstring = i18n( "Status against revision: %1.").tqarg( revision );
+				userstring = i18n( "Status against revision: %1.").arg( revision );
 			break;
 		case svn_wc_notify_status_external: //status_external
-             userstring = i18n("Performing status on external item at %1.").tqarg( path ); 
+             userstring = i18n("Performing status on external item at %1.").arg( path ); 
 			break;
 		case svn_wc_notify_commit_modified: //commit_modified
-			userstring = i18n( "Sending %1").tqarg( path );
+			userstring = i18n( "Sending %1").arg( path );
 			break;
 		case svn_wc_notify_commit_added: //commit_added
 			if (mime_type && svn_mime_type_is_binary (mime_type)) {
-				userstring = i18n( "Adding (bin) %1.").tqarg( path );
+				userstring = i18n( "Adding (bin) %1.").arg( path );
 			} else {
-				userstring = i18n( "Adding %1.").tqarg( path );
+				userstring = i18n( "Adding %1.").arg( path );
 			}
 			break;
 		case svn_wc_notify_commit_deleted: //commit_deleted
-			userstring = i18n( "Deleting %1.").tqarg( path );
+			userstring = i18n( "Deleting %1.").arg( path );
 			break; 
 		case svn_wc_notify_commit_replaced: //commit_replaced
-			userstring = i18n( "Replacing %1.").tqarg( path );
+			userstring = i18n( "Replacing %1.").arg( path );
 			break;
 		case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta
 			if (! nb->sent_first_txdelta) {
diff --git a/kioslave/svn/svnhelper/kio_svn_helper.cpp b/kioslave/svn/svnhelper/kio_svn_helper.cpp
index 3456b3fd..19f08621 100644
--- a/kioslave/svn/svnhelper/kio_svn_helper.cpp
+++ b/kioslave/svn/svnhelper/kio_svn_helper.cpp
@@ -40,11 +40,11 @@
 #include <tqspinbox.h>
 #include <kprocess.h>
 #include <ktempfile.h>
-#include <tqtextstream.h>
-#include <tqtextedit.h>
+#include <textstream.h>
+#include <textedit.h>
 #include <kstandarddirs.h>
-#include <tqtextbrowser.h>
-#include <tqtextcodec.h>
+#include <textbrowser.h>
+#include <textcodec.h>
 
 SvnHelper::SvnHelper():KApplication() {
 	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
diff --git a/kioslave/svn/svnhelper/subversioncheckout.ui b/kioslave/svn/svnhelper/subversioncheckout.ui
index 3ed752e7..8f583932 100644
--- a/kioslave/svn/svnhelper/subversioncheckout.ui
+++ b/kioslave/svn/svnhelper/subversioncheckout.ui
@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -76,7 +76,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -131,7 +131,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -155,7 +155,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>121</width>
                                     <height>20</height>
diff --git a/kioslave/svn/svnhelper/subversiondiff.ui b/kioslave/svn/svnhelper/subversiondiff.ui
index e647f6b6..a624e6bb 100644
--- a/kioslave/svn/svnhelper/subversiondiff.ui
+++ b/kioslave/svn/svnhelper/subversiondiff.ui
@@ -60,7 +60,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kioslave/svn/svnhelper/subversionlog.ui b/kioslave/svn/svnhelper/subversionlog.ui
index 20060f73..e6135a8e 100644
--- a/kioslave/svn/svnhelper/subversionlog.ui
+++ b/kioslave/svn/svnhelper/subversionlog.ui
@@ -60,7 +60,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kioslave/svn/svnhelper/subversionswitch.ui b/kioslave/svn/svnhelper/subversionswitch.ui
index c0642bc4..1e48b29e 100644
--- a/kioslave/svn/svnhelper/subversionswitch.ui
+++ b/kioslave/svn/svnhelper/subversionswitch.ui
@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -76,7 +76,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -131,7 +131,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -155,7 +155,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>121</width>
                                     <height>20</height>
diff --git a/kmtrace/demangle.cpp b/kmtrace/demangle.cpp
index 8c10c4a2..ca246038 100644
--- a/kmtrace/demangle.cpp
+++ b/kmtrace/demangle.cpp
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <tqstringlist.h>
 #include <tqstrlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqsortedlist.h>
 #include <tqfile.h>
 #include <tqtl.h>
diff --git a/kmtrace/kmtrace.cpp b/kmtrace/kmtrace.cpp
index 0c3dd137..0d27471e 100644
--- a/kmtrace/kmtrace.cpp
+++ b/kmtrace/kmtrace.cpp
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <tqstringlist.h>
 #include <tqstrlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqsortedlist.h>
 #include <tqfile.h>
 #include <tqtl.h>
diff --git a/kmtrace/match.cpp b/kmtrace/match.cpp
index add7cf3c..2e35651e 100644
--- a/kmtrace/match.cpp
+++ b/kmtrace/match.cpp
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <tqstringlist.h>
 #include <tqstrlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqsortedlist.h>
 #include <tqfile.h>
 #include <tqtl.h>
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
    while(!feof(map_file))
    {
       fgets(buf, 1024, map_file);
-      TQString line = TQString::tqfromLatin1(buf).stripWhiteSpace();
+      TQString line = TQString::fromLatin1(buf).stripWhiteSpace();
       TQStringList split = TQStringList::split(' ', line);
       if (split.count() <= 1)
          return 1;
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
    while(!feof(call_file))
    {
       fgets(buf, 1024, call_file);
-      TQString line = TQString::tqfromLatin1(buf).stripWhiteSpace();
+      TQString line = TQString::fromLatin1(buf).stripWhiteSpace();
       if (dict.find(line))
       {
          qWarning("%s", line.latin1());
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index bb1c71a9..43814746 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -258,7 +258,7 @@ void KompareShell::setupStatusBar()
 
 	m_generalLabel = new KSqueezedTextLabel( "", 0, "general_statusbar_label" );
 	statusBar()->addWidget( m_generalLabel, 1, false );
-	m_generalLabel->tqsetAlignment( TQt::AlignLeft );
+	m_generalLabel->setAlignment( TQt::AlignLeft );
 }
 
 void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int modelCount, int differenceCount, int appliedCount )
@@ -269,13 +269,13 @@ void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int
 	TQString diffStr;
 
 	if ( modelIndex >= 0 )
-		fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).tqarg( modelIndex + 1 );
+		fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).arg( modelIndex + 1 );
 	else
 		fileStr = i18n( " %n file ", " %n files ", modelCount );
 
 	if ( differenceIndex >= 0 )
 		diffStr = i18n( " %1 of %n difference, %2 applied ", " %1 of %n differences, %2 applied ", differenceCount )
-		          .tqarg( differenceIndex + 1 ).tqarg( appliedCount );
+		          .arg( differenceIndex + 1 ).arg( appliedCount );
 	else
 		diffStr = i18n( " %n difference ", " %n differences ", differenceCount );
 
@@ -438,7 +438,7 @@ void KompareShell::slotShowTextView()
 		// FIXME: proper error checking
 		m_textViewWidget = createDockWidget( i18n("Text View"), SmallIcon( "text") );
 		m_textViewPart = KParts::ComponentFactory::createPartInstanceFromQuery<KTextEditor::Document>(
-		                 TQString::tqfromLatin1("KTextEditor/Document"),
+		                 TQString::fromLatin1("KTextEditor/Document"),
 		                 TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0, TQStringList(), &errCode );
 		if ( m_textViewPart )
 		{
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index 1a402260..9f9d775e 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -582,7 +582,7 @@ KDirLVI* KDirLVI::findChild( TQString dir )
 //	kdDebug(8105) << "KDirLVI::findChild called with dir = " << dir << endl;
 	KDirLVI* child;
 	if ( ( child = static_cast<KDirLVI*>(this->firstChild()) ) != 0L )
-	{ // has tqchildren, check if dir already exists, if so addModel
+	{ // has children, check if dir already exists, if so addModel
 		do {
 			if ( dir == child->dirName() )
 				return child;
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index 3c110857..c11bbe8e 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -21,7 +21,7 @@
 
 #include "kompare_qsplitter.h" // make sure we get there first
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 
 #include <kaction.h>
@@ -266,7 +266,7 @@ const TQString KomparePart::fetchURL( const KURL& url )
 	{
 		if ( ! KIO::NetAccess::download( url, tempFileName, widget() ) )
 		{
-			slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).tqarg( url.prettyURL() ) );
+			slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).arg( url.prettyURL() ) );
 			tempFileName = "";
 		}
 		return tempFileName;
@@ -278,7 +278,7 @@ const TQString KomparePart::fetchURL( const KURL& url )
 			return url.path();
 		else
 		{
-			slotShowError( i18n( "<qt>The URL <b>%1</b> does not exist on your system.</qt>" ).tqarg( url.prettyURL() ) );
+			slotShowError( i18n( "<qt>The URL <b>%1</b> does not exist on your system.</qt>" ).arg( url.prettyURL() ) );
 			return tempFileName;
 		}
 	}
@@ -543,26 +543,26 @@ void KomparePart::updateStatus()
 	{
 	case Kompare::ComparingFiles :
 		text = i18n( "Comparing file %1 with file %2" )
-		   .tqarg( source )
-		   .tqarg( destination );
+		   .arg( source )
+		   .arg( destination );
 		break;
 	case Kompare::ComparingDirs :
 		text = i18n( "Comparing files in %1 with files in %2" )
-		   .tqarg( source )
-		   .tqarg( destination );
+		   .arg( source )
+		   .arg( destination );
 		break;
 	case Kompare::ShowingDiff :
-		text = i18n( "Viewing diff output from %1" ).tqarg( source );
+		text = i18n( "Viewing diff output from %1" ).arg( source );
 		break;
 	case Kompare::BlendingFile :
 		text = i18n( "Blending diff output from %1 into file %2" )
-		    .tqarg( source )
-		    .tqarg( destination );
+		    .arg( source )
+		    .arg( destination );
 		break;
 	case Kompare::BlendingDir :
 		text = i18n( "Blending diff output from %1 into folder %2" )
-		    .tqarg( m_info.source.prettyURL() )
-		    .tqarg( m_info.destination.prettyURL() );
+		    .arg( m_info.source.prettyURL() )
+		    .arg( m_info.destination.prettyURL() );
 		break;
 	default:
 		break;
@@ -678,8 +678,8 @@ void KomparePart::slotShowDiffstats( void )
 		    "Format: %3\n"
 		    "Number of hunks: %4\n"
 		    "Number of differences: %5")
-		    .tqarg(oldFile).tqarg(newFile).tqarg(diffFormat)
-		    .tqarg(noOfHunks).tqarg(noOfDiffs),
+		    .arg(oldFile).arg(newFile).arg(diffFormat)
+		    .arg(noOfHunks).arg(noOfDiffs),
 		    i18n("Diff Statistics"), TQString(), false );
 	} else { // more than 1 file in diff, or 2 directories compared
 		KMessageBox::information( 0L, i18n(
@@ -693,8 +693,8 @@ void KomparePart::slotShowDiffstats( void )
 		    "\n"
 		    "Number of hunks: %5\n"
 		    "Number of differences: %6")
-		    .tqarg(filesInDiff).tqarg(diffFormat).tqarg(oldFile)
-		    .tqarg(newFile).tqarg(noOfHunks).tqarg(noOfDiffs),
+		    .arg(filesInDiff).arg(diffFormat).arg(oldFile)
+		    .arg(newFile).arg(noOfHunks).arg(noOfDiffs),
 		    i18n("Diff Statistics"), TQString(), false );
 	}
 }
diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp
index 4d7bd603..2bccc48b 100644
--- a/kompare/komparepart/kompareconnectwidget.cpp
+++ b/kompare/komparepart/kompareconnectwidget.cpp
@@ -46,14 +46,14 @@ KompareConnectWidgetFrame::KompareConnectWidgetFrame( KompareListView* left,
 	m_label ( "", this ),
 	m_layout ( this )
 {
-	tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) );
-	m_wid.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
-	m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+	setSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) );
+	m_wid.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
+	m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
 	m_label.setMargin(3);
 	TQFrame* bottomLine = new TQFrame(this);
 	bottomLine->setFrameShape(TQFrame::HLine);
 	bottomLine->setFrameShadow ( TQFrame::Plain );
-	bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+	bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
 	bottomLine->setFixedHeight(1);
 	m_layout.setSpacing(0);
 	m_layout.setMargin(0);
@@ -66,9 +66,9 @@ KompareConnectWidgetFrame::~KompareConnectWidgetFrame()
 {
 }
 
-TQSize KompareConnectWidgetFrame::tqsizeHint() const
+TQSize KompareConnectWidgetFrame::sizeHint() const
 {
-	return TQSize(50, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) );
+	return TQSize(50, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) );
 }
 
 static int kMouseOffset;
@@ -111,7 +111,7 @@ KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListVi
 {
 //	connect( m_settings, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotDelayedRepaint() ) );
 	setBackgroundMode( NoBackground );
-	tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
+	setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
 	setFocusProxy( parent->parentWidget() );
 }
 
@@ -139,7 +139,7 @@ void KompareConnectWidget::slotSetSelection( const DiffModel* model, const Diffe
 
 void KompareConnectWidget::slotDelayedRepaint()
 {
-	TQTimer::singleShot( 0, this, TQT_SLOT( tqrepaint() ) );
+	TQTimer::singleShot( 0, this, TQT_SLOT( repaint() ) );
 }
 
 void KompareConnectWidget::slotSetSelection( const Difference* diff )
@@ -190,13 +190,13 @@ void KompareConnectWidget::paintEvent( TQPaintEvent* /* e */ )
 
 				if ( TQApplication::reverseLayout() )
 				{
-					leftRect = m_rightView->tqitemRect( i );
-					rightRect = m_leftView->tqitemRect( i );
+					leftRect = m_rightView->itemRect( i );
+					rightRect = m_leftView->itemRect( i );
 				}
 				else
 				{
-					leftRect = m_leftView->tqitemRect( i );
-					rightRect = m_rightView->tqitemRect( i );
+					leftRect = m_leftView->itemRect( i );
+					rightRect = m_rightView->itemRect( i );
 				}
 
 				int tl = leftRect.top();
diff --git a/kompare/komparepart/kompareconnectwidget.h b/kompare/komparepart/kompareconnectwidget.h
index cc22ed86..ec48ff61 100644
--- a/kompare/komparepart/kompareconnectwidget.h
+++ b/kompare/komparepart/kompareconnectwidget.h
@@ -76,7 +76,7 @@ public:
 	      ViewSettings* settings, KompareSplitter* parent, const char* name = 0 );
 	~KompareConnectWidgetFrame();
 	
-	TQSize tqsizeHint() const;
+	TQSize sizeHint() const;
 
 	KompareConnectWidget*     wid() { return &m_wid; }
 
diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp
index f8779fa9..30e65d87 100644
--- a/kompare/komparepart/komparelistview.cpp
+++ b/kompare/komparepart/komparelistview.cpp
@@ -54,12 +54,12 @@ KompareListViewFrame::KompareListViewFrame( bool isSource,
 	m_label ( isSource?"Source":"Dest", this ),
 	m_layout ( this )
 {
-	tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
-	m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+	setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
+	m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
 	TQFrame *bottomLine = new TQFrame(this);
 	bottomLine->setFrameShape(TQFrame::HLine);
 	bottomLine->setFrameShadow ( TQFrame::Plain );
-	bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+	bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
 	bottomLine->setFixedHeight(1);
 	m_label.setMargin(3);
 	m_layout.setSpacing(0);
@@ -182,7 +182,7 @@ int KompareListView::lastVisibleDifference()
 	return -1;
 }
 
-TQRect KompareListView::tqitemRect( int i )
+TQRect KompareListView::itemRect( int i )
 {
 	TQListViewItem* item = itemAtIndex( i );
 	int x = 0;
@@ -390,7 +390,7 @@ void KompareListView::slotApplyAllDifferences( bool apply )
 	TQPtrDictIterator<KompareListViewDiffItem> it ( m_itemDict );
 	for( ; it.current(); ++it )
 		it.current()->applyDifference( apply );
-	tqrepaint();
+	repaint();
 }
 
 void KompareListView::slotApplyDifference( const Difference* diff, bool apply )
@@ -500,7 +500,7 @@ void KompareListViewDiffItem::applyDifference( bool apply )
 	kdDebug(8104) << "KompareListViewDiffItem::applyDifference( " << apply << " )" << endl;
 	setVisibility();
 	setup();
-	tqrepaint();
+	repaint();
 }
 
 int KompareListViewDiffItem::maxHeight()
@@ -520,7 +520,7 @@ void KompareListViewDiffItem::setSelected( bool b )
 	                      m_sourceItem->firstChild() :
 	                      m_destItem->firstChild();
 	while( item && item->isVisible() ) {
-		item->tqrepaint();
+		item->repaint();
 		item = item->nextSibling();
 	}
 }
diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h
index b5de7661..0cbbefd7 100644
--- a/kompare/komparepart/komparelistview.h
+++ b/kompare/komparepart/komparelistview.h
@@ -25,7 +25,7 @@
 #include <tqptrlist.h>
 #include <tqptrdict.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klistview.h>
 
@@ -55,7 +55,7 @@ public:
 	KompareListViewItem* itemAtIndex( int i );
 	int                  firstVisibleDifference();
 	int                  lastVisibleDifference();
-	TQRect                tqitemRect( int i );
+	TQRect                itemRect( int i );
 	int                  minScrollId();
 	int                  maxScrollId();
 	int                  contentsWidth();
diff --git a/kompare/komparepart/komparesaveoptionsbase.ui b/kompare/komparepart/komparesaveoptionsbase.ui
index 7636a27f..47cfc893 100644
--- a/kompare/komparepart/komparesaveoptionsbase.ui
+++ b/kompare/komparepart/komparesaveoptionsbase.ui
@@ -83,7 +83,7 @@
             <property name="title">
                 <string>Command Line</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignLeft</set>
             </property>
             <property name="hAlign" stdset="0">
diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp
index 5e30652c..7087ca4d 100644
--- a/kompare/komparepart/komparesplitter.cpp
+++ b/kompare/komparepart/komparesplitter.cpp
@@ -44,25 +44,25 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent,
 
 	// Set up the scrollFrame
 	scrollFrame->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain );
-	scrollFrame->setLineWidth(scrollFrame->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth));
-	TQGridLayout *pairtqlayout = new TQGridLayout(scrollFrame, 2, 2, 0);
+	scrollFrame->setLineWidth(scrollFrame->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth));
+	TQGridLayout *pairlayout = new TQGridLayout(scrollFrame, 2, 2, 0);
 	m_vScroll = new TQScrollBar( Qt::Vertical, scrollFrame );
-	pairtqlayout->addWidget( m_vScroll, 0, 1 );
+	pairlayout->addWidget( m_vScroll, 0, 1 );
 	m_hScroll = new TQScrollBar( Qt::Horizontal, scrollFrame );
-	pairtqlayout->addWidget( m_hScroll, 1, 0 );
+	pairlayout->addWidget( m_hScroll, 1, 0 );
 
 	new KompareListViewFrame(true, m_settings, this, "source");
 	new KompareListViewFrame(false, m_settings, this, "destination");
-	pairtqlayout->addWidget( this, 0, 0 );
+	pairlayout->addWidget( this, 0, 0 );
 
 	// set up our looks
 	setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
-	setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) );
+	setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) );
 
 	setHandleWidth(50);
 	setChildrenCollapsible( false );
 	setFrameStyle( TQFrame::NoFrame );
-	tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
+	setSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
 	setOpaqueResize( true );
 	setFocusPolicy( TQ_WheelFocus );
 
@@ -121,7 +121,7 @@ TQSplitterLayoutStruct *KompareSplitter::addWidget( KompareListViewFrame *w, boo
 		s->wid = newHandle;
 		newHandle->setId( d->list.count() );
 		s->isHandle = TRUE;
-		s->sizer = pick( newHandle->tqsizeHint() );
+		s->sizer = pick( newHandle->sizeHint() );
 		if ( prepend )
 		    d->list.prepend( s );
 		else
@@ -184,7 +184,7 @@ void KompareSplitter::childEvent( TQChildEvent *c )
 	}
 }
 
-// This is from a private qt header (kernel/qtqlayoutengine_p.h). sorry.
+// This is from a private qt header (kernel/qlayoutengine_p.h). sorry.
 TQSize qSmartMinSize( TQWidget *w );
 
 static TQPoint toggle( TQWidget *w, TQPoint pos )
@@ -212,7 +212,7 @@ static TQPoint bottomRight( TQWidget *w )
     if ( isCollapsed(w) ) {
         return toggle( w, w->pos() ) - TQPoint( 1, 1 );
     } else {
-        return w->tqgeometry().bottomRight();
+        return w->geometry().bottomRight();
     }
 }
 
@@ -279,7 +279,7 @@ void KompareSplitter::doMove( bool backwards, int pos, int id, int delta,
 				                   : pick( bottomRight(w) ) - pos + 1;
 				if ( dd > 0 || (!isCollapsed(w) && !mayCollapse) ) {
 					dd = TQMAX( pick(qSmartMinSize(w)),
-					           TQMIN(dd, pick(w->tqmaximumSize())) );
+					           TQMIN(dd, pick(w->maximumSize())) );
 				} else {
 					dd = 0;
 				}
@@ -396,7 +396,7 @@ void KompareSplitter::repaintHandles()
 	TQSplitterLayoutStruct *curr;
 	for ( curr = d->list.first(); curr; curr = d->list.next() )
 		if ( curr->isHandle )
-			((KompareConnectWidgetFrame*)curr->wid)->wid()->tqrepaint();
+			((KompareConnectWidgetFrame*)curr->wid)->wid()->repaint();
 }
 
 // Scrolling stuff
diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp
index 8e6d55e5..e8ad94fe 100644
--- a/kompare/libdialogpages/diffpage.cpp
+++ b/kompare/libdialogpages/diffpage.cpp
@@ -18,7 +18,7 @@
 #include <tqcheckbox.h>
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 #include <tqtooltip.h>
@@ -203,19 +203,19 @@ void DiffPage::slotExcludeFileToggled( bool on )
 void DiffPage::addDiffTab()
 {
 	TQWidget* page   = new TQWidget( this );
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
+	layout->setSpacing( KDialog::spacingHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	// add diff program selector
 	m_diffProgramGroup = new TQVButtonGroup( i18n( "Diff Program" ), page );
-	tqlayout->addWidget( m_diffProgramGroup );
+	layout->addWidget( m_diffProgramGroup );
 	m_diffProgramGroup->setMargin( KDialog::marginHint() );
 
 	m_diffURLRequester = new KURLRequester( m_diffProgramGroup, "diffURLRequester" );
 	TQWhatsThis::add( m_diffURLRequester, i18n( "You can select a different diff program here. On Solaris the standard diff program does not support all the options that the GNU version does. This way you can select that version." ) );
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Diff" ) );
@@ -224,14 +224,14 @@ void DiffPage::addDiffTab()
 void DiffPage::addFormatTab()
 {
 	TQWidget* page   = new TQWidget( this );
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
+	layout->setSpacing( KDialog::spacingHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	// add diff modes
 	m_modeButtonGroup = new TQVButtonGroup( i18n( "Output Format" ), page );
 	TQWhatsThis::add( m_modeButtonGroup, i18n( "Select the format of the output generated by diff. Unified is the one that is used most frequently because it is very readable. The KDE developers like this format the best so use it for sending patches." ) );
-	tqlayout->addWidget( m_modeButtonGroup );
+	layout->addWidget( m_modeButtonGroup );
 	m_modeButtonGroup->setMargin( KDialog::marginHint() );
 
 	TQRadioButton* radioButton;
@@ -245,7 +245,7 @@ void DiffPage::addFormatTab()
 
 	// #lines of context (loc)
 	TQHGroupBox* groupBox = new TQHGroupBox( i18n( "Lines of Context" ), page );
-	tqlayout->addWidget( groupBox );
+	layout->addWidget( groupBox );
 	groupBox->setMargin( KDialog::marginHint() );
 
 	TQLabel* label = new TQLabel( i18n( "Number of context lines:" ), groupBox );
@@ -253,7 +253,7 @@ void DiffPage::addFormatTab()
 	TQWhatsThis::add( m_locSpinBox, i18n( "The number of context lines is normally 2 or 3. This makes the diff readable and applicable in most cases. More than 3 lines will only bloat the diff unnecessarily." ) );
 	label->setBuddy( m_locSpinBox );
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Format" ) );
@@ -262,13 +262,13 @@ void DiffPage::addFormatTab()
 void DiffPage::addOptionsTab()
 {
 	TQWidget* page   = new TQWidget( this );
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
+	layout->setSpacing( KDialog::spacingHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	// add diff options
 	TQVButtonGroup* optionButtonGroup     = new TQVButtonGroup( i18n( "General" ), page );
-	tqlayout->addWidget( optionButtonGroup );
+	layout->addWidget( optionButtonGroup );
 	optionButtonGroup->setMargin( KDialog::marginHint() );
 
 	m_smallerCheckBox     = new TQCheckBox( i18n( "&Look for smaller changes" ), optionButtonGroup );
@@ -278,7 +278,7 @@ void DiffPage::addOptionsTab()
 	m_caseCheckBox        = new TQCheckBox( i18n( "&Ignore changes in case" ), optionButtonGroup );
 	TQToolTip::add( m_caseCheckBox, i18n( "This corresponds to the -i diff option." ) );
 
-	TQHBoxLayout* groupLayout = new TQHBoxLayout( tqlayout, -1, "regexp_horizontal_layout" );
+	TQHBoxLayout* groupLayout = new TQHBoxLayout( layout, -1, "regexp_horizontal_layout" );
 	groupLayout->setMargin( KDialog::marginHint() );
 
 	m_ignoreRegExpCheckBox = new TQCheckBox( i18n( "Ignore regexp:" ), page );
@@ -298,7 +298,7 @@ void DiffPage::addOptionsTab()
 	}
 
 	TQVButtonGroup* moreOptionButtonGroup = new TQVButtonGroup( i18n( "Whitespace" ), page );
-	tqlayout->addWidget( moreOptionButtonGroup );
+	layout->addWidget( moreOptionButtonGroup );
 	moreOptionButtonGroup->setMargin( KDialog::marginHint() );
 
 	m_tabsCheckBox        = new TQCheckBox( i18n( "E&xpand tabs to spaces in output" ), moreOptionButtonGroup );
@@ -312,7 +312,7 @@ void DiffPage::addOptionsTab()
 	m_ignoreTabExpansionCheckBox = new TQCheckBox( i18n( "Igno&re changes due to tab expansion" ), moreOptionButtonGroup );
 	TQToolTip::add( m_ignoreTabExpansionCheckBox, i18n( "This option corresponds to the -E diff option." ) );
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "O&ptions" ) );
@@ -321,16 +321,16 @@ void DiffPage::addOptionsTab()
 void DiffPage::addExcludeTab()
 {
 	TQWidget* page = new TQWidget( this );
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
+	layout->setSpacing( KDialog::spacingHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	TQHGroupBox* excludeFilePatternGroupBox = new TQHGroupBox( i18n( "File Pattern to Exclude" ), page );
 	m_excludeFilePatternCheckBox = new TQCheckBox( "", excludeFilePatternGroupBox );
 	TQToolTip::add( m_excludeFilePatternCheckBox, i18n( "If this is checked you can enter a shell pattern in the text box on the right or select entries from the list." ) );
 	m_excludeFilePatternEditListBox = new KEditListBox( excludeFilePatternGroupBox, "exclude_file_pattern_editlistbox", false, KEditListBox::Add|KEditListBox::Remove );
 	TQToolTip::add( m_excludeFilePatternEditListBox, i18n( "Here you can enter or remove a shell pattern or select one or more entries from the list." ) );
-	tqlayout->addWidget( excludeFilePatternGroupBox );
+	layout->addWidget( excludeFilePatternGroupBox );
 
 
 	connect( m_excludeFilePatternCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFilePatternToggled(bool)));
@@ -342,11 +342,11 @@ void DiffPage::addExcludeTab()
 	TQToolTip::add( m_excludeFileURLComboBox, i18n( "Here you can enter the URL of a file with shell patterns to ignore during the comparison of the folders." ) );
 	m_excludeFileURLRequester = new KURLRequester( m_excludeFileURLComboBox, excludeFileNameGroupBox, "exclude_file_name_urlrequester" );
 	TQToolTip::add( m_excludeFileURLRequester, i18n( "Any file you select in the dialog that pops up when you click it will be put in the dialog to the left of this button." ) );
-	tqlayout->addWidget( excludeFileNameGroupBox );
+	layout->addWidget( excludeFileNameGroupBox );
 
 	connect( m_excludeFileCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFileToggled(bool)));
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Exclude" ) );
diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp
index 0bbc87fe..82276439 100644
--- a/kompare/libdialogpages/filespage.cpp
+++ b/kompare/libdialogpages/filespage.cpp
@@ -16,7 +16,7 @@
 **
 ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 
 #include <kapplication.h>
@@ -34,9 +34,9 @@
 FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( false )
 {
 	TQWidget* page = new TQWidget( this );
-	TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	TQVBoxLayout* layout = new TQVBoxLayout( page );
+	layout->setSpacing( KDialog::spacingHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	m_firstGB = new TQGroupBox( 1, Qt::Vertical, "You have to set this moron :)", page );
 	m_firstURLComboBox = new KURLComboBox( KURLComboBox::Both, true, m_firstGB, "SourceURLComboBox" );
@@ -54,11 +54,11 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( fal
 	m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" );
 	m_encodingComboBox->insertStringList( KGlobal::charsets()->availableEncodingNames() );
 
-	tqlayout->addWidget( m_firstGB );
-	tqlayout->addWidget( m_secondGB );
-	tqlayout->addWidget( m_thirdGB );
+	layout->addWidget( m_firstGB );
+	layout->addWidget( m_secondGB );
+	layout->addWidget( m_thirdGB );
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Files" ) );
diff --git a/kompare/libdialogpages/pagebase.cpp b/kompare/libdialogpages/pagebase.cpp
index 33c45dba..3a35e479 100644
--- a/kompare/libdialogpages/pagebase.cpp
+++ b/kompare/libdialogpages/pagebase.cpp
@@ -17,7 +17,7 @@
 **
 ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>
 
 #include "pagebase.h"
@@ -36,9 +36,9 @@ PageBase::~PageBase()
 TQSize PageBase::sizeHintForWidget( TQWidget* widget )
 {
 	//
-	// The size is computed by adding the tqsizeHint().height() of all
-	// widget tqchildren and taking the width of the widest child and adding
-	// tqlayout()->margin() and tqlayout()->spacing()
+	// The size is computed by adding the sizeHint().height() of all
+	// widget children and taking the width of the widest child and adding
+	// layout()->margin() and layout()->spacing()
 	//
 
 	// this code in this method has been ripped out of a file in kbabel
@@ -57,7 +57,7 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget )
 			numChild += 1;
 			TQWidget *w=((TQWidget*)o);
 
-			TQSize s = w->tqsizeHint();
+			TQSize s = w->sizeHint();
 			if( s.isEmpty() == true )
 			{
 				s = TQSize( 50, 100 ); // Default size
@@ -72,8 +72,8 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget )
 
 	if( numChild > 0 )
 	{
-		size.setHeight( size.height() + widget->tqlayout()->spacing()*(numChild-1) );
-		size += TQSize( widget->tqlayout()->margin()*2, widget->tqlayout()->margin()*2 + 1 );
+		size.setHeight( size.height() + widget->layout()->spacing()*(numChild-1) );
+		size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 );
 	}
 	else
 	{
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index 827e8a4d..ab80506c 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -21,7 +21,7 @@
 #include <tqgroupbox.h>
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqspinbox.h>
 
 #include <kapplication.h>
@@ -36,45 +36,45 @@
 ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
 {
 	TQWidget*     page;
-	TQVBoxLayout* tqlayout;
-	TQGroupBox*   tqcolorGroupBox;
+	TQVBoxLayout* layout;
+	TQGroupBox*   colorGroupBox;
 	TQHGroupBox*  snolGroupBox;
 	TQHGroupBox*  tabGroupBox;
 	TQLabel*      label;
 
 	page   = new TQWidget( this );
-	tqlayout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	layout = new TQVBoxLayout( page );
+	layout->setSpacing( KDialog::spacingHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	// add a groupbox
-	tqcolorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
-	tqlayout->addWidget( tqcolorGroupBox );
-	tqcolorGroupBox->setMargin( KDialog::marginHint() );
+	colorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
+	layout->addWidget( colorGroupBox );
+	colorGroupBox->setMargin( KDialog::marginHint() );
 
 	// add the removeColor
-	label = new TQLabel( i18n( "Removed color:" ), tqcolorGroupBox );
-	m_removedColorButton = new KColorButton( tqcolorGroupBox );
+	label = new TQLabel( i18n( "Removed color:" ), colorGroupBox );
+	m_removedColorButton = new KColorButton( colorGroupBox );
 	label->setBuddy( m_removedColorButton );
 
 	// add the changeColor
-	label = new TQLabel( i18n( "Changed color:" ), tqcolorGroupBox );
-	m_changedColorButton = new KColorButton( tqcolorGroupBox );
+	label = new TQLabel( i18n( "Changed color:" ), colorGroupBox );
+	m_changedColorButton = new KColorButton( colorGroupBox );
 	label->setBuddy( m_changedColorButton );
 
 	// add the addColor
-	label = new TQLabel( i18n( "Added color:" ), tqcolorGroupBox );
-	m_addedColorButton = new KColorButton( tqcolorGroupBox );
+	label = new TQLabel( i18n( "Added color:" ), colorGroupBox );
+	m_addedColorButton = new KColorButton( colorGroupBox );
 	label->setBuddy( m_addedColorButton );
 
 	// add the appliedColor
-	label = new TQLabel( i18n( "Applied color:" ), tqcolorGroupBox );
-	m_appliedColorButton = new KColorButton( tqcolorGroupBox );
+	label = new TQLabel( i18n( "Applied color:" ), colorGroupBox );
+	m_appliedColorButton = new KColorButton( colorGroupBox );
 	label->setBuddy( m_appliedColorButton );
 
 	// scroll number of lines (snol)
 	snolGroupBox = new TQHGroupBox( i18n( "Mouse Wheel" ), page );
-	tqlayout->addWidget( snolGroupBox );
+	layout->addWidget( snolGroupBox );
 	snolGroupBox->setMargin( KDialog::marginHint() );
 
 	label            = new TQLabel( i18n( "Number of lines:" ), snolGroupBox );
@@ -84,25 +84,25 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
 	// Temporarily here for testing...
 	// number of spaces for a tab character stuff
 	tabGroupBox = new TQHGroupBox( i18n( "Tabs to Spaces" ), page );
-	tqlayout->addWidget( tabGroupBox );
+	layout->addWidget( tabGroupBox );
 	tabGroupBox->setMargin( KDialog::marginHint() );
 
 	label = new TQLabel( i18n( "Number of spaces to convert a tab character to:" ), tabGroupBox );
 	m_tabSpinBox = new TQSpinBox( 1, 16, 1, tabGroupBox );
 	label->setBuddy( m_tabSpinBox );
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "A&ppearance" ) );
 
 	page   = new TQWidget( this );
-	tqlayout = new TQVBoxLayout( page );
-	tqlayout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() );
+	layout = new TQVBoxLayout( page );
+	layout->setSpacing( KDialog::spacingHint() );
+	layout->setMargin( KDialog::marginHint() );
 
 	TQHGroupBox* gb = new TQHGroupBox( i18n( "Text Font" ), page );
-	tqlayout->addWidget( gb );
+	layout->addWidget( gb );
 	gb->setMargin( KDialog::marginHint() );
 
 	label = new TQLabel( i18n( "Font:" ), gb );
@@ -113,7 +113,7 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
 	m_fontSizeSpinBox = new TQSpinBox( 6, 24, 1, gb, "fontsize" );
 	label->setBuddy( m_fontSizeSpinBox );
 
-	tqlayout->addStretch( 1 );
+	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
 
 	addTab( page, i18n( "&Fonts" ) );
diff --git a/kompare/libdiff2/difference.h b/kompare/libdiff2/difference.h
index 4e440222..87b8f556 100644
--- a/kompare/libdiff2/difference.h
+++ b/kompare/libdiff2/difference.h
@@ -130,7 +130,7 @@ public:
 protected:
 	void calculateHash()
 	{
-		unsigned short const* str = reinterpret_cast<unsigned short const*>( m_string.tqunicode() );
+		unsigned short const* str = reinterpret_cast<unsigned short const*>( m_string.unicode() );
 		const unsigned int len = m_string.length();
 
 		m_hash = 1315423911;
diff --git a/kompare/libdiff2/diffhunk.cpp b/kompare/libdiff2/diffhunk.cpp
index efa7e12d..3b48d796 100644
--- a/kompare/libdiff2/diffhunk.cpp
+++ b/kompare/libdiff2/diffhunk.cpp
@@ -97,16 +97,16 @@ TQString DiffHunk::recreateHunk() const
 	}
 
 	// recreate header
-	hunk += TQString::tqfromLatin1( "@@ -%1,%3 +%2,%4 @@" )
-	        .tqarg( m_sourceLine )
-	        .tqarg( m_destinationLine )
-	        .tqarg( slc )
-	        .tqarg( dlc ); 
+	hunk += TQString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" )
+	        .arg( m_sourceLine )
+	        .arg( m_destinationLine )
+	        .arg( slc )
+	        .arg( dlc ); 
 
 	if ( !m_function.isEmpty() )
 		hunk += " " + m_function;
 
-	hunk += TQString::tqfromLatin1( "\n" );
+	hunk += TQString::fromLatin1( "\n" );
 
 	hunk += differences;
 
diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp
index cd348dfc..1b3822b0 100644
--- a/kompare/libdiff2/diffmodel.cpp
+++ b/kompare/libdiff2/diffmodel.cpp
@@ -152,13 +152,13 @@ TQString DiffModel::recreateDiff() const
 	TQString diff;
 
 	// recreate header
-	TQString tab = TQString::tqfromLatin1( "\t" );
-	TQString nl  = TQString::tqfromLatin1( "\n" );
-	diff += TQString::tqfromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp );
+	TQString tab = TQString::fromLatin1( "\t" );
+	TQString nl  = TQString::fromLatin1( "\n" );
+	diff += TQString::fromLatin1( "--- %1\t%2" ).arg( m_source ).arg( m_sourceTimestamp );
 	if ( !m_sourceRevision.isEmpty() )
 		diff += tab + m_sourceRevision;
 	diff += nl;
-	diff += TQString::tqfromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp );
+	diff += TQString::fromLatin1( "+++ %1\t%2" ).arg( m_destination ).arg( m_destinationTimestamp );
 	if ( !m_destinationRevision.isEmpty() )
 		diff += tab + m_destinationRevision;
 	diff += nl;
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index 89912eac..fc27fb56 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -22,7 +22,7 @@
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqregexp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqvaluelist.h>
 
 #include <kaction.h>
@@ -235,7 +235,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di
 
 	if ( parseDiffOutput( readFile( diff ) ) != 0 )
 	{
-		emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).tqarg(  diff ) );
+		emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).arg(  diff ) );
 		return false;
 	}
 
@@ -243,7 +243,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di
 	if ( !blendOriginalIntoModelList( file ) )
 	{
 		kdDebug(8101) << "Oops cant blend original file into modellist : " << file << endl;
-		emit( i18n( "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" ).tqarg( diff ).tqarg( file ) );
+		emit( i18n( "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" ).arg( diff ).arg( file ) );
 		return false;
 	}
 
@@ -259,7 +259,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff
 
 	if ( parseDiffOutput( readFile( diff ) ) != 0 )
 	{
-		emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).tqarg( diff ) );
+		emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).arg( diff ) );
 		return false;
 	}
 
@@ -268,7 +268,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff
 	{
 		// Trouble blending the original into the model
 		kdDebug(8101) << "Oops cant blend original dir into modellist : " << dir << endl;
-		emit error( i18n( "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>.</qt>" ).tqarg( diff ).tqarg( dir ) );
+		emit error( i18n( "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>.</qt>" ).arg( diff ).arg( dir ) );
 		return false;
 	}
 
@@ -347,7 +347,7 @@ bool KompareModelList::saveDestination( DiffModel* model )
 
 	temp->close();
 	if( temp->status() != 0 ) {
-		emit error( i18n( "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" ).tqarg( temp->name() ) );
+		emit error( i18n( "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" ).arg( temp->name() ) );
 		temp->unlink();
 		delete temp;
 		return false;
@@ -380,7 +380,7 @@ bool KompareModelList::saveDestination( DiffModel* model )
 
 	if ( !result )
 	{
-		emit error( i18n( "<qt>Could not upload the temporary file to the destination location <b>%1</b>. The temporary file is still available under: <b>%2</b>. You can manually copy it to the right place.</qt>" ).tqarg( m_destination ).tqarg( temp->name() ) );
+		emit error( i18n( "<qt>Could not upload the temporary file to the destination location <b>%1</b>. The temporary file is still available under: <b>%2</b>. You can manually copy it to the right place.</qt>" ).arg( m_destination ).arg( temp->name() ) );
 	}
 	else
 	{
diff --git a/kompare/libdiff2/kompareprocess.cpp b/kompare/libdiff2/kompareprocess.cpp
index db165ae5..df1c5b14 100644
--- a/kompare/libdiff2/kompareprocess.cpp
+++ b/kompare/libdiff2/kompareprocess.cpp
@@ -21,7 +21,7 @@
 
 #include <tqdir.h>
 #include <tqstringlist.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <kcharsets.h>
 #include <kdebug.h>
diff --git a/kompare/libdiff2/levenshteintable.cpp b/kompare/libdiff2/levenshteintable.cpp
index c031ee61..7e4ddbbe 100644
--- a/kompare/libdiff2/levenshteintable.cpp
+++ b/kompare/libdiff2/levenshteintable.cpp
@@ -113,8 +113,8 @@ unsigned int LevenshteinTable::createTable( DifferenceString* source, Difference
 	unsigned int m = s.length();
 	unsigned int n = d.length();
 
-	const TQChar* sq = s.tqunicode();
-	const TQChar* dq = d.tqunicode();
+	const TQChar* sq = s.unicode();
+	const TQChar* dq = d.unicode();
 
 	if ( m == 1 )
 		return --n;
diff --git a/kompare/libdiff2/perforceparser.cpp b/kompare/libdiff2/perforceparser.cpp
index b0d54157..0e0a2aef 100644
--- a/kompare/libdiff2/perforceparser.cpp
+++ b/kompare/libdiff2/perforceparser.cpp
@@ -103,8 +103,8 @@ bool PerforceParser::parseContextDiffHeader()
 			destinationFileRE.exactMatch( m_contextDiffHeader1.cap( 2 ) );
 			kdDebug(8101) << "Matched length   = " << sourceFileRE.matchedLength() << endl;
 			kdDebug(8101) << "Matched length   = " << destinationFileRE.matchedLength() << endl;
-			kdDebug(8101) << "Captured texts   = " << sourceFileRE.tqcapturedTexts() << endl;
-			kdDebug(8101) << "Captured texts   = " << destinationFileRE.tqcapturedTexts() << endl;
+			kdDebug(8101) << "Captured texts   = " << sourceFileRE.capturedTexts() << endl;
+			kdDebug(8101) << "Captured texts   = " << destinationFileRE.capturedTexts() << endl;
 			kdDebug(8101) << "Source File      : " << sourceFileRE.cap( 1 ) << endl;
 			kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl;
 			m_currentModel->setSourceFile     ( sourceFileRE.cap( 1 ) );
@@ -117,7 +117,7 @@ bool PerforceParser::parseContextDiffHeader()
 		else
 		{
 			kdDebug(8101) << "Matched length = " << m_contextDiffHeader1.matchedLength() << endl;
-			kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.tqcapturedTexts() << endl;
+			kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.capturedTexts() << endl;
 		}
 	}
 
@@ -149,8 +149,8 @@ bool PerforceParser::parseNormalDiffHeader()
 			destinationFileRE.exactMatch( m_normalDiffHeader.cap( 2 ) );
 			kdDebug(8101) << "Matched length   = " << sourceFileRE.matchedLength() << endl;
 			kdDebug(8101) << "Matched length   = " << destinationFileRE.matchedLength() << endl;
-			kdDebug(8101) << "Captured texts   = " << sourceFileRE.tqcapturedTexts() << endl;
-			kdDebug(8101) << "Captured texts   = " << destinationFileRE.tqcapturedTexts() << endl;
+			kdDebug(8101) << "Captured texts   = " << sourceFileRE.capturedTexts() << endl;
+			kdDebug(8101) << "Captured texts   = " << destinationFileRE.capturedTexts() << endl;
 			kdDebug(8101) << "Source File      : " << sourceFileRE.cap( 1 ) << endl;
 			kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl;
 			m_currentModel->setSourceFile     ( sourceFileRE.cap( 1 ) );
@@ -163,7 +163,7 @@ bool PerforceParser::parseNormalDiffHeader()
 		else
 		{
 			kdDebug(8101) << "Matched length = " << m_normalDiffHeader.matchedLength() << endl;
-			kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.tqcapturedTexts() << endl;
+			kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.capturedTexts() << endl;
 		}
 	}
 
@@ -200,8 +200,8 @@ bool PerforceParser::parseUnifiedDiffHeader()
 			destinationFileRE.exactMatch( m_unifiedDiffHeader1.cap( 2 ) );
 //			kdDebug(8101) << "Matched length   = " << sourceFileRE.matchedLength() << endl;
 //			kdDebug(8101) << "Matched length   = " << destinationFileRE.matchedLength() << endl;
-//			kdDebug(8101) << "Captured texts   = " << sourceFileRE.tqcapturedTexts() << endl;
-//			kdDebug(8101) << "Captured texts   = " << destinationFileRE.tqcapturedTexts() << endl;
+//			kdDebug(8101) << "Captured texts   = " << sourceFileRE.capturedTexts() << endl;
+//			kdDebug(8101) << "Captured texts   = " << destinationFileRE.capturedTexts() << endl;
 //			kdDebug(8101) << "Source File      : " << sourceFileRE.cap( 1 ) << endl;
 //			kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl;
 			m_currentModel->setSourceFile     ( sourceFileRE.cap( 1 ) );
@@ -214,7 +214,7 @@ bool PerforceParser::parseUnifiedDiffHeader()
 		else
 		{
 //			kdDebug(8101) << "Matched length = " << m_unifiedDiffHeader1.matchedLength() << endl;
-//			kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.tqcapturedTexts() << endl;
+//			kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.capturedTexts() << endl;
 		}
 	}
 
diff --git a/kompare/tests/cvsdiff/context.diff b/kompare/tests/cvsdiff/context.diff
index 1d6eaac3..cef4f0cf 100644
--- a/kompare/tests/cvsdiff/context.diff
+++ b/kompare/tests/cvsdiff/context.diff
@@ -12,7 +12,7 @@ diff -c -r1.2 dcopfind.cpp
   
 ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
 --- 36,42 ----
   static bool bAppIdOnly = 0;
@@ -20,7 +20,7 @@ diff -c -r1.2 dcopfind.cpp
   
 ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
 ***************
 *** 118,124 ****
diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff
index 6877889c..1da3a860 100644
--- a/kompare/tests/cvsdiff/contextm.diff
+++ b/kompare/tests/cvsdiff/contextm.diff
@@ -82,7 +82,7 @@ diff -c -r1.26 dcop.cpp
 ! void callFunction( const char* app, const char* obj, const char* func, int argc, char** args )
   {
 - 
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
       int right = f.find( ')' );
 --- 146,153 ----
@@ -91,7 +91,7 @@ diff -c -r1.26 dcop.cpp
   
 ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
       int right = f.find( ')' );
 ***************
@@ -747,7 +747,7 @@ diff -c -r1.2 dcopfind.cpp
   
 ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
 --- 36,42 ----
   static bool bAppIdOnly = 0;
@@ -755,7 +755,7 @@ diff -c -r1.2 dcopfind.cpp
   
 ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
 ***************
 *** 118,124 ****
diff --git a/kompare/tests/cvsdiff/unified.diff b/kompare/tests/cvsdiff/unified.diff
index 63dbb88a..0c8a20fb 100644
--- a/kompare/tests/cvsdiff/unified.diff
+++ b/kompare/tests/cvsdiff/unified.diff
@@ -12,7 +12,7 @@ diff -u -r1.2 dcopfind.cpp
 -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
 +bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
  {
-     QString f = func; // Qt is better with tqunicode strings, so use one.
+     QString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
 @@ -118,7 +118,7 @@
  	f = fc;
diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff
index 788b469d..e6a6e040 100644
--- a/kompare/tests/cvsdiff/unifiedm.diff
+++ b/kompare/tests/cvsdiff/unifiedm.diff
@@ -66,7 +66,7 @@ diff -u -r1.26 dcop.cpp
 +void callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
  {
 -
-     QString f = func; // Qt is better with tqunicode strings, so use one.
+     QString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
      int right = f.find( ')' );
 @@ -136,7 +163,7 @@
@@ -668,7 +668,7 @@ diff -u -r1.2 dcopfind.cpp
 -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
 +bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
  {
-     QString f = func; // Qt is better with tqunicode strings, so use one.
+     QString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
 @@ -118,7 +118,7 @@
  	f = fc;
diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff
index 76c3f974..38db371e 100644
--- a/kompare/tests/diff/contextm.diff
+++ b/kompare/tests/diff/contextm.diff
@@ -78,7 +78,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
 ! void callFunction( const char* app, const char* obj, const char* func, int argc, char** args )
   {
 - 
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
       int right = f.find( ')' );
 --- 146,153 ----
@@ -87,7 +87,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
   
 ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
       int right = f.find( ')' );
 ***************
@@ -737,7 +737,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
   
 ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
 --- 36,42 ----
   static bool bAppIdOnly = 0;
@@ -745,7 +745,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
   
 ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
   {
-      QString f = func; // Qt is better with tqunicode strings, so use one.
+      QString f = func; // Qt is better with unicode strings, so use one.
       int left = f.find( '(' );
 ***************
 *** 118,124 ****
diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff
index 4296e44f..7763ce5e 100644
--- a/kompare/tests/diff/unifiedm.diff
+++ b/kompare/tests/diff/unifiedm.diff
@@ -62,7 +62,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
 +void callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
  {
 -
-     QString f = func; // Qt is better with tqunicode strings, so use one.
+     QString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
      int right = f.find( ')' );
 @@ -136,7 +163,7 @@
@@ -659,7 +659,7 @@ diff -aur dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
 -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
 +bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
  {
-     QString f = func; // Qt is better with tqunicode strings, so use one.
+     QString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
 @@ -118,7 +118,7 @@
  	f = fc;
diff --git a/kspy/classinfoview.cpp b/kspy/classinfoview.cpp
index 0fa16c86..87f018bb 100644
--- a/kspy/classinfoview.cpp
+++ b/kspy/classinfoview.cpp
@@ -41,7 +41,7 @@ ClassInfoView::~ClassInfoView()
 
 void ClassInfoView::buildList( TQObject *o )
 {
-  TQMetaObject *mo = o->tqmetaObject();
+  TQMetaObject *mo = o->metaObject();
 
   for (int index = 0; index < mo->numClassInfo(true); index++) {
     const TQClassInfo * classInfo = mo->classInfo(index, true);
diff --git a/kspy/propsview.cpp b/kspy/propsview.cpp
index 93747c28..8d099a94 100644
--- a/kspy/propsview.cpp
+++ b/kspy/propsview.cpp
@@ -35,15 +35,15 @@ public:
   }
 protected:
   void paintCell( TQPainter * p, const TQColorGroup & cg,
-                            int column, int width, int tqalignment )
+                            int column, int width, int alignment )
   {
     if (column == 1 && text(2) == "TQColor") {
       TQColorGroup color_cg( cg.foreground(), cg.background(), 
                             cg.light(), cg.dark(), cg.mid(), 
                             TQColor(text(1)), TQColor(text(1)) );
-      TQListViewItem::paintCell(p, color_cg, column, width, tqalignment);
+      TQListViewItem::paintCell(p, color_cg, column, width, alignment);
     } else {
-      KListViewItem::paintCell(p, cg, column, width, tqalignment);
+      KListViewItem::paintCell(p, cg, column, width, alignment);
     }
   }
 };
@@ -69,7 +69,7 @@ PropsView::~PropsView()
 
 void PropsView::buildList( TQObject *o )
 {
-  TQMetaObject *mo = o->tqmetaObject();
+  TQMetaObject *mo = o->metaObject();
   TQStrList names = mo->propertyNames( true );
 
   for ( uint i = 0; i < names.count(); i++ ) {
@@ -95,60 +95,60 @@ void PropsView::buildList( TQObject *o )
        case TQVariant::Cursor:
        {
          TQCursor c = v.toCursor();
-         val = TQString("tqshape=%1").tqarg(c.tqshape());
+         val = TQString("shape=%1").arg(c.shape());
          break;
        }
        case TQVariant::Font:
        {
          TQFont f = v.toFont();
          val = TQString("family=%1, pointSize=%2, weight=%3, italic=%4, bold=%5, underline=%6, strikeOut=%7")
-                       .tqarg(f.family())
-                       .tqarg(f.pointSize())
-                       .tqarg(f.weight())
-                       .tqarg(f.italic())
-                       .tqarg(f.bold())
-                       .tqarg(f.underline())
-                       .tqarg(f.strikeOut());
+                       .arg(f.family())
+                       .arg(f.pointSize())
+                       .arg(f.weight())
+                       .arg(f.italic())
+                       .arg(f.bold())
+                       .arg(f.underline())
+                       .arg(f.strikeOut());
          break;
        }
        case TQVariant::Int:
          val.setNum( v.toInt() );
          if (mp->isEnumType()) {
 #ifdef USE_QT4
-//            TQMetaObject * tqmetaObject = *(mp->meta);										// FIXME
-           val = TQString("%1::%2").tqarg("QT4_CANNOT_FIND_TQMETAOBJECT_FOR_TQMETAPROPERTY").tqarg(mp->valueToKey(val.toInt()));	// FIXME
+//            TQMetaObject * metaObject = *(mp->meta);										// FIXME
+           val = TQString("%1::%2").arg("QT4_CANNOT_FIND_TQMETAOBJECT_FOR_TQMETAPROPERTY").arg(mp->valueToKey(val.toInt()));	// FIXME
 #else // USE_QT4
-           TQMetaObject * tqmetaObject = *(mp->meta);
-           val = TQString("%1::%2").tqarg(tqmetaObject->className()).tqarg(mp->valueToKey(val.toInt()));
+           TQMetaObject * metaObject = *(mp->meta);
+           val = TQString("%1::%2").arg(metaObject->className()).arg(mp->valueToKey(val.toInt()));
 #endif // USE_QT4
          }
          break;
        case TQVariant::Point:
        {
          TQPoint p = v.toPoint();
-         val = TQString("x=%1, y=%2").tqarg(p.x()).tqarg(p.y());
+         val = TQString("x=%1, y=%2").arg(p.x()).arg(p.y());
          break;
        }
        case TQVariant::Rect:
        {
          TQRect r = v.toRect();
          val = TQString("left=%1, right=%2, top=%3, bottom=%4")
-                       .tqarg(r.left())
-                       .tqarg(r.right())
-                       .tqarg(r.top())
-                       .tqarg(r.bottom());
+                       .arg(r.left())
+                       .arg(r.right())
+                       .arg(r.top())
+                       .arg(r.bottom());
          break;
        }
        case TQVariant::Size:
        {
          TQSize s = v.toSize();
-         val = TQString("width=%1, height=%2").tqarg(s.width()).tqarg(s.height());
+         val = TQString("width=%1, height=%2").arg(s.width()).arg(s.height());
          break;
        }
        case TQVariant::SizePolicy:
        {
          TQSizePolicy s = v.toSizePolicy();
-         val = TQString("horData=%1, verData=%2").tqarg(s.horData()).tqarg(s.verData());
+         val = TQString("horData=%1, verData=%2").arg(s.horData()).arg(s.verData());
          break;
        }
        case TQVariant::Double:
diff --git a/kspy/receiversview.cpp b/kspy/receiversview.cpp
index 36e06e63..9cf31c31 100644
--- a/kspy/receiversview.cpp
+++ b/kspy/receiversview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          tqreceiversview.cpp  -  description
+                          receiversview.cpp  -  description
                              -------------------
     begin                : Tue Jan 11 2005
     copyright            : (C) 2005 by Richard Dale
@@ -20,7 +20,7 @@
 #include <tqmetaobject.h>
 #include <tqstrlist.h>
 #include <tqvariant.h>
-#include <tqsignalslotimp.h>
+#include <signalslotimp.h>
 
 #include <klocale.h>
 
@@ -28,7 +28,7 @@
 
 class UnencapsulatedTQObject : public TQObject {
 public:
-    TQConnectionList *public_tqreceivers(int signal) const { return tqreceivers(signal); }
+    TQConnectionList *public_receivers(int signal) const { return receivers(signal); }
 };
 
 ReceiversView::ReceiversView(TQWidget *parent, const char *name ) : KListView(parent,name)
@@ -48,13 +48,13 @@ ReceiversView::~ReceiversView()
 
 void ReceiversView::buildList( TQObject *o )
 {
-  TQMetaObject *mo = o->tqmetaObject();
+  TQMetaObject *mo = o->metaObject();
     
   UnencapsulatedTQObject * qobject = (UnencapsulatedTQObject *) o;
   TQStrList signalNames = mo->signalNames(true);
     
   for (int sig = 0; sig < mo->numSignals(true); sig++) {
-    TQConnectionList * clist = qobject->public_tqreceivers(sig);
+    TQConnectionList * clist = qobject->public_receivers(sig);
     if (clist != 0) {
       KListViewItem *conn = new KListViewItem( this, signalNames.at(sig) );
             
diff --git a/kspy/receiversview.h b/kspy/receiversview.h
index 6e703472..a0498b67 100644
--- a/kspy/receiversview.h
+++ b/kspy/receiversview.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          tqreceiversview.h  -  description
+                          receiversview.h  -  description
                              -------------------
     begin                : Tue Jan 11 2005
     copyright            : (C) 2005 by Richard Dale
diff --git a/kspy/sigslotview.cpp b/kspy/sigslotview.cpp
index 97d024fb..d6fdba24 100644
--- a/kspy/sigslotview.cpp
+++ b/kspy/sigslotview.cpp
@@ -40,7 +40,7 @@ SigSlotView::~SigSlotView()
 
 void SigSlotView::buildList( TQObject *o )
 {
-  TQMetaObject *mo = o->tqmetaObject();
+  TQMetaObject *mo = o->metaObject();
 
   KListViewItem *sigs = new KListViewItem( this, "Signals" );
   TQStrList sigList = mo->signalNames( true );
diff --git a/kspy/spy.cpp b/kspy/spy.cpp
index 1ef024d0..ec5d099d 100644
--- a/kspy/spy.cpp
+++ b/kspy/spy.cpp
@@ -19,7 +19,7 @@
 #include <klocale.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
 #include <tqsplitter.h>
 #include <ktabwidget.h>
@@ -47,10 +47,10 @@ extern "C"
 Spy::Spy( TQWidget *parent, const char *name )
   : TQWidget( parent, name )
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 11, 6 );
+  TQVBoxLayout *layout = new TQVBoxLayout( this, 11, 6 );
 
   TQSplitter *div = new TQSplitter( this );
-  tqlayout->addWidget( div );
+  layout->addWidget( div );
 
   TQVBox *leftPane = new TQVBox( div );
 
@@ -66,7 +66,7 @@ Spy::Spy( TQWidget *parent, const char *name )
   mSigSlotView = new SigSlotView( tabs, "signals and slots view" );
   tabs->addTab( mSigSlotView, i18n( "Signals && Slots" ) );
 
-  mReceiversView = new ReceiversView( tabs, "tqreceivers view" );
+  mReceiversView = new ReceiversView( tabs, "receivers view" );
   tabs->addTab( mReceiversView, i18n( "Receivers" ) );
 
   mClassInfoView = new ClassInfoView( tabs, "class info view" );
diff --git a/kstartperf/kstartperf.cpp b/kstartperf/kstartperf.cpp
index ca8dfcec..e683c92c 100644
--- a/kstartperf/kstartperf.cpp
+++ b/kstartperf/kstartperf.cpp
@@ -16,7 +16,7 @@
 #include <sys/time.h>
 
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 
 #include <kapplication.h>
diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp
index b710ce95..f2ae01cb 100644
--- a/kuiviewer/kuiviewer.cpp
+++ b/kuiviewer/kuiviewer.cpp
@@ -153,11 +153,11 @@ void KUIViewer::takeScreenshot(const TQCString &filename, int w, int h){
         // resize widget to the desired size
         m_part->widget()->setMinimumSize(w, h);
         m_part->widget()->setMaximumSize(w, h);
-        m_part->widget()->tqrepaint();
+        m_part->widget()->repaint();
         // resize app to be as large as desired size
         adjustSize();
         // Disable the saving of the size
-        setAutoSaveSettings(TQString::tqfromLatin1("MainWindow"), false);
+        setAutoSaveSettings(TQString::fromLatin1("MainWindow"), false);
     }
     TQPixmap pixmap = TQPixmap::grabWidget( m_part->widget() );
     pixmap.save( filename, "PNG" );
diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp
index d4d3fc21..38b73f57 100644
--- a/kuiviewer/kuiviewer_part.cpp
+++ b/kuiviewer/kuiviewer_part.cpp
@@ -36,7 +36,7 @@
 #include <kstyle.h>
 #include <tqmetaobject.h>
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqcursor.h>
 #include <tqfile.h>
 #include <tqobjectlist.h>
@@ -205,7 +205,7 @@ void KUIViewerPart::slotGrab()
 	return;
     }
 
-    TQClipboard *clipboard = TQApplication::tqclipboard();
+    TQClipboard *clipboard = TQApplication::clipboard();
     clipboard->setPixmap(TQPixmap::grabWidget(m_widget));
 }
 
diff --git a/kunittest/runnergui.cpp b/kunittest/runnergui.cpp
index 4644d0e5..c2d770f1 100644
--- a/kunittest/runnergui.cpp
+++ b/kunittest/runnergui.cpp
@@ -26,7 +26,7 @@
 #include <tqmetaobject.h>
 #include <tqregexp.h>
 #include <tqpushbutton.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqlabel.h>
 #include <tqprogressbar.h>
 #include <tqcombobox.h>
@@ -162,13 +162,13 @@ namespace KUnitTest
         if ( Runner::self()->numberOfTests() > 0 )
             m_testerWidget->resultsLabel()->setText(
                 TQString("Test cases: %1 | Tests performed: %5, Skipped: <font color=\"#f7a300\">%4</font> | Passed: <font color=\"#009900\">%2</font>, Failed: <font color=\"#990000\">%3</font>")
-                .tqarg(Runner::self()->numberOfTestCases())
-                .tqarg(Runner::self()->numberOfPassedTests())
-                .tqarg(Runner::self()->numberOfFailedTests())
-                .tqarg(Runner::self()->numberOfSkippedTests())
-                .tqarg(Runner::self()->numberOfTests()) );
+                .arg(Runner::self()->numberOfTestCases())
+                .arg(Runner::self()->numberOfPassedTests())
+                .arg(Runner::self()->numberOfFailedTests())
+                .arg(Runner::self()->numberOfSkippedTests())
+                .arg(Runner::self()->numberOfTests()) );
         else
-            m_testerWidget->resultsLabel()->setText(TQString("Test cases: %1").tqarg(Runner::self()->numberOfTestCases()));
+            m_testerWidget->resultsLabel()->setText(TQString("Test cases: %1").arg(Runner::self()->numberOfTestCases()));
     }
 
     void RunnerGUI::addTestResult(const char *name, Tester *test)
@@ -211,7 +211,7 @@ namespace KUnitTest
         
         if ( test->inherits("KUnitTest::SlotTester") )
         {
-            TQStrList allSlots = test->tqmetaObject()->slotNames();
+            TQStrList allSlots = test->metaObject()->slotNames();
             for ( char *sl = allSlots.first(); sl; sl = allSlots.next() ) 
             {
                 if ( TQString(sl).startsWith("test") )
diff --git a/kunittest/testerwidget.ui b/kunittest/testerwidget.ui
index 1f294c02..e6e92e1c 100644
--- a/kunittest/testerwidget.ui
+++ b/kunittest/testerwidget.ui
@@ -156,7 +156,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>0</width>
                     <height>200</height>
@@ -167,7 +167,7 @@
             <property name="name">
                 <cstring>m_teDetails</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>600</width>
                     <height>200</height>
diff --git a/poxml/antlr/antlr/AST.hpp b/poxml/antlr/antlr/AST.hpp
index 7eb883c2..a36ffd15 100644
--- a/poxml/antlr/antlr/AST.hpp
+++ b/poxml/antlr/antlr/AST.hpp
@@ -59,7 +59,7 @@ public:
 	virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAll(RefAST t)=0;
 	virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAllPartial(RefAST t)=0;
 
-	/** Get the first child of this node; null if no tqchildren */
+	/** Get the first child of this node; null if no children */
 	virtual RefAST getFirstChild() const=0;
 	/** Get  the next sibling in line after this one */
 	virtual RefAST getNextSibling() const=0;
diff --git a/poxml/antlr/antlr/ASTFactory.hpp b/poxml/antlr/antlr/ASTFactory.hpp
index f83bec10..584cee6d 100644
--- a/poxml/antlr/antlr/ASTFactory.hpp
+++ b/poxml/antlr/antlr/ASTFactory.hpp
@@ -90,7 +90,7 @@ public:
 	RefAST dupTree(RefAST t);
 	/** Make a tree from a list of nodes.  The first element in the
 	 *  array is the root.  If the root is null, then the tree is
-	 *  a simple list not a tree.  Handles null tqchildren nodes correctly.
+	 *  a simple list not a tree.  Handles null children nodes correctly.
 	 *  For example, build(a, b, null, c) yields tree (a b c).  build(null,a,b)
 	 *  yields tree (nil a b).
 	 */
diff --git a/poxml/antlr/antlr/BaseAST.hpp b/poxml/antlr/antlr/BaseAST.hpp
index bf1e1629..7b93c1ef 100644
--- a/poxml/antlr/antlr/BaseAST.hpp
+++ b/poxml/antlr/antlr/BaseAST.hpp
@@ -70,7 +70,7 @@ public:
 	virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAll(RefAST t);
 	virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAllPartial(RefAST t);
 
-	/** Get the first child of this node; null if no tqchildren */
+	/** Get the first child of this node; null if no children */
 	virtual RefAST getFirstChild() const;
 	/** Get  the next sibling in line after this one */
 	virtual RefAST getNextSibling() const;
@@ -80,7 +80,7 @@ public:
 	/** Get the token type for this node */
 	virtual int getType() const;
 
-	/** Remove all tqchildren */
+	/** Remove all children */
 	virtual void removeChildren();
 
 	/** Set the first child of a node. */
diff --git a/poxml/antlr/src/ASTFactory.cpp b/poxml/antlr/src/ASTFactory.cpp
index 66902522..e44386f7 100644
--- a/poxml/antlr/src/ASTFactory.cpp
+++ b/poxml/antlr/src/ASTFactory.cpp
@@ -144,7 +144,7 @@ RefAST ASTFactory::dupList(RefAST t)
 RefAST ASTFactory::dupTree(RefAST t)
 {
 	RefAST result = dup(t);		// make copy of root
-	// copy all tqchildren of root.
+	// copy all children of root.
 	if (t) {
 		result->setFirstChild( dupList(t->getFirstChild()) );
 	}
@@ -152,7 +152,7 @@ RefAST ASTFactory::dupTree(RefAST t)
 }
 /** Make a tree from a list of nodes.  The first element in the
  *  array is the root.  If the root is null, then the tree is
- *  a simple list not a tree.  Handles null tqchildren nodes correctly.
+ *  a simple list not a tree.  Handles null children nodes correctly.
  *  For example, build(a, b, null, c) yields tree (a b c).  build(null,a,b)
  *  yields tree (nil a b).
  */
@@ -165,7 +165,7 @@ RefAST ASTFactory::make(ANTLR_USE_NAMESPACE(std)vector<RefAST> nodes)
 	if (root) {
 		root->setFirstChild(RefAST(nullASTptr));	// don't leave any old pointers set
 	}
-	// link in tqchildren;
+	// link in children;
 	for (unsigned int i=1; i<nodes.size(); i++) {
 		if ( !nodes[i] ) continue;	// ignore null nodes
 		if ( !root ) {
diff --git a/poxml/antlr/src/BaseAST.cpp b/poxml/antlr/src/BaseAST.cpp
index d4b7368b..4080e0e8 100644
--- a/poxml/antlr/src/BaseAST.cpp
+++ b/poxml/antlr/src/BaseAST.cpp
@@ -64,7 +64,7 @@ void BaseAST::doWorkForFindAll(
 				(!partialMatch && sibling->equalsTree(target)) ) {
 			v.push_back(sibling);
 		}
-		// regardless of match or not, check any tqchildren for matches
+		// regardless of match or not, check any children for matches
 		if ( sibling->getFirstChild() ) {
 			RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch);
 		}
@@ -96,7 +96,7 @@ bool BaseAST::equalsList(RefAST t) const
 		// as a quick optimization, check roots first.
 		if (!sibling->equals(t))
 			return false;
-		// if roots match, do full list match test on tqchildren.
+		// if roots match, do full list match test on children.
 		if (sibling->getFirstChild()) {
 			if (!sibling->getFirstChild()->equalsList(t->getFirstChild()))
 				return false;
@@ -129,7 +129,7 @@ bool BaseAST::equalsListPartial(RefAST sub) const
 		// as a quick optimization, check roots first.
 		if (!sibling->equals(sub))
 			return false;
-		// if roots match, do partial list match test on tqchildren.
+		// if roots match, do partial list match test on children.
 		if (sibling->getFirstChild())
 			if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild()))
 				return false;
@@ -151,7 +151,7 @@ bool BaseAST::equalsTree(RefAST t) const
 	// check roots first
 	if (!equals(t))
 		return false;
-	// if roots match, do full list match test on tqchildren.
+	// if roots match, do full list match test on children.
 	if (getFirstChild()) {
 		if (!getFirstChild()->equalsList(t->getFirstChild()))
 			return false;
@@ -175,7 +175,7 @@ bool BaseAST::equalsTreePartial(RefAST sub) const
 	// check roots first
 	if (!equals(sub))
 		return false;
-	// if roots match, do full list partial match test on tqchildren.
+	// if roots match, do full list partial match test on children.
 	if (getFirstChild())
 		if (!getFirstChild()->equalsListPartial(sub->getFirstChild()))
 			return false;
diff --git a/poxml/lauri.po b/poxml/lauri.po
index c28eeb2f..6384835c 100644
--- a/poxml/lauri.po
+++ b/poxml/lauri.po
@@ -299,7 +299,7 @@ msgstr "Der schlimme Teil"
 msgid "Ending Text:"
 msgstr "Ende:"
 
-#. Tag: literaltqlayout
+#. Tag: literallayout
 #: lauri.xml:143
 #, no-c-format
 msgid ""
diff --git a/poxml/lauri.xml b/poxml/lauri.xml
index 35448f0c..18a1e08a 100644
--- a/poxml/lauri.xml
+++ b/poxml/lauri.xml
@@ -165,7 +165,7 @@ editor.</action></para>
 <para>
   Ending Text:
 
-<literaltqlayout>
+<literallayout>
 Matthias Hoelzer
 KDE-Verein i.G.
 Account-Nr. 2798296
@@ -180,7 +180,7 @@ SWIFT-Address: BYLA DE 77
 print "$b4 /path/to/KDE/libs/libpng.a $af\n"; \
 you see it here
 whereever
-</literaltqlayout>
+</literallayout>
 </para>
 <para>
 <screen>
diff --git a/poxml/parser.cpp b/poxml/parser.cpp
index b4f0161b..be06d80a 100644
--- a/poxml/parser.cpp
+++ b/poxml/parser.cpp
@@ -44,7 +44,7 @@ static const char *cuttingtags[] = {"bridgehead", "trans_comment", "para", "titl
                                     "revdescription", "glossentry", "partinfo", 
 				    "segmentedlist", "segtitle", "seg", "seglistitem", "screenco",
                                     0};
-static const char *literaltags[] = {"literaltqlayout", "synopsis", "screen",
+static const char *literaltags[] = {"literallayout", "synopsis", "screen",
 				    "programlisting", 0};
 
 bool StructureParser::fatalError ( const TQXmlParseException &e )
@@ -99,7 +99,7 @@ bool StructureParser::isLiteralTag(const TQString &qName)
 bool StructureParser::skippedEntity ( const TQString & name )
 {
     if (inside)
-        message += TQString("&%1;").tqarg(name);
+        message += TQString("&%1;").arg(name);
     return true;
 }
 
@@ -126,10 +126,10 @@ bool StructureParser::startElement( const TQString& , const TQString& ,
     {
         TQString tmp = "<" + tname;
         for (int i = 0; i < attr.length(); i++) {
-            tmp += TQString(" %1=\"%2\"").tqarg(attr.qName(i)).tqarg(attr.value(i));
+            tmp += TQString(" %1=\"%2\"").arg(attr.qName(i)).arg(attr.value(i));
         }
-        tmp += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber());
-        tmp += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber());
+        tmp += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber());
+        tmp += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber());
 
         if (isSingleTag(qName))
             tmp += "/>";
@@ -180,8 +180,8 @@ bool StructureParser::closureTag(const TQString& message, const TQString &tag)
     uint index = 0;
     while (true)
     {
-        int nextclose = message.find(TQRegExp(TQString::tqfromLatin1("</%1[\\s>]").tqarg(tag)), index);
-        int nextstart = message.find(TQRegExp(TQString::tqfromLatin1("<%1[>\\s]").tqarg(tag)), index);
+        int nextclose = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)), index);
+        int nextstart = message.find(TQRegExp(TQString::fromLatin1("<%1[>\\s]").arg(tag)), index);
         //  qDebug("finding %d %d %d %d", nextstart, nextclose, index, inside);
         if (nextclose == -1) {
 #ifdef POXML_DEBUG
@@ -223,7 +223,7 @@ void StructureParser::descape(TQString &message)
     bool lastws = false;
 
     while (index < message.length()) {
-        switch (message.tqat(index).latin1()) {
+        switch (message.at(index).latin1()) {
             case '\n':
             case '\t':
             case '\r':
@@ -278,7 +278,7 @@ bool StructureParser::formatMessage(MsgBlock &msg) const
     {
         int slen = strlen(singletags[index]);
 
-        if (msg.msgid.left(slen + 1) == TQString::tqfromLatin1("<%1").tqarg(singletags[index]) &&
+        if (msg.msgid.left(slen + 1) == TQString::fromLatin1("<%1").arg(singletags[index]) &&
             !msg.msgid.at( slen + 1 ).isLetterOrNumber() )
         {
 #ifdef POXML_DEBUG
@@ -418,9 +418,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
 #endif
 
                 // the exception for poxml_* attributes is made in the closing tag
-                int closing_index = message.find(TQRegExp(TQString::tqfromLatin1("</%1[\\s>]").tqarg(tag)),
+                int closing_index = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)),
                                                  strindex);
-                int starting_index = message.find(TQRegExp(TQString::tqfromLatin1("<%1[\\s>]").tqarg(tag)),
+                int starting_index = message.find(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)),
                                                   strindex);
 
 #ifdef POXML_DEBUG
@@ -529,9 +529,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb)
                 qDebug("inside %s %d", message.mid(strindex, 35).latin1(), inside);
 #endif
 
-                int closing_index = message.findRev(TQRegExp(TQString::tqfromLatin1("</%1[\\s>]").tqarg(tag)),
+                int closing_index = message.findRev(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)),
                                                     strindex - 1);
-                int starting_index = message.findRev(TQRegExp(TQString::tqfromLatin1("<%1[\\s>]").tqarg(tag)),
+                int starting_index = message.findRev(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)),
                                                      strindex - 1);
 
 #ifdef POXML_DEBUG
@@ -601,9 +601,9 @@ bool StructureParser::endElement( const TQString& , const TQString&, const TQStr
 
     if (inside) {
         if (!isSingleTag(qName)) {
-            message += TQString("</%1").tqarg(tname);
-            message += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber());
-            message += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber());
+            message += TQString("</%1").arg(tname);
+            message += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber());
+            message += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber());
             message += ">";
         }
     }
@@ -713,8 +713,8 @@ void StructureParser::cleanupTags( TQString &contents )
     contents.replace(TQRegExp("&"), "!POXML_AMP!");
 
     for (int index = 0; literaltags[index]; index++) {
-        TQRegExp start(TQString("<%1[\\s>]").tqarg(literaltags[index]));
-        TQRegExp end(TQString("</%1[\\s>]").tqarg(literaltags[index]));
+        TQRegExp start(TQString("<%1[\\s>]").arg(literaltags[index]));
+        TQRegExp end(TQString("</%1[\\s>]").arg(literaltags[index]));
         int strindex = 0;
         while (true) {
             strindex = contents.find(start, strindex);
@@ -739,7 +739,7 @@ void StructureParser::cleanupTags( TQString &contents )
         if (index < 0)
             break;
         TQString tag = unclosed.cap(1);
-        contents.replace(index, unclosed.matchedLength(), TQString("</%1>").tqarg(tag));
+        contents.replace(index, unclosed.matchedLength(), TQString("</%1>").arg(tag));
     }
 
     TQRegExp start("<((\\s*[^<>\\s])*)\\s\\s*(/*)>");
@@ -753,7 +753,7 @@ void StructureParser::cleanupTags( TQString &contents )
         TQString tag = start.cap(1);
 	TQString cut = start.capturedTexts().last();
         // qDebug("UNCLO %s %d -%s- -%s-", start.cap(0).latin1(), index, tag.latin1(), cut.latin1());
-        contents.replace(index, start.matchedLength(), TQString("<%1%2>").tqarg(tag).tqarg(cut));
+        contents.replace(index, start.matchedLength(), TQString("<%1%2>").arg(tag).arg(cut));
     }
     TQRegExp singletag("<(\\w*)\\s([^><]*)/>");
 
@@ -764,7 +764,7 @@ void StructureParser::cleanupTags( TQString &contents )
             break;
         TQString tag = singletag.cap(1);
         if (!StructureParser::isSingleTag(tag)) {
-            contents.replace(index, singletag.matchedLength(), TQString("<%1 %2></%3>").tqarg(tag).tqarg(singletag.cap(2)).tqarg(tag));
+            contents.replace(index, singletag.matchedLength(), TQString("<%1 %2></%3>").arg(tag).arg(singletag.cap(2)).arg(tag));
         }
     }
 
@@ -775,7 +775,7 @@ void StructureParser::cleanupTags( TQString &contents )
         if (index < 0)
             break;
         TQString msgid = trans_comment.cap(1);
-        contents.replace(index, trans_comment.matchedLength(), TQString("<trans_comment>%1</trans_comment>").tqarg(msgid));
+        contents.replace(index, trans_comment.matchedLength(), TQString("<trans_comment>%1</trans_comment>").arg(msgid));
     }
 
 #ifdef POXML_DEBUG
@@ -788,7 +788,7 @@ static bool removeEmptyTag( TQString &contents, const TQString & tag)
 {
 //    qDebug("cont %s %s", contents.latin1(), tag.latin1());
 
-    TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*</%2\\s*>").tqarg(tag).tqarg(tag));
+    TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*</%2\\s*>").arg(tag).arg(tag));
     int strindex = 0;
     while (true) {
         strindex = contents.find(empty, strindex);
@@ -938,7 +938,7 @@ MsgList parseXML(const char *filename)
         TQString replacement = "";
         while (contents.at(endindex) != '>' || inside)
         {
-            switch (contents.tqat(endindex).latin1()) {
+            switch (contents.at(endindex).latin1()) {
                 case '<':
                     inside++; break;
                 case '>':
@@ -977,8 +977,8 @@ MsgList parseXML(const char *filename)
         {
             TQMap<TQString,TQString>::Iterator found = msgids.find((*it).msgid);
             if ((*it).msgid.length() < 4) {
-                (*it).msgid = TQString("<%1>").tqarg((*it).tag) + (*it).msgid +
-                              TQString("</%1>").tqarg((*it).tag);
+                (*it).msgid = TQString("<%1>").arg((*it).tag) + (*it).msgid +
+                              TQString("</%1>").arg((*it).tag);
                 changed = true;
                 break;
             }
@@ -993,7 +993,7 @@ MsgList parseXML(const char *filename)
                          it2 != english.end(); it2++)
                     {
                         if ((*it2).msgid == msgid)
-                            (*it2).msgid = TQString("<%1>").tqarg((*it2).tag) + msgid + TQString("</%1>").tqarg((*it2).tag);
+                            (*it2).msgid = TQString("<%1>").arg((*it2).tag) + msgid + TQString("</%1>").arg((*it2).tag);
                     }
                     break;
                 }
diff --git a/poxml/split.cpp b/poxml/split.cpp
index db20f15f..29104d3e 100644
--- a/poxml/split.cpp
+++ b/poxml/split.cpp
@@ -112,7 +112,7 @@ int main( int argc, char **argv )
     while (tit != translated.end())
     {
         MsgBlock mb;
-        mb.msgid = TQString::tqfromLatin1("appended paragraph %1").tqarg(counter++);
+        mb.msgid = TQString::fromLatin1("appended paragraph %1").arg(counter++);
         mb.msgstr = (*tit).msgid;
         mb.lines += (*tit).lines;
         english.append(mb);
diff --git a/poxml/transxx.cpp b/poxml/transxx.cpp
index cd3a78be..bfc2e9cf 100644
--- a/poxml/transxx.cpp
+++ b/poxml/transxx.cpp
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
         headerLines.gres( TQRegExp( "^Last-Translator:.*" ), "Last-Translator: transxx program <null@kde.org>" );
         headerLines.gres( TQRegExp( "^Language-Team:.*" ), "Language-Team: Test Language <tde-i18n-doc@kde.org>" );
         TQString revisionDate ( "PO-Revision-Date: " );
-        const TQDateTime dt = TQDateTime::tqcurrentDateTime( Qt::UTC );
+        const TQDateTime dt = TQDateTime::currentDateTime( Qt::UTC );
         revisionDate += dt.toString( "yyyy-MM-dd hh:mm+0000" );
         headerLines.gres( TQRegExp( "^PO-Revision-Date:.*" ), revisionDate );
         headerLines << "Plural-Forms: nplurals=1; plural=0;";
diff --git a/poxml/xml2pot.cpp b/poxml/xml2pot.cpp
index 658e557b..345a53e6 100644
--- a/poxml/xml2pot.cpp
+++ b/poxml/xml2pot.cpp
@@ -33,7 +33,7 @@ int main( int argc, char **argv )
         }
     }
 
-    const TQDateTime now = TQDateTime::tqcurrentDateTime( Qt::UTC );
+    const TQDateTime now = TQDateTime::currentDateTime( Qt::UTC );
     
     cout << "# SOME DESCRIPTIVE TITLE.\n";
     cout << "# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.\n";
diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp
index 5d8d3582..60585b2a 100644
--- a/scheck/scheck.cpp
+++ b/scheck/scheck.cpp
@@ -55,7 +55,7 @@
 #include <tqregexp.h>
 #include <tqscrollbar.h>
 #include <tqslider.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqtabbar.h>
 #include <tqtimer.h>
 #include <tqtoolbutton.h>
@@ -729,7 +729,7 @@ static void renderViolations(const TQValueVector<StyleGuideViolation>& violation
 		// str.setLength() always does a deep copy, so the replacement code below is safe.
 		parStr.setLength( len );
 		// compatible behaviour to the old implementation. Replace tabs by spaces
-		TQChar *chr = (TQChar*)parStr.tqunicode();
+		TQChar *chr = (TQChar*)parStr.unicode();
 		int l = len;
 		while ( l-- )
 		{
@@ -900,10 +900,10 @@ void StyleCheckStyle::accelManageRecursive(TQWidget* widget)
 		return;
 	}
 	
-	const TQObjectList tqchildren = widget->childrenListObject();
-	if (tqchildren.isEmpty())
+	const TQObjectList children = widget->childrenListObject();
+	if (children.isEmpty())
 		return;
-	TQObjectListIterator iter(tqchildren);
+	TQObjectListIterator iter(children);
 	
 	TQObject* walk;
 	while ((walk = iter.current()))
@@ -918,7 +918,7 @@ void StyleCheckStyle::accelManageRecursive(TQWidget* widget)
 void StyleCheckStyle::slotAccelManage()
 {
 	//Walk through top-levels
-	TQWidgetList* topLevels = TQApplication::tqtopLevelWidgets();
+	TQWidgetList* topLevels = TQApplication::topLevelWidgets();
 	if (!topLevels)
 		return;
 	
@@ -1058,7 +1058,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
 
 			if ( sunken )
 				kDrawBeButton( p, x, y, w, h, cg, true,
-						&cg.tqbrush(TQColorGroup::Mid) );
+						&cg.brush(TQColorGroup::Mid) );
 
 			else if ( flags & Style_MouseOver ) {
 				TQBrush brush(cg.button().light(110));
@@ -1071,7 +1071,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
 
 			else
 				kDrawBeButton(p, x, y, w, h, cg, false,
-							  &cg.tqbrush(TQColorGroup::Button));
+							  &cg.brush(TQColorGroup::Button));
 			break;
 		}
 
@@ -1392,7 +1392,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
 		case PE_WindowFrame:
 		case PE_PanelLineEdit: {
 			bool sunken  = flags & Style_Sunken;
-			int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth)
+			int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth)
 										: opt.lineWidth();
 			if (lw == 2)
 			{
@@ -1502,8 +1502,8 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
 
 				p->save();
 				if ( flags & Style_Down )
-					p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ),
-								  tqpixelMetric( PM_ButtonShiftVertical ) );
+					p->translate( pixelMetric( PM_ButtonShiftHorizontal ),
+								  pixelMetric( PM_ButtonShiftVertical ) );
 
 				if ( flags & Style_Enabled ) {
 					a.translate( r.x() + r.width() / 2, r.y() + r.height() / 2 );
@@ -1705,7 +1705,7 @@ void StyleCheckStyle::drawKStylePrimitive( KStylePrimitive kpe,
 }
 
 
-void StyleCheckStyle::tqdrawControl( ControlElement element,
+void StyleCheckStyle::drawControl( ControlElement element,
 								  TQPainter *p,
 								  const TQWidget *widget,
 								  const TQRect &r,
@@ -1727,7 +1727,7 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
 
 			if ( btnDefault || button->autoDefault() ) {
 				// Compensate for default indicator
-				static int di = tqpixelMetric( PM_ButtonDefaultIndicator );
+				static int di = pixelMetric( PM_ButtonDefaultIndicator );
 				br.addCoords( di, di, -di, -di );
 			}
 
@@ -1750,14 +1750,14 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
 
 			// Shift button contents if pushed.
 			if ( active ) {
-				x += tqpixelMetric(PM_ButtonShiftHorizontal, widget);
-				y += tqpixelMetric(PM_ButtonShiftVertical, widget);
+				x += pixelMetric(PM_ButtonShiftHorizontal, widget);
+				y += pixelMetric(PM_ButtonShiftVertical, widget);
 				flags |= Style_Sunken;
 			}
 
 			// Does the button have a popup menu?
 			if ( button->isMenuButton() ) {
-				int dx = tqpixelMetric( PM_MenuButtonIndicator, widget );
+				int dx = pixelMetric( PM_MenuButtonIndicator, widget );
 				drawPrimitive( PE_ArrowDown, p, TQRect(x + w - dx - 2, y + 2, dx, h - 4),
 							   cg, flags, opt );
 				w -= dx;
@@ -1786,7 +1786,7 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
 			// Make the label indicate if the button is a default button or not
 			if ( active || button->isDefault() ) {
 				// Draw "fake" bold text  - this enables the font metrics to remain
-				// the same as computed in TQPushButton::tqsizeHint(), but gives
+				// the same as computed in TQPushButton::sizeHint(), but gives
 				// a reasonable bold effect.
 				int i;
 
@@ -1794,25 +1794,25 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
 				if (button->isEnabled()) // Don't draw double-shadow when disabled
 					for(i=0; i<2; i++)
 						drawItem( p, TQRect(x+i+1, y+1, w, h), AlignCenter | ShowPrefix,
-								button->tqcolorGroup(), button->isEnabled(), button->pixmap(),
+								button->colorGroup(), button->isEnabled(), button->pixmap(),
 								removedXX(stripAccelViolations(button->text())), -1,
-								active ? &button->tqcolorGroup().dark() : &button->tqcolorGroup().mid() );
+								active ? &button->colorGroup().dark() : &button->colorGroup().mid() );
 
 				// Normal Text
 				for(i=0; i<2; i++)
 					drawItem( p, TQRect(x+i, y, w, h), AlignCenter | ShowPrefix,
-							button->tqcolorGroup(), button->isEnabled(), button->pixmap(),
+							button->colorGroup(), button->isEnabled(), button->pixmap(),
 							removedXX(stripAccelViolations(button->text())), -1,
-							active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() );
+							active ? &button->colorGroup().light() : &button->colorGroup().buttonText() );
 			} else
-				drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->tqcolorGroup(),
+				drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->colorGroup(),
 						button->isEnabled(), button->pixmap(), removedXX(stripAccelViolations(button->text())), -1,
-						active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() );
+						active ? &button->colorGroup().light() : &button->colorGroup().buttonText() );
 
 			// Draw a focus rect if the button has focus
 			if ( flags & Style_HasFocus )
 				drawPrimitive( PE_FocusRect, p,
-						TQStyle::tqvisualRect(subRect(SR_PushButtonFocusRect, widget), widget),
+						TQStyle::visualRect(subRect(SR_PushButtonFocusRect, widget), widget),
 						cg, flags );
 			break;
 		}
@@ -1828,7 +1828,7 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
 			TQRect tr = r;
 			if ( t->identifier() == tb->currentTab() )
 			tr.setBottom( tr.bottom() -
-					tqpixelMetric( TQStyle::PM_DefaultFrameWidth, tb ) );
+					pixelMetric( TQStyle::PM_DefaultFrameWidth, tb ) );
 
 			TQValueVector<StyleGuideViolation> violations = checkTitleStyle(t->text(), ShortTitle, HasAccels);
 			renderViolations(violations, p, r, AlignCenter |ShowPrefix,  t->text());
@@ -1846,18 +1846,18 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
 		{
 			const TQCheckBox* checkbox = static_cast<const TQCheckBox*>(widget);
 
-			int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
+			int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
 
 			TQValueVector<StyleGuideViolation> violations = checkSentenceStyle(checkbox->text());
 
-			renderViolations(violations, p, r, tqalignment | AlignVCenter | ShowPrefix, checkbox->text());
+			renderViolations(violations, p, r, alignment | AlignVCenter | ShowPrefix, checkbox->text());
 
-			drawItem(p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
+			drawItem(p, r, alignment | AlignVCenter | ShowPrefix, cg,
 				flags & Style_Enabled, checkbox->pixmap(), removedXX(stripAccelViolations(checkbox->text())));
 
 			if (flags & Style_HasFocus)
 			{
-				TQRect fr = tqvisualRect(subRect(SR_CheckBoxFocusRect, widget), widget);
+				TQRect fr = visualRect(subRect(SR_CheckBoxFocusRect, widget), widget);
 				drawPrimitive(PE_FocusRect, p, fr, cg, flags);
 			}
 			break;
@@ -1867,18 +1867,18 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
 		{
 			const TQRadioButton* rb = static_cast<const TQRadioButton*>(widget);
 
-			int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
+			int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
 
 			TQValueVector<StyleGuideViolation> violations = checkSentenceStyle(rb->text());
 
-			renderViolations(violations, p, r,tqalignment | AlignVCenter | ShowPrefix,  rb->text());
+			renderViolations(violations, p, r,alignment | AlignVCenter | ShowPrefix,  rb->text());
 
-			drawItem(p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
+			drawItem(p, r, alignment | AlignVCenter | ShowPrefix, cg,
 				flags & Style_Enabled, rb->pixmap(), removedXX(stripAccelViolations(rb->text())));
 
 			if (flags & Style_HasFocus)
 			{
-				TQRect fr = tqvisualRect(subRect(SR_CheckBoxFocusRect, widget), widget);
+				TQRect fr = visualRect(subRect(SR_CheckBoxFocusRect, widget), widget);
 				drawPrimitive(PE_FocusRect, p, fr, cg, flags);
 			}
 			break;
@@ -1933,7 +1933,7 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
 			bool enabled    = mi->isEnabled();
 			bool checkable  = popupmenu->isCheckable();
 			bool active     = flags & Style_Active;
-			bool etchtext   = tqstyleHint( SH_EtchDisabledText );
+			bool etchtext   = styleHint( SH_EtchDisabledText );
 			bool reverse    = TQApplication::reverseLayout();
 			int x, y, w, h;
 			r.rect( &x, &y, &w, &h );
@@ -1964,7 +1964,7 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
 			// Do we have an icon?
 			if ( mi->iconSet() ) {
 				TQIconSet::Mode mode;
-				TQRect cr = tqvisualRect( TQRect(x, y, checkcol, h), r );
+				TQRect cr = visualRect( TQRect(x, y, checkcol, h), r );
 
 				// Select the correct icon from the iconset
 				if ( active )
@@ -2110,8 +2110,8 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
 			// Does the menu item have a submenu?
 			if ( mi->popup() ) {
 				PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
-				int dim = tqpixelMetric(PM_MenuButtonIndicator);
-				TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
+				int dim = pixelMetric(PM_MenuButtonIndicator);
+				TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
 							y + h / 2 - dim / 2, dim, dim), r );
 
 				// Draw an arrow at the far end of the menu item
@@ -2164,12 +2164,12 @@ void StyleCheckStyle::tqdrawControl( ControlElement element,
 		}
 
 		default:
-			KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt);
+			KStyle::drawControl(element, p, widget, r, cg, flags, opt);
 	}
 }
 
 
-void StyleCheckStyle::tqdrawControlMask( ControlElement element,
+void StyleCheckStyle::drawControlMask( ControlElement element,
 								  	  TQPainter *p,
 								  	  const TQWidget *widget,
 								  	  const TQRect &r,
@@ -2190,12 +2190,12 @@ void StyleCheckStyle::tqdrawControlMask( ControlElement element,
 		}
 
 		default:
-			KStyle::tqdrawControlMask(element, p, widget, r, opt);
+			KStyle::drawControlMask(element, p, widget, r, opt);
 	}
 }
 
 
-void StyleCheckStyle::tqdrawComplexControl( ComplexControl control,
+void StyleCheckStyle::drawComplexControl( ComplexControl control,
                                          TQPainter *p,
                                          const TQWidget *widget,
                                          const TQRect &r,
@@ -2246,7 +2246,7 @@ void StyleCheckStyle::tqdrawComplexControl( ComplexControl control,
 				p->drawLine(x+1, y+2, x+1, y2-2);
 
 				// Get the button bounding box
-				TQRect ar = TQStyle::tqvisualRect(
+				TQRect ar = TQStyle::visualRect(
 					querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxArrow),
 					widget );
 
@@ -2265,7 +2265,7 @@ void StyleCheckStyle::tqdrawComplexControl( ComplexControl control,
 			if ( controls & SC_ComboBoxEditField )
 			{
 				const TQComboBox * cb = (const TQComboBox *) widget;
-				TQRect re = TQStyle::tqvisualRect(
+				TQRect re = TQStyle::visualRect(
 					querySubControlMetrics( CC_ComboBox, widget,
 						                    SC_ComboBoxEditField), widget );
 
@@ -2289,7 +2289,7 @@ void StyleCheckStyle::tqdrawComplexControl( ComplexControl control,
 					p->fillRect( re.x(), re.y(), re.width(), re.height(),
 								 cg.brush( TQColorGroup::Highlight ) );
 
-					TQRect re = TQStyle::tqvisualRect(
+					TQRect re = TQStyle::visualRect(
 								subRect(SR_ComboBoxFocusRect, cb), widget);
 
 					drawPrimitive( PE_FocusRect, p, re, cg,
@@ -2377,14 +2377,14 @@ void StyleCheckStyle::tqdrawComplexControl( ComplexControl control,
 
 
 		default:
-			KStyle::tqdrawComplexControl(control, p, widget,
+			KStyle::drawComplexControl(control, p, widget,
 						r, cg, flags, controls, active, opt);
 			break;
 	}
 }
 
 
-void StyleCheckStyle::tqdrawComplexControlMask( ComplexControl control,
+void StyleCheckStyle::drawComplexControlMask( ComplexControl control,
 											 TQPainter *p,
 											 const TQWidget *widget,
 											 const TQRect &r,
@@ -2406,7 +2406,7 @@ void StyleCheckStyle::tqdrawComplexControlMask( ComplexControl control,
 		}
 
 		default:
-			KStyle::tqdrawComplexControlMask(control, p, widget, r, opt);
+			KStyle::drawComplexControlMask(control, p, widget, r, opt);
 	}
 }
 
@@ -2422,11 +2422,11 @@ TQRect StyleCheckStyle::subRect(SubRect r, const TQWidget *widget) const
 		int dbw1 = 0, dbw2 = 0;
 
 		if (button->isDefault() || button->autoDefault()) {
-			dbw1 = tqpixelMetric(PM_ButtonDefaultIndicator, widget);
+			dbw1 = pixelMetric(PM_ButtonDefaultIndicator, widget);
 			dbw2 = dbw1 * 2;
 		}
 
-		int dfw1 = tqpixelMetric(PM_DefaultFrameWidth, widget) * 2,
+		int dfw1 = pixelMetric(PM_DefaultFrameWidth, widget) * 2,
 			dfw2 = dfw1 * 2;
 
 		return TQRect(wrect.x()      + dfw1 + dbw1 + 1,
@@ -2438,7 +2438,7 @@ TQRect StyleCheckStyle::subRect(SubRect r, const TQWidget *widget) const
 }
 
 
-int StyleCheckStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
+int StyleCheckStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
 {
 	switch(m)
 	{
@@ -2465,7 +2465,7 @@ int StyleCheckStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
 		}
 
 		default:
-			return KStyle::tqpixelMetric(m, widget);
+			return KStyle::pixelMetric(m, widget);
 	}
 }
 
@@ -2483,8 +2483,8 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents,
 			const TQPushButton* button = (const TQPushButton*) widget;
 			int w  = contentSize.width();
 			int h  = contentSize.height();
-			int bm = tqpixelMetric( PM_ButtonMargin, widget );
-			int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2;
+			int bm = pixelMetric( PM_ButtonMargin, widget );
+			int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2;
 
 			w += bm + fw + 6;	// ### Add 6 to make way for bold font.
 			h += bm + fw;
@@ -2495,7 +2495,7 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents,
 					w = 80;
 
 				// Compensate for default indicator
-				int di = tqpixelMetric( PM_ButtonDefaultIndicator );
+				int di = pixelMetric( PM_ButtonDefaultIndicator );
 				w += di * 2;
 				h += di * 2;
 			}
@@ -2520,8 +2520,8 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents,
 			int w = contentSize.width(), h = contentSize.height();
 
 			if ( mi->custom() ) {
-				w = mi->custom()->tqsizeHint().width();
-				h = mi->custom()->tqsizeHint().height();
+				w = mi->custom()->sizeHint().width();
+				h = mi->custom()->sizeHint().height();
 				if ( ! mi->custom()->fullSpan() )
 					h += 2*itemVMargin + 2*itemFrame;
 			}
@@ -2571,7 +2571,7 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents,
 }
 
 
-// Fix TQt's wacky image tqalignment
+// Fix TQt's wacky image alignment
 TQPixmap StyleCheckStyle::stylePixmap(StylePixmap stylepixmap,
 									const TQWidget* widget,
 									const TQStyleOption& opt) const
@@ -2602,12 +2602,12 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
 		if ( (event->type() == TQEvent::Enter) &&
 			 (button->isEnabled()) ) {
 			hoverWidget = button;
-			button->tqrepaint( false );
+			button->repaint( false );
 		}
 		else if ( (event->type() == TQEvent::Leave) &&
 				  (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget)) ) {
 			hoverWidget = 0L;
-			button->tqrepaint( false );
+			button->repaint( false );
 		}
 	}
 
@@ -2629,14 +2629,14 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
 			m = lb->fontMetrics().width('x') / 2 - lb->margin();
 		if ( m > 0 )
 		{
-			int hAlign = TQApplication::horizontalAlignment( lb->tqalignment() );
+			int hAlign = TQApplication::horizontalAlignment( lb->alignment() );
 			if ( hAlign & AlignLeft )
 				cr.setLeft( cr.left() + m );
 			if ( hAlign & AlignRight )
 				cr.setRight( cr.right() - m );
-			if ( lb->tqalignment() & AlignTop )
+			if ( lb->alignment() & AlignTop )
 				cr.setTop( cr.top() + m );
-			if ( lb->tqalignment() & AlignBottom )
+			if ( lb->alignment() & AlignBottom )
 				cr.setBottom( cr.bottom() - m );
 		}
 
@@ -2656,17 +2656,17 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
 
 		if (lb->buddy())
 		{
-			renderViolations(violations, &p, cr,lb->tqalignment() | ShowPrefix, lb->text() );
+			renderViolations(violations, &p, cr,lb->alignment() | ShowPrefix, lb->text() );
 			// ordinary text or pixmap label
-			drawItem( &p, cr, lb->tqalignment(), lb->tqcolorGroup(), lb->isEnabled(),
+			drawItem( &p, cr, lb->alignment(), lb->colorGroup(), lb->isEnabled(),
 				0, removedXX(stripAccelViolations(lb->text())) );
 		}
 		else
 		{
-			renderViolations(violations, &p, cr,lb->tqalignment(), lb->text() );
+			renderViolations(violations, &p, cr,lb->alignment(), lb->text() );
 
 			// ordinary text or pixmap label
-			drawItem( &p, cr, lb->tqalignment(), lb->tqcolorGroup(), lb->isEnabled(),
+			drawItem( &p, cr, lb->alignment(), lb->colorGroup(), lb->isEnabled(),
 				0, removedXX(stripAccelViolations(lb->text())) );
 		}
 
@@ -2704,11 +2704,11 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
 			int h = fm.height();
 			int tw = fm.width( stripped_title, stripped_title.length() ) + 2*fm.width(TQChar(' '));
 			int x;
-			if ( gb->tqalignment() & AlignHCenter )		// center tqalignment
+			if ( gb->alignment() & AlignHCenter )		// center alignment
 				x = gb->frameRect().width()/2 - tw/2;
-			else if ( gb->tqalignment() & AlignRight )	// right tqalignment
+			else if ( gb->alignment() & AlignRight )	// right alignment
 				x = gb->frameRect().width() - tw - 8;
-			else if ( gb->tqalignment() & AlignLeft )		 // left tqalignment
+			else if ( gb->alignment() & AlignLeft )		 // left alignment
 				x = 8;
 			else
 			{ // auto align
@@ -2723,7 +2723,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
 
 			renderViolations( violations, &paint, r, AlignCenter | ShowPrefix, gb->title() );
 
-			drawItem(&paint, r, AlignCenter | ShowPrefix, gb->tqcolorGroup(),
+			drawItem(&paint, r, AlignCenter | ShowPrefix, gb->colorGroup(),
 				gb->isEnabled(), 0, stripped_title );
 
 			paint.setClipRegion( pevent->region().subtract( r ) );
@@ -2740,7 +2740,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event )
 		else
 		{
 			tqdrawPrimitive( TQStyle::PE_GroupBoxFrame, &paint, gb->frameRect(),
-			               gb->tqcolorGroup(), TQStyle::Style_Default,
+			               gb->colorGroup(), TQStyle::Style_Default,
 			               TQStyleOption(gb->lineWidth(), gb->midLineWidth(),
 			               gb->frameShape(), gb->frameShadow()) );
 		}
diff --git a/scheck/scheck.h b/scheck/scheck.h
index 6a68063d..60eb48dd 100644
--- a/scheck/scheck.h
+++ b/scheck/scheck.h
@@ -95,7 +95,7 @@ class StyleCheckStyle : public KStyle
 					SFlags flags = Style_Default,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void tqdrawControl( ControlElement element,
+		void drawControl( ControlElement element,
 					TQPainter *p,
 					const TQWidget *widget,
 					const TQRect &r,
@@ -103,13 +103,13 @@ class StyleCheckStyle : public KStyle
 					SFlags flags = Style_Default,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void tqdrawControlMask( ControlElement element,
+		void drawControlMask( ControlElement element,
 					TQPainter *p,
 					const TQWidget *widget,
 					const TQRect &r,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void tqdrawComplexControl( ComplexControl control,
+		void drawComplexControl( ComplexControl control,
 					TQPainter *p,
 					const TQWidget *widget,
 					const TQRect &r,
@@ -119,13 +119,13 @@ class StyleCheckStyle : public KStyle
 					SCFlags active = SC_None,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void tqdrawComplexControlMask( ComplexControl control,
+		void drawComplexControlMask( ComplexControl control,
 					TQPainter *p,
 					const TQWidget *widget,
 					const TQRect &r,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		int tqpixelMetric( PixelMetric m,
+		int pixelMetric( PixelMetric m,
 					const TQWidget *widget = 0 ) const;
 
 		TQSize sizeFromContents( ContentsType contents,
diff --git a/scripts/fixheaders b/scripts/fixheaders
index fd538d5c..b1b0a15b 100644
--- a/scripts/fixheaders
+++ b/scripts/fixheaders
@@ -53,7 +53,7 @@ $lastdir = '.';
  'variable `class QFile \S*\' has initializer but incomplete type' => "qfile",
  'implicit declaration of function `int ICON\(\.\.\.\)' => "kiconloader",
  '`QMessageBox\' undeclared \(first use this function\)' => "qmessagebox",
- 'no matching function for call to `QBoxLayout::QBoxLayout' => "qtqlayout",
+ 'no matching function for call to `QBoxLayout::QBoxLayout' => "qlayout",
  '`QUriDrag\' undeclared \(first use this function\)' => "qdragobject",
  '`kdDebug\' undeclared \(first use this function\)' => "kdebug",
  '`kdWarning\' undeclared \(first use this function\)' => "kdebug",
diff --git a/scripts/kde-devel-emacs.el b/scripts/kde-devel-emacs.el
index 856595e6..c63bb5c1 100644
--- a/scripts/kde-devel-emacs.el
+++ b/scripts/kde-devel-emacs.el
@@ -1441,7 +1441,7 @@ With arg, to it arg times."
 ;; Please notify blackie@klaralvdalens-datakonsult.se with any modification to this variable!
 (defvar kdab-special-includes
   '( 
-    (qtqlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout)
+    (qlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout)
     (qlistview.h QListViewItem QCheckListItem QListViewItemIterator)
     (qiconview.h QIconViewItem QIconDragItem QIconDrag)
     (qdragobject.h QTextDrag QStoredDrag QUriDag QColorDrag QImageDrag QDragManager)
diff --git a/scripts/kde-devel-gdb b/scripts/kde-devel-gdb
index 8284428b..62a43aba 100644
--- a/scripts/kde-devel-gdb
+++ b/scripts/kde-devel-gdb
@@ -25,7 +25,7 @@ define printqstringdata
     set $i=0
     set $d = (QStringData *)$arg0
     while $i < $d->len
-        printf "%c", (char)($d->tqunicode[$i++].ucs & 0xff)
+        printf "%c", (char)($d->unicode[$i++].ucs & 0xff)
     end
     printf "\n"
 end
@@ -57,7 +57,7 @@ define printqstring_utf8
    set $i=0
    set $s = $arg0
    while $i < $s.d->len
-     set $uc = (unsigned short) $s.d->tqunicode[$i++].ucs
+     set $uc = (unsigned short) $s.d->unicode[$i++].ucs
      if ( $uc < 0x80 )
        printf "%c", (unsigned char)($uc & 0x7f)
      else
diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim
index 7b8961fe..581076fa 100644
--- a/scripts/kde-devel-vim.vim
+++ b/scripts/kde-devel-vim.vim
@@ -174,7 +174,7 @@ endfunction
 function! MapIdentHeader( ident )
     " Qt stuff
     if a:ident =~ 'Q.*Layout'
-        return '<qtqlayout.h>'
+        return '<qlayout.h>'
     elseif a:ident == 'QListViewItem' ||
           \a:ident == 'QCheckListItem' ||
           \a:ident == 'QListViewItemIterator'
diff --git a/scripts/kde-emacs/kde-emacs-core.el b/scripts/kde-emacs/kde-emacs-core.el
index 37017413..eaa63a0c 100644
--- a/scripts/kde-emacs/kde-emacs-core.el
+++ b/scripts/kde-emacs/kde-emacs-core.el
@@ -199,7 +199,7 @@ This function does not do any hidden buffer changes."
 	   ;; throw it away due to the narrowing that might be done
 	   ;; by the function above.  That means we must not do any
 	   ;; changes during the execution of this function, since
-	   ;; `c-tqinvalidate-state-cache' then would change this local
+	   ;; `c-invalidate-state-cache' then would change this local
 	   ;; variable and leave a bogus value in the global one.
 	   (c-state-cache (if inclass-p
 			      (c-whack-state-before (point-min) paren-state)
diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el
index 082f9bbb..01de447a 100644
--- a/scripts/kde-emacs/klaralv.el
+++ b/scripts/kde-emacs/klaralv.el
@@ -52,7 +52,7 @@
 ;; Please notify blackie@klaralvdalens-datakonsult.se with any modification to this variable!
 (defvar kdab-special-includes
   '( 
-    (qtqlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout)
+    (qlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout)
     (qlistview.h QListViewItem QCheckListItem QListViewItemIterator)
     (qiconview.h QIconViewItem QIconDragItem QIconDrag)
     (qdragobject.h QTextDrag QStoredDrag QUriDag QColorDrag QImageDrag QDragManager)
@@ -217,7 +217,7 @@
     (palmtoprecord.h Record)
     (palmtopuidgen.h UidGen)
     (password.h Password)
-    (power.h PowertqStatus PowerStatusManager )
+    (power.h PowerStatus PowerStatusManager )
     (process.h Process)
     (qcopenvelope_qws.h QCopEnvelope)
     (qdawg.h QDawg)
diff --git a/scripts/kde-spellcheck.pl b/scripts/kde-spellcheck.pl
index 34ce47a0..901fdf12 100755
--- a/scripts/kde-spellcheck.pl
+++ b/scripts/kde-spellcheck.pl
@@ -373,7 +373,7 @@ Afganistan             Afghanistan
 agressive              aggressive
 Agressive              Aggressive
 agressively            aggressively
-alignement             tqalignment
+alignement             alignment
 alligned               aligned
 Allignment             Alignment
 allmost                almost
@@ -514,7 +514,7 @@ charakters             characters
 charater               character
 Chatacter              Character
 chatwindow             chat window
-childs                 tqchildren
+childs                 children
 choosed                chose
 choosen                chosen
 Choosen                Chosen
diff --git a/scripts/tdesvn-build b/scripts/tdesvn-build
index 73951a0f..17efa128 100755
--- a/scripts/tdesvn-build
+++ b/scripts/tdesvn-build
@@ -3432,7 +3432,7 @@ sub update_module_environment
     my $path = join(':', "$qtdir/bin", "$tdedir/bin", get_option ($module, 'binpath'));
     my $libdir = join(':', "$qtdir/lib", "$tdedir/lib", get_option ($module, 'libpath'));
 
-    # Set up the tqchildren's environment.  We use setenv since it
+    # Set up the children's environment.  We use setenv since it
     # won't set an environment variable to nothing.  (e.g, setting
     # QTDIR to a blank string might confuse Qt or KDE.
 
diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp
index 2ac38d4e..3aac8342 100644
--- a/umbrello/umbrello/aligntoolbar.cpp
+++ b/umbrello/umbrello/aligntoolbar.cpp
@@ -335,7 +335,7 @@ void AlignToolBar::slotButtonChanged(int btn) {
 
     // at least 2 widgets must be selected
     if (widgetList.count() > 1) {
-        // now perform tqalignment according to the clicked button
+        // now perform alignment according to the clicked button
         switch (btn) {
         case alac_align_left:
             alignLeft(widgetList);
@@ -380,7 +380,7 @@ void AlignToolBar::slotButtonChanged(int btn) {
         UMLApp::app()->getDocument()->setModified();
     } else {
         KMessageBox::messageBox(0, KMessageBox::Information,
-                                i18n("For tqalignment you have to select at least 2 objects like classes or actors. You can not align associations."),
+                                i18n("For alignment you have to select at least 2 objects like classes or actors. You can not align associations."),
                                 i18n("Information"), i18n("&OK"), TQString(""),
                                 "showAlignInformation");
     } // if (widgetList.count() > 1)
diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h
index 7e2170a5..7720b9b3 100644
--- a/umbrello/umbrello/aligntoolbar.h
+++ b/umbrello/umbrello/aligntoolbar.h
@@ -21,10 +21,10 @@ class TQMainWindow;
 class UMLWidget;
 
 /**
- * This toolbar provides tools for tqalignment. Widgets can only be aligned, when
+ * This toolbar provides tools for alignment. Widgets can only be aligned, when
  * there are at least 2 widgets (not associations) are selected
  *
- * @short Toolbar providing tqalignment tools.
+ * @short Toolbar providing alignment tools.
  * @author Sebastian Stein <seb.kde@hpfsc.de>
  * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org
  */
@@ -34,7 +34,7 @@ class AlignToolBar : public KToolBar {
 public:
 
     /**
-     * Creates a bar with tools for tqalignment.
+     * Creates a bar with tools for alignment.
      *
      * @param parentWindow      The parent of the toolbar.
      * @param name              The name of the toolbar.
@@ -215,7 +215,7 @@ private:
 private slots:
 
     /**
-     * Performs the tqalignment when a button was clicked.
+     * Performs the alignment when a button was clicked.
      *
      * @param btn The clicked button.
      */
diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp
index 6ded541d..81a1bb57 100644
--- a/umbrello/umbrello/associationwidget.cpp
+++ b/umbrello/umbrello/associationwidget.cpp
@@ -797,7 +797,7 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc)
         //    BTW, IMHO the concept of a widget being the parent of a UML object
         //    is fundamentally flawed. Widgets are pure presentation - they can
         //    come and go at a whim. If at all, the widgets could be considered
-        //    tqchildren of the corresponding UML object.
+        //    children of the corresponding UML object.
         //
         // ANSWER: This is the wrong treatment of cut and paste. Associations that
         // are being cut/n pasted should be serialized to XMI, then reconstituted
@@ -2101,7 +2101,7 @@ void AssociationWidget::createAssocClassLine() {
     computeAssocClassLine();
     TQPen pen(getLineColor(), getLineWidth(), TQt::DashLine);
     m_pAssocClassLine->setPen(pen);
-    m_pAssocClassLine->tqsetVisible(true);
+    m_pAssocClassLine->setVisible(true);
 }
 
 void AssociationWidget::createAssocClassLine(ClassifierWidget* classifier,
diff --git a/umbrello/umbrello/associationwidget.h b/umbrello/umbrello/associationwidget.h
index fbbdf214..175a64ec 100644
--- a/umbrello/umbrello/associationwidget.h
+++ b/umbrello/umbrello/associationwidget.h
@@ -1012,7 +1012,7 @@ public slots:
     /**
      * This slot is entered when an event has occurred on the views display,
      * most likely a mouse event.  Before it sends out that mouse event all
-     * tqchildren should make sure that they don't have a menu active or there
+     * children should make sure that they don't have a menu active or there
      * could be more than one popup menu displayed.
      */
     void slotRemovePopupMenu();
diff --git a/umbrello/umbrello/autolayout/_graph.h b/umbrello/umbrello/autolayout/_graph.h
index b3c42f30..179a9471 100644
--- a/umbrello/umbrello/autolayout/_graph.h
+++ b/umbrello/umbrello/autolayout/_graph.h
@@ -15,7 +15,7 @@
 #ifndef AUTOLAYOUTGRAPH_H
 #define AUTOLAYOUTGRAPH_H
 #include "baseinclude.h"
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
index e47911e6..894dddbc 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp
@@ -12,7 +12,7 @@
 #include "autolayoutdlg.h"
 #include "../associationwidget.h"
 #include "../umlwidget.h"
-#include "autotqlayout.h"
+#include "autolayout.h"
 #include "newautolayoutdialog.h"
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
@@ -84,7 +84,7 @@ void AutolayoutDlg::slotSetClusterizeHierarchies(bool b)
 
 void AutolayoutDlg::slotSetShapeSeparation(int i)
 {
-    tqshapeSeparation=i;
+    shapeSeparation=i;
 }
 
 void AutolayoutDlg::slotReloadSettings()
@@ -99,10 +99,10 @@ void AutolayoutDlg::slotSaveSettings()
 }
 
 
-void AutolayoutDlg::slotDoAutotqlayout()
+void AutolayoutDlg::slotDoAutolayout()
 {
 
-    Autotqlayout::Autolayouter* a=getAutolayouter();;
+    Autolayout::Autolayouter* a=getAutolayouter();;
 
     a->setAssociationAsEdges( associationAsEdges);
     a->setAssociationWeight( associationWeight );
@@ -115,8 +115,8 @@ void AutolayoutDlg::slotDoAutotqlayout()
     a->setGeneralizationWeight( generalizationWeight);
     a->setNoteConnectionWeight( 1);
     a->setNoteConnectionsAsEdges(true);
-    a->setShapeSeparation( tqshapeSeparation);
-    a->autotqlayout( view);
+    a->setShapeSeparation( shapeSeparation);
+    a->autolayout( view);
     delete a;
     a=0;
     accept();
@@ -134,7 +134,7 @@ void AutolayoutDlg::readConfig( KConfig * conf)
     generalizationCB->setChecked((bool)(conf->readBoolEntry( "genralizationAsEdges",true)));
     generalizationEdgessSL->setValue((int)(conf->readNumEntry( "generalizationWeight",1)));
     associationEdgesSL->setValue((int)(conf->readNumEntry( "associationWeight",0)));
-    tqshapeSeparationSB->setValue((int)(conf->readNumEntry( "tqshapeSeparation",0)));
+    shapeSeparationSB->setValue((int)(conf->readNumEntry( "shapeSeparation",0)));
     algorithmCOB->setCurrentItem((int)(conf->readNumEntry( "algorithm",0)));
 }
 
@@ -151,7 +151,7 @@ void AutolayoutDlg::writeConfig( KConfig * conf)
 
     conf->writeEntry("generalizationWeight",generalizationEdgessSL->value());
     conf->writeEntry("associationWeight",associationEdgesSL->value());
-    conf->writeEntry("tqshapeSeparation",tqshapeSeparationSB->value());
+    conf->writeEntry("shapeSeparation",shapeSeparationSB->value());
     //conf->writeEntry("al
 
 
@@ -165,18 +165,18 @@ void AutolayoutDlg::slotSelectAlgorithm( const TQString& _algname)
 
 }
 
-Autotqlayout::Autolayouter * AutolayoutDlg::getAutolayouter( )
+Autolayout::Autolayouter * AutolayoutDlg::getAutolayouter( )
 {
     const TQString text = algorithmCOB->currentText();
-    kDebug() << "Autotqlayout Algorithm " << algname << " found " << text << endl;
+    kDebug() << "Autolayout Algorithm " << algname << " found " << text << endl;
     if (text == "dot")
-        return new Autotqlayout::DotAutolayouter();
+        return new Autolayout::DotAutolayouter();
     if (text == "circo")
-        return new Autotqlayout::CircoAutolayouter();
+        return new Autolayout::CircoAutolayouter();
     if (text ==  "neato")
-        return new Autotqlayout::NeatoAutolayouter();
-    kError() << "Autotqlayout Algorithm not found" << endl;
-    return new Autotqlayout::DotAutolayouter();
+        return new Autolayout::NeatoAutolayouter();
+    kError() << "Autolayout Algorithm not found" << endl;
+    return new Autolayout::DotAutolayouter();
 }
 
 
diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h
index f2614d03..972fd83c 100644
--- a/umbrello/umbrello/autolayout/autolayoutdlg.h
+++ b/umbrello/umbrello/autolayout/autolayoutdlg.h
@@ -16,7 +16,7 @@
 #include "../umlview.h"
 #include <tqobject.h>
 #include <kconfig.h>
-#include "autotqlayout.h"
+#include "autolayout.h"
 
 class AutolayoutDlg : public MyDialog1
 {
@@ -37,7 +37,7 @@ class AutolayoutDlg : public MyDialog1
     virtual void slotSetShapeSeparation(int i);
     virtual void slotReloadSettings();
     virtual void slotSaveSettings();
-    virtual void slotDoAutotqlayout();
+    virtual void slotDoAutolayout();
     void readConfig(KConfig*);
     void writeConfig(KConfig*);
     virtual void slotSelectAlgorithm(const TQString&);
@@ -54,10 +54,10 @@ class AutolayoutDlg : public MyDialog1
     bool compressShapes;
     bool centerDiagram;
     bool clusterizeHierarchies;
-    int tqshapeSeparation;
+    int shapeSeparation;
     KConfig* config;
     TQString algname;
-    Autotqlayout::Autolayouter* getAutolayouter();
+    Autolayout::Autolayouter* getAutolayouter();
 
 };
 
diff --git a/umbrello/umbrello/autolayout/autolayouter.cpp b/umbrello/umbrello/autolayout/autolayouter.cpp
index 802bc438..f70fd195 100644
--- a/umbrello/umbrello/autolayout/autolayouter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouter.cpp
@@ -13,11 +13,11 @@
  ***************************************************************************/
 #include "autolayouter.h"
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 
 
-void Autolayouter::autotqlayout( UMLView * v )
+void Autolayouter::autolayout( UMLView * v )
 {
     setCanvas(v);
     setGraph(v);
@@ -25,5 +25,5 @@ void Autolayouter::autotqlayout( UMLView * v )
     updateView(v);
 }
 
-}  // end namespace Autotqlayout
+}  // end namespace Autolayout
 
diff --git a/umbrello/umbrello/autolayout/autolayouter.h b/umbrello/umbrello/autolayout/autolayouter.h
index 5d4645f9..a56b1ce3 100644
--- a/umbrello/umbrello/autolayout/autolayouter.h
+++ b/umbrello/umbrello/autolayout/autolayouter.h
@@ -13,10 +13,10 @@
 #define AUTOLAYOUTAUTOLAYOUTER_H
 #include "baseinclude.h"
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
-This is the super class of any class which encapsulate an autotqlayout algorithm
+This is the super class of any class which encapsulate an autolayout algorithm
 
 
 @author Dimitri Ognibene <ognibened @yahoo.it>
@@ -47,14 +47,14 @@ public:
 
     virtual void setShapeSeparation(int i)=0;
 
-    virtual void autotqlayout(UMLView* v);
+    virtual void autolayout(UMLView* v);
 protected:
     virtual void run()=0;
     virtual void updateView(UMLView*)=0;
-    virtual Autotqlayout::Canvas* getCanvas()=0;
-    virtual Autotqlayout::Graph* getGraph()=0;
-    virtual Autotqlayout::Graph* setGraph(UMLView* view)=0;
-    virtual Autotqlayout::Canvas* setCanvas(UMLView* view)=0;
+    virtual Autolayout::Canvas* getCanvas()=0;
+    virtual Autolayout::Graph* getGraph()=0;
+    virtual Autolayout::Graph* setGraph(UMLView* view)=0;
+    virtual Autolayout::Canvas* setCanvas(UMLView* view)=0;
 
 
 };
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.cpp b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
index 3a245cbc..0673fde1 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp
@@ -12,18 +12,18 @@
 #include "autolayouteradapter.h"
 
 
-namespace Autotqlayout
+namespace Autolayout
   {
 
   AutolayouterAdapter::AutolayouterAdapter()
-      : Autotqlayout::Autolayouter()
+      : Autolayout::Autolayouter()
     {}
 
 
   AutolayouterAdapter::~AutolayouterAdapter()
   {}}
 
-void Autotqlayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
+void Autolayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
   {
   int weight;
   switch (a->getAssocType())
@@ -71,60 +71,60 @@ void Autotqlayout::AutolayouterAdapter::addRelationship( AssociationWidget * a )
   getGraph()->addEdge(a->getWidgetID(Uml::A).c_str(),a->getWidgetID(Uml::B).c_str(),weight);
   }
 
-void Autotqlayout::AutolayouterAdapter::setAssociationWeight( int i )
+void Autolayout::AutolayouterAdapter::setAssociationWeight( int i )
   {
   associationWeight=i;
   }
 
-void Autotqlayout::AutolayouterAdapter::setDependenciesWeight( int i )
+void Autolayout::AutolayouterAdapter::setDependenciesWeight( int i )
   {
   dependenciesWeight=i;
   }
 
-void Autotqlayout::AutolayouterAdapter::setGeneralizationWeight( int i )
+void Autolayout::AutolayouterAdapter::setGeneralizationWeight( int i )
   {
   generalizationWeight=i;
   }
 
-void Autotqlayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b )
   {
   genralizationAsEdges=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setDependenciesAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setDependenciesAsEdges( bool b )
   {
   dependenciesAsEdges=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setAssociationAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setAssociationAsEdges( bool b )
   {
   associationAsEdges=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setCompressShapes( bool b )
+void Autolayout::AutolayouterAdapter::setCompressShapes( bool b )
   {
   compressShapes=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setCenterDiagram( bool b )
+void Autolayout::AutolayouterAdapter::setCenterDiagram( bool b )
   {
   centerDiagram=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
+void Autolayout::AutolayouterAdapter::setClusterizeHierarchies( bool b )
   {
   clusterizeHierarchies=b;
   }
 
-void Autotqlayout::AutolayouterAdapter::setShapeSeparation( int i )
+void Autolayout::AutolayouterAdapter::setShapeSeparation( int i )
   {
-  tqshapeSeparation=i;
+  shapeSeparation=i;
   }
 
-Autotqlayout::Graph  * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * view )
+Autolayout::Graph  * Autolayout::AutolayouterAdapter::setGraph( UMLView * view )
   {
   if (! view) return 0;
-  Autotqlayout::Graph * g=getGraph();
+  Autolayout::Graph * g=getGraph();
   if (g&&g->empty())
     {
     UMLWidgetList list = view->getWidgetList();
@@ -151,7 +151,7 @@ Autotqlayout::Graph  * Autotqlayout::AutolayouterAdapter::setGraph( UMLView * vi
   return g;
   }
 
-void Autotqlayout::AutolayouterAdapter::updateView( UMLView* view )
+void Autolayout::AutolayouterAdapter::updateView( UMLView* view )
   {
 if (! view) return ;
 UMLWidgetList list = view->getWidgetList();
@@ -175,17 +175,17 @@ UMLWidgetList list = view->getWidgetList();
       }
   }
 
-Autotqlayout::Canvas * Autotqlayout::AutolayouterAdapter::setCanvas( UMLView* view )
+Autolayout::Canvas * Autolayout::AutolayouterAdapter::setCanvas( UMLView* view )
   {
-  return canvas=new Autotqlayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight());
+  return canvas=new Autolayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight());
   }
 
-void Autotqlayout::AutolayouterAdapter::setNoteConnectionWeight( int i )
+void Autolayout::AutolayouterAdapter::setNoteConnectionWeight( int i )
 {
 noteConnectionWeight=i;
 }
 
-void Autotqlayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b )
+void Autolayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b )
 {
 noteConnectionAsEdges=b;
 }
diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h
index 1d05f0d2..7c52e742 100644
--- a/umbrello/umbrello/autolayout/autolayouteradapter.h
+++ b/umbrello/umbrello/autolayout/autolayouteradapter.h
@@ -11,19 +11,19 @@
 
 #ifndef AUTOLAYOUTAUTOLAYOUTERADAPTER_H
 #define AUTOLAYOUTAUTOLAYOUTERADAPTER_H
-//#include "autotqlayout.h"
+//#include "autolayout.h"
 #include "baseinclude.h"
 #include "autolayouter.h"
 #include "../umlnamespace.h"
 
 
-namespace Autotqlayout
+namespace Autolayout
 {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class AutolayouterAdapter : virtual public Autotqlayout::Autolayouter
+class AutolayouterAdapter : virtual public Autolayout::Autolayouter
 {
 public:
     AutolayouterAdapter();
@@ -70,7 +70,7 @@ protected:
     bool compressShapes;
     bool centerDiagram;
     bool clusterizeHierarchies;
-    int tqshapeSeparation;
+    int shapeSeparation;
     int noteConnectionWeight;
     bool noteConnectionAsEdges;
     bool anchorsAsEdges;
diff --git a/umbrello/umbrello/autolayout/canvas.h b/umbrello/umbrello/autolayout/canvas.h
index 210b1353..246df8a7 100644
--- a/umbrello/umbrello/autolayout/canvas.h
+++ b/umbrello/umbrello/autolayout/canvas.h
@@ -15,7 +15,7 @@
 #ifndef AUTOLAYOUTCANVAS_H
 #define AUTOLAYOUTCANVAS_H
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
diff --git a/umbrello/umbrello/autolayout/diagram.h b/umbrello/umbrello/autolayout/diagram.h
index 43f35f51..33bda398 100644
--- a/umbrello/umbrello/autolayout/diagram.h
+++ b/umbrello/umbrello/autolayout/diagram.h
@@ -16,12 +16,12 @@
 #define AUTOLAYOUTABLEDIAGRAM_H
 #include <dotneato.h>
 #define internal_renderizer
-#include "autotqlayout.h"
+#include "autolayout.h"
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 Umbrello UML Modeller Authors
 */
-namespace Autotqlayout{
+namespace Autolayout{
 class Diagram//: public virtual Graph, public virtual Canvas{
 {
 private:
@@ -39,7 +39,7 @@ public:
 
     void addNode(const char *name, int width,int heigt);
     void addEdge(const char* nodea,const char*nodeb);
-    void autotqlayout();
+    void autolayout();
     void save();
     Node getNode(const char*);
 
diff --git a/umbrello/umbrello/autolayout/dotautolayouter.cpp b/umbrello/umbrello/autolayout/dotautolayouter.cpp
index dea9b554..5d197845 100644
--- a/umbrello/umbrello/autolayout/dotautolayouter.cpp
+++ b/umbrello/umbrello/autolayout/dotautolayouter.cpp
@@ -15,10 +15,10 @@
 
 #include <graphviz/dotprocs.h>
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 DotAutolayouter::DotAutolayouter()
-        : Autotqlayout::GraphvizAutolayouter()
+        : Autolayout::GraphvizAutolayouter()
 {
 }
 
@@ -32,10 +32,10 @@ DotAutolayouter::~DotAutolayouter()
 void DotAutolayouter::run()
 {
     //#ifndef internal_renderizer
-    /* bind graph to GV context - currently must be done before tqlayout */
+    /* bind graph to GV context - currently must be done before layout */
     //  gvBindContext(gvc,g);
     //#endif
-    // do tqlayout
+    // do layout
     //dot_layout();
     dot_layout( gg->_agraph );
 }
diff --git a/umbrello/umbrello/autolayout/dotautolayouter.h b/umbrello/umbrello/autolayout/dotautolayouter.h
index 4b8af212..5c6530ba 100644
--- a/umbrello/umbrello/autolayout/dotautolayouter.h
+++ b/umbrello/umbrello/autolayout/dotautolayouter.h
@@ -17,12 +17,12 @@
 #include "baseinclude.h"
 #include "graphvizautolayouter.h"
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class DotAutolayouter : virtual public Autotqlayout::GraphvizAutolayouter
+class DotAutolayouter : virtual public Autolayout::GraphvizAutolayouter
 {
 public:
     DotAutolayouter();
diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
index da075642..8defc5ef 100644
--- a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
+++ b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp
@@ -15,10 +15,10 @@
 
 #include <graphviz/graph.h>
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 GraphvizAutolayouter::GraphvizAutolayouter()
-        : Autotqlayout::AutolayouterAdapter()
+        : Autolayout::AutolayouterAdapter()
 {
     gg = new GraphvizGraph();
 }
@@ -44,7 +44,7 @@ void GraphvizAutolayouter::setShapeSeparation( int i )
     gg->setShapeSeparation(i);
 }
 
-Autotqlayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view )
+Autolayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view )
 {
     Canvas* canvas= AutolayouterAdapter::setCanvas(view);
     gg->setCanvas(canvas);
diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.h b/umbrello/umbrello/autolayout/graphvizautolayouter.h
index 95fa46ba..114ae63f 100644
--- a/umbrello/umbrello/autolayout/graphvizautolayouter.h
+++ b/umbrello/umbrello/autolayout/graphvizautolayouter.h
@@ -15,13 +15,13 @@
 #include "autolayouteradapter.h"
 #include "graphvizgraph.h"
 
-namespace Autotqlayout
+namespace Autolayout
 {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class GraphvizAutolayouter : virtual public Autotqlayout::AutolayouterAdapter
+class GraphvizAutolayouter : virtual public Autolayout::AutolayouterAdapter
 {
 public:
     GraphvizAutolayouter();
diff --git a/umbrello/umbrello/autolayout/graphvizgraph.cpp b/umbrello/umbrello/autolayout/graphvizgraph.cpp
index a3b4ea8a..716f9223 100644
--- a/umbrello/umbrello/autolayout/graphvizgraph.cpp
+++ b/umbrello/umbrello/autolayout/graphvizgraph.cpp
@@ -23,7 +23,7 @@ char* _strcpy(const char* name)
     a=strcpy(a,name);
     return a;
 }
-namespace Autotqlayout
+namespace Autolayout
 {
 
 /**
@@ -31,7 +31,7 @@ namespace Autotqlayout
  * @return
  */
 GraphvizGraph::GraphvizGraph()
-        : Autotqlayout::Graph()
+        : Autolayout::Graph()
 {
     aginit();
     empty_flag=true;
@@ -42,7 +42,7 @@ GraphvizGraph::GraphvizGraph()
     a_weight= agedgeattr(_agraph,"weight","");
     agnodeattr(_agraph, "fixedsize", "true");
     agnodeattr(_agraph, "margin", "0.01,0.01");
-    agnodeattr(_agraph, "tqshape", "box");
+    agnodeattr(_agraph, "shape", "box");
     agraphattr(_agraph, "dpi", "DPI/0");
 
 
@@ -96,7 +96,7 @@ void GraphvizGraph::addNode(const char* name, int width, int height)
 }
 
 
-void Autotqlayout::GraphvizGraph::setCompressShapes( bool b )
+void Autolayout::GraphvizGraph::setCompressShapes( bool b )
 {
     if (empty())
     {
@@ -105,7 +105,7 @@ void Autotqlayout::GraphvizGraph::setCompressShapes( bool b )
     }
 }
 
-void Autotqlayout::GraphvizGraph::setCenterDiagram( bool b )
+void Autolayout::GraphvizGraph::setCenterDiagram( bool b )
 {
     if (empty())
     {
@@ -114,7 +114,7 @@ void Autotqlayout::GraphvizGraph::setCenterDiagram( bool b )
     }
 }
 
-void Autotqlayout::GraphvizGraph::setShapeSeparation( int i )
+void Autolayout::GraphvizGraph::setShapeSeparation( int i )
 {
     char* a;
     asprintf(&a,"%f",((float) i)/10.0);
@@ -122,22 +122,22 @@ void Autotqlayout::GraphvizGraph::setShapeSeparation( int i )
     free (a);
 }
 
-bool Autotqlayout::GraphvizGraph::empty( )
+bool Autolayout::GraphvizGraph::empty( )
 {
     return empty_flag;
 }
 
-Autotqlayout::Node* Autotqlayout::GraphvizGraph::getNode( const char * arg1 )
+Autolayout::Node* Autolayout::GraphvizGraph::getNode( const char * arg1 )
 {
     char *a = _strcpy(arg1);
-    Autotqlayout::GraphvizNode* b=
-        new Autotqlayout::GraphvizNode(agnode(_agraph,a));
+    Autolayout::GraphvizNode* b=
+        new Autolayout::GraphvizNode(agnode(_agraph,a));
     delete[](a);
     nodelist.push_back(b);
     return b;
 }
 
-void GraphvizGraph::setCanvas( Autotqlayout::Canvas * canvas)
+void GraphvizGraph::setCanvas( Autolayout::Canvas * canvas)
 {
     char buf[100];
     sprintf(buf,"%f,%f",((float)canvas->getMaxX()/DPI),((float)canvas->getMaxY()/DPI));
@@ -146,5 +146,5 @@ void GraphvizGraph::setCanvas( Autotqlayout::Canvas * canvas)
     agraphattr(_agraph, "page", buf);
 }
 
-}  // end namespace Autotqlayout
+}  // end namespace Autolayout
 
diff --git a/umbrello/umbrello/autolayout/graphvizgraph.h b/umbrello/umbrello/autolayout/graphvizgraph.h
index 1be57139..dfbf323d 100644
--- a/umbrello/umbrello/autolayout/graphvizgraph.h
+++ b/umbrello/umbrello/autolayout/graphvizgraph.h
@@ -21,13 +21,13 @@
 #include <deque>
 #include <graphviz/types.h>
 
-namespace Autotqlayout
+namespace Autolayout
 {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class GraphvizGraph : virtual public Autotqlayout::Graph
+class GraphvizGraph : virtual public Autolayout::Graph
 {
 public:
     GraphvizGraph();
diff --git a/umbrello/umbrello/autolayout/graphviznode.cpp b/umbrello/umbrello/autolayout/graphviznode.cpp
index 430e176c..ea3510cf 100644
--- a/umbrello/umbrello/autolayout/graphviznode.cpp
+++ b/umbrello/umbrello/autolayout/graphviznode.cpp
@@ -17,7 +17,7 @@
 #include <graphviz/types.h>
 #include <graphviz/graph.h>
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 
 
@@ -40,7 +40,7 @@ int GraphvizNode::getY()
 
 }
 
-Autotqlayout::GraphvizNode::GraphvizNode( Agnode_t * node )
+Autolayout::GraphvizNode::GraphvizNode( Agnode_t * node )
 {
     n=node;
 }
diff --git a/umbrello/umbrello/autolayout/graphviznode.h b/umbrello/umbrello/autolayout/graphviznode.h
index 1190f5af..0efcb6d8 100644
--- a/umbrello/umbrello/autolayout/graphviznode.h
+++ b/umbrello/umbrello/autolayout/graphviznode.h
@@ -18,12 +18,12 @@
 
 class Agnode_t;
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
 */
-class GraphvizNode : virtual public Autotqlayout::Node
+class GraphvizNode : virtual public Autolayout::Node
 {
 
     GraphvizNode (Agnode_t* n);
diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
index 9301abe3..7213c164 100644
--- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui
+++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui
@@ -88,12 +88,12 @@
                         <string>Shape separation</string>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring>tqshapeSeparationSB</cstring>
+                        <cstring>shapeSeparationSB</cstring>
                     </property>
                 </widget>
                 <widget class="TQSpinBox">
                     <property name="name">
-                        <cstring>tqshapeSeparationSB</cstring>
+                        <cstring>shapeSeparationSB</cstring>
                     </property>
                     <property name="prefix">
                         <string></string>
@@ -203,7 +203,7 @@
                                 <string>Weight</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+                                <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
                             </property>
                         </widget>
                     </widget>
@@ -258,7 +258,7 @@
                                 <string>Weight</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+                                <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
                             </property>
                         </widget>
                     </widget>
@@ -313,7 +313,7 @@
                                 <string>Weight</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
+                                <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string>
                             </property>
                         </widget>
                     </widget>
@@ -330,7 +330,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>1</height>
@@ -339,7 +339,7 @@
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout9</cstring>
+                <cstring>layout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -366,7 +366,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>277</width>
                             <height>20</height>
@@ -450,7 +450,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>tqshapeSeparationSB</sender>
+        <sender>shapeSeparationSB</sender>
         <signal>valueChanged(int)</signal>
         <receiver>MyDialog1</receiver>
         <slot>slotSetShapeSeparation(int)</slot>
@@ -513,7 +513,7 @@
         <sender>buttonOk</sender>
         <signal>clicked()</signal>
         <receiver>MyDialog1</receiver>
-        <slot>slotDoAutotqlayout()</slot>
+        <slot>slotDoAutolayout()</slot>
     </connection>
     <connection>
         <sender>restoreDefaultsBTN</sender>
@@ -535,7 +535,7 @@
     </connection>
 </connections>
 <Q_SLOTS>
-    <slot>slotDoAutotqlayout()</slot>
+    <slot>slotDoAutolayout()</slot>
     <slot>slotSaveSettings()</slot>
     <slot>slotReloadSettings()</slot>
     <slot>slotSetClusterizeHierarchies(bool b)</slot>
diff --git a/umbrello/umbrello/autolayout/node.h b/umbrello/umbrello/autolayout/node.h
index 74259233..c2532b8b 100644
--- a/umbrello/umbrello/autolayout/node.h
+++ b/umbrello/umbrello/autolayout/node.h
@@ -15,7 +15,7 @@
 #ifndef AUTOLAYOUTNODE_H
 #define AUTOLAYOUTNODE_H
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Umbrello UML Modeller Authors
diff --git a/umbrello/umbrello/autolayout/simplecanvas.cpp b/umbrello/umbrello/autolayout/simplecanvas.cpp
index 38832962..0598c15e 100644
--- a/umbrello/umbrello/autolayout/simplecanvas.cpp
+++ b/umbrello/umbrello/autolayout/simplecanvas.cpp
@@ -13,7 +13,7 @@
  ***************************************************************************/
 #include "simplecanvas.h"
 
-namespace Autotqlayout {
+namespace Autolayout {
 
 
 
diff --git a/umbrello/umbrello/autolayout/simplecanvas.h b/umbrello/umbrello/autolayout/simplecanvas.h
index 90cecea5..29712b9e 100644
--- a/umbrello/umbrello/autolayout/simplecanvas.h
+++ b/umbrello/umbrello/autolayout/simplecanvas.h
@@ -17,7 +17,7 @@
 
 #include "canvas.h"
 #include <tqrect.h>
-namespace Autotqlayout {
+namespace Autolayout {
 
 /**
 @author Dimitri Ognibene <ognibened @yahoo.it>
diff --git a/umbrello/umbrello/classifierwidget.h b/umbrello/umbrello/classifierwidget.h
index b92b774f..f80f1289 100644
--- a/umbrello/umbrello/classifierwidget.h
+++ b/umbrello/umbrello/classifierwidget.h
@@ -101,7 +101,7 @@ public:
     /**
      * Return the status of showing operation signatures.
      *
-     * @return  tqStatus of showing operation signatures.
+     * @return  Status of showing operation signatures.
      */
     Uml::Signature_Type getShowOpSigs() const;
 
@@ -173,7 +173,7 @@ public:
      * Returns whether to show attribute signatures.
      * Only applies when m_pObject->getBaseType() is ot_Class.
      *
-     * @return  tqStatus of how attribute signatures are shown.
+     * @return  Status of how attribute signatures are shown.
      */
     Uml::Signature_Type getShowAttSigs() {
         return m_ShowAttSigs;
diff --git a/umbrello/umbrello/clipboard/umlclipboard.cpp b/umbrello/umbrello/clipboard/umlclipboard.cpp
index d654e083..069ba84b 100644
--- a/umbrello/umbrello/clipboard/umlclipboard.cpp
+++ b/umbrello/umbrello/clipboard/umlclipboard.cpp
@@ -267,7 +267,7 @@ void UMLClipboard::checkItemForCopyType(UMLListViewItem* Item, bool & WithDiagra
     }
 }
 
-/** Adds the tqchildren of a UMLListViewItem to m_ItemList */
+/** Adds the children of a UMLListViewItem to m_ItemList */
 bool UMLClipboard::insertItemChildren(UMLListViewItem * Item, UMLListViewItemList& SelectedItems) {
     if(Item->childCount()) {
         UMLListViewItem * child = (UMLListViewItem*)Item->firstChild();
@@ -347,7 +347,7 @@ bool UMLClipboard::pasteClip1(TQMimeSource* data) {
         return true;
     lv->setStartedCopy(false);
     /* If we get here we are pasting after a Copy and need to
-    // paste possible tqchildren.
+    // paste possible children.
     UMLListViewItem* itemdata = 0;
     UMLListViewItemListIt it(itemdatalist);
     while ( (itemdata=it.current()) != 0 ) {
@@ -630,7 +630,7 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) {
                 break;
             }
         default :
-            kWarning() << "pasting unknown tqchildren type in clip type 5" << endl;
+            kWarning() << "pasting unknown children type in clip type 5" << endl;
             return false;
         }
     }
diff --git a/umbrello/umbrello/clipboard/umlclipboard.h b/umbrello/umbrello/clipboard/umlclipboard.h
index b0607ef2..017a4beb 100644
--- a/umbrello/umbrello/clipboard/umlclipboard.h
+++ b/umbrello/umbrello/clipboard/umlclipboard.h
@@ -167,13 +167,13 @@ private:
                               bool& OnlyAttsOps);
 
     /**
-     * Adds the tqchildren of a UMLListViewItem to m_ItemList.
+     * Adds the children of a UMLListViewItem to m_ItemList.
      */
     bool insertItemChildren(UMLListViewItem* Item,
                             UMLListViewItemList& SelectedItems);
 
     /**
-     * Inserts the data of the tqchildren of the given item
+     * Inserts the data of the children of the given item
      * into the item data list.  Used for clip type 4.  Used
      * to make * sure classes have all the attributes and
      * operations saved.
@@ -181,7 +181,7 @@ private:
     bool insertItemChildren(UMLListViewItem* item);
 
     /**
-     * Pastes the tqchildren of a UMLListViewItem (The Parent)
+     * Pastes the children of a UMLListViewItem (The Parent)
      */
     bool pasteChildren(UMLListViewItem* parent, IDChangeLog *chgLog);
 
diff --git a/umbrello/umbrello/clipboard/umldrag.cpp b/umbrello/umbrello/clipboard/umldrag.cpp
index 543a4b39..27f8dde2 100644
--- a/umbrello/umbrello/clipboard/umldrag.cpp
+++ b/umbrello/umbrello/clipboard/umldrag.cpp
@@ -108,11 +108,11 @@ void UMLDrag::setSubType(const TQCString& string, int index) {
     data->setSubType(string, index);
 }
 
-void UMLDrag::setEncodedData(const TQByteArray& tqencodedData, int index) {
-    data->enc[index] = tqencodedData.copy();
+void UMLDrag::setEncodedData(const TQByteArray& encodedData, int index) {
+    data->enc[index] = encodedData.copy();
 }
 
-TQByteArray UMLDrag::tqencodedData(const char* dataName) const {
+TQByteArray UMLDrag::encodedData(const char* dataName) const {
     TQString str(dataName);
     for (int i = 0; i < 4; i++) {
         if ( !qstricmp(dataName,data->fmt[i]) ) {
@@ -286,7 +286,7 @@ bool UMLDrag::decodeClip1(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip1") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip1");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip1");
     if ( !payload.size() ) {
         return false;
     }
@@ -376,7 +376,7 @@ bool UMLDrag::decodeClip2(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip2") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip2");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip2");
     if ( !payload.size() ) {
         return false;
     }
@@ -486,7 +486,7 @@ bool UMLDrag::getClip3TypeAndID(const TQMimeSource* mimeSource,
     if ( !mimeSource->provides("application/x-uml-clip3") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3");
     if ( !payload.size() ) {
         return false;
     }
@@ -543,7 +543,7 @@ bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& u
     if ( !mimeSource->provides("application/x-uml-clip3") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3");
     if ( !payload.size() ) {
         return false;
     }
@@ -602,7 +602,7 @@ bool UMLDrag::decodeClip4(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip4") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip4");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip4");
     if ( !payload.size() ) {
         return false;
     }
@@ -699,7 +699,7 @@ bool UMLDrag::decodeClip5(const TQMimeSource* mimeSource, UMLObjectList& objects
     if ( !mimeSource->provides("application/x-uml-clip5") ) {
         return false;
     }
-    TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip5");
+    TQByteArray payload = mimeSource->encodedData("application/x-uml-clip5");
     if ( !payload.size() ) {
         return false;
     }
diff --git a/umbrello/umbrello/clipboard/umldrag.h b/umbrello/umbrello/clipboard/umldrag.h
index ad5e4f02..fa535399 100644
--- a/umbrello/umbrello/clipboard/umldrag.h
+++ b/umbrello/umbrello/clipboard/umldrag.h
@@ -149,7 +149,7 @@ public:
      *
      * @param dataName the name of the data type to return
      */
-    virtual TQByteArray tqencodedData(const char* dataName) const;
+    virtual TQByteArray encodedData(const char* dataName) const;
 
     /**
      * For use when the user selects only UML Objects
diff --git a/umbrello/umbrello/codedocument.cpp b/umbrello/umbrello/codedocument.cpp
index cb571b6b..a77e948a 100644
--- a/umbrello/umbrello/codedocument.cpp
+++ b/umbrello/umbrello/codedocument.cpp
@@ -281,7 +281,7 @@ void CodeDocument::updateHeader () {
     headingText.replace(TQRegExp("%filename%"),getFileName()+getFileExtension());
     headingText.replace(TQRegExp("%filepath%"),getPath());
     headingText.replace( TQRegExp("%time%"), TQTime::currentTime().toString());
-    headingText.replace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString());
+    headingText.replace( TQRegExp("%date%"), TQDate::currentDate().toString());
 
     getHeader()->setText(headingText);
 
diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp
index 9cac6c3a..273018b6 100644
--- a/umbrello/umbrello/codegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerationpolicy.cpp
@@ -23,7 +23,7 @@
 // qt includes
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdatetime.h>
 
 // kde includes
@@ -552,7 +552,7 @@ TQString CodeGenerationPolicy::getHeadingFile(const TQString& str) {
     retstr.replace( TQRegExp("%author%"),TQString(getenv("USER")));  //get the user name from some where else
     retstr.replace( TQRegExp("%headingpath%"),filename );
     retstr.replace( TQRegExp("%time%"), TQTime::currentTime().toString());
-    retstr.replace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString());
+    retstr.replace( TQRegExp("%date%"), TQDate::currentDate().toString());
     // the replace filepath, time parts are also in the code document updateHeader method
     // (which is not a virtual function)...
 
diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp
index 44a65c62..8c4f64d0 100644
--- a/umbrello/umbrello/codegenerator.cpp
+++ b/umbrello/umbrello/codegenerator.cpp
@@ -24,7 +24,7 @@
 #include <tqdatetime.h>
 #include <tqregexp.h>
 #include <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // kde includes
 #include <kdebug.h>
@@ -470,7 +470,7 @@ bool CodeGenerator::openFile (TQFile & file, const TQString &fileName ) {
         TQDir outputDirectory = UMLApp::app()->getCommonPolicy()->getOutputDirectory();
         file.setName(outputDirectory.absFilePath(fileName));
         if(!file.open(IO_WriteOnly)) {
-            KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").tqarg(file.name()),i18n("Cannot Open File"));
+            KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").arg(file.name()),i18n("Cannot Open File"));
             return false;
         }
         return true;
diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp
index ec2bf59a..c4b36956 100644
--- a/umbrello/umbrello/codegenerators/adawriter.cpp
+++ b/umbrello/umbrello/codegenerators/adawriter.cpp
@@ -20,7 +20,7 @@
 #include <kmessagebox.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../uml.h"
diff --git a/umbrello/umbrello/codegenerators/aswriter.cpp b/umbrello/umbrello/codegenerators/aswriter.cpp
index e973a55e..e3e72a38 100644
--- a/umbrello/umbrello/codegenerators/aswriter.cpp
+++ b/umbrello/umbrello/codegenerators/aswriter.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 ASWriter::ASWriter() {
 }
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
index 6ca8377b..dee5c9f4 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui
@@ -41,7 +41,7 @@
             </property>
             <widget class="TQLayoutWidget" row="0" column="0">
                 <property name="name">
-                    <cstring>tqlayout4</cstring>
+                    <cstring>layout4</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -149,7 +149,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>410</width>
                             <height>113</height>
@@ -166,7 +166,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout17</cstring>
+                        <cstring>layout17</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -223,7 +223,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32</width>
                                     <height>32767</height>
@@ -285,7 +285,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -302,7 +302,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -430,7 +430,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32</width>
                                     <height>32767</height>
diff --git a/umbrello/umbrello/codegenerators/cppwriter.cpp b/umbrello/umbrello/codegenerators/cppwriter.cpp
index d58ceae4..5517d2f3 100644
--- a/umbrello/umbrello/codegenerators/cppwriter.cpp
+++ b/umbrello/umbrello/codegenerators/cppwriter.cpp
@@ -20,7 +20,7 @@
 #include "cppwriter.h"
 // qt/kde includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <kdebug.h>
 // app includes
@@ -627,7 +627,7 @@ void CppWriter::writeAttributeMethods(UMLAttributeList *attribs,
         // from what I can tell, this IS the default behavior for
         // cleanName. I dunno why its not working -b.t.
         methodBaseName = methodBaseName.stripWhiteSpace();
-        methodBaseName.replace(0,1,methodBaseName.tqat(0).upper());
+        methodBaseName.replace(0,1,methodBaseName.at(0).upper());
 
         writeSingleAttributeAccessorMethods(at->getTypeName(), varName,
                                             methodBaseName, at->getDoc(), Uml::chg_Changeable, isHeaderMethod,
diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp
index 180ba176..167ccb12 100644
--- a/umbrello/umbrello/codegenerators/csharpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp
@@ -16,7 +16,7 @@
 
 #include <kdebug.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../uml.h"
 #include "../umldoc.h"
@@ -629,7 +629,7 @@ void CSharpWriter::writeAssociatedAttributes(UMLAssociationList &associated, UML
         TQString roleName = cleanName(a->getRoleName(Uml::B));
         TQString typeName = cleanName(o->getName());
         if (roleName.isEmpty()) {
-            roleName = TQString("UnnamedRoleB_%1").tqarg(m_unnamedRoles++);
+            roleName = TQString("UnnamedRoleB_%1").arg(m_unnamedRoles++);
         }
         TQString roleDoc = a->getRoleDoc(Uml::B);
 
diff --git a/umbrello/umbrello/codegenerators/dwriter.cpp b/umbrello/umbrello/codegenerators/dwriter.cpp
index 088ab9c1..fdcc63b6 100644
--- a/umbrello/umbrello/codegenerators/dwriter.cpp
+++ b/umbrello/umbrello/codegenerators/dwriter.cpp
@@ -20,7 +20,7 @@
 #include "dwriter.h"
 // qt includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 // kde includes
 #include <kdebug.h>
diff --git a/umbrello/umbrello/codegenerators/idlwriter.cpp b/umbrello/umbrello/codegenerators/idlwriter.cpp
index efb49dc9..675982ca 100644
--- a/umbrello/umbrello/codegenerators/idlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/idlwriter.cpp
@@ -15,7 +15,7 @@
 #include <kmessagebox.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../classifier.h"
diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
index 1587c265..426c6d9a 100644
--- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp
@@ -428,7 +428,7 @@ void JavaClassifierCodeDocument::updateContent( )
 
     // NOW create document in sections..
     // now we want to populate the body of our class
-    // our tqlayout is the following general groupings of code blocks:
+    // our layout is the following general groupings of code blocks:
 
     // start java classifier document
 
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
index a9ba6a89..60764673 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -74,7 +74,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -117,7 +117,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="1" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -163,7 +163,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="2" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/umbrello/umbrello/codegenerators/javawriter.cpp b/umbrello/umbrello/codegenerators/javawriter.cpp
index 19f3c1fd..a1e4d0b3 100644
--- a/umbrello/umbrello/codegenerators/javawriter.cpp
+++ b/umbrello/umbrello/codegenerators/javawriter.cpp
@@ -21,7 +21,7 @@
 #include "javawriter.h"
 // qt includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 // kde includes
 #include <kdebug.h>
@@ -408,7 +408,7 @@ void JavaWriter::writeAttributeMethods(UMLAttributeList &atpub, Uml::Visibility
         // from what I can tell, this IS the default behavior for
         // cleanName. I dunno why its not working -b.t.
         fieldName.stripWhiteSpace();
-        fieldName.replace(0,1,fieldName.tqat(0).upper());
+        fieldName.replace(0,1,fieldName.at(0).upper());
 
         writeSingleAttributeAccessorMethods(at->getTypeName(),
                                             cleanName(at->getName()),
diff --git a/umbrello/umbrello/codegenerators/jswriter.cpp b/umbrello/umbrello/codegenerators/jswriter.cpp
index ea4cc2e1..9d58cf3d 100644
--- a/umbrello/umbrello/codegenerators/jswriter.cpp
+++ b/umbrello/umbrello/codegenerators/jswriter.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 JSWriter::JSWriter() {
 }
diff --git a/umbrello/umbrello/codegenerators/pascalwriter.cpp b/umbrello/umbrello/codegenerators/pascalwriter.cpp
index 0f3c32ef..9e75c6d6 100644
--- a/umbrello/umbrello/codegenerators/pascalwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pascalwriter.cpp
@@ -16,7 +16,7 @@
 #include <kmessagebox.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../uml.h"
diff --git a/umbrello/umbrello/codegenerators/perlwriter.cpp b/umbrello/umbrello/codegenerators/perlwriter.cpp
index 9d51ffde..def1c7dd 100644
--- a/umbrello/umbrello/codegenerators/perlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/perlwriter.cpp
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqdir.h>
 #include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 PerlWriter::PerlWriter()
 {
@@ -168,8 +168,8 @@ void PerlWriter::writeClass(UMLClassifier *c) {
   if(!str.isEmpty()) {
     str.replace(TQRegExp("%filename%"),fileName);
     str.replace(TQRegExp("%filepath%"),fileperl.name());
-    str.replace(TQRegExp("%year%"),TQDate::tqcurrentDate().toString("yyyy"));
-    str.replace(TQRegExp("%date%"),TQDate::tqcurrentDate().toString());
+    str.replace(TQRegExp("%year%"),TQDate::currentDate().toString("yyyy"));
+    str.replace(TQRegExp("%date%"),TQDate::currentDate().toString());
     str.replace(TQRegExp("%time%"),TQTime::currentTime().toString());
     str.replace(TQRegExp("%package-name%"),ThisPkgName);
     if(str.find(TQRegExp("%PACKAGE-DECLARE%"))){
diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp
index f0de28a3..c222e3c9 100644
--- a/umbrello/umbrello/codegenerators/php5writer.cpp
+++ b/umbrello/umbrello/codegenerators/php5writer.cpp
@@ -19,7 +19,7 @@
 
 #include <kdebug.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../classifier.h"
@@ -173,7 +173,7 @@ static const char *php5words[] =
         "checkout",
         "chgrp",
         "child_nodes",
-        "tqchildren",
+        "children",
         "chmod",
         "chop",
         "chown",
@@ -760,8 +760,8 @@ static const char *php5words[] =
         "getrusage",
         "getservbyname",
         "getservbyport",
-        "gettqshape1",
-        "gettqshape2",
+        "getshape1",
+        "getshape2",
         "gettext",
         "gettimeofday",
         "gettype",
@@ -2704,7 +2704,7 @@ static const char *php5words[] =
         "SWFDisplayItem",
         "swf_endbutton",
         "swf_enddoaction",
-        "swf_endtqshape",
+        "swf_endshape",
         "swf_endsymbol",
         "SWFFill",
         "SWFFont",
@@ -2738,21 +2738,21 @@ static const char *php5words[] =
         "swf_setfont",
         "swf_setframe",
         "SWFShape",
-        "swf_tqshapearc",
-        "swf_tqshapecurveto",
-        "swf_tqshapecurveto3",
-        "swf_tqshapefillbitmapclip",
-        "swf_tqshapefillbitmaptile",
-        "swf_tqshapefilloff",
-        "swf_tqshapefillsolid",
-        "swf_tqshapelinesolid",
-        "swf_tqshapelineto",
-        "swf_tqshapemoveto",
+        "swf_shapearc",
+        "swf_shapecurveto",
+        "swf_shapecurveto3",
+        "swf_shapefillbitmapclip",
+        "swf_shapefillbitmaptile",
+        "swf_shapefilloff",
+        "swf_shapefillsolid",
+        "swf_shapelinesolid",
+        "swf_shapelineto",
+        "swf_shapemoveto",
         "swf_showframe",
         "SWFSprite",
         "swf_startbutton",
         "swf_startdoaction",
-        "swf_starttqshape",
+        "swf_startshape",
         "swf_startsymbol",
         "SWFText",
         "SWFTextField",
diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp
index f7e1e76e..e589b661 100644
--- a/umbrello/umbrello/codegenerators/phpwriter.cpp
+++ b/umbrello/umbrello/codegenerators/phpwriter.cpp
@@ -18,7 +18,7 @@
 
 #include <kdebug.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "../umldoc.h"
 #include "../classifier.h"
@@ -171,7 +171,7 @@ static const char *words[] =
         "checkout",
         "chgrp",
         "child_nodes",
-        "tqchildren",
+        "children",
         "chmod",
         "chop",
         "chown",
@@ -758,8 +758,8 @@ static const char *words[] =
         "getrusage",
         "getservbyname",
         "getservbyport",
-        "gettqshape1",
-        "gettqshape2",
+        "getshape1",
+        "getshape2",
         "gettext",
         "gettimeofday",
         "gettype",
@@ -2700,7 +2700,7 @@ static const char *words[] =
         "SWFDisplayItem",
         "swf_endbutton",
         "swf_enddoaction",
-        "swf_endtqshape",
+        "swf_endshape",
         "swf_endsymbol",
         "SWFFill",
         "SWFFont",
@@ -2734,21 +2734,21 @@ static const char *words[] =
         "swf_setfont",
         "swf_setframe",
         "SWFShape",
-        "swf_tqshapearc",
-        "swf_tqshapecurveto",
-        "swf_tqshapecurveto3",
-        "swf_tqshapefillbitmapclip",
-        "swf_tqshapefillbitmaptile",
-        "swf_tqshapefilloff",
-        "swf_tqshapefillsolid",
-        "swf_tqshapelinesolid",
-        "swf_tqshapelineto",
-        "swf_tqshapemoveto",
+        "swf_shapearc",
+        "swf_shapecurveto",
+        "swf_shapecurveto3",
+        "swf_shapefillbitmapclip",
+        "swf_shapefillbitmaptile",
+        "swf_shapefilloff",
+        "swf_shapefillsolid",
+        "swf_shapelinesolid",
+        "swf_shapelineto",
+        "swf_shapemoveto",
         "swf_showframe",
         "SWFSprite",
         "swf_startbutton",
         "swf_startdoaction",
-        "swf_starttqshape",
+        "swf_startshape",
         "swf_startsymbol",
         "SWFText",
         "SWFTextField",
diff --git a/umbrello/umbrello/codegenerators/pythonwriter.cpp b/umbrello/umbrello/codegenerators/pythonwriter.cpp
index 8c913022..c89da92e 100644
--- a/umbrello/umbrello/codegenerators/pythonwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pythonwriter.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include "../umldoc.h"
@@ -418,7 +418,7 @@ const TQStringList PythonWriter::reservedKeywords() const {
         << "TypeError"
         << "UnboundLocalError"
         << "unichr"
-        << "tqunicode"
+        << "unicode"
         << "UnicodeError"
         << "UserWarning"
         << "ValueError"
diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
index 22fa56fc..ada4b0bb 100644
--- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
+++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp
@@ -435,7 +435,7 @@ void RubyClassifierCodeDocument::updateContent( )
 
     // NOW create document in sections..
     // now we want to populate the body of our class
-    // our tqlayout is the following general groupings of code blocks:
+    // our layout is the following general groupings of code blocks:
 
     // start ruby classifier document
 
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
index c47dc97f..28f74fd0 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -45,7 +45,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -88,7 +88,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="1" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -134,7 +134,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="2" column="0">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/umbrello/umbrello/codegenerators/rubywriter.cpp b/umbrello/umbrello/codegenerators/rubywriter.cpp
index e736641f..64302a80 100644
--- a/umbrello/umbrello/codegenerators/rubywriter.cpp
+++ b/umbrello/umbrello/codegenerators/rubywriter.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include "classifierinfo.h"
diff --git a/umbrello/umbrello/codegenerators/sqlwriter.cpp b/umbrello/umbrello/codegenerators/sqlwriter.cpp
index 8582ec93..55717ea0 100644
--- a/umbrello/umbrello/codegenerators/sqlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/sqlwriter.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include "../classifier.h"
diff --git a/umbrello/umbrello/codegenerators/tclwriter.cpp b/umbrello/umbrello/codegenerators/tclwriter.cpp
index 6d40b4b0..c0c42ad6 100644
--- a/umbrello/umbrello/codegenerators/tclwriter.cpp
+++ b/umbrello/umbrello/codegenerators/tclwriter.cpp
@@ -18,7 +18,7 @@
 #include "tclwriter.h"
 // qt/kde includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <kdebug.h>
 // app includes
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
index f2bf7a66..bff55304 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
@@ -19,7 +19,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 
 #include "../umldoc.h"
@@ -543,7 +543,7 @@ void XMLSchemaWriter::writeComment( const TQString &comment, TQTextStream &XMLsc
     }
 }
 
-// all that matters here is roleA, the role served by the tqchildren of this class
+// all that matters here is roleA, the role served by the children of this class
 // in any composition or aggregation association. In full associations, I have only
 // considered the case of "self" association, so it shouldn't matter if we use role A or
 // B to find the child class as long as we don't use BOTH roles. I bet this will fail
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.h b/umbrello/umbrello/codegenerators/xmlschemawriter.h
index cc4372a2..cb5546d8 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.h
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.h
@@ -88,7 +88,7 @@ private:
 
     /**
      * write a <group> declaration for this classifier. Used for interfaces to classes with
-     * inheriting tqchildren.
+     * inheriting children.
      */
     void writeGroupClassifierDecl(UMLClassifier *c,
                                   UMLClassifierList superclassifiers,
diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.cpp b/umbrello/umbrello/codegenobjectwithtextblocks.cpp
index 0c689e1e..c3fb2fd6 100644
--- a/umbrello/umbrello/codegenobjectwithtextblocks.cpp
+++ b/umbrello/umbrello/codegenobjectwithtextblocks.cpp
@@ -170,7 +170,7 @@ CodeGenObjectWithTextBlocks * CodeGenObjectWithTextBlocks::findParentObjectForTa
         return this;
 
     // shouldn't happen unless the textblock doesn't exist in this object
-    // or its tqchildren at all
+    // or its children at all
     return (CodeGenObjectWithTextBlocks*) NULL;
 
 }
@@ -378,7 +378,7 @@ void CodeGenObjectWithTextBlocks::setAttributesFromNode ( TQDomElement & root)
 // in this vanilla version, we only load comments and codeblocks
 // as they are the only instanciatable (vanilla) things
 // this method should be overridden if this class is inherited
-// by some other class that is concrete and takes tqchildren
+// by some other class that is concrete and takes children
 // derived from codeblock/codecomment
 void CodeGenObjectWithTextBlocks::loadChildTextBlocksFromNode ( TQDomElement & root)
 {
diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.h b/umbrello/umbrello/codegenobjectwithtextblocks.h
index b8f50454..7bf338f2 100644
--- a/umbrello/umbrello/codegenobjectwithtextblocks.h
+++ b/umbrello/umbrello/codegenobjectwithtextblocks.h
@@ -165,7 +165,7 @@ protected:
       * in this vanilla version, we only load comments and codeblocks
       * as they are the only instanciatable (vanilla) things
       * this method should be overridden if this class is inherited
-      * by some other class that is concrete and takes tqchildren
+      * by some other class that is concrete and takes children
       * derived from codeblock/codecomment/hierarchicalcb/ownedhiercodeblock
       */
     virtual void loadChildTextBlocksFromNode ( TQDomElement & root);
diff --git a/umbrello/umbrello/codeimport/classimport.cpp b/umbrello/umbrello/codeimport/classimport.cpp
index 469e4030..e32758dd 100644
--- a/umbrello/umbrello/codeimport/classimport.cpp
+++ b/umbrello/umbrello/codeimport/classimport.cpp
@@ -32,7 +32,7 @@ void ClassImport::importFiles(const TQStringList &fileList) {
             fileIT != fileList.end(); ++fileIT) {
         TQString fileName = (*fileIT);
         umldoc->writeToStatusBar(i18n("Importing file: %1 Progress: %2/%3").
-                                 tqarg(fileName).tqarg(processedFilesCount).tqarg(fileList.size()));
+                                 arg(fileName).arg(processedFilesCount).arg(fileList.size()));
         parseFile(fileName);
         processedFilesCount++;
     }
diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp
index 4e38a1aa..6b87f493 100644
--- a/umbrello/umbrello/codeimport/import_utils.cpp
+++ b/umbrello/umbrello/codeimport/import_utils.cpp
@@ -178,7 +178,7 @@ UMLObject *createUMLObject(Uml::Object_Type type,
                         /* We know std and TQt are namespaces */
                         if (scopeName != "std" && scopeName != "TQt") {
                             wantNamespace = KMessageBox::questionYesNo(NULL,
-                                        i18n("Is the scope %1 a namespace or a class?").tqarg(scopeName),
+                                        i18n("Is the scope %1 a namespace or a class?").arg(scopeName),
                                         i18n("C++ Import Requests Your Help"),
                                         i18n("Namespace"), i18n("Class"));
                         }
diff --git a/umbrello/umbrello/codeimport/javaimport.cpp b/umbrello/umbrello/codeimport/javaimport.cpp
index 7f62a1a9..0b90d5a0 100644
--- a/umbrello/umbrello/codeimport/javaimport.cpp
+++ b/umbrello/umbrello/codeimport/javaimport.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
 #include <kdebug.h>
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
index ebb10af4..2c962e5d 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
@@ -128,7 +128,7 @@ AST::AST()
       m_endLine( 0 ), m_endColumn( 0 )
 {
 #ifndef CPPPARSER_NO_CHILDREN
-    m_tqchildren.setAutoDelete( false );
+    m_children.setAutoDelete( false );
 #endif
 }
 
@@ -188,12 +188,12 @@ void AST::setParent( AST* parent )
 #ifndef CPPPARSER_NO_CHILDREN
 void AST::appendChild( AST* child )
 {
-    m_tqchildren.append( child );
+    m_children.append( child );
 }
 
 void AST::removeChild( AST* child )
 {
-    m_tqchildren.remove( child );
+    m_children.remove( child );
 }
 #endif
 
@@ -466,7 +466,7 @@ TQString ClassOrNamespaceNameAST::text() const
 
     TQString str = m_name->text();
     if( m_templateArgumentList.get() )
-        str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >");
+        str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >");
 
     return str;
 }
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
index 49520e33..3c96da9e 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
@@ -232,7 +232,7 @@ public:
     void getEndPosition( int* line, int* col ) const;
 
 #ifndef CPPPARSER_NO_CHILDREN
-    TQPtrList<AST> tqchildren() { return m_tqchildren; }
+    TQPtrList<AST> children() { return m_children; }
     void appendChild( AST* child );
     void removeChild( AST* child );
 #endif
@@ -266,7 +266,7 @@ private:
     int m_endLine, m_endColumn;
     Slice m_slice;
 #ifndef CPPPARSER_NO_CHILDREN
-    TQPtrList<AST> m_tqchildren;
+    TQPtrList<AST> m_children;
 #endif
     TQString m_comment;
 
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
index ee6937ac..44c10f82 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
@@ -35,8 +35,8 @@ AST* findNodeAt( AST* node, int line, int column )
     if( (line > startLine || (line == startLine && column >= startColumn)) &&
         (line < endLine || (line == endLine && column < endColumn)) ){
 
-        TQPtrList<AST> tqchildren = node->tqchildren();
-	TQPtrListIterator<AST> it( tqchildren );
+        TQPtrList<AST> children = node->children();
+	TQPtrListIterator<AST> it( children );
 	while( it.current() ){
 	    AST* a = it.current();
 	    ++it;
@@ -66,7 +66,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
     case NodeType_ClassSpecifier:
         if( ((ClassSpecifierAST*)ast)->name() ){
 	    s = ((ClassSpecifierAST*)ast)->name()->text();
-	    s = s.isEmpty() ? TQString::tqfromLatin1("<unnamed>") : s;
+	    s = s.isEmpty() ? TQString::fromLatin1("<unnamed>") : s;
 	    scope.push_back( s );
 	}
 	break;
@@ -74,7 +74,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
     case NodeType_Namespace:
     {
         AST* namespaceName = ((NamespaceAST*)ast)->namespaceName();
-	s = namespaceName ? namespaceName->text() : TQString::tqfromLatin1("<unnamed>");
+	s = namespaceName ? namespaceName->text() : TQString::fromLatin1("<unnamed>");
 	scope.push_back( s );
     }
     break;
@@ -131,7 +131,7 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b
    text += scope;
 
    if( declarator->subDeclarator() )
-       text += TQString::tqfromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::tqfromLatin1(")");
+       text += TQString::fromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::fromLatin1(")");
 
    if( declarator->declaratorId() )
        text += declarator->declaratorId()->text();
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
index f91813f1..eb3c4b6a 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
@@ -175,7 +175,7 @@ int Lexer::toInt( const Token& token )
 	int i = s[0] == 'L' ? 2 : 1; // wide char ?
 	if( s[i] == '\\' ){
 	    // escaped char
-	    int c = s[i+1].tqunicode();
+	    int c = s[i+1].unicode();
 	    switch( c ) {
 	    case '0':
 		return 0;
@@ -186,7 +186,7 @@ int Lexer::toInt( const Token& token )
 		return c;
 	    }
 	} else {
-	    return s[i].tqunicode();
+	    return s[i].unicode();
 	}
     } else {
 	return 0;
@@ -374,21 +374,21 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
                 TQString tokText = tok.text();
                 TQString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText;
                 if( str == ide ){
-                    //Problem p( i18n("unsafe use of macro '%1'").tqarg(ide), m_currentLine, m_currentColumn );
+                    //Problem p( i18n("unsafe use of macro '%1'").arg(ide), m_currentLine, m_currentColumn );
                     //m_driver->addProblem( m_driver->currentFileName(), p );
                     m_driver->removeMacro( ide );
                     // str = TQString();
                 }
 
                 if( stringify ) {
-                    textToInsert.append( TQString::tqfromLatin1("\"") + str + TQString::tqfromLatin1("\" ") );
+                    textToInsert.append( TQString::fromLatin1("\"") + str + TQString::fromLatin1("\" ") );
                 } else if( merge ){
                     textToInsert.truncate( textToInsert.length() - 1 );
                     textToInsert.append( str );
                 } else if( tok == Token_ellipsis && d->hasBind("...") ){
                     textToInsert.append( ellipsisArg );
                 } else {
-                    textToInsert.append( str + TQString::tqfromLatin1(" ") );
+                    textToInsert.append( str + TQString::fromLatin1(" ") );
                 }
             }
 
@@ -465,7 +465,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
 	tk.setStartPosition( startLine, startColumn );
 	tk.setEndPosition( m_currentLine, m_currentColumn );
     } else {
-	tk = CREATE_TOKEN( ch.tqunicode(), currentPosition(), 1 );
+	tk = CREATE_TOKEN( ch.unicode(), currentPosition(), 1 );
 	nextChar();
 	tk.setStartPosition( startLine, startColumn );
 	tk.setEndPosition( m_currentLine, m_currentColumn );
@@ -808,7 +808,7 @@ int Lexer::macroPrimary()
 {
     readWhiteSpaces( false );
     int result = 0;
-    switch( currentChar().tqunicode() ) {
+    switch( currentChar().unicode() ) {
     case '(':
 	nextChar();
 	result = macroExpression();
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
index a05a7ddf..2d009294 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
@@ -71,7 +71,7 @@ const HashEntry* Lookup::findEntry( const struct HashTable *table,
 const HashEntry* Lookup::findEntry( const struct HashTable *table,
 				    const TQString &s )
 {
-    return findEntry( table, s.tqunicode(), s.length() );
+    return findEntry( table, s.unicode(), s.length() );
 }
 
 int Lookup::find(const struct HashTable *table,
@@ -85,7 +85,7 @@ int Lookup::find(const struct HashTable *table,
 
 int Lookup::find(const struct HashTable *table, const TQString &s)
 {
-  return find(table, s.tqunicode(), s.length());
+  return find(table, s.unicode(), s.length());
 }
 
 unsigned int Lookup::hash(const TQChar *c, unsigned int len)
@@ -100,7 +100,7 @@ unsigned int Lookup::hash(const TQChar *c, unsigned int len)
 
 unsigned int Lookup::hash(const TQString &key)
 {
-    return hash(key.tqunicode(), key.length());
+    return hash(key.unicode(), key.length());
 }
 
 unsigned int Lookup::hash(const char *s)
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
index 51837b1e..b724faba 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
@@ -37,7 +37,7 @@ using namespace std;
 { \
   const Token& token = lex->lookAhead( 0 ); \
   if( token != tk ){ \
-      reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
+      reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
       return false; \
   } \
   lex->nextToken(); \
@@ -47,7 +47,7 @@ using namespace std;
 { \
   const Token& token = lex->lookAhead( 0 ); \
   if( token != tk ){ \
-      reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
+      reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
   } \
   else \
       lex->nextToken(); \
@@ -137,7 +137,7 @@ bool Parser::reportError( const Error& err )
 	if( s.isEmpty() )
 	    s = i18n( "<eof>" );
 
-	m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) );
+	m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) );
     }
 
     return true;
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
index 8b8cc8eb..3e6dde46 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
@@ -294,7 +294,7 @@ TQString URLUtil::envExpand ( const TQString& str )
       if (pos < 0)
         pos = len;
 
-      char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() );
+      char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() );
 
       if (ret)
       {
diff --git a/umbrello/umbrello/codeimport/nativeimportbase.cpp b/umbrello/umbrello/codeimport/nativeimportbase.cpp
index b2f7dac3..5005bd1e 100644
--- a/umbrello/umbrello/codeimport/nativeimportbase.cpp
+++ b/umbrello/umbrello/codeimport/nativeimportbase.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/umbrello/umbrello/dialog_utils.cpp b/umbrello/umbrello/dialog_utils.cpp
index 0e114082..d6092915 100644
--- a/umbrello/umbrello/dialog_utils.cpp
+++ b/umbrello/umbrello/dialog_utils.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <kinputdialog.h>
@@ -25,15 +25,15 @@
 
 namespace Dialog_Utils {
 
-TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row,
+TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row,
                                 TQLabel * &label, const TQString& labelText,
                                 TQLineEdit * &editField,
                                 const TQString& editFieldText /* = TQString() */)
 {
     label = new TQLabel(labelText, containingBox);
-    tqlayout->addWidget(label, row, 0);
+    layout->addWidget(label, row, 0);
     editField = new TQLineEdit(editFieldText, containingBox);
-    tqlayout->addWidget(editField, row, 1 );
+    layout->addWidget(editField, row, 1 );
     label->setBuddy(editField);
     return editField;
 }
diff --git a/umbrello/umbrello/dialog_utils.h b/umbrello/umbrello/dialog_utils.h
index 5588049e..59925d3e 100644
--- a/umbrello/umbrello/dialog_utils.h
+++ b/umbrello/umbrello/dialog_utils.h
@@ -31,7 +31,7 @@ namespace Dialog_Utils {
  * Create a labeled text lineedit widget.
  *
  * @param containingBox         The containing TQGroupBox.
- * @param tqlayout                The TQGridLayout to use.
+ * @param layout                The TQGridLayout to use.
  * @param row                   The row number within the TQGridLayout.
  * @param label                 The TQLabel object allocated (return value)
  * @param labelText             The label text.
@@ -39,7 +39,7 @@ namespace Dialog_Utils {
  * @param editFieldText         Initialization text in the editField (optional.)
  * @return a pointer to the TQLineEdit so you can setFocus() if necessary
  */
-TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row,
+TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row,
                                 TQLabel * &label, const TQString& labelText,
                                 TQLineEdit * &editField,
                                 const TQString& editFieldText = TQString());
diff --git a/umbrello/umbrello/dialogs/activitydialog.cpp b/umbrello/umbrello/dialogs/activitydialog.cpp
index ed7f779e..6449bd50 100644
--- a/umbrello/umbrello/dialogs/activitydialog.cpp
+++ b/umbrello/umbrello/dialogs/activitydialog.cpp
@@ -13,7 +13,7 @@
 #include "activitydialog.h"
 
 //qt includes
-#include <tqlayout.h>
+#include <layout.h>
 
 //kde includes
 #include <kiconloader.h>
diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp
index 10ccb04b..5b604d1d 100644
--- a/umbrello/umbrello/dialogs/activitypage.cpp
+++ b/umbrello/umbrello/dialogs/activitypage.cpp
@@ -18,7 +18,7 @@
 #include <klocale.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstringlist.h>
 
 ActivityPage::ActivityPage( TQWidget * pParent, StateWidget * pWidget ) : TQWidget( pParent ) {
@@ -37,7 +37,7 @@ void ActivityPage::setupPage() {
 
     m_pActivityGB = new TQGroupBox(i18n("Activities"), this );
 
-    // vertical box tqlayout for the activity lists, arrow buttons and the button box
+    // vertical box layout for the activity lists, arrow buttons and the button box
     TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pActivityGB );
     listVBoxLayout -> setMargin(margin);
     listVBoxLayout -> setSpacing ( 10 );
diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp
index b093cae0..089a8427 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.cpp
+++ b/umbrello/umbrello/dialogs/assocgenpage.cpp
@@ -13,7 +13,7 @@
 #include "assocgenpage.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <kcombobox.h>
 
 // kde includes
diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp
index ec95f619..67ff8cd1 100644
--- a/umbrello/umbrello/dialogs/assocpage.cpp
+++ b/umbrello/umbrello/dialogs/assocpage.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include "assocpage.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include "assocpropdlg.h"
 
@@ -25,12 +25,12 @@ AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(pa
     m_pAssocGB = new TQGroupBox(i18n("Associations"), this);
     mainLayout -> addWidget(m_pAssocGB);
 
-    TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pAssocGB);
-    tqlayout -> setSpacing(10);
-    tqlayout -> setMargin(margin);
+    TQHBoxLayout * layout = new TQHBoxLayout(m_pAssocGB);
+    layout -> setSpacing(10);
+    layout -> setMargin(margin);
 
     m_pAssocLB = new TQListBox(m_pAssocGB);
-    tqlayout -> addWidget(m_pAssocLB);
+    layout -> addWidget(m_pAssocLB);
     setMinimumSize(310, 330);
     fillListBox();
     m_pMenu = 0;
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp
index 1d5b9c77..32bedb48 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp
@@ -13,7 +13,7 @@
 #include "assocpropdlg.h"
 
 // qt/kde includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 #include <klocale.h>
diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp
index a44a5f05..1d884bad 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.cpp
+++ b/umbrello/umbrello/dialogs/assocrolepage.cpp
@@ -13,7 +13,7 @@
 #include "assocrolepage.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 
 // kde includes
 #include <klocale.h>
@@ -228,7 +228,7 @@ void AssocRolePage::constructWidget() {
     // m_pDocB-> setEnabled(false);
     m_pDocB->setWordWrap(TQMultiLineEdit::WidgetWidth);
 
-    // add group boxes to main tqlayout 
+    // add group boxes to main layout 
     mainLayout -> addWidget( propsAGB, 0, 0);
     mainLayout -> addWidget( scopeABG, 1, 0);
     mainLayout -> addWidget(changeABG, 2, 0);
diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp
index d633b6ae..a21018a2 100644
--- a/umbrello/umbrello/dialogs/classgenpage.cpp
+++ b/umbrello/umbrello/dialogs/classgenpage.cpp
@@ -13,7 +13,7 @@
 #include "classgenpage.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp
index a96cb645..16039a79 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.cpp
+++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp
@@ -25,7 +25,7 @@
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 using namespace Uml;
 
@@ -60,11 +60,11 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi
     int margin = fontMetrics().height();
     setMinimumSize(310,330);
 
-    //main tqlayout contains our two group boxes, the list and the documentation
+    //main layout contains our two group boxes, the list and the documentation
     TQVBoxLayout* mainLayout = new TQVBoxLayout( this );
     mainLayout->setSpacing(10);
 
-    //top group box, contains a vertical tqlayout with list box above and buttons below
+    //top group box, contains a vertical layout with list box above and buttons below
     m_pItemListGB = new TQGroupBox(typeName, this );
     TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pItemListGB );
     listVBoxLayout->setMargin(margin);
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.h b/umbrello/umbrello/dialogs/classifierlistpage.h
index 2675fd35..fb3527b2 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.h
+++ b/umbrello/umbrello/dialogs/classifierlistpage.h
@@ -16,7 +16,7 @@
 #include <tqwidget.h>
 #include <tqgroupbox.h>
 #include <tqlistbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 //kde includes
 #include <karrowbutton.h>
 
diff --git a/umbrello/umbrello/dialogs/classoptionspage.cpp b/umbrello/umbrello/dialogs/classoptionspage.cpp
index 670d86f1..87e8430c 100644
--- a/umbrello/umbrello/dialogs/classoptionspage.cpp
+++ b/umbrello/umbrello/dialogs/classoptionspage.cpp
@@ -13,7 +13,7 @@
 #include "classoptionspage.h"
 
 // qt/kde includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/umbrello/umbrello/dialogs/classoptionspage.h b/umbrello/umbrello/dialogs/classoptionspage.h
index e9c81525..718944cc 100644
--- a/umbrello/umbrello/dialogs/classoptionspage.h
+++ b/umbrello/umbrello/dialogs/classoptionspage.h
@@ -23,7 +23,7 @@ class ClassifierWidget;
 
 /**
  * A dialog page to display options for a @ref UMLWidget and its
- * tqchildren.  This is not normally called by you.  It is used by
+ * children.  This is not normally called by you.  It is used by
  * the @ref ClassPropDlg.
  *
  * @short A dialog page to display the options for a UMLWidget.
diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp
index 169de20e..e1da407f 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/classpropdlg.cpp
@@ -13,7 +13,7 @@
 #include "classpropdlg.h"
 
 // qt/kde includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp
index 33fb743b..432bf941 100644
--- a/umbrello/umbrello/dialogs/codeeditor.cpp
+++ b/umbrello/umbrello/dialogs/codeeditor.cpp
@@ -26,8 +26,8 @@
 #include <tqcursor.h>
 #include <tqcolor.h>
 #include <tqlabel.h>
-#include <tqbrush.h>
-#include <tqlayout.h>
+#include <brush.h>
+#include <layout.h>
 #include <tqregexp.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h
index d5c42d1f..a1186223 100644
--- a/umbrello/umbrello/dialogs/codeeditor.h
+++ b/umbrello/umbrello/dialogs/codeeditor.h
@@ -22,7 +22,7 @@
 #include <tqpopupmenu.h>
 #include <tqstring.h>
 #include <tqlabel.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include "../codeviewerstate.h"
 #include "../textblocklist.h"
 
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
index 601b5385..0adc90c3 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
@@ -55,7 +55,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout1</cstring>
+                            <cstring>layout1</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -163,7 +163,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>30</width>
                                                 <height>20</height>
@@ -180,7 +180,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>30</width>
                                                 <height>20</height>
@@ -270,7 +270,7 @@ generator wants to use as output file already exists:</string>
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout8</cstring>
+                            <cstring>layout8</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -297,7 +297,7 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
@@ -314,7 +314,7 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
@@ -331,7 +331,7 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
index 30ab5817..b64e30dc 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
@@ -159,7 +159,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) {
         if(!info.exists())
         {
             if (KMessageBox::questionYesNo(this,
-                                           i18n("The folder %1 does not exist. Do you want to create it now?").tqarg(info.filePath()),
+                                           i18n("The folder %1 does not exist. Do you want to create it now?").arg(info.filePath()),
                                            i18n("Output Folder Does Not Exist"), i18n("Create Folder"), i18n("Do Not Create")) == KMessageBox::Yes)
             {
                 TQDir dir;
@@ -188,7 +188,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) {
             // it exits and we can write... make sure it is a directory
             if(!info.isDir())
             {
-                KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").tqarg(info.filePath()),
+                KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").arg(info.filePath()),
                                    i18n("Please Choose Valid Folder"));
                 return;
             }
diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
index 517df16e..fdd59c2c 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
@@ -88,7 +88,7 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -146,7 +146,7 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -190,7 +190,7 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -206,7 +206,7 @@ for in the right hand side list</string>
             <cstring>status</cstring>
         </property>
         <attribute name="title">
-            <string>Code Generation tqStatus</string>
+            <string>Code Generation Status</string>
         </attribute>
         <vbox>
             <property name="name">
@@ -231,7 +231,7 @@ for in the right hand side list</string>
                     <cstring>GroupBox2</cstring>
                 </property>
                 <property name="title">
-                    <string>Generation tqStatus</string>
+                    <string>Generation Status</string>
                 </property>
                 <vbox>
                     <property name="name">
@@ -257,7 +257,7 @@ for in the right hand side list</string>
                         </column>
                         <column>
                             <property name="text">
-                                <string>Generation tqStatus</string>
+                                <string>Generation Status</string>
                             </property>
                             <property name="clickable">
                                 <bool>true</bool>
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
index 3f11adb3..054f84d7 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
@@ -19,7 +19,7 @@
 #include "codeviewerdialog.h"
 
 // qt/kde includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtabwidget.h>
 #include <tqcheckbox.h>
 #include <kdebug.h>
@@ -69,7 +69,7 @@ void CodeViewerDialog::initGUI ( const char * name) {
 
     CodeViewerDialogBaseLayout->setMargin(margin);
 
-    resize( TQSize(width, height).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(width, height).expandedTo(minimumSizeHint()) );
 
 }
 
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h
index eef90445..d8774674 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.h
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.h
@@ -23,7 +23,7 @@
 #include <tqmap.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include "../codeviewerstate.h"
 #include "codeviewerdialogbase.h"
 
diff --git a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
index 665d6ccf..1a283200 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
+++ b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
index ed75ea9d..346dc44d 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
@@ -31,7 +31,7 @@
         </widget>
         <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
-                <cstring>tqcolorGroupBox</cstring>
+                <cstring>colorGroupBox</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
@@ -161,7 +161,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -192,7 +192,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="4">
                             <property name="name">
-                                <cstring>tqlayout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp
index 34176e3a..0301ca18 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.cpp
+++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp
@@ -13,7 +13,7 @@
 #include "diagramprintpage.h"
 
 // qt/kde includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqptrlist.h>
 #include <tqlistbox.h>
 #include <tqradiobutton.h>
@@ -112,13 +112,13 @@ void DiagramPrintPage::getOptions( TQMap<TQString,TQString>& opts, bool /*inclde
     for(int     i=0;i<listCount;i++) {
         if(m_pSelectLB -> isSelected(i)) {
             UMLView *view = (UMLView *)m_pDoc -> findView(m_nIdList[i]);
-            TQString sCount = TQString("%1").tqarg(count);
-            TQString sID = TQString("%1").tqarg(ID2STR(view -> getID()));
+            TQString sCount = TQString("%1").arg(count);
+            TQString sID = TQString("%1").arg(ID2STR(view -> getID()));
             opts.insert(diagram + sCount, sID);
             count++;
         }
     }
-    opts.insert("kde-uml-count", TQString("%1").tqarg(count));
+    opts.insert("kde-uml-count", TQString("%1").arg(count));
 }
 
 void DiagramPrintPage::setOptions( const TQMap<TQString,TQString>& /*opts*/ ) {}
diff --git a/umbrello/umbrello/dialogs/diagrampropertiespage.ui b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
index 8dc7f029..c7e430cb 100644
--- a/umbrello/umbrello/dialogs/diagrampropertiespage.ui
+++ b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
@@ -70,7 +70,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout20</cstring>
+                        <cstring>layout20</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -78,7 +78,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -131,7 +131,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>20</height>
@@ -164,7 +164,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -172,7 +172,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -218,7 +218,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -229,7 +229,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -307,7 +307,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -318,7 +318,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -369,7 +369,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
index 443ad9e2..4ec2b30c 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
@@ -13,7 +13,7 @@
 #include "exportallviewsdialog.h"
 
 // include files for TQt
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
 
@@ -33,7 +33,7 @@ ExportAllViewsDialog::ExportAllViewsDialog(
   : ExportAllViewsDialogBase(parent,name, modal,fl) {
     // create and initialize m_imageType
     m_imageType = new KFileFilterCombo(this, "m_imageType");
-    m_imageType->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
+    m_imageType->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
     m_imageType->setEditable(false);
 
     m_imageType->setMimeFilter(UMLViewImageExporterModel::supportedMimeTypes(), defaultMimeType);
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
index e795d2c9..4a7edb52 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
+++ b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
@@ -120,7 +120,7 @@ Only the folders made by the user are created in the base directory (Logical vie
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -151,7 +151,7 @@ Only the folders made by the user are created in the base directory (Logical vie
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/umbrello/umbrello/dialogs/notedialog.cpp b/umbrello/umbrello/dialogs/notedialog.cpp
index effb585d..ab823a4b 100644
--- a/umbrello/umbrello/dialogs/notedialog.cpp
+++ b/umbrello/umbrello/dialogs/notedialog.cpp
@@ -15,8 +15,8 @@
 // qt/kde includes
 #include <tqlineedit.h>
 #include <tqgroupbox.h>
-#include <tqtextedit.h>
-#include <tqlayout.h>
+#include <textedit.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp
index 9088b794..d2baa69e 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.cpp
+++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <kdebug.h>
@@ -26,14 +26,14 @@ OverwriteDialogue::OverwriteDialogue(
         bool applyToAllRemaining, TQWidget* parent, const char* name) :
 KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, parent, name) {
 
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
+    TQVBoxLayout* layout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
 
-    TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").tqarg(fileName).tqarg(outputDirectory), plainPage() );
-    tqlayout->addWidget(dialogueLabel);
+    TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").arg(fileName).arg(outputDirectory), plainPage() );
+    layout->addWidget(dialogueLabel);
 
     m_applyToAllRemaining = new TQCheckBox( i18n("&Apply to all remaining files"), plainPage() );
     m_applyToAllRemaining->setChecked(applyToAllRemaining);
-    tqlayout->addWidget(m_applyToAllRemaining);
+    layout->addWidget(m_applyToAllRemaining);
 
     setButtonText(KDialogBase::Ok, i18n("&Overwrite"));
     setButtonText(KDialogBase::Apply, i18n("&Generate Similar File Name"));
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp
index 38a75292..c0f161dc 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp
@@ -13,7 +13,7 @@
 #include "parmpropdlg.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 
 // kde includes
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.h b/umbrello/umbrello/dialogs/parmpropdlg.h
index 0164277d..851eedae 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.h
+++ b/umbrello/umbrello/dialogs/parmpropdlg.h
@@ -16,7 +16,7 @@
 #include <kcombobox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
index a5b742b1..172fc0cd 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include "pkgcontentspage.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include "../umlobjectlist.h"
 #include "../uml.h"
@@ -29,12 +29,12 @@ PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg)
     m_pContentGB = new TQGroupBox(i18n("Contained Items"), this);
     mainLayout -> addWidget(m_pContentGB);
 
-    TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pContentGB);
-    tqlayout -> setSpacing(10);
-    tqlayout -> setMargin(margin);
+    TQHBoxLayout * layout = new TQHBoxLayout(m_pContentGB);
+    layout -> setSpacing(10);
+    layout -> setMargin(margin);
 
     m_pContentLB = new TQListBox(m_pContentGB);
-    tqlayout -> addWidget(m_pContentLB);
+    layout -> addWidget(m_pContentLB);
     setMinimumSize(310, 330);
     fillListBox();
     m_pMenu = 0;
diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp
index 1c175752..d4694afb 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.cpp
+++ b/umbrello/umbrello/dialogs/selectopdlg.cpp
@@ -13,7 +13,7 @@
 #include "selectopdlg.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 
 // kde includes
 #include <klocale.h>
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp
index b5cddff5..f4827ac8 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@@ -13,7 +13,7 @@
 #include "settingsdlg.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqvbox.h>
 // kde includes
diff --git a/umbrello/umbrello/dialogs/statedialog.cpp b/umbrello/umbrello/dialogs/statedialog.cpp
index 564146ec..1d3288d7 100644
--- a/umbrello/umbrello/dialogs/statedialog.cpp
+++ b/umbrello/umbrello/dialogs/statedialog.cpp
@@ -13,7 +13,7 @@
 #include "statedialog.h"
 
 //qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqmultilineedit.h>
diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp
index d6ea57ce..c46e2af6 100644
--- a/umbrello/umbrello/dialogs/umlattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp
@@ -13,7 +13,7 @@
 #include "umlattributedialog.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
index 55a47857..d00718b6 100644
--- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
@@ -13,7 +13,7 @@
 #include "umlentityattributedialog.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp
index e8216b99..c177a01b 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.cpp
+++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp
@@ -13,7 +13,7 @@
 #include "umloperationdialog.h"
 
 //qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlistbox.h>
 #include <tqbuttongroup.h>
@@ -463,7 +463,7 @@ bool UMLOperationDialog::apply()
     if( classifier != 0L &&
             classifier->checkOperationSignature(name, m_pOperation->getParmList(), m_pOperation) )
     {
-        TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(classifier->getName())
+        TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(classifier->getName())
                       +
                       TQString(i18n("Choose a different name or parameter list." ));
         KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
diff --git a/umbrello/umbrello/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp
index 607ac759..e66c841f 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.cpp
+++ b/umbrello/umbrello/dialogs/umlroledialog.cpp
@@ -13,7 +13,7 @@
 #include "umlroledialog.h"
 
 // qt/kde  includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <kdebug.h>
 #include <klocale.h>
 
@@ -35,7 +35,7 @@ void UMLRoleDialog::setupDialog() {
     m_pRoleProps = new UMLRoleProperties(this, m_pRole);
     setMainWidget( m_pRoleProps );
 
-    resize( TQSize(425, 620).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(425, 620).expandedTo(minimumSizeHint()) );
 
     //  topLayout -> addWidget( m_pParmsGB);
 
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.cpp b/umbrello/umbrello/dialogs/umlroleproperties.cpp
index fe2e2f5f..998a6311 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.cpp
+++ b/umbrello/umbrello/dialogs/umlroleproperties.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqradiobutton.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqlineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
index ecaa98ae..dde405a5 100644
--- a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
+++ b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
@@ -14,7 +14,7 @@
     </property>
     <widget class="TQLayoutWidget">
         <property name="name">
-            <cstring>tqlayout6</cstring>
+            <cstring>layout6</cstring>
         </property>
         <property name="geometry">
             <rect>
@@ -37,7 +37,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <property name="geometry">
                         <rect>
@@ -111,7 +111,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout2</cstring>
+                            <cstring>layout2</cstring>
                         </property>
                         <grid>
                             <property name="name">
diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
index 6075fbe4..de8af77c 100644
--- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp
+++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
@@ -13,7 +13,7 @@
 #include "umltemplatedialog.h"
 
 // qt includes
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp
index 33a6a21f..586f729d 100644
--- a/umbrello/umbrello/dialogs/umlviewdialog.cpp
+++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp
@@ -14,12 +14,12 @@
 
 // qt/kde includes
 #include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqgroupbox.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqspinbox.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
index 824d708f..ca84bf7d 100644
--- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
+++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
@@ -14,7 +14,7 @@
 #include "../umlview.h"
 #include "../umlwidget.h"
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
index e577a6c3..266dd12f 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
@@ -33,7 +33,7 @@
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "uml.h"
 #include "umldoc.h"
@@ -96,7 +96,7 @@ KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
 
   // lets open the file for writing
   if( !file.open( IO_WriteOnly ) ) {
-    KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(tmpfile.name()), i18n("Save Error"));
+    KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(tmpfile.name()), i18n("Save Error"));
     return false;
   }
   umlDoc->saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it
diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
index a0555188..c00e9c5d 100644
--- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
@@ -33,7 +33,7 @@
 #include <kstandarddirs.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "uml.h"
 #include "umldoc.h"
diff --git a/umbrello/umbrello/docwindow.cpp b/umbrello/umbrello/docwindow.cpp
index ab935d00..d2900533 100644
--- a/umbrello/umbrello/docwindow.cpp
+++ b/umbrello/umbrello/docwindow.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmultilineedit.h>
 #include <klocale.h>
 
diff --git a/umbrello/umbrello/floatingtextwidget.cpp b/umbrello/umbrello/floatingtextwidget.cpp
index 700f9de4..94c5ec21 100644
--- a/umbrello/umbrello/floatingtextwidget.cpp
+++ b/umbrello/umbrello/floatingtextwidget.cpp
@@ -225,7 +225,7 @@ void FloatingTextWidget::changeName(const TQString& newText)
         setText( newText );
         UMLApp::app()->getDocument()->setModified(true);
     }
-    tqsetVisible( true );
+    setVisible( true );
     updateComponentSize();
     update();
 }
@@ -265,7 +265,7 @@ void FloatingTextWidget::changeTextDlg() {
 
     if(ok && newText != getText() && isTextValid(newText)) {
         setText( newText );
-        tqsetVisible( ( getText().length() > 0 ) );
+        setVisible( ( getText().length() > 0 ) );
         updateComponentSize();
         update();
     }
@@ -302,7 +302,7 @@ void FloatingTextWidget::showOpDlg() {
     opText = selectDlg.getOpText();
     if (selectDlg.isClassOp()) {
         Model_Utils::OpDescriptor od;
-        Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(opText, od, c);
+        Model_Utils::Parse_Status st = Model_Utils::parseOperation(opText, od, c);
         if (st == Model_Utils::PS_OK) {
             UMLClassifierList selfAndAncestors = c->findSuperClassConcepts();
             selfAndAncestors.prepend(c);
@@ -444,7 +444,7 @@ bool FloatingTextWidget::loadFromXMI( TQDomElement & qElement ) {
 void FloatingTextWidget::setMessageText() {
     if (m_pLink)
         m_pLink->setMessageText(this);
-    tqsetVisible(getText().length() > 0);
+    setVisible(getText().length() > 0);
     updateComponentSize();
 }
 
diff --git a/umbrello/umbrello/folder.cpp b/umbrello/umbrello/folder.cpp
index 127c3b34..1c608d8f 100644
--- a/umbrello/umbrello/folder.cpp
+++ b/umbrello/umbrello/folder.cpp
@@ -286,11 +286,11 @@ bool UMLFolder::loadDiagramsFromXMI(TQDomNode& diagrams) {
 bool UMLFolder::loadFolderFile(const TQString& path) {
     TQFile file(path);
     if (!file.exists()) {
-        KMessageBox::error(0, i18n("The folderfile %1 does not exist.").tqarg(path), i18n("Load Error"));
+        KMessageBox::error(0, i18n("The folderfile %1 does not exist.").arg(path), i18n("Load Error"));
         return false;
     }
     if (!file.open(IO_ReadOnly)) {
-        KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").tqarg(path), i18n("Load Error"));
+        KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").arg(path), i18n("Load Error"));
         return false;
     }
     TQTextStream stream(&file);
diff --git a/umbrello/umbrello/import_rose.cpp b/umbrello/umbrello/import_rose.cpp
index 3968e72a..70b98b6c 100644
--- a/umbrello/umbrello/import_rose.cpp
+++ b/umbrello/umbrello/import_rose.cpp
@@ -14,7 +14,7 @@
 
 // qt includes
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqptrlist.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp
index c5efcb65..95007d73 100644
--- a/umbrello/umbrello/kplayerslideraction.cpp
+++ b/umbrello/umbrello/kplayerslideraction.cpp
@@ -74,7 +74,7 @@ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text,
     m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised);
     m_frame -> setLineWidth (2);
     m_slider = new KPlayerSlider (Qt::Vertical, m_frame);
-    m_frame -> resize (36, m_slider -> tqsizeHint().height() + 4);
+    m_frame -> resize (36, m_slider -> sizeHint().height() + 4);
     m_slider -> setGeometry (m_frame -> contentsRect());
     //CHANGED  kdDebug() << "Popup slider size " << m_slider -> width() << "x" << m_slider -> height() << "\n";
     connect (m_slider, TQT_SIGNAL (changed (int)), receiver, slot);
@@ -278,9 +278,9 @@ KPlayerSlider::~KPlayerSlider()
     //CHANGED  kdDebug() << "KPlayerSlider destroyed\n";
 }
 
-TQSize KPlayerSlider::tqsizeHint() const
+TQSize KPlayerSlider::sizeHint() const
 {
-    TQSize hint = TQSlider::tqsizeHint();
+    TQSize hint = TQSlider::sizeHint();
     //CHANGED int length = kPlayerSettings() -> preferredSliderLength();
     int length = 200;
     if ( orientation() == Qt::Horizontal )
@@ -296,10 +296,10 @@ TQSize KPlayerSlider::tqsizeHint() const
     return hint;
 }
 
-TQSize KPlayerSlider::tqminimumSizeHint() const
+TQSize KPlayerSlider::minimumSizeHint() const
 {
     //kdDebug() << "KPlayerSlider minimum size hint\n";
-    TQSize hint = TQSlider::tqminimumSizeHint();
+    TQSize hint = TQSlider::minimumSizeHint();
     //CHANGED  int length = kPlayerSettings() -> minimumSliderLength();
     int length = 200;
     if ( orientation() == Qt::Horizontal )
diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h
index 8c0b11ef..14866991 100644
--- a/umbrello/umbrello/kplayerslideraction.h
+++ b/umbrello/umbrello/kplayerslideraction.h
@@ -38,10 +38,10 @@ public:
 
     /** The size hint.
      */
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
     /** The minimum size hint.
      */
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     /** The minimum value.
       */
diff --git a/umbrello/umbrello/linepath.cpp b/umbrello/umbrello/linepath.cpp
index 2d23021d..df3f614d 100644
--- a/umbrello/umbrello/linepath.cpp
+++ b/umbrello/umbrello/linepath.cpp
@@ -176,7 +176,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) {
         line -> setZ( -2 );
         line -> setPoints( point.x(), point.y(), ep.x(), ep.y() );
         line -> setPen( getPen() );
-        line -> tqsetVisible( true );
+        line -> setVisible( true );
         m_LineList.insert( 1, line );
         if (!bLoading)
             setupSelected();
@@ -191,7 +191,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) {
         line -> setPoints( point.x(), point.y(), ep.x(), ep.y() );
         line -> setZ( -2 );
         line -> setPen( getPen() );
-        line -> tqsetVisible( true );
+        line -> setVisible( true );
         m_LineList.append( line );
         if (!bLoading)
             setupSelected();
@@ -205,7 +205,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) {
     line -> setPoints( point.x(), point.y(), ep.x(), ep.y() );
     line -> setZ( -2 );
     line -> setPen( getPen() );
-    line -> tqsetVisible( true );
+    line -> setVisible( true );
     m_LineList.insert( pointIndex, line );
     if (!bLoading)
         setupSelected();
@@ -277,7 +277,7 @@ bool LinePath::setStartEndPoints( const TQPoint &start, const TQPoint &end ) {
         line -> setPoints( start.x(), start.y(), end.x(), end.y() );
         line -> setZ( -2 );
         line -> setPen( getPen() );
-        line -> tqsetVisible( true );
+        line -> setVisible( true );
         m_LineList.append( line );
         return true;
     }
@@ -644,7 +644,7 @@ void LinePath::growList(LineList &list, int by) {
         TQCanvasLine * line = new TQCanvasLine( getCanvas() );
         line -> setZ( 0 );
         line -> setPen( pen );
-        line -> tqsetVisible( true );
+        line -> setVisible( true );
         list.append( line );
     }
 }
@@ -665,7 +665,7 @@ void LinePath::createHeadLines() {
     case Uml::at_Realization:
         growList(m_HeadList, 3);
         m_pClearPoly = new TQCanvasPolygon( canvas );
-        m_pClearPoly -> tqsetVisible( true );
+        m_pClearPoly -> setVisible( true );
         m_pClearPoly -> setBrush( TQBrush( TQt::white ) );
         m_pClearPoly -> setZ( -1 );
         break;
@@ -674,7 +674,7 @@ void LinePath::createHeadLines() {
     case Uml::at_Aggregation:
         growList(m_HeadList, 4);
         m_pClearPoly = new TQCanvasPolygon( canvas );
-        m_pClearPoly -> tqsetVisible( true );
+        m_pClearPoly -> setVisible( true );
         if( getAssocType() == Uml::at_Aggregation )
             m_pClearPoly -> setBrush( TQBrush( TQt::white ) );
         else
diff --git a/umbrello/umbrello/messagewidget.cpp b/umbrello/umbrello/messagewidget.cpp
index 6f2eea21..f3227c31 100644
--- a/umbrello/umbrello/messagewidget.cpp
+++ b/umbrello/umbrello/messagewidget.cpp
@@ -64,7 +64,7 @@ void MessageWidget::init() {
     m_pOw[Uml::A] = m_pOw[Uml::B] = NULL;
     m_pFText = NULL;
     m_nY = 0;
-    tqsetVisible(true);
+    setVisible(true);
 }
 
 MessageWidget::~MessageWidget() {
@@ -353,7 +353,7 @@ void MessageWidget::calculateWidget() {
     setMessageText(m_pFText);
     calculateDimensions();
 
-    tqsetVisible(true);
+    setVisible(true);
 
     setX(m_nPosX);
     setY(m_nY);
@@ -464,7 +464,7 @@ bool MessageWidget::activate(IDChangeLog * Log /*= 0*/) {
     m_pFText -> setText("");
     m_pFText->setActivated();
     TQString messageText = m_pFText->getText();
-    m_pFText->tqsetVisible( messageText.length() > 1 );
+    m_pFText->setVisible( messageText.length() > 1 );
 
     connect(m_pOw[Uml::A], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType)));
     connect(m_pOw[Uml::B], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType)));
diff --git a/umbrello/umbrello/messagewidget.h b/umbrello/umbrello/messagewidget.h
index 9d36922b..db24fd36 100644
--- a/umbrello/umbrello/messagewidget.h
+++ b/umbrello/umbrello/messagewidget.h
@@ -209,7 +209,7 @@ public:
     UMLClassifier * getSeqNumAndOp(TQString& seqNum, TQString& op);
 
     /**
-     * Calculate the tqgeometry of the widget.
+     * Calculate the geometry of the widget.
      */
     void calculateWidget();
 
diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp
index 4131d9b1..1c7a1add 100644
--- a/umbrello/umbrello/model_utils.cpp
+++ b/umbrello/umbrello/model_utils.cpp
@@ -407,7 +407,7 @@ int stringToDirection(TQString input, Uml::Parameter_Direction & result) {
     return dirLen;
 }
 
-Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) {
+Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) {
 
     UMLDoc *pDoc = UMLApp::app()->getDocument();
 
@@ -430,7 +430,7 @@ Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *ownin
     return PS_OK;
 }
 
-Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
+Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
                             Uml::Visibility *vis /* = 0 */) {
     UMLDoc *pDoc = UMLApp::app()->getDocument();
 
@@ -494,7 +494,7 @@ Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owni
     return PS_OK;
 }
 
-Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) {
+Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) {
     UMLDoc *pDoc = UMLApp::app()->getDocument();
 
     m = m.simplifyWhiteSpace();
@@ -546,7 +546,7 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own
     TQStringList args = TQStringList::split( TQRegExp("\\s*,\\s*"), arglist);
     for (TQStringList::Iterator lit = args.begin(); lit != args.end(); ++lit) {
         NameAndType nmTp;
-        Parse_tqStatus ps = parseAttribute(*lit, nmTp, owningScope);
+        Parse_Status ps = parseAttribute(*lit, nmTp, owningScope);
         if (ps)
             return ps;
         desc.m_args.append(nmTp);
@@ -554,7 +554,7 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own
     return PS_OK;
 }
 
-TQString psText(Parse_tqStatus value) {
+TQString psText(Parse_Status value) {
     const TQString text[] = {
                                i18n("OK"), i18n("Empty"), i18n("Malformed argument"),
                                i18n("Unknown argument type"), i18n("Illegal method name"),
diff --git a/umbrello/umbrello/model_utils.h b/umbrello/umbrello/model_utils.h
index 6660ff64..1e8bd83b 100644
--- a/umbrello/umbrello/model_utils.h
+++ b/umbrello/umbrello/model_utils.h
@@ -236,7 +236,7 @@ Uml::Programming_Language stringToProgLang(TQString str);
 /**
  * Return type of parseOperation()
  */
-enum Parse_tqStatus {
+enum Parse_Status {
     PS_OK, PS_Empty, PS_Malformed_Arg, PS_Unknown_ArgType,
     PS_Illegal_MethodName, PS_Unknown_ReturnType, PS_Unspecified_Error
 };
@@ -284,7 +284,7 @@ struct OpDescriptor {
  * @param owningScope   Pointer to the owning scope of the template param.
  * @return      Error status of the parse, PS_OK for success.
  */
-Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope);
+Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope);
 
 /**
  * Parses an attribute given in UML syntax.
@@ -303,7 +303,7 @@ Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *ownin
  *
  * @return      Error status of the parse, PS_OK for success.
  */
-Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
+Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope,
                             Uml::Visibility *vis = 0);
 
 /**
@@ -316,12 +316,12 @@ Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owni
  * @param owningScope   Pointer to the owning scope of the operation.
  * @return      Error status of the parse, PS_OK for success.
  */
-Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope);
+Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope);
 
 /**
- * Returns the Parse_tqStatus as a text.
+ * Returns the Parse_Status as a text.
  */
-TQString psText(Parse_tqStatus value);
+TQString psText(Parse_Status value);
 
 }
 
diff --git a/umbrello/umbrello/notewidget.cpp b/umbrello/umbrello/notewidget.cpp
index 1826847b..c23425d1 100644
--- a/umbrello/umbrello/notewidget.cpp
+++ b/umbrello/umbrello/notewidget.cpp
@@ -14,7 +14,7 @@
 //qt includes
 #include <tqpointarray.h>
 #include <tqpainter.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqframe.h>
 // kde includes
 #include <kdebug.h>
@@ -201,7 +201,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse
 #if defined (NOTEWIDGET_EMBED_EDITOR)
     m_pEditor->setText( getDoc() );
     m_pEditor->setShown(true);
-    m_pEditor->tqrepaint();
+    m_pEditor->repaint();
 #else
     if (p == NULL)
         return;
diff --git a/umbrello/umbrello/notewidgetcontroller.h b/umbrello/umbrello/notewidgetcontroller.h
index 7c3da48c..081556ed 100644
--- a/umbrello/umbrello/notewidgetcontroller.h
+++ b/umbrello/umbrello/notewidgetcontroller.h
@@ -44,7 +44,7 @@ public:
     /**
      * Overriden from UMLWidgetController.
      * Handles a mouse move event.
-     * Executes base code and then sets the tqgeometry of the editor.
+     * Executes base code and then sets the geometry of the editor.
      *
      * @param me The TQMouseEvent event.
      */
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp
index 1986cfa3..193f9545 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.cpp
+++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp
@@ -650,7 +650,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
         UMLOperation *op = static_cast<UMLOperation*>(movingObject);
         if(newClassifier->checkOperationSignature(op->getName(), op->getParmList()))
         {
-            TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(newClassifier->getName())
+            TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(newClassifier->getName())
                           +
                           TQString(i18n("Choose a different name or parameter list." ));
             KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
@@ -666,7 +666,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
         //              UMLAttribute *att = static_cast<UMLAttribute*>(movingObject);
         //              if(!newClassifier->checkAttributeSignature(att))
         //              {
-        //                      TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).tqarg(newClassifier->getName())
+        //                      TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).arg(newClassifier->getName())
         //                              +
         //                            TQString(i18n("Choose a different name or parameter list." ));
         //                      KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
diff --git a/umbrello/umbrello/seqlinewidget.cpp b/umbrello/umbrello/seqlinewidget.cpp
index 18d70a68..9b992398 100644
--- a/umbrello/umbrello/seqlinewidget.cpp
+++ b/umbrello/umbrello/seqlinewidget.cpp
@@ -28,7 +28,7 @@ SeqLineWidget::SeqLineWidget( UMLView * pView, ObjectWidget * pObject ) : TQCanv
     m_pObject = pObject;
     setPen( TQPen( m_pObject->getLineColor(), 0, TQt::DashLine ) );
     setZ( 0 );
-    tqsetVisible( true );
+    setVisible( true );
     m_DestructionBox.line1 = 0;
     m_nLengthY = 250;
     setupDestructionBox();
@@ -83,13 +83,13 @@ void SeqLineWidget::setupDestructionBox() {
 
     m_DestructionBox.line1 = new TQCanvasLine( m_pView->canvas() );
     m_DestructionBox.setLine1Points(rect);
-    m_DestructionBox.line1->tqsetVisible( true );
+    m_DestructionBox.line1->setVisible( true );
     m_DestructionBox.line1->setPen( TQPen(m_pObject->getLineColor(), 2) );
     m_DestructionBox.line1->setZ( 3 );
 
     m_DestructionBox.line2 = new TQCanvasLine( m_pView -> canvas() );
     m_DestructionBox.setLine2Points(rect);
-    m_DestructionBox.line2->tqsetVisible( true );
+    m_DestructionBox.line2->setVisible( true );
     m_DestructionBox.line2->setPen( TQPen(m_pObject->getLineColor(), 2) );
     m_DestructionBox.line2->setZ( 3 );
 }
diff --git a/umbrello/umbrello/toolbarstatearrow.cpp b/umbrello/umbrello/toolbarstatearrow.cpp
index 05e98734..cbcbc20f 100644
--- a/umbrello/umbrello/toolbarstatearrow.cpp
+++ b/umbrello/umbrello/toolbarstatearrow.cpp
@@ -58,7 +58,7 @@ void ToolBarStateArrow::mousePressEmpty() {
             line->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(),
                             m_pMouseEvent->x(), m_pMouseEvent->y());
             line->setPen(TQPen(TQColor("grey"), 0, TQt::DotLine));
-            line->tqsetVisible(true);
+            line->setVisible(true);
             line->setZ(100);
             m_selectionRect.append(line);
         }
diff --git a/umbrello/umbrello/toolbarstateassociation.cpp b/umbrello/umbrello/toolbarstateassociation.cpp
index 340a28dc..005e5def 100644
--- a/umbrello/umbrello/toolbarstateassociation.cpp
+++ b/umbrello/umbrello/toolbarstateassociation.cpp
@@ -132,7 +132,7 @@ void ToolBarStateAssociation::setFirstWidget() {
     m_associationLine->setPoints(pos.x(), pos.y(), pos.x(), pos.y());
     m_associationLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine));
 
-    m_associationLine->tqsetVisible(true);
+    m_associationLine->setVisible(true);
 
     m_pUMLView->viewport()->setMouseTracking(true);
 }
diff --git a/umbrello/umbrello/toolbarstatemessages.cpp b/umbrello/umbrello/toolbarstatemessages.cpp
index 453c6d7c..f8e5930a 100644
--- a/umbrello/umbrello/toolbarstatemessages.cpp
+++ b/umbrello/umbrello/toolbarstatemessages.cpp
@@ -118,7 +118,7 @@ void ToolBarStateMessages::setFirstWidget(ObjectWidget* firstObject) {
     m_messageLine->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(), m_pMouseEvent->x(), m_pMouseEvent->y());
     m_messageLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine));
 
-    m_messageLine->tqsetVisible(true);
+    m_messageLine->setVisible(true);
 
     m_pUMLView->viewport()->setMouseTracking(true);
 }
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 8a305952..8f991962 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -13,7 +13,7 @@
 #include "uml.h"
 
 // qt includes
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqpopupmenu.h>
 #include <tqtimer.h>
 #include <tqwidgetstack.h>
@@ -55,7 +55,7 @@
 #include "umlviewlist.h"
 #include "worktoolbar.h"
 #ifdef HAVE_DOT
-# include "autotqlayout/autolayoutdlg.h" //dimitri
+# include "autolayout/autolayoutdlg.h" //dimitri
 #endif
 #include "model_utils.h"
 #include "clipboard/umlclipboard.h"
@@ -225,8 +225,8 @@ void UMLApp::initActions() {
                                 TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" );
 
 #if defined (HAVE_DOT)
-    autotqlayout = new KAction(i18n("&Autotqlayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutotqlayout()),
-                             actionCollection(),"autotqlayout");
+    autolayout = new KAction(i18n("&Autolayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutolayout()),
+                             actionCollection(),"autolayout");
 #endif
     sequenceDiagram= new KAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0,
                                   TQT_TQOBJECT(this), TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" );
@@ -374,7 +374,7 @@ void UMLApp::setupZoomMenu() {
 
 void UMLApp::initStatusBar() {
     m_statusLabel = new KStatusBarLabel( i18n("Ready."), 0, statusBar() );
-    m_statusLabel->setFixedHeight( m_statusLabel->tqsizeHint().height() );
+    m_statusLabel->setFixedHeight( m_statusLabel->sizeHint().height() );
 
     m_statusLabel->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain );
     m_statusLabel->setMargin( 0 );
@@ -382,7 +382,7 @@ void UMLApp::initStatusBar() {
 
     statusBar()->addWidget( m_statusLabel, 1, false );
 
-    m_statusLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignVCenter);
+    m_statusLabel->setAlignment(TQt::AlignLeft|TQt::AlignVCenter);
 
     connect(m_doc, TQT_SIGNAL( sigWriteToStatusBar(const TQString &) ), this, TQT_SLOT( slotStatusMsg(const TQString &) ));
 }
@@ -737,7 +737,7 @@ bool UMLApp::slotFileSaveAs()
             TQDir d = url.path(-1);
 
             if(TQFile::exists(d.path())) {
-                int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").tqarg(url.path()), i18n("Warning"), i18n("Overwrite"));
+                int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").arg(url.path()), i18n("Warning"), i18n("Overwrite"));
                 if(want_save == KMessageBox::Continue)
                     cont = false;
             } else
@@ -776,7 +776,7 @@ void UMLApp::slotFilePrint()
     DiagramPrintPage * selectPage = new DiagramPrintPage(0, m_doc);
     printer.addDialogPage(selectPage);
     TQString msg;
-    if (printer.setup(this, i18n("Print %1").tqarg(m_doc->URL().prettyURL()))) {
+    if (printer.setup(this, i18n("Print %1").arg(m_doc->URL().prettyURL()))) {
 
         m_doc -> print(&printer);
     }
@@ -842,7 +842,7 @@ void UMLApp::slotEditCopy() {
 
 void UMLApp::slotEditPaste() {
     slotStatusMsg(i18n("Inserting clipboard contents..."));
-    TQMimeSource* data = TQApplication::tqclipboard()->data();
+    TQMimeSource* data = TQApplication::clipboard()->data();
     UMLClipboard clipboard;
     setCursor(KCursor::waitCursor());
     if(!clipboard.paste(data)) {
@@ -895,7 +895,7 @@ void UMLApp::slotStatusMsg(const TQString &text) {
     statusBar()->clear();
     m_statusLabel->setText( text );
 
-    m_statusLabel->tqrepaint();
+    m_statusLabel->repaint();
 }
 
 void UMLApp::slotClassDiagram() {
@@ -977,7 +977,7 @@ void UMLApp::enableRedo(bool enable) {
 
 /** initialize the QT's global clipboard support for the application */
 void UMLApp::initClip() {
-    TQClipboard* clip = TQApplication::tqclipboard();
+    TQClipboard* clip = TQApplication::clipboard();
     connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged()));
 
     // Don't poll the X11 clipboard every second. This is a little expensive and resulted
@@ -1007,7 +1007,7 @@ bool UMLApp::canDecode(const TQMimeSource* mimeSource) {
 }
 
 void UMLApp::slotClipDataChanged() {
-    TQMimeSource * data = TQApplication::tqclipboard()->data();
+    TQMimeSource * data = TQApplication::clipboard()->data();
 
     //Pass the MimeSource to the Doc
     editPaste->setEnabled( data && canDecode(data) );
@@ -1075,7 +1075,7 @@ bool UMLApp::editCutCopy( bool bFromView ) {
     TQMimeSource * clipdata = 0;
 
     if ((clipdata = clipboard.copy(bFromView)) != 0) {
-        TQClipboard* clip = TQApplication::tqclipboard();
+        TQClipboard* clip = TQApplication::clipboard();
         clip->setData(clipdata);//the global clipboard takes ownership of the clipdata memory
         connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged()));
         return true;
@@ -1679,7 +1679,7 @@ void UMLApp::slotMoveTabRight() {
     //m_tabWidget->moveTab( m_tabWidget->currentPageIndex(), m_tabWidget->currentPageIndex() + 1 );
 }
 
-void UMLApp::slotAutotqlayout(){
+void UMLApp::slotAutolayout(){
 #ifdef HAVE_DOT
 /*
     TQDialog* d = new AutolayoutDlg(getCurrentView());
diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h
index 3e5b27e7..f8e1be48 100644
--- a/umbrello/umbrello/uml.h
+++ b/umbrello/umbrello/uml.h
@@ -340,7 +340,7 @@ protected:
 
     /**
      * Save general Options like all bar positions and status
-     * as well as the tqgeometry and the recent file list to
+     * as well as the geometry and the recent file list to
      * the configuration file.
      */
     void saveOptions();
@@ -535,7 +535,7 @@ public slots:
     /**
      * Autolayouts the current class diagram
      */
-    void slotAutotqlayout();
+    void slotAutolayout();
 
     /**
      * Changes the statusbar contents for the standard label
@@ -959,7 +959,7 @@ private:
     KAction* deleteSelectedWidget;
     KAction* deleteDiagram;
 #ifdef HAVE_DOT
-    KAction* autotqlayout;
+    KAction* autolayout;
 #endif
 
     KAction* changeTabLeft;
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index 39c8ce61..edf56b23 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -352,7 +352,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
     KIO::NetAccess::download( url, tmpfile, UMLApp::app() );
     TQFile file( tmpfile );
     if ( !file.exists() ) {
-        KMessageBox::error(0, i18n("The file %1 does not exist.").tqarg(d.path()), i18n("Load Error"));
+        KMessageBox::error(0, i18n("The file %1 does not exist.").arg(d.path()), i18n("Load Error"));
         m_doc_url.setFileName(i18n("Untitled"));
         m_bLoading = false;
         newDocument();
@@ -377,7 +377,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
         KTar archive(tmpfile, mimetype);
         if (archive.open(IO_ReadOnly) == false)
         {
-            KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").tqarg(d.path()), i18n("Load Error"));
+            KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").arg(d.path()), i18n("Load Error"));
             m_doc_url.setFileName(i18n("Untitled"));
             m_bLoading = false;
             newDocument();
@@ -419,7 +419,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
             entry = const_cast<KArchiveEntry*>(rootDir->entry(*it));
             if (entry == 0)
             {
-                KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error"));
+                KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 m_bLoading = false;
                 newDocument();
@@ -431,7 +431,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
             fileEntry = dynamic_cast<KArchiveFile*>(entry);
             if (fileEntry == 0)
             {
-                KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error"));
+                KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 m_bLoading = false;
                 newDocument();
@@ -445,7 +445,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
             TQFile xmi_file(tmp_dir.name() + *it);
             if( !xmi_file.open( IO_ReadOnly ) )
             {
-                KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").tqarg(d.path()), i18n("Load Error"));
+                KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").arg(d.path()), i18n("Load Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 m_bLoading = false;
                 newDocument();
@@ -458,7 +458,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
             tmp_dir.unlink();
 
         } else {
-            KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error"));
+            KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error"));
             m_doc_url.setFileName(i18n("Untitled"));
             m_bLoading = false;
             newDocument();
@@ -469,7 +469,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
     } else {
         // no, it seems to be an ordinary file
         if( !file.open( IO_ReadOnly ) ) {
-            KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error"));
+            KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error"));
             m_doc_url.setFileName(i18n("Untitled"));
             m_bLoading = false;
             newDocument();
@@ -485,7 +485,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
     KIO::NetAccess::removeTempFile( tmpfile );
     if( !status )
     {
-        KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error"));
+        KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error"));
         m_bLoading = false;
         newDocument();
         return false;
@@ -553,7 +553,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
         // now check if we can write to the file
         if (archive->open(IO_WriteOnly) == false)
         {
-            KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+            KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
 
@@ -562,7 +562,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
         KTempFile tmp_xmi_file;
         file.setName(tmp_xmi_file.name());
         if( !file.open( IO_WriteOnly ) ) {
-            KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+            KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
         saveToXMI(*TQT_TQIODEVICE(&file)); // save XMI to this file...
@@ -582,7 +582,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
 #if KDE_IS_VERSION(3,4,89)
         if (!archive->closeSucceeded())
         {
-            KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+            KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
 #endif
@@ -617,7 +617,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
 
         // lets open the file for writing
         if( !file.open( IO_WriteOnly ) ) {
-            KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+            KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
         saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it
@@ -630,7 +630,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
         } else {
             // now remove the original file
             if ( KIO::NetAccess::file_move( tmpfile.name(), d.path(), -1, true ) == false ) {
-                KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error"));
+                KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
                 m_doc_url.setFileName(i18n("Untitled"));
                 return false;
             }
@@ -638,7 +638,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
     }
     if( !uploaded )
     {
-        KMessageBox::error(0, i18n("There was a problem uploading file: %1").tqarg(d.path()), i18n("Save Error"));
+        KMessageBox::error(0, i18n("There was a problem uploading file: %1").arg(d.path()), i18n("Save Error"));
         m_doc_url.setFileName(i18n("Untitled"));
     }
     setModified(false);
@@ -1096,7 +1096,7 @@ void UMLDoc::removeDiagram(Uml::IDType id) {
         kError()<<"Request to remove diagram " << ID2STR(id) << ": Diagram not found!"<<endl;
         return;
     }
-    if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").tqarg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) {
+    if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").arg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) {
         removeView(umlview);
         emit sigDiagramRemoved(id);
         setModified(true);
@@ -1213,7 +1213,7 @@ void UMLDoc::saveToXMI(TQIODevice& file) {
 
     TQDomElement root = doc.createElement( "XMI" );
     root.setAttribute( "xmi.version", "1.2" );
-    TQDateTime now = TQDateTime::tqcurrentDateTime();
+    TQDateTime now = TQDateTime::currentDateTime();
     root.setAttribute( "timestamp", now.toString(Qt::ISODate));
     root.setAttribute( "verified", "false");
     root.setAttribute( "xmlns:UML", "http://schema.omg.org/spec/UML/1.3");
@@ -1915,7 +1915,7 @@ void UMLDoc::print(KPrinter * pPrinter) {
     for(int i = 0;i < count;i++) {
         if(i>0)
             pPrinter -> newPage();
-        TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").tqarg(i);
+        TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").arg(i);
         TQString sID = pPrinter -> option(diagram);
         Uml::IDType id = STR2ID(sID);
         printView = findView(id);
@@ -2101,7 +2101,7 @@ void UMLDoc::slotAutoSave() {
     }
     KURL tempURL = m_doc_url;
     if( tempURL.fileName() == i18n("Untitled") ) {
-        tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").tqarg(".xmi") );
+        tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").arg(".xmi") );
         saveDocument( tempURL );
         m_doc_url.setFileName( i18n("Untitled") );
         m_modified = true;
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index 6fe7b84f..5db7d670 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -86,7 +86,7 @@ protected:
             return;
         UMLOperation *op = static_cast<UMLOperation*>(obj);
         TQString text = op->toString(Uml::st_ShowSig);
-        TQRect rect = lv->tqitemRect(item);
+        TQRect rect = lv->itemRect(item);
         tip(rect, text);
     }
 };
@@ -381,7 +381,7 @@ void UMLListView::popupMenuSel(int sel) {
                 file.close();
             } else {
                 KMessageBox::error(0,
-                                   i18n("There was a problem saving file: %1").tqarg(fileName),
+                                   i18n("There was a problem saving file: %1").arg(fileName),
                                    i18n("Save Error"));
                 return;
             }
@@ -1719,7 +1719,7 @@ void UMLListView::focusOutEvent ( TQFocusEvent * fe) {
         clearSelection();
         triggerUpdate();
     }
-    //tqrepaint();
+    //repaint();
 
     TQListView::focusOutEvent(fe);
 }
@@ -2111,7 +2111,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
     } else if ( type == Uml::ot_Template )  {
         UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent);
         Model_Utils::NameAndType nt;
-        Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(text, nt, owningClassifier);
+        Model_Utils::Parse_Status st = Model_Utils::parseTemplate(text, nt, owningClassifier);
         if (st) {
             KMessageBox::error( kapp->mainWidget(),
                                 Model_Utils::psText(st),
@@ -2127,7 +2127,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
         UMLClassifier *owningClass = static_cast<UMLClassifier*>(parent);
         Model_Utils::NameAndType nt;
         Uml::Visibility vis;
-        Model_Utils::Parse_tqStatus st;
+        Model_Utils::Parse_Status st;
         st = Model_Utils::parseAttribute(text, nt, owningClass, &vis);
         if (st) {
             KMessageBox::error( kapp->mainWidget(),
@@ -2143,7 +2143,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type
     } else if ( type == Uml::ot_Operation ) {
         UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent);
         Model_Utils::OpDescriptor od;
-        Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(text, od, owningClassifier);
+        Model_Utils::Parse_Status st = Model_Utils::parseOperation(text, od, owningClassifier);
         if (st) {
             KMessageBox::error( kapp->mainWidget(),
                                 Model_Utils::psText(st),
@@ -2378,7 +2378,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement &
         UMLListViewItem * item = 0;
         if (nID != Uml::id_None) {
             // The following is an ad hoc hack for the copy/paste code.
-            // The clip still contains the old tqchildren although new
+            // The clip still contains the old children although new
             // UMLCLassifierListItems have already been created.
             // If the IDChangeLog finds new IDs this means we are in
             // copy/paste and need to adjust the child listitems to the
diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h
index b6bf201c..f2328cef 100644
--- a/umbrello/umbrello/umllistview.h
+++ b/umbrello/umbrello/umllistview.h
@@ -88,7 +88,7 @@ public:
     int getSelectedItems(UMLListViewItemList &ItemList);
 
     /**
-     * Get selected items, but only root elements selected (without tqchildren).
+     * Get selected items, but only root elements selected (without children).
      *
      * @param ItemList  List of UMLListViewItems returned.
      * @return          The number of selected items.
diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp
index 01680fde..89bb581c 100644
--- a/umbrello/umbrello/umllistviewitem.cpp
+++ b/umbrello/umbrello/umllistviewitem.cpp
@@ -333,7 +333,7 @@ void UMLListViewItem::okRename( int col ) {
             UMLOperation *op = static_cast<UMLOperation*>(m_pObject);
             UMLClassifier *parent = static_cast<UMLClassifier *>( op -> parent() );
             Model_Utils::OpDescriptor od;
-            Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(newText, od, parent);
+            Model_Utils::Parse_Status st = Model_Utils::parseOperation(newText, od, parent);
             if (st == Model_Utils::PS_OK) {
                 // TODO: Check that no operation with the exact same profile exists.
                 op->setName( od.m_name );
@@ -385,7 +385,7 @@ void UMLListViewItem::okRename( int col ) {
             UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent());
             Model_Utils::NameAndType nt;
             Uml::Visibility vis;
-            Model_Utils::Parse_tqStatus st;
+            Model_Utils::Parse_Status st;
             st = Model_Utils::parseAttribute(newText, nt, parent, &vis);
             if (st == Model_Utils::PS_OK) {
                 UMLObject *exists = parent->findChildObject(newText);
@@ -417,7 +417,7 @@ void UMLListViewItem::okRename( int col ) {
             }
             UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent());
             Model_Utils::NameAndType nt;
-            Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(newText, nt, parent);
+            Model_Utils::Parse_Status st = Model_Utils::parseTemplate(newText, nt, parent);
             if (st == Model_Utils::PS_OK) {
                 UMLObject *exists = parent->findChildObject(newText);
                 if (exists) {
@@ -465,7 +465,7 @@ void UMLListViewItem::okRename( int col ) {
         }
     default:
         KMessageBox::error( kapp->mainWidget() ,
-                            i18n("Renaming an item of listview type %1 is not yet implemented.").tqarg(m_Type),
+                            i18n("Renaming an item of listview type %1 is not yet implemented.").arg(m_Type),
                             i18n("Function Not Implemented") );
         TQListViewItem::setText(0, m_Label);
         break;
diff --git a/umbrello/umbrello/umllistviewitem.h b/umbrello/umbrello/umllistviewitem.h
index 596a93f5..1064befc 100644
--- a/umbrello/umbrello/umllistviewitem.h
+++ b/umbrello/umbrello/umllistviewitem.h
@@ -190,7 +190,7 @@ public:
     virtual int compare(TQListViewItem *other, int col, bool ascending) const;
 
     /**
-     * Returns the number of tqchildren of the UMLListViewItem
+     * Returns the number of children of the UMLListViewItem
      * containing this object
      */
     int childCount() const {
@@ -213,7 +213,7 @@ public:
 
     /**
      * Find the UMLListViewItem that represents the given UMLClassifierListItem
-     * in the tqchildren of the current UMLListViewItem.  (Only makes sense if
+     * in the children of the current UMLListViewItem.  (Only makes sense if
      * the current UMLListViewItem represents a UMLClassifier.)
      * Return a pointer to the item or NULL if not found.
      */
diff --git a/umbrello/umbrello/umlobject.h b/umbrello/umbrello/umlobject.h
index a0e02160..aedc2325 100644
--- a/umbrello/umbrello/umlobject.h
+++ b/umbrello/umbrello/umlobject.h
@@ -379,7 +379,7 @@ public slots:
 
 signals:
     /** Emitted when the UMLObject has changed. Note that some objects emit
-      * this signal when one of its tqchildren changes, for example, a UMLClass
+      * this signal when one of its children changes, for example, a UMLClass
       * emits a modified() signal when one of its operation changes while the Operation
       * itself emits the corresponding signal as well.
       */
diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp
index a64b770c..aef18eca 100644
--- a/umbrello/umbrello/umlview.cpp
+++ b/umbrello/umbrello/umlview.cpp
@@ -294,7 +294,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) {
             pPainter.translate(offsetX,offsetY);
 
             //draw foot note
-            TQString string = i18n("Diagram: %2 Page %1").tqarg(page + 1).tqarg(getName());
+            TQString string = i18n("Diagram: %2 Page %1").arg(page + 1).arg(getName());
             TQColor textColor(50, 50, 50);
             pPainter.setPen(textColor);
             pPainter.drawLine(0, height + 2, width, height + 2);
@@ -354,7 +354,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) {
     getDiagram(TQRect(rect.x(), rect.y(), windowWidth, diagramHeight), pPainter);
 
     //draw foot note
-    TQString string = i18n("Diagram: %2 Page %1").tqarg( 1).tqarg(getName());
+    TQString string = i18n("Diagram: %2 Page %1").arg( 1).arg(getName());
     TQColor textColor(50, 50, 50);
     pPainter.setPen(textColor);
     pPainter.drawLine(rect.x(), footTop    , windowWidth, footTop);
@@ -371,7 +371,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) {
 void UMLView::setupNewWidget(UMLWidget *w) {
     w->setX( m_Pos.x() );
     w->setY( m_Pos.y() );
-    w->tqsetVisible( true );
+    w->setVisible( true );
     w->setActivated();
     w->setFont( getFont() );
     w->slotColorChanged( getID() );
@@ -451,7 +451,7 @@ void UMLView::slotObjectCreated(UMLObject* o) {
     UMLWidget* newWidget = Widget_Factory::createWidget(this, o);
     if (newWidget == NULL)
         return;
-    newWidget->tqsetVisible( true );
+    newWidget->setVisible( true );
     newWidget->setActivated();
     newWidget->setFont( getFont() );
     newWidget->slotColorChanged( getID() );
@@ -1362,7 +1362,7 @@ void UMLView::activate() {
             continue;
 
         if (obj->activate()) {
-            obj->tqsetVisible(true);
+            obj->setVisible(true);
         } else {
             m_WidgetList.remove(obj);
             delete obj;
@@ -1378,7 +1378,7 @@ void UMLView::activate() {
             continue;
 
         obj->activate(m_pDoc->getChangeLog());
-        obj->tqsetVisible( true );
+        obj->setVisible( true );
 
     }//end while
 
@@ -2365,7 +2365,7 @@ void UMLView::setMenu() {
     if( menu != ListPopupMenu::mt_Undefined ) {
         m_pMenu = new ListPopupMenu(this, menu, this);
         connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int)));
-        m_pMenu->popup( mapToGlobal( contentsToViewport(tqworldMatrix().map(m_Pos)) ) );
+        m_pMenu->popup( mapToGlobal( contentsToViewport(worldMatrix().map(m_Pos)) ) );
     }
 }
 
@@ -2797,17 +2797,17 @@ void UMLView::setZoom(int zoom) {
 }
 
 int UMLView::currentZoom() {
-    return (int)(tqworldMatrix().m11()*100.0);
+    return (int)(worldMatrix().m11()*100.0);
 }
 
 void UMLView::zoomIn() {
-    TQWMatrix wm = tqworldMatrix();
+    TQWMatrix wm = worldMatrix();
     wm.scale(1.5,1.5); // adjust zooming step here
     setZoom( (int)(wm.m11()*100.0) );
 }
 
 void UMLView::zoomOut() {
-    TQWMatrix wm = tqworldMatrix();
+    TQWMatrix wm = worldMatrix();
     wm.scale(2.0/3.0, 2.0/3.0); //adjust zooming step here
     setZoom( (int)(wm.m11()*100.0) );
 }
@@ -3014,10 +3014,10 @@ bool UMLView::loadFromXMI( TQDomElement & qElement ) {
     TQString zoom = qElement.attribute( "zoom", "100" );
     m_nZoom = zoom.toInt();
 
-    TQString height = qElement.attribute( "canvasheight", TQString("%1").tqarg(UMLView::defaultCanvasSize) );
+    TQString height = qElement.attribute( "canvasheight", TQString("%1").arg(UMLView::defaultCanvasSize) );
     m_nCanvasHeight = height.toInt();
 
-    TQString width = qElement.attribute( "canvaswidth", TQString("%1").tqarg(UMLView::defaultCanvasSize) );
+    TQString width = qElement.attribute( "canvaswidth", TQString("%1").arg(UMLView::defaultCanvasSize) );
     m_nCanvasWidth = width.toInt();
 
     int nType = type.toInt();
@@ -3226,7 +3226,7 @@ bool UMLView::loadUisDiagramPresentation(TQDomElement & qElement) {
         while (!e.isNull()) {
             tag = e.tagName();
             kDebug() << "Presentation: tag = " << tag << endl;
-            if (Uml::tagEq(tag, "Presentation.tqgeometry")) {
+            if (Uml::tagEq(tag, "Presentation.geometry")) {
                 TQDomNode gnode = e.firstChild();
                 TQDomElement gelem = gnode.toElement();
                 TQString csv = gelem.text();
diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h
index 4cf51b7f..ce84e17c 100644
--- a/umbrello/umbrello/umlview.h
+++ b/umbrello/umbrello/umlview.h
@@ -706,7 +706,7 @@ public:
     void resetPastePoint();
 
     /**
-     * Called by the view or any of its tqchildren when they start a cut
+     * Called by the view or any of its children when they start a cut
      * operation.
      */
     void setStartedCut() {
@@ -1120,7 +1120,7 @@ protected:
     UMLWidgetList m_SelectedList;
 
     /**
-     *  Flag if view/tqchildren started cut operation.
+     *  Flag if view/children started cut operation.
      */
     bool m_bStartedCut;
 
@@ -1152,7 +1152,7 @@ private:
     bool m_bActivated;
 
     /**
-     * tqStatus of a popupmenu on view.
+     * Status of a popupmenu on view.
      * true - a popup is on view
      */
     bool m_bPopupShowing;
diff --git a/umbrello/umbrello/umlviewimageexporter.cpp b/umbrello/umbrello/umlviewimageexporter.cpp
index 23164171..c669086d 100644
--- a/umbrello/umbrello/umlviewimageexporter.cpp
+++ b/umbrello/umbrello/umlviewimageexporter.cpp
@@ -63,7 +63,7 @@ bool UMLViewImageExporter::prepareExportView() {
         // check if the file exists
         if (KIO::NetAccess::exists(m_imageURL, true, UMLApp::app())) {
             int wantSave = KMessageBox::warningContinueCancel(0,
-                                i18n("The selected file %1 exists.\nDo you want to overwrite it?").tqarg(m_imageURL.prettyURL()),
+                                i18n("The selected file %1 exists.\nDo you want to overwrite it?").arg(m_imageURL.prettyURL()),
                                 i18n("File Already Exists"), i18n("&Overwrite"));
             if (wantSave == KMessageBox::Continue) {
                 exportPrepared = true;
diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp
index a8de3637..155ba9b8 100644
--- a/umbrello/umbrello/umlviewimageexportermodel.cpp
+++ b/umbrello/umbrello/umlviewimageexportermodel.cpp
@@ -123,7 +123,7 @@ TQStringList UMLViewImageExporterModel::exportAllViews(const TQString &imageType
 TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &imageType, const KURL &url) const {
     // create the needed directories
     if (!prepareDirectory(url)) {
-        return i18n("Can not create directory: %1").tqarg(url.directory());
+        return i18n("Can not create directory: %1").arg(url.directory());
     }
 
     // The fileName will be used when exporting the image. If the url isn't local,
@@ -148,14 +148,14 @@ TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &im
     // exporting the view to the file
     if (!exportViewTo(view, imageType, fileName)) {
         tmpFile.unlink();
-        return i18n("A problem occured while saving diagram in %1").tqarg(fileName);
+        return i18n("A problem occured while saving diagram in %1").arg(fileName);
     }
 
     // if the file wasn't local, upload the temp file to the target
     if (!url.isLocalFile()) {
         if (!KIO::NetAccess::upload(tmpFile.name(), url, UMLApp::app())) {
             tmpFile.unlink();
-            return i18n("There was a problem saving file: %1").tqarg(url.path());
+            return i18n("There was a problem saving file: %1").arg(url.path());
         }
     } //!isLocalFile
 
@@ -177,7 +177,7 @@ TQString UMLViewImageExporterModel::getDiagramFileName(UMLView *view, const TQSt
     listViewItem = static_cast<UMLListViewItem*>(listViewItem->parent());
 
     // Relies on the tree structure of the UMLListView. There are a base "Views" folder
-    // and five tqchildren, one for each view type (Logical, use case, components, deployment
+    // and five children, one for each view type (Logical, use case, components, deployment
     // and entity relationship)
     while (listView->rootView(listViewItem->getType()) == NULL) {
         name.insert(0, listViewItem->getText() + '/');
@@ -320,7 +320,7 @@ bool UMLViewImageExporterModel::fixEPS(const TQString &fileName, const TQRect& r
 
     // modify content
     fileContent.replace(pos,rx.cap(0).length(),
-                        TQString("%%BoundingBox: %1 %2 %3 %4").tqarg(left).tqarg(bottom).tqarg(right).tqarg(top));
+                        TQString("%%BoundingBox: %1 %2 %3 %4").arg(left).arg(bottom).arg(right).arg(top));
 
     ts << fileContent;
     epsfile.close();
diff --git a/umbrello/umbrello/umlwidget.h b/umbrello/umbrello/umlwidget.h
index 0cebb9d8..6a74579f 100644
--- a/umbrello/umbrello/umlwidget.h
+++ b/umbrello/umbrello/umlwidget.h
@@ -466,7 +466,7 @@ public:
     /**
      * Set the m_bActivated flag of a widget but does not perform the Activate method
      *
-     * @param Active tqStatus of activation is to be set.
+     * @param Active Status of activation is to be set.
      */
     void setActivated(bool Active = true);
 
@@ -667,7 +667,7 @@ public slots:
     /**
      * This slot is entered when an event has occurred on the views display,
      * most likely a mouse event.  Before it sends out that mouse event all
-     * tqchildren should make sure that they don't have a menu active or there
+     * children should make sure that they don't have a menu active or there
      * could be more than one popup menu displayed.
      */
     virtual void slotRemovePopupMenu();
diff --git a/umbrello/umbrello/widget_utils.cpp b/umbrello/umbrello/widget_utils.cpp
index eeb51956..bc9226dd 100644
--- a/umbrello/umbrello/widget_utils.cpp
+++ b/umbrello/umbrello/widget_utils.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqcanvas.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpen.h>
 #include <kiconloader.h>
 #include <kdebug.h>
@@ -101,7 +101,7 @@ TQCanvasRectangle *decoratePoint(const TQPoint& p) {
                                 SIZE, SIZE, currentView->canvas());
     rect->setBrush( TQBrush(TQt::blue) );
     rect->setPen( TQPen(TQt::blue) );
-    rect->tqsetVisible(true);
+    rect->setVisible(true);
     return rect;
 }