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

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

55 files changed, 343 insertions, 343 deletions

diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp
index a099397e..73c41d12 100644
--- a/cervisia/addremovedlg.cpp
+++ b/cervisia/addremovedlg.cpp
@@ -22,7 +22,7 @@
 
 #include <tqfileinfo.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.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 *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *tqlayout = 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 );
-    layout->addWidget(textlabel);
+    tqlayout->addWidget(textlabel);
 
     m_listBox = new TQListBox(mainWidget);
     m_listBox->setSelectionMode(TQListBox::NoSelection);
-    layout->addWidget(m_listBox, 5);
+    tqlayout->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);
 
-        layout->addSpacing(5);
-        layout->addLayout(warningLayout);
-        layout->addSpacing(5);
+        tqlayout->addSpacing(5);
+        tqlayout->addLayout(warningLayout);
+        tqlayout->addSpacing(5);
     }
 
     if( action == Remove )
diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp
index 187e0e16..e451fca0 100644
--- a/cervisia/addrepositorydlg.cpp
+++ b/cervisia/addrepositorydlg.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kconfig.h>
 #include <klineedit.h>
@@ -40,10 +40,10 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo,
 {
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout* layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     TQLabel* repo_label = new TQLabel(i18n("&Repository:"), mainWidget);
-    layout->addWidget(repo_label);
+    tqlayout->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);
     }
-    layout->addWidget(repo_edit);
+    tqlayout->addWidget(repo_edit);
     
     TQLabel* rsh_label = new TQLabel(i18n("Use remote &shell (only for :ext: repositories):"), mainWidget);
-    layout->addWidget(rsh_label);
+    tqlayout->addWidget(rsh_label);
     
     rsh_edit = new KLineEdit(mainWidget);
     rsh_label->setBuddy(rsh_edit);
-    layout->addWidget(rsh_edit);
+    tqlayout->addWidget(rsh_edit);
     
     TQLabel* server_label = new TQLabel(i18n("Invoke this program on the server side:"),
                                       mainWidget);
-    layout->addWidget(server_label);
+    tqlayout->addWidget(server_label);
     
     server_edit = new KLineEdit(mainWidget);
     server_label->setBuddy(server_edit);
-    layout->addWidget(server_edit);
+    tqlayout->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);
-    layout->addWidget(compressionBox);
+    tqlayout->addWidget(compressionBox);
     
     m_retrieveCvsignoreFile = new TQCheckBox(i18n("Download cvsignore file from "
                                             "server"), mainWidget);
-    layout->addWidget(m_retrieveCvsignoreFile);
+    tqlayout->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 1f220342..09d0cef0 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").arg(fileName));
+    d->dialog->setCaption(i18n("CVS Annotate: %1").tqarg(fileName));
     d->dialog->show();
 }
 
diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp
index 6d99c573..f3d80605 100644
--- a/cervisia/annotateview.cpp
+++ b/cervisia/annotateview.cpp
@@ -175,7 +175,7 @@ void AnnotateView::addLine(const LogInfo& logInfo, const TQString& content,
 }
 
 
-TQSize AnnotateView::sizeHint() const
+TQSize AnnotateView::tqsizeHint() 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 = itemRect(item);
+            viewportRect = tqitemRect(item);
             text = item->m_logInfo.createToolTipText(false);
         }
     }
diff --git a/cervisia/annotateview.h b/cervisia/annotateview.h
index aa6d947b..e4c78b58 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 sizeHint() const;
+    virtual TQSize tqsizeHint() const;
 
 private slots:
 
diff --git a/cervisia/cervisia.1.in b/cervisia/cervisia.1.in
index b60c2f3c..3a0c720a 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\-\-geometry\fR\ \fIgeometry\fR\ ]
+         [\ \fB\-\-tqgeometry\fR\ \fItqgeometry\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\-\-geometry\fR \fIgeometry\fR" 4
-.IX Item "--geometry geometry"
-Sets the geometry of the main window
+.IP "\fB\-\-tqgeometry\fR \fItqgeometry\fR" 4
+.IX Item "--tqgeometry tqgeometry"
+Sets the tqgeometry 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 940ba8e0..75ea6b27 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<--geometry> I<geometry> ]>
+         S<[ B<--tqgeometry> I<tqgeometry> ]>
          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<--geometry> I<geometry>
+=item B<--tqgeometry> I<tqgeometry>
 
-Sets the geometry of the main window
+Sets the tqgeometry of the main window
 
 =head1 FILES
 
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index beebe356..9087bacc 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -22,7 +22,7 @@
 #include <tqmessagebox.h>
 #include <tqpushbutton.h>
 #include <tqpopupmenu.h>
-#include <textstream.h>
+#include <tqtextstream.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->sizeHint());
+    filterLabel->setFixedSize(filterLabel->tqsizeHint());
     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( slotStatus() ),
+                          this, TQT_SLOT( slottqStatus() ),
                           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.arg(CERVISIA_VERSION).arg(TDE_VERSION_STRING));
+                       aboutstr.tqarg(CERVISIA_VERSION).tqarg(TDE_VERSION_STRING));
 }
 
 
@@ -856,7 +856,7 @@ void CervisiaPart::slotUpdate()
 }
 
 
-void CervisiaPart::slotStatus()
+void CervisiaPart::slottqStatus()
 {
     TQStringList list = update->multipleSelection();
     if (list.isEmpty())
@@ -1166,13 +1166,13 @@ void CervisiaPart::slotAnnotate()
 
 void CervisiaPart::slotDiffBase()
 {
-    showDiff(TQString::fromLatin1("BASE"));
+    showDiff(TQString::tqfromLatin1("BASE"));
 }
 
 
 void CervisiaPart::slotDiffHead()
 {
-    showDiff(TQString::fromLatin1("HEAD"));
+    showDiff(TQString::tqfromLatin1("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")
-                             .arg(repository));
+                             .tqarg(repository));
         m_jobType = Unknown;
     }
 }
@@ -1764,7 +1764,7 @@ bool CervisiaPart::openSandbox(const TQString &dirname)
     if (dostatus)
     {
         update->setSelected(update->firstChild(), true);
-        slotStatus();
+        slottqStatus();
     }
 
     //load the recentCommits for this app from the KConfig app
diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h
index 7a3802fd..b802e8ad 100644
--- a/cervisia/cervisiapart.h
+++ b/cervisia/cervisiapart.h
@@ -83,7 +83,7 @@ public slots:
 
     void slotOpen();
     void slotResolve();
-    void slotStatus();
+    void slottqStatus();
     void slotUpdate();
     void slotChangeLog();
     void slotCommit();
diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp
index 429becfd..9d00a8e8 100644
--- a/cervisia/changelogdlg.cpp
+++ b/cervisia/changelogdlg.cpp
@@ -22,7 +22,7 @@
 #include "changelogdlg.h"
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <kconfig.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
@@ -33,7 +33,7 @@
 
 static inline TQString DateStringISO8601()
 {
-    return TQDate::currentDate().toString(Qt::ISODate);
+    return TQDate::tqcurrentDate().toString(Qt::ISODate);
 }
 
 
diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp
index a5cb5689..9be04dd4 100644
--- a/cervisia/checkoutdlg.cpp
+++ b/cervisia/checkoutdlg.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqdir.h>
-#include <layout.h>
+#include <tqlayout.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* layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
-    TQGridLayout* grid = new TQGridLayout(layout);
+    TQGridLayout* grid = new TQGridLayout(tqlayout);
     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->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+    repo_combo->tqsetSizePolicy(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 1861fd6c..a2e587f3 100644
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqdir.h>
 #include <tqfileinfo.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.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 *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     TQLabel *textlabel = new TQLabel( i18n("Commit the following &files:"), mainWidget );
-    layout->addWidget(textlabel);
+    tqlayout->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()) );
-    layout->addWidget(m_fileList, 5);
+    tqlayout->addWidget(m_fileList, 5);
 
     TQLabel *archivelabel = new TQLabel(i18n("Older &messages:"), mainWidget);
-    layout->addWidget(archivelabel);
+    tqlayout->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->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
-    layout->addWidget(combo);
+    combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed));
+    tqlayout->addWidget(combo);
 
     TQLabel *messagelabel = new TQLabel(i18n("&Log message:"), mainWidget);
-    layout->addWidget(messagelabel);
+    tqlayout->addWidget(messagelabel);
 
     edit = new Cervisia::LogMessageEdit(mainWidget);
     messagelabel->setBuddy(edit);
     edit->setCheckSpellingEnabled(true);
     edit->setFocus();
     edit->setMinimumSize(400, 100);
-    layout->addWidget(edit, 10);
+    tqlayout->addWidget(edit, 10);
 
     m_useTemplateChk = new TQCheckBox(i18n("Use log message &template"), mainWidget);
-    layout->addWidget(m_useTemplateChk);
+    tqlayout->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 904a1682..cf0b4641 100644
--- a/cervisia/cvsinitdlg.cpp
+++ b/cervisia/cvsinitdlg.cpp
@@ -20,7 +20,7 @@
 #include "cvsinitdlg.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 #include <kfiledialog.h>
diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp
index 398c1c47..822a77ae 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::fromLatin1("Repository-") + location;
+    TQString repositoryGroup = TQString::tqfromLatin1("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 4c8f666e..8d7ed8c8 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -23,7 +23,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.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 *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
-    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);
+    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);
 
     revlabel1 = new TQLabel(mainWidget);
-    pairlayout->addWidget(revlabel1, 0, 0);
+    pairtqlayout->addWidget(revlabel1, 0, 0);
 
     revlabel2 = new TQLabel(mainWidget);
-    pairlayout->addWidget(revlabel2, 0, 2);
+    pairtqlayout->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);
 
-    pairlayout->addWidget(diff1, 1, 0);
-    pairlayout->addWidget(zoom,  1, 1);
-    pairlayout->addWidget(diff2, 1, 2);
+    pairtqlayout->addWidget(diff1, 1, 0);
+    pairtqlayout->addWidget(zoom,  1, 1);
+    pairtqlayout->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").arg(10000)));
+    nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").tqarg(10000)));
 
-    backbutton = new TQPushButton(TQString::fromLatin1("&<<"), mainWidget);
+    backbutton = new TQPushButton(TQString::tqfromLatin1("&<<"), mainWidget);
     connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) );
 
-    forwbutton = new TQPushButton(TQString::fromLatin1("&>>"), mainWidget);
+    forwbutton = new TQPushButton(TQString::tqfromLatin1("&>>"), mainWidget);
     connect( forwbutton, TQT_SIGNAL(clicked()), TQT_SLOT(forwClicked()) );
 
     connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) );
 
-    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);
+    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);
 
     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").arg(linenoA).arg(lineendA).arg(linenoB-1);
+        res = TQString("%1,%2d%3").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB-1);
     else if (linecountA == 0)
-        res = TQString("%1a%2,%3").arg(linenoA-1).arg(linenoB).arg(lineendB);
+        res = TQString("%1a%2,%3").tqarg(linenoA-1).tqarg(linenoB).tqarg(lineendB);
     else if (linenoA == lineendA)
         if (linenoB == lineendB)
-            res = TQString("%1c%2").arg(linenoA).arg(linenoB);
+            res = TQString("%1c%2").tqarg(linenoA).tqarg(linenoB);
         else
-            res = TQString("%1c%2,%3").arg(linenoA).arg(linenoB).arg(lineendB);
+            res = TQString("%1c%2,%3").tqarg(linenoA).tqarg(linenoB).tqarg(lineendB);
     else if (linenoB == lineendB)
-        res = TQString("%1,%2c%3").arg(linenoA).arg(lineendA).arg(linenoB);
+        res = TQString("%1,%2c%3").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB);
     else
-        res = TQString("%1,%2c%3,%4").arg(linenoA).arg(lineendA).arg(linenoB).arg(lineendB);
+        res = TQString("%1,%2c%3,%4").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB).tqarg(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").arg(fileName));
+    setCaption(i18n("CVS Diff: %1").tqarg(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").arg(markeditem+1).arg(items.count());
+	str = i18n("%1 of %2").tqarg(markeditem+1).tqarg(items.count());
     else
-	str = i18n("%1 differences").arg(items.count());
+	str = i18n("%1 differences").tqarg(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->repaint();
-    diff2->repaint();
+    diff1->tqrepaint();
+    diff2->tqrepaint();
     updateNofN();
 }
 
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index eacd7847..554e6d3f 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -293,7 +293,7 @@ int DiffView::cellWidth(int col)
 }
 
 
-TQSize DiffView::sizeHint() const
+TQSize DiffView::tqsizeHint() 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)
 {
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
+    tqsetSizePolicy( 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::sizeHint() const
+TQSize DiffZoomWidget::tqsizeHint() const
 {
-    return TQSize(25, tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent, this));
+    return TQSize(25, tqstyle().tqpixelMetric(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)
-        repaint();
+        tqrepaint();
 
     return TQFrame::eventFilter(o, e);
 }
diff --git a/cervisia/diffview.h b/cervisia/diffview.h
index 9bc57b06..2a2b998b 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 sizeHint() const;
+    virtual TQSize tqsizeHint() 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 sizeHint() const;
+    TQSize tqsizeHint() const;
 
 protected:
     void paintEvent(TQPaintEvent *);
diff --git a/cervisia/entry.h b/cervisia/entry.h
index f3705d35..2c0a1c98 100644
--- a/cervisia/entry.h
+++ b/cervisia/entry.h
@@ -43,7 +43,7 @@ struct Entry
     };
 
     /**
-     * Sets status to \a EntryStatus::Unknown and type to \a File.
+     * Sets status to \a EntrytqStatus::Unknown and type to \a File.
      */
     Entry();
 
@@ -60,7 +60,7 @@ struct Entry
     /**
      * The status of this entry.
      */
-    EntryStatus m_status;
+    EntrytqStatus m_status;
 
     /**
      * The revision of this entry.
diff --git a/cervisia/entry_status.cpp b/cervisia/entry_status.cpp
index 00ff3b32..c76c135c 100644
--- a/cervisia/entry_status.cpp
+++ b/cervisia/entry_status.cpp
@@ -28,10 +28,10 @@ namespace Cervisia
 {
 
 
-TQString toString(EntryStatus entryStatus)
+TQString toString(EntrytqStatus entrytqStatus)
 {
     TQString result;
-    switch (entryStatus)
+    switch (entrytqStatus)
     {
     case LocallyModified:
         result = i18n("Locally Modified");
diff --git a/cervisia/entry_status.h b/cervisia/entry_status.h
index aa964735..b1d6cf6f 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 EntryStatus
+enum EntrytqStatus
 {
     LocallyModified,
     LocallyAdded,
@@ -51,11 +51,11 @@ enum EntryStatus
 /**
  * The entry status as translated string.
  *
- * @param entryStatus The entry status to translate.
+ * @param entrytqStatus The entry status to translate.
  *
  * @return The translated string.
  */
-TQString toString(EntryStatus entryStatus);
+TQString toString(EntrytqStatus entrytqStatus);
 
 
 } // namespace Cervisia
diff --git a/cervisia/entry_status_change.h b/cervisia/entry_status_change.h
index 3518eed8..7935cf1d 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.
      */
-    EntryStatus m_status;
+    EntrytqStatus m_status;
 };
 
 
diff --git a/cervisia/globalignorelist.cpp b/cervisia/globalignorelist.cpp
index b3834a42..4b5c8a47 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::fromLatin1(". .."));
+        addEntriesFromString(TQString::tqfromLatin1(". .."));
     }
 }
 
@@ -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::fromLatin1(ignorestr));
+    addEntriesFromString(TQString::tqfromLatin1(ignorestr));
     addEntriesFromString(TQString::fromLocal8Bit(::getenv("CVSIGNORE")));
     addEntriesFromFile(TQDir::homeDirPath() + "/.cvsignore");  
     
diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp
index 273dbc33..1eb3b6ee 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -22,7 +22,7 @@
 
 #include <tqcheckbox.h>
 #include <tqdatetime.h>
-#include <layout.h>
+#include <tqlayout.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 *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *tqlayout = 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();
-    layout->addWidget(listview, 1);
+    tqlayout->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(layout);
+    TQGridLayout *grid = new TQGridLayout(tqlayout);
     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::fromLatin1("HistoryListView"));
+    listview->restoreLayout(&partConfig, TQString::tqfromLatin1("HistoryListView"));
 }
 
 
@@ -254,7 +254,7 @@ HistoryDialog::~HistoryDialog()
 {
     saveDialogSize(partConfig, "HistoryDialog");
 
-    listview->saveLayout(&partConfig, TQString::fromLatin1("HistoryListView"));
+    listview->saveLayout(&partConfig, TQString::tqfromLatin1("HistoryListView"));
 }
 
 
diff --git a/cervisia/ignorelistbase.cpp b/cervisia/ignorelistbase.cpp
index bc9850fa..74036d25 100644
--- a/cervisia/ignorelistbase.cpp
+++ b/cervisia/ignorelistbase.cpp
@@ -21,7 +21,7 @@ using namespace Cervisia;
 
 #include <tqfile.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 
 void IgnoreListBase::addEntriesFromString(const TQString& str)
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index 278a32a6..84954778 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -25,10 +25,10 @@
 #include <tqfile.h>
 #include <tqfileinfo.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqtabwidget.h>
-#include <textedit.h>
+#include <tqtextedit.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 *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *tqlayout = 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);
-            layout->addWidget(frame);
+            tqlayout->addWidget(frame);
         }
 
-        TQGridLayout *grid = new TQGridLayout(layout);
+        TQGridLayout *grid = new TQGridLayout(tqlayout);
         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").arg(filename));
+    setCaption(i18n("CVS Log: %1").tqarg(filename));
 
     DCOPRef job = cvsService->log(filename);
     if( !cvsService->ok() )
diff --git a/cervisia/loginfo.cpp b/cervisia/loginfo.cpp
index 8d4bd323..8e6464d0 100644
--- a/cervisia/loginfo.cpp
+++ b/cervisia/loginfo.cpp
@@ -19,7 +19,7 @@
 
 #include "loginfo.h"
 
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 
 #include <kglobal.h>
 #include <klocale.h>
@@ -41,7 +41,7 @@ TQString TagInfo::toString(bool prefixWithType) const
     TQString text;
     if (prefixWithType)
     {
-        text += typeToString() + TQString::fromLatin1(": ");
+        text += typeToString() + TQString::tqfromLatin1(": ");
     }
     text += m_name;
 
@@ -71,32 +71,32 @@ TQString TagInfo::typeToString() const
 
 TQString LogInfo::createToolTipText(bool showTime) const
 {
-    TQString text(TQString::fromLatin1("<nobr><b>"));
+    TQString text(TQString::tqfromLatin1("<nobr><b>"));
     text += TQStyleSheet::escape(m_revision);
-    text += TQString::fromLatin1("</b>&nbsp;&nbsp;");
+    text += TQString::tqfromLatin1("</b>&nbsp;&nbsp;");
     text += TQStyleSheet::escape(m_author);
-    text += TQString::fromLatin1("&nbsp;&nbsp;<b>");
+    text += TQString::tqfromLatin1("&nbsp;&nbsp;<b>");
     text += TQStyleSheet::escape(dateTimeToString(showTime));
-    text += TQString::fromLatin1("</b></nobr>");
+    text += TQString::tqfromLatin1("</b></nobr>");
 
     if (!m_comment.isEmpty())
     {
-        text += TQString::fromLatin1("<pre>");
+        text += TQString::tqfromLatin1("<pre>");
         text += TQStyleSheet::escape(m_comment);
-        text += TQString::fromLatin1("</pre>");
+        text += TQString::tqfromLatin1("</pre>");
     }
 
     if (!m_tags.isEmpty())
     {
-        text += TQString::fromLatin1("<i>");
+        text += TQString::tqfromLatin1("<i>");
         for (TTagInfoSeq::const_iterator it = m_tags.begin();
              it != m_tags.end(); ++it)
         {
             if (it != m_tags.begin() || m_comment.isEmpty())
-                text += TQString::fromLatin1("<br>");
+                text += TQString::tqfromLatin1("<br>");
             text += TQStyleSheet::escape((*it).toString());
         }
-        text += TQString::fromLatin1("</i>");
+        text += TQString::tqfromLatin1("</i>");
     }
 
     return text;
diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp
index d676718a..439ba36f 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::fromLatin1(", ")));
+                                       TQString::tqfromLatin1(", ")));
 }
 
 
@@ -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::fromLatin1("LogList view"));
+    restoreLayout(&partConfig, TQString::tqfromLatin1("LogList view"));
 }
 
 
 LogListView::~LogListView()
 {
-    saveLayout(&partConfig, TQString::fromLatin1("LogList view"));
+    saveLayout(&partConfig, TQString::tqfromLatin1("LogList view"));
 }
 
 
@@ -220,7 +220,7 @@ void LogListView::slotQueryToolTip(const TQPoint& viewportPos,
 {
     if (const LogListViewItem* item = static_cast<LogListViewItem*>(itemAt(viewportPos)))
     {
-        viewportRect = itemRect(item);
+        viewportRect = tqitemRect(item);
         text = item->m_logInfo.createToolTipText();
     }
 }
diff --git a/cervisia/logmessageedit.cpp b/cervisia/logmessageedit.cpp
index 4d5fdc04..90b0d405 100644
--- a/cervisia/logmessageedit.cpp
+++ b/cervisia/logmessageedit.cpp
@@ -22,7 +22,7 @@
 #include "logmessageedit.h"
 using Cervisia::LogMessageEdit;
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <kaccel.h>
 
 
@@ -76,7 +76,7 @@ void LogMessageEdit::keyPressEvent(TQKeyEvent* event)
     if( noModifier )
     {
         TQString keycode = event->text();
-        if( !keycode.isEmpty() && keycode.unicode()->isPrint() )
+        if( !keycode.isEmpty() && keycode.tqunicode()->isPrint() )
         {
             KTextEdit::keyPressEvent(event);
             tryCompletion();
diff --git a/cervisia/logplainview.cpp b/cervisia/logplainview.cpp
index 474046f0..44754cd4 100644
--- a/cervisia/logplainview.cpp
+++ b/cervisia/logplainview.cpp
@@ -21,7 +21,7 @@
 
 #include <tqregexp.h>
 #include <tqstringlist.h>
-#include <stylesheet.h>
+#include <tqstylesheet.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").arg(TQStyleSheet::escape(logInfo.m_revision)) +
+    logEntry += "<b>" + i18n("revision %1").tqarg(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").arg(TQStyleSheet::escape(logInfo.dateTimeToString()))
-                                            .arg(TQStyleSheet::escape(logInfo.m_author)) +
+                i18n("date: %1; author: %2").tqarg(TQStyleSheet::escape(logInfo.dateTimeToString()))
+                                            .tqarg(TQStyleSheet::escape(logInfo.m_author)) +
                 "</i>";
 
     append(logEntry);
diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp
index 95bf9035..88684312 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;
-            repaint(false);
+            tqrepaint(false);
         }
     }
 }
 
 
-TQSize LogTreeView::sizeHint() const
+TQSize LogTreeView::tqsizeHint() const
 {
     return TQSize(2 * static_width, 3 * static_height);
 }
diff --git a/cervisia/logtree.h b/cervisia/logtree.h
index c895c183..f1af28b9 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 sizeHint() const;
+    virtual TQSize tqsizeHint() const;
     
     virtual TQString text(int row, int col) const;
 
diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp
index fb9e5ad4..be371c62 100644
--- a/cervisia/mergedlg.cpp
+++ b/cervisia/mergedlg.cpp
@@ -23,7 +23,7 @@
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.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().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
+    int const iWidgetIndent(tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     bybranch_button = new TQRadioButton(i18n("Merge from &branch:"), mainWidget);
     bybranch_button->setChecked(true);
-    layout->addWidget(bybranch_button);
+    tqlayout->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(layout);
+    TQBoxLayout *branchedit_layout = new TQHBoxLayout(tqlayout);
     branchedit_layout->addSpacing(iWidgetIndent);
     branchedit_layout->addWidget(branch_combo, 2);
     branchedit_layout->addWidget(branch_button, 0);
     
     bytags_button = new TQRadioButton(i18n("Merge &modifications:"), mainWidget);
-    layout->addWidget(bytags_button);
+    tqlayout->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(layout);
+    TQGridLayout *tagsedit_layout = new TQGridLayout(tqlayout);
     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 7a13b15c..76ae72d1 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.unicode();
+    const TQChar* const startPos = str.tqunicode();
     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?").arg(fileName),
+                  i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").tqarg(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::fromLatin1("branch"), cvsService,
+    return FetchBranchesAndTags(TQString::tqfromLatin1("branch"), cvsService,
                                 parent);
 }
 
 
 const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* parent)
 {
-    return FetchBranchesAndTags(TQString::fromLatin1("revision"), cvsService,
+    return FetchBranchesAndTags(TQString::tqfromLatin1("revision"), cvsService,
                                 parent);
 }
 
diff --git a/cervisia/patchoptiondlg.cpp b/cervisia/patchoptiondlg.cpp
index 6d232eca..6516528f 100644
--- a/cervisia/patchoptiondlg.cpp
+++ b/cervisia/patchoptiondlg.cpp
@@ -21,7 +21,7 @@ using Cervisia::PatchOptionDialog;
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
 #include <knuminput.h>
diff --git a/cervisia/progressdlg.cpp b/cervisia/progressdlg.cpp
index 674642f9..abf23d1a 100644
--- a/cervisia/progressdlg.cpp
+++ b/cervisia/progressdlg.cpp
@@ -20,7 +20,7 @@
 #include "progressdlg.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.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->sizeHint().width());
-    textLabel->setFixedHeight(textLabel->sizeHint().height());
+    textLabel->setMinimumWidth(textLabel->tqsizeHint().width());
+    textLabel->setFixedHeight(textLabel->tqsizeHint().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(sizeHint());
+    resize(tqsizeHint());
 }
 
 
diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp
index 004226a8..eb248cc1 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").arg(exitStatus);
+            msg = i18n("[Exited with status %1]\n").tqarg(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>").arg(color.name())
-                                                           .arg(escapedLine)
+           ? TQString("<font color=\"%1\"><b>%2</b></font>").tqarg(color.name())
+                                                           .tqarg(escapedLine)
            : escapedLine);
 }
 
diff --git a/cervisia/protocolview.h b/cervisia/protocolview.h
index 5a10195e..42995d85 100644
--- a/cervisia/protocolview.h
+++ b/cervisia/protocolview.h
@@ -22,7 +22,7 @@
 #ifndef PROTOCOLVIEW_H
 #define PROTOCOLVIEW_H
 
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <dcopobject.h>
 
 class TQPoint;
diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp
index 43b597a0..a9e8a9fd 100644
--- a/cervisia/qttableview.cpp
+++ b/cervisia/qttableview.cpp
@@ -33,8 +33,8 @@ enum ScrollBarDirtyFlags {
 };
 
 
-#define HSBEXT horizontalScrollBar()->sizeHint().height()
-#define VSBEXT verticalScrollBar()->sizeHint().width()
+#define HSBEXT horizontalScrollBar()->tqsizeHint().height()
+#define VSBEXT verticalScrollBar()->tqsizeHint().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 repaint().
+  \e including the frame.  They are used by functions such as tqrepaint().
 
   \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 shapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
+  Frame line tqshapes (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::repaint( bool erase )
+  \overload void QtTableView::tqrepaint( 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 repaint() usually is faster than doing an update(), but
+  Doing a tqrepaint() 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::repaint() repaint()\endlink.	 It does this because by
+  TQWidget::tqrepaint() tqrepaint()\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::repaint( int x, int y, int w, int h, bool erase )
+void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
 {
     if ( !isVisible() || testWState(WState_BlockUpdates) )
 	return;
@@ -248,7 +248,7 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase )
 }
 
 /*!
-  \overload void QtTableView::repaint( const TQRect &r, bool erase )
+  \overload void QtTableView::tqrepaint( 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() ) )
-		repaint( oldTopCell != topCell() );
+		tqrepaint( 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 )
-	    repaint();
+	    tqrepaint();
     }
     updateScrollBars( horRange );
     updateFrameSize();
@@ -590,7 +590,7 @@ void QtTableView::setCellWidth( int cellWidth )
 
     updateScrollBars( horSteps | horRange );
     if ( autoUpdate() && isVisible() )
-	repaint();
+	tqrepaint();
 
 }
 
@@ -642,7 +642,7 @@ void QtTableView::setCellHeight( int cellHeight )
 #endif
     cellH = (short)cellHeight;
     if ( autoUpdate() && isVisible() )
-	repaint();
+	tqrepaint();
     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;	// repaint table
+	    repaintMask |= Tbl_snapToGrid;	// tqrepaint table
 	}
     }
 
@@ -824,7 +824,7 @@ void QtTableView::setTableFlags( uint f )
 	setAutoUpdate( TRUE );
 	updateScrollBars();
 	if ( isVisible() && (f & repaintMask) )
-	    repaint();
+	    tqrepaint();
     }
 
 }
@@ -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;		     // repaint table
+	    repaintMask |= Tbl_smoothScrolling;		     // tqrepaint 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) )
-	    repaint();
+	    tqrepaint();
     }
 
 }
@@ -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 repaint itself or update
+  If \a enable is FALSE, the view does NOT tqrepaint 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 repaint().
+  auto-update and call tqrepaint().
 
   \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 repaint the view; you must call
-  repaint() to do this.
+  Setting auto-update to TRUE does not tqrepaint the view; you must call
+  tqrepaint() to do this.
 
-  \sa autoUpdate(), repaint()
+  \sa autoUpdate(), tqrepaint()
 */
 
 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) );
-    repaint( uR.intersect(viewRect()), erase );
+    tqrepaint( 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 repaint(FALSE).
+    // flicker-freeness and encourage the use of tqrepaint(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 = colorGroup();
+    const TQColorGroup g = tqcolorGroup();
 
     if ( xPos <= maxX ) {
 	TQRect r = viewR;
@@ -1430,7 +1430,7 @@ void QtTableView::wheelEvent( TQWheelEvent * e )
 
 void QtTableView::updateView()
 {
-    repaint( viewRect() );
+    tqrepaint( viewRect() );
 }
 
 /*!
@@ -1447,7 +1447,7 @@ TQScrollBar *QtTableView::verticalScrollBar() const
 #ifndef TQT_NO_CURSOR
 	sb->setCursor( arrowCursor );
 #endif
-        sb->resize( sb->sizeHint() ); // height is irrelevant
+        sb->resize( sb->tqsizeHint() ); // 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->sizeHint() ); // width is irrelevant
+	sb->resize( sb->tqsizeHint() ); // 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() )
-	    repaint( hScrollBar->x(), hScrollBar->y(),
+	    tqrepaint( 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() )
-	    repaint( vScrollBar->x(), vScrollBar->y(),
+	    tqrepaint( 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 geometry
+			// show scrollbar only when it has a sane tqgeometry
 	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 geometry
+			// show scrollbar only when it has a sane tqgeometry
 	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 repaint the widget.
+  This function does not tqrepaint the widget.
 */
 
 void QtTableView::updateTableSize()
diff --git a/cervisia/qttableview.h b/cervisia/qttableview.h
index b3c8ff8a..ce2af64b 100644
--- a/cervisia/qttableview.h
+++ b/cervisia/qttableview.h
@@ -32,9 +32,9 @@ public:
     virtual void setPalette( const TQPalette & );
     void	show();
 
-    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 );
+    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 );
 
 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::repaint( bool erase )
-{ repaint( 0, 0, width(), height(), erase ); }
+inline void QtTableView::tqrepaint( bool erase )
+{ tqrepaint( 0, 0, width(), height(), erase ); }
 
-inline void QtTableView::repaint( const TQRect &r, bool erase )
-{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); }
+inline void QtTableView::tqrepaint( const TQRect &r, bool erase )
+{ tqrepaint( 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 f17bb7b9..7f52a39d 100644
--- a/cervisia/repositories.cpp
+++ b/cervisia/repositories.cpp
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <tqfile.h>
 #include <tqdir.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <kapplication.h>
 #include <kconfig.h>
 
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index 90d64a4f..64adc69e 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -21,7 +21,7 @@
 
 #include "repositorydlg.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
 #include <kconfig.h>
@@ -141,14 +141,14 @@ void RepositoryListItem::setIsLoggedIn(bool isLoggedIn)
 
 void RepositoryListItem::changeLoginStatusColumn()
 {
-    TQString loginStatus;
+    TQString logintqStatus;
     
     if( LoginNeeded(repository()) )
-        loginStatus = m_isLoggedIn ? i18n("Logged in") : i18n("Not logged in");
+        logintqStatus = m_isLoggedIn ? i18n("Logged in") : i18n("Not logged in");
     else
-        loginStatus = i18n("No login required");
+        logintqStatus = i18n("No login required");
         
-    setText(3, loginStatus);
+    setText(3, logintqStatus);
 }
 
 
@@ -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->layout();
+    actionbox->tqlayout();
     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::fromLatin1("RepositoryListView"));
+    m_repoList->restoreLayout(&m_partConfig, TQString::tqfromLatin1("RepositoryListView"));
 }
 
 
@@ -239,7 +239,7 @@ RepositoryDialog::~RepositoryDialog()
 {
     saveDialogSize(m_partConfig, "RepositoryDialog");
 
-    m_repoList->saveLayout(&m_partConfig, TQString::fromLatin1("RepositoryListView"));
+    m_repoList->saveLayout(&m_partConfig, TQString::tqfromLatin1("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::fromLatin1("Repository-") +
+        m_serviceConfig->setGroup(TQString::tqfromLatin1("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::fromLatin1("Repository-") +
+    m_serviceConfig->setGroup(TQString::tqfromLatin1("Repository-") +
                               item->repository());
 
     m_serviceConfig->writeEntry("rsh", item->rsh());
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index 1e59d2a9..fd3e7d9a 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -24,10 +24,10 @@
 #include <tqfile.h>
 #include <tqkeycode.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
-#include <textcodec.h>
-#include <textstream.h>
+#include <tqtextcodec.h>
+#include <tqtextstream.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 *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *tqlayout = 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 *versionAlayout = new TQVBoxLayout(versionALayoutWidget, 5);
+    TQBoxLayout *versionAtqlayout = new TQVBoxLayout(versionALayoutWidget, 5);
 
     TQLabel *revlabel1 = new TQLabel(i18n("Your version (A):"), versionALayoutWidget);
-    versionAlayout->addWidget(revlabel1);
+    versionAtqlayout->addWidget(revlabel1);
     diff1 = new DiffView(cfg, true, false, versionALayoutWidget);
-    versionAlayout->addWidget(diff1, 10);
+    versionAtqlayout->addWidget(diff1, 10);
 
     TQWidget* versionBLayoutWidget = new TQWidget(splitter);
-    TQBoxLayout *versionBlayout = new TQVBoxLayout(versionBLayoutWidget, 5);
+    TQBoxLayout *versionBtqlayout = new TQVBoxLayout(versionBLayoutWidget, 5);
 
     TQLabel *revlabel2 = new TQLabel(i18n("Other version (B):"), versionBLayoutWidget);
-    versionBlayout->addWidget(revlabel2);
+    versionBtqlayout->addWidget(revlabel2);
     diff2 = new DiffView(cfg, true, false, versionBLayoutWidget);
-    versionBlayout->addWidget(diff2, 10);
+    versionBtqlayout->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);
 
-    layout->addWidget(vertSplitter);
+    tqlayout->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->setAlignment(AlignCenter);
+    nofnlabel->tqsetAlignment(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 *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);
+    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);
 
     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").arg(name));
+    setCaption(i18n("CVS Resolve: %1").tqarg(name));
 
     fname = name;
   
@@ -383,9 +383,9 @@ void ResolveDialog::updateNofN()
 {
     TQString str;
     if (markeditem >= 0)
-        str = i18n("%1 of %2").arg(markeditem+1).arg(items.count());
+        str = i18n("%1 of %2").tqarg(markeditem+1).tqarg(items.count());
     else
-        str = i18n("%1 conflicts").arg(items.count());
+        str = i18n("%1 conflicts").tqarg(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->repaint();
-    diff2->repaint();
-    merge->repaint();
+    diff1->tqrepaint();
+    diff2->tqrepaint();
+    merge->tqrepaint();
     updateNofN();
 }
 
@@ -456,7 +456,7 @@ void ResolveDialog::updateMergedVersion(ResolveItem* item,
     while ( (item = items.next()) != 0 )
         item->offsetM += difference;
 
-    merge->repaint();
+    merge->tqrepaint();
 }
 
 
@@ -562,9 +562,9 @@ void ResolveDialog::editClicked()
     }
 
     delete dlg;
-    diff1->repaint();
-    diff2->repaint();
-    merge->repaint();
+    diff1->tqrepaint();
+    diff2->tqrepaint();
+    merge->tqrepaint();
 }
 
 
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index f1437f24..eecdd41f 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqgrid.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.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::fromLatin1(iconName), KIcon::NoGroup,
+        return loader->loadIcon(TQString::tqfromLatin1(iconName), KIcon::NoGroup,
                                  KIcon::SizeMedium);
     }
 }
@@ -73,7 +73,7 @@ void FontButton::chooseFont()
         return;
 
     setFont(newFont);
-    repaint(false);
+    tqrepaint(false);
 }
 
 
@@ -99,7 +99,7 @@ SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *nam
     addDiffPage();
 
     //
-    // Status Options
+    // tqStatus 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::allWidgets());
+    TQWidgetListIt it(*TQApplication::tqallWidgets());
     for (; it.current(); ++it)
         {
             TQWidget *w = it.current();
@@ -236,24 +236,24 @@ void SettingsDialog::addGeneralPage()
 {
     TQFrame* generalPage = addPage(i18n("General"), TQString(),
                                   LoadIcon("misc"));
-    TQVBoxLayout* layout = new TQVBoxLayout(generalPage, 0, KDialog::spacingHint());
+    TQVBoxLayout* tqlayout = 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);
 
-    layout->addWidget(usernamelabel);
-    layout->addWidget(usernameedit);
+    tqlayout->addWidget(usernamelabel);
+    tqlayout->addWidget(usernameedit);
 
     TQLabel *cvspathlabel = new TQLabel( i18n("&Path to CVS executable, or 'cvs':"), generalPage );
     cvspathedit = new KURLRequester(generalPage);
     cvspathlabel->setBuddy(cvspathedit);
 
-    layout->addWidget(cvspathlabel);
-    layout->addWidget(cvspathedit);
+    tqlayout->addWidget(cvspathlabel);
+    tqlayout->addWidget(cvspathedit);
 
-    layout->addStretch();
+    tqlayout->addStretch();
 }
 
 
@@ -341,37 +341,37 @@ void SettingsDialog::addLookAndFeelPage()
     m_changelogFontBox = new FontButton(i18n("Font for ChangeLog View..."),
                                         fontGroupBox);
 
-    TQGroupBox* colorGroupBox = new TQGroupBox(4, Qt::Horizontal,
+    TQGroupBox* tqcolorGroupBox = new TQGroupBox(4, Qt::Horizontal,
                                              i18n("Colors"), lookPage);
-    colorGroupBox->setColumns(4);
-    colorGroupBox->setInsideSpacing(KDialog::spacingHint());
+    tqcolorGroupBox->setColumns(4);
+    tqcolorGroupBox->setInsideSpacing(KDialog::spacingHint());
 
-    TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), colorGroupBox);
-    m_conflictButton      = new KColorButton(colorGroupBox);
+    TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), tqcolorGroupBox);
+    m_conflictButton      = new KColorButton(tqcolorGroupBox);
     conflictLabel->setBuddy(m_conflictButton);
 
-    TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), colorGroupBox);
-    m_diffChangeButton      = new KColorButton(colorGroupBox);
+    TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), tqcolorGroupBox);
+    m_diffChangeButton      = new KColorButton(tqcolorGroupBox);
     diffChangeLabel->setBuddy(m_diffChangeButton);
 
-    TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), colorGroupBox);
-    m_localChangeButton      = new KColorButton(colorGroupBox);
+    TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), tqcolorGroupBox);
+    m_localChangeButton      = new KColorButton(tqcolorGroupBox);
     localChangeLabel->setBuddy(m_localChangeButton);
 
-    TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), colorGroupBox);
-    m_diffInsertButton      = new KColorButton(colorGroupBox);
+    TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), tqcolorGroupBox);
+    m_diffInsertButton      = new KColorButton(tqcolorGroupBox);
     diffInsertLabel->setBuddy(m_diffInsertButton);
 
-    TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), colorGroupBox);
-    m_remoteChangeButton      = new KColorButton(colorGroupBox);
+    TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), tqcolorGroupBox);
+    m_remoteChangeButton      = new KColorButton(tqcolorGroupBox);
     remoteChangeLabel->setBuddy( m_remoteChangeButton );
 
-    TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), colorGroupBox);
-    m_diffDeleteButton      = new KColorButton(colorGroupBox);
+    TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), tqcolorGroupBox);
+    m_diffDeleteButton      = new KColorButton(tqcolorGroupBox);
     diffDeleteLabel->setBuddy(m_diffDeleteButton);
 
-    TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), colorGroupBox);
-    m_notInCvsButton      = new KColorButton(colorGroupBox);
+    TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), tqcolorGroupBox);
+    m_notInCvsButton      = new KColorButton(tqcolorGroupBox);
     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 c15d391f..2100e8ff 100644
--- a/cervisia/settingsdlg_advanced.ui
+++ b/cervisia/settingsdlg_advanced.ui
@@ -26,7 +26,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>31</width>
                     <height>41</height>
diff --git a/cervisia/stringmatcher.cpp b/cervisia/stringmatcher.cpp
index 6e70a6e0..0c7e833c 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.unicode());
+    const TQChar* pos(text.tqunicode());
     const TQChar* posEnd(pos + text.length());
     while (pos < posEnd)
     {
diff --git a/cervisia/tagdlg.cpp b/cervisia/tagdlg.cpp
index b652c4c9..3d8b9516 100644
--- a/cervisia/tagdlg.cpp
+++ b/cervisia/tagdlg.cpp
@@ -23,7 +23,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.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 *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *tqlayout = 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(layout);
+            TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout);
             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(layout);
+            TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout);
             tagedit_layout->addWidget(tag_label);
             tagedit_layout->addWidget(tag_edit);
 
             branchtag_button = new TQCheckBox(i18n("Create &branch with this tag"), mainWidget);
-            layout->addWidget(branchtag_button);
+            tqlayout->addWidget(branchtag_button);
 
             forcetag_button = new TQCheckBox(i18n("&Force tag creation even if tag already exists"), mainWidget);
-            layout->addWidget(forcetag_button);
+            tqlayout->addWidget(forcetag_button);
 	}
 
     setHelp("taggingbranching");
diff --git a/cervisia/tooltip.cpp b/cervisia/tooltip.cpp
index 728945ca..df3c4977 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* unicode(text.unicode());
-    for (int count(maxNumberOfLines); count; ++unicode)
-        if (*unicode == newLine)
+    const TQChar* tqunicode(text.tqunicode());
+    for (int count(maxNumberOfLines); count; ++tqunicode)
+        if (*tqunicode == newLine)
             --count;
 
-    return text.left(unicode - text.unicode() - 1);
+    return text.left(tqunicode - text.tqunicode() - 1);
 }
 
 
diff --git a/cervisia/updatedlg.cpp b/cervisia/updatedlg.cpp
index eb559b2f..55243796 100644
--- a/cervisia/updatedlg.cpp
+++ b/cervisia/updatedlg.cpp
@@ -22,7 +22,7 @@
 
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.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().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
+    int const iWidgetIndent(tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6);
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     bybranch_button = new TQRadioButton(i18n("Update to &branch: "), mainWidget);
     bybranch_button->setChecked(true);
-    layout->addWidget(bybranch_button);
+    tqlayout->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(layout);
+    TQBoxLayout *branchedit_layout = new TQHBoxLayout(tqlayout);
     branchedit_layout->addSpacing(iWidgetIndent);
     branchedit_layout->addWidget(branch_combo);
     branchedit_layout->addWidget(branch_button);
     
     bytag_button = new TQRadioButton(i18n("Update to &tag: "), mainWidget);
-    layout->addWidget(bytag_button);
+    tqlayout->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(layout);
+    TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout);
     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);
-    layout->addWidget(bydate_button);
+    tqlayout->addWidget(bydate_button);
 
     date_edit = new KLineEdit(mainWidget);
 
-    TQBoxLayout *dateedit_layout = new TQHBoxLayout(layout);
+    TQBoxLayout *dateedit_layout = new TQHBoxLayout(tqlayout);
     dateedit_layout->addSpacing(iWidgetIndent);
     dateedit_layout->addWidget(date_edit);
 
diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp
index 52e44b2e..47ab5c65 100644
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@@ -35,7 +35,7 @@
 
 
 using Cervisia::Entry;
-using Cervisia::EntryStatus;
+using Cervisia::EntrytqStatus;
 
 
 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::fromLatin1("UpdateView"));
+    restoreLayout(&m_partConfig, TQString::tqfromLatin1("UpdateView"));
 }
 
 
 UpdateView::~UpdateView()
 {
-    saveLayout(&m_partConfig, TQString::fromLatin1("UpdateView"));
+    saveLayout(&m_partConfig, TQString::tqfromLatin1("UpdateView"));
 }
 
 
@@ -548,7 +548,7 @@ void UpdateView::updateColors()
 
 
 /**
- * Process one line from the output of 'cvs update'. If parseAsStatus
+ * Process one line from the output of 'cvs update'. If parseAstqStatus
  * 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] == ' ')
     {
-        EntryStatus status(Cervisia::Unknown);
+        EntrytqStatus 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::fromLatin1("cvs server: "));
-    const TQString removedFileEnd(TQString::fromLatin1(" is no longer in the repository"));
+    const TQString removedFileStart(TQString::tqfromLatin1("cvs server: "));
+    const TQString removedFileEnd(TQString::tqfromLatin1(" 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, EntryStatus status, bool isdir)
+void UpdateView::updateItem(const TQString& filePath, EntrytqStatus status, bool isdir)
 {
     if (isdir && filePath == TQChar('.'))
         return;
diff --git a/cervisia/updateview.h b/cervisia/updateview.h
index 9fde0956..181cf739 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::EntryStatus status, bool isdir);
+    void updateItem(const TQString &filename, Cervisia::EntrytqStatus 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 9e0abc22..4e07c1ab 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -39,7 +39,7 @@
 
 
 using Cervisia::Entry;
-using Cervisia::EntryStatus;
+using Cervisia::EntrytqStatus;
 
 
 // ------------------------------------------------------------------------------
@@ -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,
-                                    EntryStatus status,
+                                    EntrytqStatus 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->setStatus(status);
+            fileItem->settqStatus(status);
         }
         return;
     }
@@ -127,7 +127,7 @@ void UpdateDirItem::updateChildItem(const TQString& name,
     else
     {
         entry.m_type = Entry::File;
-        createFileItem(entry)->setStatus(status);
+        createFileItem(entry)->settqStatus(status);
     }
 }
 
@@ -150,7 +150,7 @@ void UpdateDirItem::updateEntriesItem(const Entry& entry,
                 entry.m_status == Cervisia::LocallyRemoved ||
                 entry.m_status == Cervisia::Conflict)
             {
-                fileItem->setStatus(entry.m_status);
+                fileItem->settqStatus(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::fromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
+	int pivot = s.find( TQRegExp(TQString::tqfromLatin1("[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->setStatus(Cervisia::Removed);
+                fileItem->settqStatus(Cervisia::Removed);
                 fileItem->setRevTag(TQString(), TQString());
             }
         }
@@ -501,14 +501,14 @@ UpdateFileItem::UpdateFileItem(UpdateDirItem* parent, const Entry& entry)
 }
 
 
-void UpdateFileItem::setStatus(EntryStatus status)
+void UpdateFileItem::settqStatus(EntrytqStatus status)
 {
     if (status != m_entry.m_status)
     {
         m_entry.m_status = status;
         const bool visible(applyFilter(updateView()->filter()));
         if (visible)
-            repaint();
+            tqrepaint();
     }
     m_undefined = false;
 }
@@ -584,7 +584,7 @@ void UpdateFileItem::setRevTag(const TQString& rev, const TQString& tag)
     if (isVisible())
     {
         widthChanged();
-        repaint();
+        tqrepaint();
     }
 }
 
@@ -598,13 +598,13 @@ void UpdateFileItem::setDate(const TQDateTime& date)
 void UpdateFileItem::markUpdated(bool laststage,
                                  bool success)
 {
-    EntryStatus newstatus = m_entry.m_status;
+    EntrytqStatus newstatus = m_entry.m_status;
 
     if (laststage)
     {
         if (undefinedState() && m_entry.m_status != Cervisia::NotInCVS)
             newstatus = success? Cervisia::UpToDate : Cervisia::Unknown;
-        setStatus(newstatus);
+        settqStatus(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 Status:
+    case tqStatus:
         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 Status:
+    case tqStatus:
         result = toString(entry().m_status);
         break;
     case Revision:
diff --git a/cervisia/updateview_items.h b/cervisia/updateview_items.h
index 73694646..ca26930f 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) children.
+    // TQString() for the root item and its (direct) tqchildren.
     // 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::EntryStatus status, bool isdir);
+    void updateChildItem(const TQString& name, Cervisia::EntrytqStatus 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, Status, Revision, TagOrDate, Timestamp };
+    enum { Name, MimeType, tqStatus, 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 setStatus(Cervisia::EntryStatus status);
+    void settqStatus(Cervisia::EntrytqStatus 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 0dae046b..8232d98c 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 children
+    // - it has visible tqchildren
     // - 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 0ce48954..607dbd46 100644
--- a/cervisia/watchdlg.cpp
+++ b/cervisia/watchdlg.cpp
@@ -23,7 +23,7 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <klocale.h>
 
@@ -36,37 +36,37 @@ WatchDialog::WatchDialog(ActionType action, TQWidget *parent, const char *name)
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *tqlayout = 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 );
-    layout->addWidget(textlabel, 0);
+    tqlayout->addWidget(textlabel, 0);
 
     all_button = new TQRadioButton(i18n("&All"), mainWidget);
     all_button->setFocus();
     all_button->setChecked(true);
-    layout->addWidget(all_button);
+    tqlayout->addWidget(all_button);
     
     only_button = new TQRadioButton(i18n("&Only:"), mainWidget);
-    layout->addWidget(only_button);
+    tqlayout->addWidget(only_button);
 
-    TQGridLayout *eventslayout = new TQGridLayout(layout);
-    eventslayout->addColSpacing(0, 20);
-    eventslayout->setColStretch(0, 0);
-    eventslayout->setColStretch(1, 1);
+    TQGridLayout *eventstqlayout = new TQGridLayout(tqlayout);
+    eventstqlayout->addColSpacing(0, 20);
+    eventstqlayout->setColStretch(0, 0);
+    eventstqlayout->setColStretch(1, 1);
     
     commitbox = new TQCheckBox(i18n("&Commits"), mainWidget);
     commitbox->setEnabled(false);
-    eventslayout->addWidget(commitbox, 0, 1);
+    eventstqlayout->addWidget(commitbox, 0, 1);
     
     editbox = new TQCheckBox(i18n("&Edits"), mainWidget);
     editbox->setEnabled(false);
-    eventslayout->addWidget(editbox, 1, 1);
+    eventstqlayout->addWidget(editbox, 1, 1);
 
     uneditbox = new TQCheckBox(i18n("&Unedits"), mainWidget);
     uneditbox->setEnabled(false);
-    eventslayout->addWidget(uneditbox, 2, 1);
+    eventstqlayout->addWidget(uneditbox, 2, 1);
 
     TQButtonGroup* group = new TQButtonGroup(mainWidget);
     group->hide();
diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp
index e080eabf..afe9e7a3 100644
--- a/cervisia/watchersdlg.cpp
+++ b/cervisia/watchersdlg.cpp
@@ -19,7 +19,7 @@
 
 #include "watchersdlg.h"
 
-#include <layout.h>
+#include <tqlayout.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 *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *tqlayout = 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"));
     
-    layout->addWidget(table, 1);
+    tqlayout->addWidget(table, 1);
 
     setWFlags(TQt::WDestructiveClose | getWFlags());